curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-16 00:52:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Jeff Lawson pointed out that we need to check for a '5' in the version field

Browse Source 
to properly work with SOCKS5 proxies. I also included some ascii art describing
the SOCKS5 response, as RFC1928 describes. Jeff provided details in bug
report #741841 and here: http://curl.haxx.se/mail/lib-2004-02/0181.html
This commit is contained in:
Daniel Stenberg 2004-02-16 07:33:30 +00:00
parent 3ec605de67
commit e4916145ef
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/url.c
View File

@ -1581,6 +1581,23 @@ static int handleSock5Proxy(const char *proxy_name,
const char *proxy_password, const char *proxy_password,
struct connectdata *conn) struct connectdata *conn)
{ {
/*
According to the RFC1928, section "6. Replies". This is what a SOCK5
replies:
+----+-----+-------+------+----------+----------+
|VER | REP | RSV | ATYP | BND.ADDR | BND.PORT |
+----+-----+-------+------+----------+----------+
| 1 | 1 | X'00' | 1 | Variable | 2 |
+----+-----+-------+------+----------+----------+
Where:
o VER protocol version: X'05'
o REP Reply field:
o X'00' succeeded
*/
unsigned char socksreq[600]; /* room for large user/pw (255 max each) */ unsigned char socksreq[600]; /* room for large user/pw (255 max each) */
ssize_t actualread; ssize_t actualread;
ssize_t written; ssize_t written;
@ -1651,7 +1668,7 @@ static int handleSock5Proxy(const char *proxy_name,
return 1; return 1;
} }
if ((socksreq[0] != 1) || /* version */ if ((socksreq[0] != 5) || /* version */
(socksreq[1] != 0)) { /* status */ (socksreq[1] != 0)) { /* status */
failf(conn->data, "User was rejected by the SOCKS5 server (%d %d).", failf(conn->data, "User was rejected by the SOCKS5 server (%d %d).",
socksreq[0], socksreq[1]); socksreq[0], socksreq[1]);