diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-08 14:58:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-08 14:58:43 -0500 |
| commit | 5ee0cccd49e57fad8c810e817d912d4a61dbc96c (patch) | |
| tree | 2aa4d71a332805bcb1bf7746887e7435ffdc51f4 /src/or/circuitbuild.h | |
| parent | 44010c6fc11608b13924372a179825946672cb23 (diff) | |
| parent | 7ca5f4bf0365b853cdb0bab5cc9cb0ce6deaec26 (diff) | |
| download | tor-5ee0cccd49e57fad8c810e817d912d4a61dbc96c.tar.gz tor-5ee0cccd49e57fad8c810e817d912d4a61dbc96c.zip | |
Merge branch 'macro_free_v2_squashed'
Diffstat (limited to 'src/or/circuitbuild.h')
| -rw-r--r-- | src/or/circuitbuild.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index b8a651e055..9b5fcc71ed 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -58,7 +58,9 @@ extend_info_t *extend_info_new(const char *nickname, const tor_addr_t *addr, uint16_t port); extend_info_t *extend_info_from_node(const node_t *r, int for_direct_connect); extend_info_t *extend_info_dup(extend_info_t *info); -void extend_info_free(extend_info_t *info); +void extend_info_free_(extend_info_t *info); +#define extend_info_free(info) \ + FREE_AND_NULL(extend_info_t, extend_info_free_, (info)) int extend_info_addr_is_allowed(const tor_addr_t *addr); int extend_info_supports_tap(const extend_info_t* ei); int extend_info_supports_ntor(const extend_info_t* ei); |