diff options
| author | Linus Nordberg <linus@nordberg.se> | 2011-11-28 13:47:12 +0100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-30 11:55:46 -0500 |
| commit | 3b51b326e4fb71b7ec75c5c8ef5a4869f5c4acc1 (patch) | |
| tree | 832e2ef76f4e83d4f30ee61f44f493a1abc2d574 /src/or/nodelist.c | |
| parent | 2376a6ade4c5258da5512885eba28e3e0461f2a8 (diff) | |
| download | tor-3b51b326e4fb71b7ec75c5c8ef5a4869f5c4acc1.tar tor-3b51b326e4fb71b7ec75c5c8ef5a4869f5c4acc1.tar.gz | |
Make router_get_{prim,alt,pref}_addr_port take tor_addr_port_t *.
Rename to *_orport for consistency with node_*.
Diffstat (limited to 'src/or/nodelist.c')
| -rw-r--r-- | src/or/nodelist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 493c03f82..921ce1ad3 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -688,7 +688,7 @@ void node_get_prim_orport(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { - router_get_prim_addr_port(node->ri, &ap_out->addr, &ap_out->port); + router_get_prim_orport(node->ri, ap_out); } else if (node->rs) { tor_addr_from_ipv4h(&ap_out->addr, node->rs->addr); @@ -725,7 +725,7 @@ void node_get_pref_orport(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { - router_get_pref_addr_port(node->ri, &ap_out->addr, &ap_out->port); + router_get_pref_orport(node->ri, ap_out); } else if (node->rs) { /* No IPv6 in routerstatus_t yet. XXXprop186 ok for private bridges but needs fixing */ @@ -737,7 +737,7 @@ node_get_pref_orport(const node_t *node, tor_addr_port_t *ap_out) /** Copy the preferred IPv6 OR port (address and TCP port) for * <b>node</b> into *<b>ap_out</b>. */ void -node_get_pref_ipv6_orport(const node_t *node, tor_addr_port_t *ap_out) +node_get_pref_ipv6_addr(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { tor_addr_copy(&ap_out->addr, &node->ri->ipv6_addr); |