mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 23:21:38 +01:00
Code Issues Projects Releases Wiki Activity

Resolve inconsistencies between buf refactor and HTTP connect

Browse source
This commit is contained in:
Nick Mathewson 2017-09-05 14:41:35 -04:00
parent 73b0e2e6fd
commit 4ce60dab00
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/or/connection_edge.c
View file

@ -82,6 +82,7 @@
#include "main.h" #include "main.h"
#include "nodelist.h" #include "nodelist.h"
#include "policies.h" #include "policies.h"
#include "proto_http.h"
#include "proto_socks.h" #include "proto_socks.h"
#include "reasons.h" #include "reasons.h"
#include "relay.h" #include "relay.h"
@ -2516,7 +2517,7 @@ connection_ap_process_http_connect(entry_connection_t *conn)
if (BUG(errmsg == NULL)) if (BUG(errmsg == NULL))
errmsg = "HTTP/1.0 400 Bad Request\r\n\r\n"; errmsg = "HTTP/1.0 400 Bad Request\r\n\r\n";
log_warn(LD_EDGE, "Saying %s", escaped(errmsg)); log_warn(LD_EDGE, "Saying %s", escaped(errmsg));
connection_write_to_buf(errmsg, strlen(errmsg), ENTRY_TO_CONN(conn)); connection_buf_add(errmsg, strlen(errmsg), ENTRY_TO_CONN(conn));
connection_mark_unattached_ap(conn, connection_mark_unattached_ap(conn,
END_STREAM_REASON_HTTPPROTOCOL| END_STREAM_REASON_HTTPPROTOCOL|
END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED);
@ -3159,7 +3160,7 @@ connection_ap_handshake_socks_reply(entry_connection_t *conn, char *reply,
if (!response) { if (!response) {
response = "HTTP/1.0 400 Bad Request\r\n\r\n"; response = "HTTP/1.0 400 Bad Request\r\n\r\n";
} }
connection_write_to_buf(response, strlen(response), ENTRY_TO_CONN(conn)); connection_buf_add(response, strlen(response), ENTRY_TO_CONN(conn));
} else if (conn->socks_request->socks_version == 4) { } else if (conn->socks_request->socks_version == 4) {
memset(buf,0,SOCKS4_NETWORK_LEN); memset(buf,0,SOCKS4_NETWORK_LEN);
buf[1] = (status==SOCKS5_SUCCEEDED ? SOCKS4_GRANTED : SOCKS4_REJECT); buf[1] = (status==SOCKS5_SUCCEEDED ? SOCKS4_GRANTED : SOCKS4_REJECT);

1
src/test/fuzz/fuzz_http_connect.c
View file

@ -12,6 +12,7 @@
#include "config.h" #include "config.h"
#include "connection.h" #include "connection.h"
#include "connection_edge.h" #include "connection_edge.h"
#include "proto_socks.h"
#include "torlog.h" #include "torlog.h"
#include "fuzzing.h" #include "fuzzing.h"