aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_socks.c
diff options
context:
space:
mode:
authorrl1987 <rl1987@sdf.lonestar.org>2018-05-23 11:44:43 +0200
committerNick Mathewson <nickm@torproject.org>2018-07-12 11:41:44 -0400
commit58cb2ed24381d29458927c68e56aca0cae4b0f2e (patch)
tree07e0ff8e6f690eda80a25320db8a7066f252f11a /src/test/test_socks.c
parent01cf3007b56fdd53ecc757c54f30393c206458de (diff)
downloadtor-58cb2ed24381d29458927c68e56aca0cae4b0f2e.tar.gz
tor-58cb2ed24381d29458927c68e56aca0cae4b0f2e.zip
Fix buf_t advancement in fetch_buf_from_socks
We pullup 512 bytes of input to make sure that at least one SOCKS message ends up in head of linked list
Diffstat (limited to 'src/test/test_socks.c')
-rw-r--r--src/test/test_socks.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/test_socks.c b/src/test/test_socks.c
index 9645ea32a0..e1c5db6ee6 100644
--- a/src/test/test_socks.c
+++ b/src/test/test_socks.c
@@ -142,7 +142,7 @@ test_socks_4_bad_arguments(void *ptr)
get_options()->SafeSocks),
OP_EQ, -1);
buf_clear(buf);
- expect_log_msg_containing("Port or DestIP is zero."); // !!!
+ expect_log_msg_containing("Port or DestIP is zero.");
mock_clean_saved_logs();
/* Try with 0 port */
@@ -164,7 +164,7 @@ test_socks_4_bad_arguments(void *ptr)
tt_int_op(fetch_from_buf_socks(buf, socks, 1, 0),
OP_EQ, -1);
buf_clear(buf);
- expect_log_msg_containing("user name too long; rejecting.");
+ expect_log_msg_containing("socks4: parsing failed - invalid request.");
mock_clean_saved_logs();
/* Try with 2000-byte hostname */