nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correct fix for self-to-self addressmap; simplify replace-old-entry logic; add missing case.

Browse Source 
svn:r3829
This commit is contained in:
Nick Mathewson 2005-03-23 05:32:06 +00:00
parent 22386ecf1e
commit b7ce4d1d3d
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/or/connection_edge.c
View File

@ -89,6 +89,7 @@ int connection_edge_process_inbuf(connection_t *conn, int package_partial) {
case AP_CONN_STATE_CIRCUIT_WAIT: case AP_CONN_STATE_CIRCUIT_WAIT:
case AP_CONN_STATE_CONNECT_WAIT: case AP_CONN_STATE_CONNECT_WAIT:
case AP_CONN_STATE_RESOLVE_WAIT: case AP_CONN_STATE_RESOLVE_WAIT:
case AP_CONN_STATE_CONTROLLER_WAIT:
log_fn(LOG_INFO,"data from edge while in '%s' state. Leaving it on buffer.", log_fn(LOG_INFO,"data from edge while in '%s' state. Leaving it on buffer.",
conn_state_to_string[conn->type][conn->state]); conn_state_to_string[conn->type][conn->state]);
return 0; return 0;
@ -206,6 +207,7 @@ int connection_edge_finished_flushing(connection_t *conn) {
case AP_CONN_STATE_RENDDESC_WAIT: case AP_CONN_STATE_RENDDESC_WAIT:
case AP_CONN_STATE_CIRCUIT_WAIT: case AP_CONN_STATE_CIRCUIT_WAIT:
case AP_CONN_STATE_CONNECT_WAIT: case AP_CONN_STATE_CONNECT_WAIT:
case AP_CONN_STATE_CONTROLLER_WAIT:
connection_stop_writing(conn); connection_stop_writing(conn);
return 0; return 0;
default: default:
@ -544,11 +546,6 @@ void addressmap_register(const char *address, char *new_address, time_t expires)
addressmap_entry_t *ent; addressmap_entry_t *ent;
ent = strmap_get(addressmap, address); ent = strmap_get(addressmap, address);
if (ent && ent->new_address && expires>1) {
log_fn(LOG_INFO,"Addressmap ('%s' to '%s') not performed, since it's already mapped to '%s'", address, new_address, ent->new_address);
tor_free(new_address);
return;
}
if (!new_address || !strcasecmp(address,new_address)) { if (!new_address || !strcasecmp(address,new_address)) {
/* Remove the mapping, if any. */ /* Remove the mapping, if any. */
tor_free(new_address); tor_free(new_address);
@ -558,15 +555,21 @@ void addressmap_register(const char *address, char *new_address, time_t expires)
} }
return; return;
} }
if (ent && ent->new_address) { /* we'll replace it */ if (!ent) { /* make a new one and register it */
ent = tor_malloc_zero(sizeof(addressmap_entry_t));
strmap_set(addressmap, address, ent);
} else if (ent->new_address) { /* we need to clean up the old mapping. */
if (expires > 1) {
log_fn(LOG_INFO,"Temporary addressmap ('%s' to '%s') not performed, since it's already mapped to '%s'", address, new_address, ent->new_address);
tor_free(new_address);
return;
}
if (address_is_in_virtual_range(ent->new_address)) { if (address_is_in_virtual_range(ent->new_address)) {
addressmap_virtaddress_remove(address, ent); addressmap_virtaddress_remove(address, ent);
} }
tor_free(ent->new_address); tor_free(ent->new_address);
} else if (!ent) { /* make a new one and register it */ } /* else { we have an in-progress resolve with no mapping. } */
ent = tor_malloc_zero(sizeof(addressmap_entry_t));
strmap_set(addressmap, address, ent);
}
ent->new_address = new_address; ent->new_address = new_address;
ent->expires = expires; ent->expires = expires;
ent->num_resolve_failures = 0; ent->num_resolve_failures = 0;