diff options
| author | David Fifield <david@bamsoftware.com> | 2012-10-06 21:25:25 -0700 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-10 22:25:30 -0400 |
| commit | 8419d184411e8cd9457346a7a3d5f9734211a8b2 (patch) | |
| tree | d97f5e28e33089a948ca958253bdd86aa9b3ab13 /src/or/dirvote.c | |
| parent | 78e2d8c7a85c8ec2defe5d1873ae19ba9b82b14c (diff) | |
| download | tor-8419d184411e8cd9457346a7a3d5f9734211a8b2.tar tor-8419d184411e8cd9457346a7a3d5f9734211a8b2.tar.gz | |
Use fmt_addrport where appropriate.
This is mostly a conversion from this pattern:
log("... %s:%d ...", fmt_and_decorate_addr(&addr), port);
to this:
log("... %s ...", fmt_addrport(&addr, port));
The output is the same in all cases.
Diffstat (limited to 'src/or/dirvote.c')
| -rw-r--r-- | src/or/dirvote.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 21ad83663..d98e18b43 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -489,10 +489,9 @@ compute_routerstatus_consensus(smartlist_t *votes, int consensus_method, _compare_orports); if (most_alt_orport) { memcpy(best_alt_orport_out, most_alt_orport, sizeof(tor_addr_port_t)); - log_debug(LD_DIR, "\"a\" line winner for %s is %s:%d", + log_debug(LD_DIR, "\"a\" line winner for %s is %s", most->status.nickname, - fmt_and_decorate_addr(&most_alt_orport->addr), - most_alt_orport->port); + fmt_addrport(&most_alt_orport->addr, most_alt_orport->port)); } SMARTLIST_FOREACH(alt_orports, tor_addr_port_t *, ap, tor_free(ap)); @@ -3561,9 +3560,8 @@ dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method) if (consensus_method >= MIN_METHOD_FOR_A_LINES && !tor_addr_is_null(&ri->ipv6_addr) && ri->ipv6_orport) - smartlist_add_asprintf(chunks, "a %s:%d\n", - fmt_and_decorate_addr(&ri->ipv6_addr), - ri->ipv6_orport); + smartlist_add_asprintf(chunks, "a %s\n", + fmt_addrport(&ri->ipv6_addr, ri->ipv6_orport)); if (family) smartlist_add_asprintf(chunks, "family %s\n", family); |