# HG changeset patch # User Herman Bloggs # Date 1046799921 0 # Node ID 4bb99cdfd83704bac4be4c5d4a87e3493880a649 # Parent ba87412b1a5727880505095df87b77520fc85777 [gaim-migrate @ 4959] Wrong value was being checked for socket error after call to getsockopt committer: Tailor Script diff -r ba87412b1a57 -r 4bb99cdfd837 src/proxy.c --- a/src/proxy.c Tue Mar 04 08:25:50 2003 +0000 +++ b/src/proxy.c Tue Mar 04 17:45:21 2003 +0000 @@ -569,17 +569,22 @@ { struct PHB *phb = data; unsigned int len; - int error = ETIMEDOUT; + int error=0; + int ret=0; debug_printf("Connected\n"); len = sizeof(error); - if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) { + + ret = getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len); + if (ret < 0 || error != 0) { close(source); gaim_input_remove(phb->inpa); phb->func(phb->data, -1, GAIM_INPUT_READ); g_free(phb->host); g_free(phb); + debug_printf("getsockopt SO_ERROR check: %s\n", + strerror(((ret<0) ? errno : error))); return; } fcntl(source, F_SETFL, 0);