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

Merge remote-tracking branch 'origin/merge-requests/776' into maint-0.4.8

Browse Source
This commit is contained in:
Alexander Færøy 2023-12-07 21:38:03 +00:00
commit 1b1f6e8574
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket40871 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (bridges, statistics):
- Correctly report statistics for client count over Pluggable transport.
Fixes bug 40871; bugfix on 0.4.8.4

10
src/core/or/channeltls.c
View File

@ -360,13 +360,19 @@ channel_tls_handle_incoming(or_connection_t *orconn)
/* Register it */ /* Register it */
channel_register(chan); channel_register(chan);
char *transport_name = NULL;
if (channel_tls_get_transport_name_method(TLS_CHAN_TO_BASE(orconn->chan),
&transport_name) < 0) {
transport_name = NULL;
}
/* Start tracking TLS connections in the DoS subsystem as soon as possible, /* Start tracking TLS connections in the DoS subsystem as soon as possible,
* so we can protect against attacks that use partially open connections. * so we can protect against attacks that use partially open connections.
*/ */
geoip_note_client_seen(GEOIP_CLIENT_CONNECT, geoip_note_client_seen(GEOIP_CLIENT_CONNECT,
&TO_CONN(orconn)->addr, NULL, &TO_CONN(orconn)->addr, transport_name,
time(NULL)); time(NULL));
dos_new_client_conn(orconn, NULL); dos_new_client_conn(orconn, transport_name);
tor_free(transport_name);
return chan; return chan;
} }