From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Thu, 23 Sep 2010 14:11:09 +0000 (-0600)
Subject: squidclient: Display IP(s) connected to in verbose display.
X-Git-Tag: take1~233
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d9acded366badca957fcd9b793c4ff8e17de774;p=thirdparty%2Fsquid.git

squidclient: Display IP(s) connected to in verbose display.
---

diff --git a/tools/squidclient.cc b/tools/squidclient.cc
index 5ca0f449b3..4eea9e0bc3 100644
--- a/tools/squidclient.cc
+++ b/tools/squidclient.cc
@@ -511,7 +511,7 @@ main(int argc, char *argv[])
     }
 
     if (opt_verbose)
-        fprintf(stderr, "Request: '%s'\n", msg);
+        fprintf(stderr, "Request:'%s'\n", msg);
 
     if (ping) {
 #if HAVE_SIGACTION
@@ -539,6 +539,9 @@ main(int argc, char *argv[])
         int fsize = 0;
         struct addrinfo *AI = NULL;
 
+        if (opt_verbose)
+            fprintf(stderr, "Resolving... %s\n", hostname);
+
         /* Connect to the server */
 
         if (localhost) {
@@ -576,6 +579,11 @@ main(int argc, char *argv[])
 
         iaddr.SetPort(port);
 
+        if (opt_verbose) {
+            char ipbuf[MAX_IPSTRLEN];
+            fprintf(stderr, "Connecting... %s(%s)\n", hostname, iaddr.NtoA(ipbuf, MAX_IPSTRLEN));
+        }
+
         if (client_comm_connect(conn, iaddr, ping ? &tv1 : NULL) < 0) {
             char hostnameBuf[MAX_IPSTRLEN];
             iaddr.ToURL(hostnameBuf, MAX_IPSTRLEN);
@@ -588,6 +596,10 @@ main(int argc, char *argv[])
             }
             exit(1);
         }
+        if (opt_verbose) {
+            char ipbuf[MAX_IPSTRLEN];
+            fprintf(stderr, "Connected to: %s (%s)\n", hostname, iaddr.NtoA(ipbuf, MAX_IPSTRLEN));
+        }
 
         /* Send the HTTP request */
         bytesWritten = mywrite(conn, msg, strlen(msg));