Commit 01a797be authored by George Kadianakis's avatar George Kadianakis
Browse files

Merge branch 'tor-github/pr/1334'

parents 0a77e5f1 2d744de3

changes/bug31107

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (logging, protocol violations):

    - Do not log a nonfatal assertion failure when receiving a VERSIONS

      cell on a connection using the obsolete v1 link protocol. Log a

      protocol_warn instead. Fixes bug 31107; bugfix on 0.2.4.4-alpha.

src/core/or/channeltls.c

+23 −12
Original line number Diff line number Diff line
@@ -1027,6 +1027,16 @@ channel_tls_time_process_cell(cell_t *cell, channel_tls_t *chan, int *time, 
}

#endif /* defined(KEEP_TIMING_STATS) */



#ifdef KEEP_TIMING_STATS

#define PROCESS_CELL(tp, cl, cn) STMT_BEGIN {                   \

    ++num ## tp;                                                \

    channel_tls_time_process_cell(cl, cn, & tp ## time ,            \

                             channel_tls_process_ ## tp ## _cell);  \

    } STMT_END

#else /* !(defined(KEEP_TIMING_STATS)) */

#define PROCESS_CELL(tp, cl, cn) channel_tls_process_ ## tp ## _cell(cl, cn)

#endif /* defined(KEEP_TIMING_STATS) */



/**

 * Handle an incoming cell on a channel_tls_t.

 *
@@ -1046,16 +1056,6 @@ channel_tls_handle_cell(cell_t *cell, or_connection_t *conn) 
  channel_tls_t *chan;

  int handshaking;



#ifdef KEEP_TIMING_STATS

#define PROCESS_CELL(tp, cl, cn) STMT_BEGIN {                   \

    ++num ## tp;                                                \

    channel_tls_time_process_cell(cl, cn, & tp ## time ,            \

                             channel_tls_process_ ## tp ## _cell);  \

    } STMT_END

#else /* !(defined(KEEP_TIMING_STATS)) */

#define PROCESS_CELL(tp, cl, cn) channel_tls_process_ ## tp ## _cell(cl, cn)

#endif /* defined(KEEP_TIMING_STATS) */



  tor_assert(cell);

  tor_assert(conn);
@@ -1073,7 +1073,8 @@ channel_tls_handle_cell(cell_t *cell, or_connection_t *conn) 
    return;



  /* Reject all but VERSIONS and NETINFO when handshaking. */

  /* (VERSIONS should actually be impossible; it's variable-length.) */

  /* (VERSIONS actually indicates a protocol warning: it's variable-length,

   * so if it reaches this function, we're on a v1 connection.) */

  if (handshaking && cell->command != CELL_VERSIONS &&

      cell->command != CELL_NETINFO) {

    log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
@@ -1106,7 +1107,15 @@ channel_tls_handle_cell(cell_t *cell, or_connection_t *conn) 
      /* do nothing */

      break;

    case CELL_VERSIONS:

      tor_fragile_assert();

      /* A VERSIONS cell should always be a variable-length cell, and

       * so should never reach this function (which handles constant-sized

       * cells). But if the connection is using the (obsolete) v1 link

       * protocol, all cells will be treated as constant-sized, and so

       * it's possible we'll reach this code.

       */

      log_fn(LOG_PROTOCOL_WARN, LD_CHANNEL,

             "Received unexpected VERSIONS cell on a channel using link "

             "protocol %d; ignoring.", conn->link_proto);

      break;

    case CELL_NETINFO:

      ++stats_n_netinfo_cells_processed;
@@ -1320,6 +1329,8 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, or_connection_t *conn) 
  }

}



#undef PROCESS_CELL



/**

 * Update channel marks after connection_or.c has changed an address.

 *