summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Bouthenot <kolter@openics.org>2008-11-17 22:31:43 +0100
committerEmmanuel Bouthenot <kolter@openics.org>2008-11-17 22:31:43 +0100
commitc463b912cc77a1e0ab76cb8ba32124f29dd78903 (patch)
treea54c9bce284c512b159a06618cc7dd492c2ad903
parent4f43cba553c73745f5693de9d566ebd6c0de401a (diff)
downloadweechat-c463b912cc77a1e0ab76cb8ba32124f29dd78903.zip
Re-enable proxy usage with rewrited network layer (closes bug #24562).
-rw-r--r--src/core/wee-network.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/wee-network.c b/src/core/wee-network.c
index 17ba8d89b..d4888c984 100644
--- a/src/core/wee-network.c
+++ b/src/core/wee-network.c
@@ -252,7 +252,7 @@ network_pass_socks4proxy (int sock, const char *address, int port)
{
/*
* socks4 protocol is explained here:
- * http://archive.socks.permeo.com/protocol/socks4.protocol
+ * http://en.wikipedia.org/wiki/SOCKS
*
*/
@@ -261,7 +261,7 @@ network_pass_socks4proxy (int sock, const char *address, int port)
char version; /* 1 byte */ /* socks version : 4 or 5 */
char method; /* 1 byte */ /* socks method : connect (1) or bind (2) */
unsigned short port; /* 2 bytes */ /* destination port */
- unsigned long address; /* 4 bytes */ /* destination address */
+ unsigned int address; /* 4 bytes */ /* destination address */
char user[64]; /* username (64 characters seems to be enought) */
} socks4;
unsigned char buffer[24];
@@ -583,6 +583,8 @@ network_connect_child (struct t_hook *hook_connect)
freeaddrinfo (res);
return;
}
+
+ status_str[0] = '0' + WEECHAT_HOOK_CONNECT_OK;
}
else
{