diff options
| author | Alexander Færøy <ahf@torproject.org> | 2023-12-07 21:38:03 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2023-12-07 21:38:03 +0000 |
| commit | 1b1f6e8574976918a692f771e22eecd2cdc0fec7 (patch) | |
| tree | f5a8cca285e82d8ee6d45e870f74a15e65e35386 | |
| parent | c97d0b46d17ce86fed66fa22a4ca6a9ea071f0f9 (diff) | |
| parent | 1291d2fca76237a96e8dc7dcc36d40ea39ba29dc (diff) | |
| download | tor-1b1f6e8574976918a692f771e22eecd2cdc0fec7.tar.gz tor-1b1f6e8574976918a692f771e22eecd2cdc0fec7.zip | |
Merge remote-tracking branch 'origin/merge-requests/776' into maint-0.4.8
| -rw-r--r-- | changes/ticket40871 | 3 | ||||
| -rw-r--r-- | src/core/or/channeltls.c | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/changes/ticket40871 b/changes/ticket40871 new file mode 100644 index 0000000000..32a89eed99 --- /dev/null +++ b/changes/ticket40871 @@ -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 diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index 1f5a466777..a79f5c36e8 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -360,13 +360,19 @@ channel_tls_handle_incoming(or_connection_t *orconn) /* Register it */ 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, * so we can protect against attacks that use partially open connections. */ geoip_note_client_seen(GEOIP_CLIENT_CONNECT, - &TO_CONN(orconn)->addr, NULL, + &TO_CONN(orconn)->addr, transport_name, time(NULL)); - dos_new_client_conn(orconn, NULL); + dos_new_client_conn(orconn, transport_name); + tor_free(transport_name); return chan; } |