commit 12afd8bfed96c57cd47b18644c2030673496a74f Author: rl1987 rl1987@sdf.lonestar.org Date: Mon Feb 12 21:16:38 2018 +0100

Also test bracket-less IPv6 string validation --- src/test/test_socks.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)

diff --git a/src/test/test_socks.c b/src/test/test_socks.c index 3f9cc887b..8da7191e8 100644 --- a/src/test/test_socks.c +++ b/src/test/test_socks.c @@ -365,6 +365,23 @@ test_socks_5_supported_commands(void *ptr)

socks_request_clear(socks);

+ /* Also allow bracket-less form. */ + + ADD_DATA(buf, "\x05\x01\x00"); + ADD_DATA(buf, "\x05\xF0\x00\x03\x27"); + ADD_DATA(buf, "2001:0db8:85a3:0000:0000:8a2e:0370:7334"); + ADD_DATA(buf, "\x01\x02"); + tt_int_op(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, 1), + OP_EQ, 1); + + tt_str_op("2001:0db8:85a3:0000:0000:8a2e:0370:7334", OP_EQ, + socks->address); + tt_int_op(258, OP_EQ, socks->port); + + tt_int_op(0, OP_EQ, buf_datalen(buf)); + + socks_request_clear(socks); + /* SOCKS 5 Send RESOLVE_PTR [F1] for IP address 2.2.2.5 */ ADD_DATA(buf, "\x05\x01\x00"); ADD_DATA(buf, "\x05\xF1\x00\x01\x02\x02\x02\x05\x01\x03");