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 /src/core/or/connection_edge.c | |
| parent | f43fe890dd7987811c1ce2b9d91404b27c965f6a (diff) | |
| parent | 05242f5555ceb276dd945f9d43a37dbe3d5d875b (diff) | |
| download | tor-07f2a06c6190696cf47b8e42476bb70b11083f15.tar.gz tor-07f2a06c6190696cf47b8e42476bb70b11083f15.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/169' into master
Diffstat (limited to 'src/core/or/connection_edge.c')
| -rw-r--r-- | src/core/or/connection_edge.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |