diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-01-28 12:02:39 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-01-28 12:02:39 -0500 |
| commit | 8f13257ccd99772473949200e72e90ba2dd419a1 (patch) | |
| tree | 6dc52a814e61080b791a65b6c74633bc0592d7ba | |
| parent | 2cf1365c17822f5e925c4c0bc3bd0367a3a657a8 (diff) | |
| parent | 248cbc2d2207a0bc3374cd18a17cda9d1b8a8ef1 (diff) | |
| download | tor-8f13257ccd99772473949200e72e90ba2dd419a1.tar.gz tor-8f13257ccd99772473949200e72e90ba2dd419a1.zip | |
Merge branch 'tor-gitlab/mr/140' into maint-0.3.5
| -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 3ba48f8858..af02b34e6b 100644 --- a/src/feature/rend/rendmid.c +++ b/src/feature/rend/rendmid.c @@ -333,10 +333,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. */ |