[tor-commits] [tor/master] Fix a "shouldn't have reached this" warning in connection_edge.c

[nickm@xxxxxxxxxxxxxx]

commit 307d244640ff9ad829bfe0769ddb2f903ec80ea8
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Nov 14 09:16:57 2016 -0500

    Fix a "shouldn't have reached this" warning in connection_edge.c
    
    This was bug 20630; bugfix on f3e158ed where I thought I was
    committing a documentation-only fix but instead messed up the
    control flow too.
---
 src/or/connection_edge.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 875c911..3874d52 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1627,11 +1627,9 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
       }
       tor_assert(!automap);
       rep_hist_note_used_resolve(now); /* help predict this next time */
-    }
+    } else if (socks->command == SOCKS_COMMAND_CONNECT) {
+      /* Now see if this is a connect request that we can reject immediately */
 
-    /* Now see if this is a connect request that we can reject immediately */
-    if (socks->command == SOCKS_COMMAND_CONNECT) {
-      /* Special handling for attempts to connect */
       tor_assert(!automap);
       /* Don't allow connections to port 0. */
       if (socks->port == 0) {
@@ -1771,7 +1769,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
       rep_hist_note_used_resolve(now); /* help predict this next time */
       /* no extra processing needed */
     } else {
-      /* We should only be doing CONNECT or RESOLVE! */
+      /* We should only be doing CONNECT, RESOLVE, or RESOLVE_PTR! */
       tor_fragile_assert();
     }
 



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