nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix assert triggers in 0.0.7.x: if the other side returns

Browse Source 
an address 0.0.0.0, don't put it into the client dns cache.


svn:r2233
This commit is contained in:
Roger Dingledine 2004-08-15 20:05:35 +00:00
parent 5be8190398
commit 488aa52f25
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/or/connection_edge.c
View File

@ -633,7 +633,8 @@ void connection_ap_handshake_socks_resolved(connection_t *conn,
if (answer_type == RESOLVED_TYPE_IPV4) { if (answer_type == RESOLVED_TYPE_IPV4) {
uint32_t a = get_uint32(answer); uint32_t a = get_uint32(answer);
client_dns_set_entry(conn->socks_request->address, ntohl(a)); if(a)
client_dns_set_entry(conn->socks_request->address, ntohl(a));
} }
if (conn->socks_request->socks_version == 4) { if (conn->socks_request->socks_version == 4) {

26
src/or/relay.c
View File

@ -502,9 +502,17 @@ connection_edge_process_relay_cell_not_open(
log_fn(LOG_WARN,"Got an end because of exitpolicy, but we're not an AP. Closing."); log_fn(LOG_WARN,"Got an end because of exitpolicy, but we're not an AP. Closing.");
return -1; return -1;
} }
log_fn(LOG_INFO,"Address %s refused due to exit policy. Retrying.",
conn->socks_request->address);
addr = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+1)); addr = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+1));
if(addr) {
log_fn(LOG_INFO,"Address %s refused due to exit policy. Retrying.",
conn->socks_request->address);
} else {
log_fn(LOG_INFO,"Address %s resolved to 0.0.0.0. Closing,",
conn->socks_request->address);
conn->has_sent_end = 1; /* we just got an 'end', don't need to send one */
connection_mark_for_close(conn);
return 0;
}
client_dns_set_entry(conn->socks_request->address, addr); client_dns_set_entry(conn->socks_request->address, addr);
/* check if he *ought* to have allowed it */ /* check if he *ought* to have allowed it */
@ -564,12 +572,18 @@ connection_edge_process_relay_cell_not_open(
} }
// log_fn(LOG_INFO,"Connected! Notifying application."); // log_fn(LOG_INFO,"Connected! Notifying application.");
conn->state = AP_CONN_STATE_OPEN; conn->state = AP_CONN_STATE_OPEN;
if (rh->length >= 4) {
addr = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE));
client_dns_set_entry(conn->socks_request->address, addr);
}
log_fn(LOG_INFO,"'connected' received after %d seconds.", log_fn(LOG_INFO,"'connected' received after %d seconds.",
(int)(time(NULL) - conn->timestamp_lastread)); (int)(time(NULL) - conn->timestamp_lastread));
if (rh->length >= 4) {
addr = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE));
if(!addr) {
log_fn(LOG_INFO,"...but it claims the IP address was 0.0.0.0. Closing.");
connection_edge_end(conn, END_STREAM_REASON_MISC, conn->cpath_layer);
connection_mark_for_close(conn);
return 0;
}
client_dns_set_entry(conn->socks_request->address, addr);
}
circuit_log_path(LOG_INFO,circ); circuit_log_path(LOG_INFO,circ);
connection_ap_handshake_socks_reply(conn, NULL, 0, 1); connection_ap_handshake_socks_reply(conn, NULL, 0, 1);
conn->socks_request->has_finished = 1; conn->socks_request->has_finished = 1;