From: wessels <>
Date: Fri, 19 Aug 2005 22:40:15 +0000 (+0000)
Subject: change 'sizeof sockaddr_in' to sizeof S' and make connect()
X-Git-Tag: SQUID_3_0_PRE4~682
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=023b0d1d8c89a3f87a06ed1dc09f0a0a8c94ae8a;p=thirdparty%2Fsquid.git

change 'sizeof sockaddr_in' to sizeof S' and make connect()
debugging a little more verbose.
---

diff --git a/src/cachemgr.cc b/src/cachemgr.cc
index d1814fff3c..19e384d714 100644
--- a/src/cachemgr.cc
+++ b/src/cachemgr.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cachemgr.cc,v 1.111 2005/07/13 23:15:46 wessels Exp $
+ * $Id: cachemgr.cc,v 1.112 2005/08/19 16:40:15 wessels Exp $
  *
  * DEBUG: section 0     CGI Cache Manager
  * AUTHOR: Duane Wessels
@@ -799,7 +799,7 @@ process_request(cachemgr_request * req)
         return 1;
     }
 
-    memset(&S, '\0', sizeof(struct sockaddr_in));
+    memset(&S, '\0', sizeof(S));
     S.sin_family = AF_INET;
 
     if ((hp = gethostbyname(req->hostname)) != NULL) {
@@ -815,8 +815,11 @@ process_request(cachemgr_request * req)
 
     S.sin_port = htons(req->port);
 
-    if (connect(s, (struct sockaddr *) &S, sizeof(struct sockaddr_in)) < 0) {
-        snprintf(buf, 1024, "connect: %s\n", xstrerror());
+    if (connect(s, (struct sockaddr *) &S, sizeof(S)) < 0) {
+        snprintf(buf, 1024, "connect %s:%d: %s\n",
+                 inet_ntoa(S.sin_addr),
+                 ntohs(S.sin_port),
+                 xstrerror());
         error_html(buf);
         return 1;
     }