Changeset a87e6ba

Timestamp:

2010-04-11T18:13:19Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e00da63

Parents:

17a6ee9 (diff), 3ab1d31 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging a Jabber ft bugfix.

File:

• protocols/jabber/s5bytestream.c (modified) (1 diff)

protocols/jabber/s5bytestream.c

@@ -482 +482 @@
                         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" );
+                                /* Either a buggy proxy or just one that doesnt regard
+                                 * the SHOULD in XEP-0065 saying the reply SHOULD
+                                 * contain the address. We'll take it, so make sure the
+                                 * next jabber_bs_peek starts with an empty buffer. */
+                                bt->peek_buf_len = 0;
                         }