tor

commit 3a785dd5beeaadcd4205f24d6949fdbbdfb5651e
parent e39b35f1de689fd1ad1ad3a6a902bf6371e6f5ce
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed,  6 May 2020 17:17:19 -0400

Merge branch 'maint-0.4.3'

Diffstat:
A
changes/bug34131
 | 
4
++++
M
src/core/or/connection_edge.c
 | 
6
++++--
M
src/core/or/connection_or.c
 | 
1
+
M
src/feature/control/btrack_orconn_cevent.c
 | 
1
+

4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/changes/bug34131 b/changes/bug34131
@@ -0,0 +1,4 @@
+  o Minor bugfixes (logging):
+    - Fix a logic error in a log message about whether an address was
+      invalid. Previously, the code would never report that onion addresses
+      were onion addresses. Fixes bug 34131; bugfix on 0.4.3.1-alpha.
diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c
@@ -1658,9 +1658,11 @@ parse_extended_hostname(char *address, hostname_type_t *type_out)
  failed:
   /* otherwise, return to previous state and return 0 */
   *s = '.';
+  const bool is_onion = (*type_out == ONION_V2_HOSTNAME) ||
+    (*type_out == ONION_V3_HOSTNAME);
   log_warn(LD_APP, "Invalid %shostname %s; rejecting",
-      (*type_out == (ONION_V2_HOSTNAME || ONION_V3_HOSTNAME) ? "onion " : ""),
-      safe_str_client(address));
+           is_onion ? "onion " : "",
+           safe_str_client(address));
   return false;
 }
 
diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c
@@ -661,6 +661,7 @@ connection_or_finished_flushing(or_connection_t *conn)
         }
         break;
       }
+      break;
     case OR_CONN_STATE_OPEN:
     case OR_CONN_STATE_OR_HANDSHAKING_V2:
     case OR_CONN_STATE_OR_HANDSHAKING_V3:
diff --git a/src/feature/control/btrack_orconn_cevent.c b/src/feature/control/btrack_orconn_cevent.c
@@ -147,6 +147,7 @@ bto_cevent_apconn(const bt_orconn_t *bto)
     break;
   case OR_CONN_STATE_OPEN:
     control_event_bootstrap(BOOTSTRAP_STATUS_AP_HANDSHAKE_DONE, 0);
+    break;
   default:
     break;
   }