Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Be explicit when we're connecting to a proxy not directly to a VPN se…
…rver

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
David Woodhouse authored and David Woodhouse committed Sep 23, 2012
1 parent 5bf5a25 commit 4bcce57
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions ssl.c
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion www/changelog.xml
Expand Up @@ -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>
Expand Down

0 comments on commit 4bcce57

Please sign in to comment.