Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
David Goulet
Tor
Commits
07f2a06c
Commit
07f2a06c
authored
Oct 26, 2020
by
George Kadianakis
Browse files
Merge remote-tracking branch 'tor-gitlab/mr/169' into master
parents
f43fe890
05242f55
Changes
3
Hide whitespace changes
Inline
Side-by-side
changes/bug33124
0 → 100644
View file @
07f2a06c
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.
src/core/or/circuituse.c
View file @
07f2a06c
...
...
@@ -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"
,
...
...
src/core/or/connection_edge.c
View file @
07f2a06c
...
...
@@ -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
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment