r18029@catbus: nickm | 2008-02-11 12:36:39 -0500

 Fix command.c compilation with gcc 4.2 warnings enabled.


svn:r13475

1 files changed, 4 insertions, 8 deletions

diff --git a/src/or/command.c b/src/or/command.c
index 48e3bd1c68..591f4cd2a9 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -489,15 +489,11 @@ command_process_versions_cell(var_cell_t *cell, or_connection_t *conn)
 
   log_info(LD_OR, "Negotiated version %d with %s",
            highest_supported_version, safe_str(conn->_base.address));
+  tor_assert(conn->link_proto >= 2);
 
-  if (highest_supported_version >= 2) {
-    if (connection_or_send_netinfo(conn) < 0) {
-      connection_mark_for_close(TO_CONN(conn));
-      return;
-    }
-  } else {
-    /* Should be impossible. */
-    tor_fragile_assert();
+  if (connection_or_send_netinfo(conn) < 0) {
+    connection_mark_for_close(TO_CONN(conn));
+    return;
   }
 }