socks4 parse error

[Jackarain]

curl/lib/socks.c

Line 309 in c866608

(((unsigned char)socksreq[8] << 8) | (unsigned char)socksreq[9]),

curl/lib/socks.c

Line 319 in c866608

(((unsigned char)socksreq[8] << 8) | (unsigned char)socksreq[9]),

curl/lib/socks.c

Line 329 in c866608

(((unsigned char)socksreq[8] << 8) | (unsigned char)socksreq[9]),

curl/lib/socks.c

Line 338 in c866608

(((unsigned char)socksreq[8] << 8) | (unsigned char)socksreq[9]),

should be:

(((unsigned char)socksreq[2] << 8) | (unsigned char)socksreq[3])

[bagder]

Sorry but that doesn't make sense, the sockreq[4] is already shown as the first byte of the IP address.

The short documentation in the comment above would however imply that index 2 and 3 are the ones that hold the port number.

[Jackarain]

 *     +----+----+----+----+----+----+----+----+
 *     | VN | CD | DSTPORT |      DSTIP        |
 *     +----+----+----+----+----+----+----+----+
 * # of bytes:  1    1      2              4

[bagder]

That's the comment I referred to. It mentions DSTPORT on index 2 and 3.

[jay]

Thanks, landed in 6d43664. I worked on those lines last but I didn't catch it. It's been like that since it was added in 2006, see a15d107. My guess is it was copied over from some SOCKS5 error message parsing since in a SOCKS5 response the port comes after the ip address.