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

Move stream-closing out of rewrite code

Browse Source
This commit is contained in:
Nick Mathewson 2015-01-10 20:07:35 -05:00
parent fc2831558c
commit cd6a57e3d5
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/or/connection_edge.c
View File

@ -915,12 +915,14 @@ typedef struct {
int automap; int automap;
addressmap_entry_source_t exit_source; addressmap_entry_source_t exit_source;
time_t map_expires; time_t map_expires;
int end_reason;
int should_close;
} rewrite_result_t; } rewrite_result_t;
/* DOCDOC 0 if closed successfully. -1 if closed on error. 1 if not /* DOCDOC
* closed.
*/ */
static int static void
connection_ap_handshake_rewrite(entry_connection_t *conn, connection_ap_handshake_rewrite(entry_connection_t *conn,
rewrite_result_t *out) rewrite_result_t *out)
{ {
@ -931,6 +933,8 @@ connection_ap_handshake_rewrite(entry_connection_t *conn,
out->automap = 0; out->automap = 0;
out->exit_source = ADDRMAPSRC_NONE; out->exit_source = ADDRMAPSRC_NONE;
out->map_expires = TIME_MAX; out->map_expires = TIME_MAX;
out->end_reason = 0;
out->should_close = 0;
tor_strlower(socks->address); /* normalize it */ tor_strlower(socks->address); /* normalize it */
strlcpy(out->orig_address, socks->address, sizeof(out->orig_address)); strlcpy(out->orig_address, socks->address, sizeof(out->orig_address));
@ -944,8 +948,9 @@ connection_ap_handshake_rewrite(entry_connection_t *conn,
"it (at your own risk)."); "it (at your own risk).");
control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s", control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s",
escaped(socks->address)); escaped(socks->address));
connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL); out->end_reason = END_STREAM_REASON_TORPROTOCOL;
return -1; out->should_close = 1;
return;
} }
if (! conn->original_dest_address) if (! conn->original_dest_address)
@ -969,8 +974,9 @@ connection_ap_handshake_rewrite(entry_connection_t *conn,
if (! new_addr) { if (! new_addr) {
log_warn(LD_APP, "Unable to automap address %s", log_warn(LD_APP, "Unable to automap address %s",
escaped_safe_str(socks->address)); escaped_safe_str(socks->address));
connection_mark_unattached_ap(conn, END_STREAM_REASON_INTERNAL); out->end_reason = END_STREAM_REASON_INTERNAL;
return -1; out->should_close = 1;
return;
} }
log_info(LD_APP, "Automapping %s to %s", log_info(LD_APP, "Automapping %s to %s",
escaped_safe_str_client(socks->address), escaped_safe_str_client(socks->address),
@ -996,10 +1002,10 @@ connection_ap_handshake_rewrite(entry_connection_t *conn,
strlen(result), (uint8_t*)result, strlen(result), (uint8_t*)result,
-1, -1,
out->map_expires); out->map_expires);
connection_mark_unattached_ap(conn, out->end_reason = END_STREAM_REASON_DONE |
END_STREAM_REASON_DONE | END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED;
END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); out->should_close = 1;
return 0; return;
} }
if (options->ClientDNSRejectInternalAddresses) { if (options->ClientDNSRejectInternalAddresses) {
/* Don't let people try to do a reverse lookup on 10.0.0.1. */ /* Don't let people try to do a reverse lookup on 10.0.0.1. */
@ -1010,10 +1016,10 @@ connection_ap_handshake_rewrite(entry_connection_t *conn,
if (ok == 1 && tor_addr_is_internal(&addr, 0)) { if (ok == 1 && tor_addr_is_internal(&addr, 0)) {
connection_ap_handshake_socks_resolved(conn, RESOLVED_TYPE_ERROR, connection_ap_handshake_socks_resolved(conn, RESOLVED_TYPE_ERROR,
0, NULL, -1, TIME_MAX); 0, NULL, -1, TIME_MAX);
connection_mark_unattached_ap(conn, out->end_reason = END_STREAM_REASON_SOCKSPROTOCOL |
END_STREAM_REASON_SOCKSPROTOCOL | END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED;
END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); out->should_close = 1;
return -1; return;
} }
} }
} else if (!out->automap) { } else if (!out->automap) {
@ -1038,11 +1044,10 @@ connection_ap_handshake_rewrite(entry_connection_t *conn,
*/ */
log_warn(LD_APP,"Missing mapping for virtual address '%s'. Refusing.", log_warn(LD_APP,"Missing mapping for virtual address '%s'. Refusing.",
safe_str_client(socks->address)); safe_str_client(socks->address));
connection_mark_unattached_ap(conn, END_STREAM_REASON_INTERNAL); out->end_reason = END_STREAM_REASON_INTERNAL;
return -1; out->should_close = 1;
return;
} }
return 1;
} }
/** Connection <b>conn</b> just finished its socks handshake, or the /** Connection <b>conn</b> just finished its socks handshake, or the
@ -1065,7 +1070,6 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
origin_circuit_t *circ, origin_circuit_t *circ,
crypt_path_t *cpath) crypt_path_t *cpath)
{ {
int r;
socks_request_t *socks = conn->socks_request; socks_request_t *socks = conn->socks_request;
hostname_type_t addresstype; hostname_type_t addresstype;
const or_options_t *options = get_options(); const or_options_t *options = get_options();
@ -1074,8 +1078,16 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
rewrite_result_t rr; rewrite_result_t rr;
memset(&rr, 0, sizeof(rr)); memset(&rr, 0, sizeof(rr));
if ((r = connection_ap_handshake_rewrite(conn,&rr)) != 1) connection_ap_handshake_rewrite(conn,&rr);
return r;
if (rr.should_close) {
connection_mark_unattached_ap(conn, rr.end_reason);
if (0 != (rr.end_reason & END_STREAM_REASON_DONE))
return 0;
else
return -1;
}
time_t map_expires = rr.map_expires; time_t map_expires = rr.map_expires;
int automap = rr.automap; int automap = rr.automap;
addressmap_entry_source_t exit_source = rr.exit_source; addressmap_entry_source_t exit_source = rr.exit_source;