Attachment 152464 Details for Bug 197025 – patch for tsocks.c

[patch] patch for tsocks.c

patch-tsocks.c (text/plain), 1006 bytes, created by Kan Sasaki on 2015-02-02 03:01:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kan Sasaki

Created: 2015-02-02 03:01:46 UTC

Size: 1006 bytes

patch

obsolete

>--- tsocks.c.orig	2002-07-16 07:50:52.000000000 +0900
>+++ tsocks.c	2015-02-02 11:57:44.000000000 +0900
>@@ -658,7 +658,7 @@
>              * come around again (since we can't flag it for read, we don't know
>              * if there is any data to be read and can't be bothered checking) */
>             if (conn->selectevents & WRITE) {
>-               setevents |= POLLOUT; 
>+               ufds[i].revents |= (conn->selectevents & WRITE);
>                nevents++;
>             }
>          }
>@@ -852,7 +852,11 @@
>                     sizeof(conn->serveraddr));
> 
>    show_msg(MSGDEBUG, "Connect returned %d, errno is %d\n", rc, errno); 
>-	if (rc) {
>+	if (rc && errno == EISCONN) {
>+      rc = 0;
>+      show_msg(MSGDEBUG, "Socket %d already connected to SOCKS server\n", conn->sockid);
>+      conn->state = CONNECTED;
>+   } else if (rc) {
>       if (errno != EINPROGRESS) {
>          show_msg(MSGERR, "Error %d attempting to connect to SOCKS "
>                   "server (%s)\n", errno, strerror(errno));

Actions: View | Diff

Attachments on bug 197025: 152463 | 152464