Be explicit when we're connecting to a proxy not directly to a VPN server

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/ssl.c b/ssl.c
index 4c7e30b..9ad5e85 100644 (file)
--- a/ssl.c
+++ b/ssl.c
@@ -219,13 +219,14 @@ int connect_https_socket(struct openconnect_info *vpninfo)
 
                        if (!getnameinfo(rp->ai_addr, rp->ai_addrlen, host,
                                         sizeof(host), NULL, 0, NI_NUMERICHOST))
-                               vpn_progress(vpninfo, PRG_INFO,
-                                            _("Attempting to connect to %s%s%s:%s\n"),
+                               vpn_progress(vpninfo, PRG_INFO, vpninfo->proxy_type?
+                                                    _("Attempting to connect to proxy %s%s%s:%s\n"):
+                                                    _("Attempting to connect to server %s%s%s:%s\n"),
                                             rp->ai_family == AF_INET6?"[":"",
                                             host,
                                             rp->ai_family == AF_INET6?"]":"",
                                             port);
-                       
+
                        ssl_sock = socket(rp->ai_family, rp->ai_socktype,
                                          rp->ai_protocol);
                        if (ssl_sock < 0)

diff --git a/www/changelog.xml b/www/changelog.xml
index 2d70c92..547bc5d 100644 (file)
--- a/www/changelog.xml
+++ b/www/changelog.xml
@@ -17,7 +17,7 @@
 <ul>
    <li><b>OpenConnect HEAD</b>
      <ul>
-       <li><i>No changelog entries yet</i></li>
+       <li>Improve <tt>"Attempting to connect..."</tt> message to be explicit when it's connecting to a proxy.</li>
      </ul><br/>
   </li>
   <li><b><a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-4.07.tar.gz">OpenConnect v4.07</a></b>