diff options
| author | George Kadianakis <desnacked@riseup.net> | 2020-10-26 17:04:58 +0200 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2020-10-26 17:04:58 +0200 |
| commit | 07f2a06c6190696cf47b8e42476bb70b11083f15 (patch) | |
| tree | d83ce58232475bdc73225f9d85147890df47ab1e | |
| parent | f43fe890dd7987811c1ce2b9d91404b27c965f6a (diff) | |
| parent | 05242f5555ceb276dd945f9d43a37dbe3d5d875b (diff) | |
| download | tor-07f2a06c6190696cf47b8e42476bb70b11083f15.tar.gz tor-07f2a06c6190696cf47b8e42476bb70b11083f15.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/169' into master
| -rw-r--r-- | changes/bug33124 | 4 | ||||
| -rw-r--r-- | src/core/or/circuituse.c | 3 | ||||
| -rw-r--r-- | src/core/or/connection_edge.c | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/changes/bug33124 b/changes/bug33124 new file mode 100644 index 0000000000..bc7003d9b5 --- /dev/null +++ b/changes/bug33124 @@ -0,0 +1,4 @@ + o Minor bugfixes (SOCKS, onion services): + - Make sure we send the SOCKS request address in relay begin cells when a + stream is attached with the purpose CIRCUIT_PURPOSE_CONTROLLER. Fixes bug + 33124; bugfix on 0.0.5. Patch by Neel Chauhan. diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 9b506e67a1..ace68cea53 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -2693,7 +2693,8 @@ link_apconn_to_circ(entry_connection_t *apconn, origin_circuit_t *circ, apconn->may_use_optimistic_data = 0; log_info(LD_APP, "Looks like completed circuit to %s %s allow " "optimistic data for connection to %s", - circ->base_.purpose == CIRCUIT_PURPOSE_C_GENERAL ? + (circ->base_.purpose == CIRCUIT_PURPOSE_C_GENERAL || + circ->base_.purpose == CIRCUIT_PURPOSE_CONTROLLER) ? /* node_describe() does the right thing if exitnode is NULL */ safe_str_client(node_describe(exitnode)) : "hidden service", diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 25337f0720..f22c49d036 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -1205,6 +1205,7 @@ connection_ap_expire_beginning(void) } if (circ->purpose != CIRCUIT_PURPOSE_C_GENERAL && + circ->purpose != CIRCUIT_PURPOSE_CONTROLLER && circ->purpose != CIRCUIT_PURPOSE_C_HSDIR_GET && circ->purpose != CIRCUIT_PURPOSE_S_HSDIR_POST && circ->purpose != CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT && @@ -3266,7 +3267,8 @@ connection_ap_handshake_send_begin,(entry_connection_t *ap_conn)) edge_conn->begincell_flags = connection_ap_get_begincell_flags(ap_conn); tor_snprintf(payload,RELAY_PAYLOAD_SIZE, "%s:%d", - (circ->base_.purpose == CIRCUIT_PURPOSE_C_GENERAL) ? + (circ->base_.purpose == CIRCUIT_PURPOSE_C_GENERAL || + circ->base_.purpose == CIRCUIT_PURPOSE_CONTROLLER) ? ap_conn->socks_request->address : "", ap_conn->socks_request->port); payload_len = (int)strlen(payload)+1; |