torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rework socks_request_set_socks5_error() with trunnel

Browse Source
This commit is contained in:
rl1987
2018-05-23 14:38:13 +02:00
committed by Nick Mathewson
parent a6af21c1b7
commit 4c845fcf9e
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/proto_socks.c
+24 -5
View File
@@ -858,12 +858,31 @@ static void
socks_request_set_socks5_error(socks_request_t *req,
socks5_reply_status_t reason)
{
req->replylen = 10;
memset(req->reply,0,10);
socks5_server_reply_t *trunnel_resp = socks5_server_reply_new();
req->reply[0] = 0x05; // VER field.
req->reply[1] = reason; // REP field.
req->reply[3] = 0x01; // ATYP field.
socks5_server_reply_set_version(trunnel_resp, 0x05);
socks5_server_reply_set_reply(trunnel_resp, reason);
socks5_server_reply_set_atype(trunnel_resp, 0x01);
const char *errmsg = socks5_server_reply_check(trunnel_resp);
if (errmsg) {
log_warn(LD_APP, "socks5: reply validation failed: %s",
errmsg);
goto end;
}
ssize_t encoded = socks5_server_reply_encode(req->reply,
sizeof(req->reply),
trunnel_resp);
if (encoded < 0) {
log_warn(LD_APP, "socks5: reply encoding failed: %d",
(int)encoded);
} else {
req->replylen = (size_t)encoded;
}
end:
socks5_server_reply_free(trunnel_resp);
}
static const char SOCKS_PROXY_IS_NOT_AN_HTTP_PROXY_MSG[] =