nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Keep make check-spaces happy

Browse Source
This commit is contained in:
Andrea Shepard 2016-06-12 21:47:14 +00:00
parent 0616fd6fb6
commit 925f76b486
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/address.h
View File

@ -74,7 +74,8 @@ typedef struct tor_addr_port_t
#define TOR_ADDR_NULL {AF_UNSPEC, {0}} #define TOR_ADDR_NULL {AF_UNSPEC, {0}}
static inline const struct in6_addr *tor_addr_to_in6(const tor_addr_t *a); static inline const struct in6_addr *tor_addr_to_in6(const tor_addr_t *a);
static inline const struct in6_addr *tor_addr_to_in6_assert(const tor_addr_t *a); static inline const struct in6_addr *tor_addr_to_in6_assert(
const tor_addr_t *a);
static inline uint32_t tor_addr_to_ipv4n(const tor_addr_t *a); static inline uint32_t tor_addr_to_ipv4n(const tor_addr_t *a);
static inline uint32_t tor_addr_to_ipv4h(const tor_addr_t *a); static inline uint32_t tor_addr_to_ipv4h(const tor_addr_t *a);
static inline uint32_t tor_addr_to_mapped_ipv4h(const tor_addr_t *a); static inline uint32_t tor_addr_to_mapped_ipv4h(const tor_addr_t *a);
@ -98,7 +99,8 @@ tor_addr_to_in6(const tor_addr_t *a)
return a->family == AF_INET6 ? &a->addr.in6_addr : NULL; return a->family == AF_INET6 ? &a->addr.in6_addr : NULL;
} }
/** As tor_addr_to_in6, but assert that the address truly is an IPv6 address. */ /** As tor_addr_to_in6, but assert that the address truly is an IPv6
* address. */
static inline const struct in6_addr * static inline const struct in6_addr *
tor_addr_to_in6_assert(const tor_addr_t *a) tor_addr_to_in6_assert(const tor_addr_t *a)
{ {

4
src/or/onion.c
View File

@ -39,8 +39,8 @@ typedef struct onion_queue_t {
/** Array of queues of circuits waiting for CPU workers. An element is NULL /** Array of queues of circuits waiting for CPU workers. An element is NULL
* if that queue is empty.*/ * if that queue is empty.*/
static TOR_TAILQ_HEAD(onion_queue_head_t, onion_queue_t) static TOR_TAILQ_HEAD(onion_queue_head_t, onion_queue_t)
ol_list[MAX_ONION_HANDSHAKE_TYPE+1] = { ol_list[MAX_ONION_HANDSHAKE_TYPE+1] =
TOR_TAILQ_HEAD_INITIALIZER(ol_list[0]), /* tap */ { TOR_TAILQ_HEAD_INITIALIZER(ol_list[0]), /* tap */
TOR_TAILQ_HEAD_INITIALIZER(ol_list[1]), /* fast */ TOR_TAILQ_HEAD_INITIALIZER(ol_list[1]), /* fast */
TOR_TAILQ_HEAD_INITIALIZER(ol_list[2]), /* ntor */ TOR_TAILQ_HEAD_INITIALIZER(ol_list[2]), /* ntor */
}; };