]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Fix make check-spaces in circuitbuild.c and router.h
authorAndrea Shepard <andrea@persephoneslair.org>
Wed, 1 Aug 2012 09:38:43 +0000 (02:38 -0700)
committerAndrea Shepard <andrea@torproject.org>
Mon, 8 Oct 2012 10:04:00 +0000 (03:04 -0700)
src/or/router.h

index c43c308496cd83d58782ff5759ede6e8b231d9c1..39640855e0d1f09548afe8db005437d1d4094f92 100644 (file)
@@ -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);