[tor-commits] [tor/master] Bug 26117: Move CIRC_BW field accounting.

[nickm@xxxxxxxxxxxxxx]

commit d0b1157fc1739301f004090db20f0ee66f825f40
Author: Mike Perry <mikeperry-git@xxxxxxxxxxxxxx>
Date:   Tue May 15 18:44:25 2018 +0000

    Bug 26117: Move CIRC_BW field accounting.
    
    Previously, we used the AF_UNSPEC check to represent valid connected cell
    data as a result of the lack of return. This was incorrect.
---
 src/or/relay.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/or/relay.c b/src/or/relay.c
index 15aa5557b..4a0893298 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1339,9 +1339,6 @@ connection_edge_process_relay_cell_not_open(
                                 entry_conn->chosen_exit_name, ttl);
 
       remap_event_helper(entry_conn, &addr);
-
-      /* This is valid data at this point. Count it */
-      circuit_read_valid_data(TO_ORIGIN_CIRCUIT(circ), rh->length);
     }
     circuit_log_path(LOG_INFO,LD_APP,TO_ORIGIN_CIRCUIT(circ));
     /* don't send a socks reply to transparent conns */
@@ -1380,6 +1377,9 @@ connection_edge_process_relay_cell_not_open(
       entry_conn->pending_optimistic_data = NULL;
     }
 
+    /* This is valid data at this point. Count it */
+    circuit_read_valid_data(TO_ORIGIN_CIRCUIT(circ), rh->length);
+
     /* handle anything that might have queued */
     if (connection_edge_package_raw_inbuf(conn, 1, NULL) < 0) {
       /* (We already sent an end cell if possible) */

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits