From efc7159e0841376a35dcdac3e737822d96c6f9e5 Mon Sep 17 00:00:00 2001 From: trinity-1686a Date: Tue, 10 Oct 2023 16:04:41 +0200 Subject: fix bridge transport statistics --- src/core/or/channeltls.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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; } -- cgit v1.2.3-54-g00ecf From d4f32c83b56bf8c5a87498a4972be1464bd4f483 Mon Sep 17 00:00:00 2001 From: trinity-1686a Date: Thu, 12 Oct 2023 18:09:05 +0200 Subject: add change file --- changes/ticket40871 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changes/ticket40871 diff --git a/changes/ticket40871 b/changes/ticket40871 new file mode 100644 index 0000000000..14ef372e08 --- /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.8 -- cgit v1.2.3-54-g00ecf From c97d0b46d17ce86fed66fa22a4ca6a9ea071f0f9 Mon Sep 17 00:00:00 2001 From: Tor CI Release Date: Thu, 9 Nov 2023 14:47:09 +0000 Subject: version: Bump version to 0.4.8.9-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c2e6b035d7..4ad906419f 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.8.9]) +AC_INIT([tor],[0.4.8.9-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2023-11-09"], # for 0.4.8.9 +AC_DEFINE(APPROX_RELEASE_DATE, ["2023-11-09"], # for 0.4.8.9-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 3382d9e891..b145b09d21 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.8.9" +!define VERSION "0.4.8.9-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" -- cgit v1.2.3-54-g00ecf From 1291d2fca76237a96e8dc7dcc36d40ea39ba29dc Mon Sep 17 00:00:00 2001 From: trinity-1686a Date: Wed, 6 Dec 2023 17:42:41 +0100 Subject: update changes file with correct introduced version --- changes/ticket40871 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/ticket40871 b/changes/ticket40871 index 14ef372e08..32a89eed99 100644 --- a/changes/ticket40871 +++ b/changes/ticket40871 @@ -1,3 +1,3 @@ o Minor bugfixes (bridges, statistics): - Correctly report statistics for client count over Pluggable transport. - Fixes bug 40871; bugfix on 0.4.8.8 + Fixes bug 40871; bugfix on 0.4.8.4 -- cgit v1.2.3-54-g00ecf