mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
Move PROCESS_CELL macros outside of channel_tls_process_cell().
These macros are used in multiple functions, and as such really don't belong within a single function. Also #undef them once we are done with them. This change makes practracker pass again.
This commit is contained in:
+12
-10
@@ -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);
|
||||
|
||||
@@ -1328,6 +1328,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.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user