diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-10 09:25:40 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-02-06 14:33:05 -0500 |
| commit | e9b663beaf153359033d78934cdf8f3d8bb9f2d9 (patch) | |
| tree | bafacd19f3cd530f41f216d13ff53b3dddb83923 /src/feature/relay/onion_queue.c | |
| parent | c8fae6b5c8c76089da37c169defbc63a53300a3f (diff) | |
| download | tor-e9b663beaf153359033d78934cdf8f3d8bb9f2d9.tar.gz tor-e9b663beaf153359033d78934cdf8f3d8bb9f2d9.zip | |
onion_queue.c: use TAILQ_HEAD less confusingly.
When we use macro inline, clang-format likes to break it in the
middle, which makes checkSpace get confused.
Diffstat (limited to 'src/feature/relay/onion_queue.c')
| -rw-r--r-- | src/feature/relay/onion_queue.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/feature/relay/onion_queue.c b/src/feature/relay/onion_queue.c index ce2d41b7e1..3cbaa65d28 100644 --- a/src/feature/relay/onion_queue.c +++ b/src/feature/relay/onion_queue.c @@ -49,10 +49,12 @@ typedef struct onion_queue_t { /** 5 seconds on the onion queue til we just send back a destroy */ #define ONIONQUEUE_WAIT_CUTOFF 5 +TOR_TAILQ_HEAD(onion_queue_head_t, onion_queue_t); +typedef struct onion_queue_head_t onion_queue_head_t; + /** Array of queues of circuits waiting for CPU workers. An element is NULL * if that queue is empty.*/ -static TOR_TAILQ_HEAD(onion_queue_head_t, onion_queue_t) - ol_list[MAX_ONION_HANDSHAKE_TYPE+1] = +static onion_queue_head_t ol_list[MAX_ONION_HANDSHAKE_TYPE+1] = { TOR_TAILQ_HEAD_INITIALIZER(ol_list[0]), /* tap */ TOR_TAILQ_HEAD_INITIALIZER(ol_list[1]), /* fast */ TOR_TAILQ_HEAD_INITIALIZER(ol_list[2]), /* ntor */ |