Fix GnuTLS select() during handshake
authorDavid Woodhouse <David.Woodhouse@intel.com>
Thu, 31 May 2012 22:13:59 +0000 (23:13 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Thu, 31 May 2012 22:13:59 +0000 (23:13 +0100)
It was using vpninfo->ssl_fd even though that's not set yet.

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

index b5686fe..e22d12a 100644 (file)
--- a/gnutls.c
+++ b/gnutls.c
@@ -961,7 +961,7 @@ int openconnect_open_https(struct openconnect_info *vpninfo)
 
                        if (vpninfo->cancel_fd != -1) {
                                FD_SET(vpninfo->cancel_fd, &rd_set);
-                               if (vpninfo->cancel_fd > vpninfo->ssl_fd)
+                               if (vpninfo->cancel_fd > ssl_sock)
                                        maxfd = vpninfo->cancel_fd;
                        }
                        select(maxfd + 1, &rd_set, &wr_set, NULL, NULL);