Changeset 29c1456

Timestamp:

2008-05-06T00:13:37Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

d56ee38

Parents:

4358b10

Message:

SOCKS5 bytestream related changes.

• allow the SOCKS5 server to not include the pseudo address in its reply(including it is an rfc-style SHOULD in XEP-0065)
• ignore if the SOCKS5 server's reply is too short (as is the one from the jabber.cz proxy [apparently using the proxy65 code])

File:

• protocols/jabber/s5bytestream.c (modified) (4 diffs)

protocols/jabber/s5bytestream.c

@@ -466 +466 @@
                                 return FALSE;
 
-                        if ( ret < sizeof( socks5_reply ) )
+                        if ( ret < 5 ) /* header up to address length */
                                 return TRUE;
+                        else if( ret < sizeof( struct socks5_message ) )
+                        {
+                                /* Either a buggy proxy or just one that doesnt regard the SHOULD in XEP-0065
+                                 * saying the reply SHOULD contain the address */
+
+                                ASSERTSOCKOP( ret = recv( fd, &socks5_reply, ret, 0 ), "Dequeuing after MSG_PEEK" );
+                        }
 
                         if( !( socks5_reply.ver == 5 ) ||
-                            !( socks5_reply.cmdrep.rep == 0 ) ||
-                            !( socks5_reply.atyp == 3 ) ||
-                            !( socks5_reply.addrlen == 40 ) )
+                            !( socks5_reply.cmdrep.rep == 0 ) )
                                 return jabber_bs_abort( bt, "SOCKS5 CONNECT failed (reply: ver=%d, rep=%d, atyp=%d, addrlen=%d", 
                                         socks5_reply.ver,
@@ -478 +483 @@
                                         socks5_reply.atyp,
                                         socks5_reply.addrlen);
+                        
+                        /* usually a proxy sends back the 40 bytes address but I encountered at least one (of jabber.cz) 
+                         * that sends atyp=0 addrlen=0 and only 6 bytes (one less than one would expect).
+                         * Therefore I removed the wait for more bytes. Since we don't care about what else the proxy
+                         * is sending, it shouldnt matter */
 
                         if( bt->tf->ft->sending )
@@ -743 +753 @@
                 /* using a proxy, abort listen */
 
+                if ( tf->watch_in )
+                {
+                        b_event_remove( tf->watch_in );
+                        tf->watch_in = 0;
+                }
+                
                 closesocket( tf->fd );
                 tf->fd = 0;
@@ -824 +840 @@
                 return XT_HANDLED;
         }
+
+        imcb_log( tf->ic, "File %s: SOCKS5 handshake and activation successful! Transfer about to start...", tf->ft->file_name );
 
         /* handshake went through, let's start transferring */