diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-01-28 12:02:43 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-01-28 12:02:43 -0500 |
| commit | ee14fae8a7ce9e3f4199ad97f90a1cff6f71e4fc (patch) | |
| tree | 4721915b3b550409a56384a8682d7e8b72c4c8cf | |
| parent | 7d4049fa9ed77d0e90e8adb8670e1e7ef585a658 (diff) | |
| parent | ab58dd15774382689dd0c2a003d1a3dbaf2d9b5d (diff) | |
| download | tor-ee14fae8a7ce9e3f4199ad97f90a1cff6f71e4fc.tar.gz tor-ee14fae8a7ce9e3f4199ad97f90a1cff6f71e4fc.zip | |
Merge branch 'maint-0.4.3' into release-0.4.3
| -rw-r--r-- | changes/bug40117 | 5 | ||||
| -rw-r--r-- | src/feature/rend/rendmid.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/changes/bug40117 b/changes/bug40117 new file mode 100644 index 0000000000..77646edf9c --- /dev/null +++ b/changes/bug40117 @@ -0,0 +1,5 @@ + o Major bugfixes (stats, onion services): + - Fix a bug where we were undercounting the Tor network's total onion + service traffic, by only counting rendezvous traffic originating from + services and ignoring any traffic originating from clients. Fixes bug + 40117; bugfix on 0.2.6.2-alpha. diff --git a/src/feature/rend/rendmid.c b/src/feature/rend/rendmid.c index a473f0c7e1..b497362857 100644 --- a/src/feature/rend/rendmid.c +++ b/src/feature/rend/rendmid.c @@ -343,10 +343,12 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request, goto err; } - /* Statistics: Mark this circuit as an RP circuit so that we collect - stats from it. */ + /* Statistics: Mark circuits as RP circuits */ if (options->HiddenServiceStatistics) { + /* `circ` is the RP <-> service circuit */ circ->circuit_carries_hs_traffic_stats = 1; + /* `rend_circ` is the client <-> RP circuit */ + rend_circ->circuit_carries_hs_traffic_stats = 1; } /* Send the RENDEZVOUS2 cell to the client. */ |