diff options
author | Andrea Shepard <andrea@persephoneslair.org> | 2012-08-01 02:38:43 -0700 |
---|---|---|
committer | Andrea Shepard <andrea@torproject.org> | 2012-10-08 03:04:00 -0700 |
commit | 7f952da55334d3a3693d1c6e8531fd96730265db (patch) | |
tree | 7b5b921c0626b8152b7492dcf073858d9ada032d /src/or/router.h | |
parent | 838743654c1bed2bfe22789ff53a1993c005f176 (diff) | |
download | tor-7f952da55334d3a3693d1c6e8531fd96730265db.tar.gz tor-7f952da55334d3a3693d1c6e8531fd96730265db.zip |
Fix make check-spaces in circuitbuild.c and router.h
Diffstat (limited to 'src/or/router.h')
-rw-r--r-- | src/or/router.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/or/router.h b/src/or/router.h index c43c308496..39640855e0 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -86,13 +86,18 @@ int router_pick_published_address(const or_options_t *options, uint32_t *addr); int router_rebuild_descriptor(int force); int router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, crypto_pk_t *ident_key); -int extrainfo_dump_to_string(char **s, extrainfo_t *extrainfo, - crypto_pk_t *ident_key); void router_get_prim_orport(const routerinfo_t *router, - tor_addr_port_t *ap_out); + tor_addr_port_t *addr_port_out); +void router_get_pref_orport(const routerinfo_t *router, + tor_addr_port_t *addr_port_out); +void router_get_pref_ipv6_orport(const routerinfo_t *router, + tor_addr_port_t *addr_port_out); +int router_ipv6_preferred(const routerinfo_t *router); int router_has_addr(const routerinfo_t *router, const tor_addr_t *addr); int router_has_orport(const routerinfo_t *router, const tor_addr_port_t *orport); +int extrainfo_dump_to_string(char **s, extrainfo_t *extrainfo, + crypto_pk_t *ident_key); int is_legal_nickname(const char *s); int is_legal_nickname_or_hexdigest(const char *s); int is_legal_hexdigest(const char *s); |