[tor-commits] [tor/master] Send NETINFO on receiving a NETINFO if we have not yet sent one.

[nickm at torproject.org]

commit 0daa26a4732234333e67d04c9b215ff6704fa9cd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 20 14:52:56 2013 -0400

    Send NETINFO on receiving a NETINFO if we have not yet sent one.
    
    (Backport to Tor 0.2.3)
    
    Relays previously, when initiating a connection, would only send a
    NETINFO after sending an AUTHENTICATE.  But bridges, when receiving a
    connection, would never send AUTH_CHALLENGE.  So relays wouldn't
    AUTHENTICATE, and wouldn't NETINFO, and then bridges would be
    surprised to be receiving CREATE cells on a non-open circuit.
    
    Fixes bug 9546.
---
 bug9546                |    5 +++++
 src/or/command.c       |   10 ++++++++++
 src/or/connection_or.c |    7 +++++++
 src/or/or.h            |    3 +++
 4 files changed, 25 insertions(+)

diff --git a/bug9546 b/bug9546
new file mode 100644
index 0000000..8596eac
--- /dev/null
+++ b/bug9546
@@ -0,0 +1,5 @@
+  o Major bugfixes:
+
+    - When a relay is extending a circuit to a bridge, it needs to send a
+      NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE
+      cell. Fixes bug 9546; bugfix on ????.
diff --git a/src/or/command.c b/src/or/command.c
index 8321e26..26e4e68 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -941,6 +941,16 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn)
    * trustworthy. */
   (void)my_apparent_addr;
 
+  if (! conn->handshake_state->sent_netinfo) {
+    /* If we were prepared to authenticate, but we never got an AUTH_CHALLENGE
+     * cell, then we would not previously have sent a NETINFO cell. Do so
+     * now. */
+    if (connection_or_send_netinfo(conn) < 0) {
+      connection_mark_for_close(TO_CONN(conn));
+      return;
+    }
+  }
+
   if (connection_or_set_state_open(conn)<0) {
     log_fn(LOG_PROTOCOL_WARN, LD_OR, "Got good NETINFO cell from %s:%d; but "
            "was unable to make the OR connection become open.",
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 5eecee0..56c6ed5 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1975,6 +1975,12 @@ connection_or_send_netinfo(or_connection_t *conn)
 
   tor_assert(conn->handshake_state);
 
+  if (conn->handshake_state->sent_netinfo) {
+    log_warn(LD_BUG, "Attempted to send an extra netinfo cell on a connection "
+             "where we already sent one.");
+    return 0;
+  }
+
   memset(&cell, 0, sizeof(cell_t));
   cell.command = CELL_NETINFO;
 
@@ -2009,6 +2015,7 @@ connection_or_send_netinfo(or_connection_t *conn)
   }
 
   conn->handshake_state->digest_sent_data = 0;
+  conn->handshake_state->sent_netinfo = 1;
   connection_or_write_cell_to_buf(&cell, conn);
 
   return 0;
diff --git a/src/or/or.h b/src/or/or.h
index dd95c34..b8f334e 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1161,6 +1161,9 @@ typedef struct or_handshake_state_t {
   /* True iff we've received valid authentication to some identity. */
   unsigned int authenticated : 1;
 
+  /* True iff we have sent a netinfo cell */
+  unsigned int sent_netinfo : 1;
+
   /** True iff we should feed outgoing cells into digest_sent and
    * digest_received respectively.
    *