diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-04-04 00:43:46 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-04-04 00:43:46 -0700 |
| commit | 1cde6435df23876fb88998e38739def0dc7dca47 (patch) | |
| tree | bdd17f2de3c9b1588da3ef07daf803f51761db0c /print-dvmrp.c | |
| parent | ed58b28d5400642cbd797e280d12b3f1b638e850 (diff) | |
| download | tcpdump-1cde6435df23876fb88998e38739def0dc7dca47.tar.gz | |
Netdissectify the to-name resolution routines.
Have them take a netdissect_options * argument, and get the "no name
resolution" flag from it.
Move the declaration of dnaddr_string to addrtoname.h, along with the
other XXX-to-string routines.
Diffstat (limited to 'print-dvmrp.c')
| -rw-r--r-- | print-dvmrp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/print-dvmrp.c b/print-dvmrp.c index 2d712d82..76a86445 100644 --- a/print-dvmrp.c +++ b/print-dvmrp.c @@ -239,7 +239,7 @@ print_probe(netdissect_options *ndo, while ((len > 0) && (bp < ep)) { ND_TCHECK2(bp[0], 4); - ND_PRINT((ndo, "\n\tneighbor %s", ipaddr_string(bp))); + ND_PRINT((ndo, "\n\tneighbor %s", ipaddr_string(ndo, bp))); bp += 4; len -= 4; } return (0); @@ -267,9 +267,9 @@ print_neighbors(netdissect_options *ndo, len -= 7; while (--ncount >= 0) { ND_TCHECK2(bp[0], 4); - ND_PRINT((ndo, " [%s ->", ipaddr_string(laddr))); + ND_PRINT((ndo, " [%s ->", ipaddr_string(ndo, laddr))); ND_PRINT((ndo, " %s, (%d/%d)]", - ipaddr_string(bp), metric, thresh)); + ipaddr_string(ndo, bp), metric, thresh)); bp += 4; len -= 4; } @@ -302,8 +302,8 @@ print_neighbors2(netdissect_options *ndo, ncount = *bp++; len -= 8; while (--ncount >= 0 && (len >= 4) && (bp + 4) <= ep) { - ND_PRINT((ndo, " [%s -> ", ipaddr_string(laddr))); - ND_PRINT((ndo, "%s (%d/%d", ipaddr_string(bp), + ND_PRINT((ndo, " [%s -> ", ipaddr_string(ndo, laddr))); + ND_PRINT((ndo, "%s (%d/%d", ipaddr_string(ndo, bp), metric, thresh)); if (flags & DVMRP_NF_TUNNEL) ND_PRINT((ndo, "/tunnel")); @@ -334,7 +334,7 @@ print_prune(netdissect_options *ndo, register const u_char *bp) { ND_TCHECK2(bp[0], 12); - ND_PRINT((ndo, " src %s grp %s", ipaddr_string(bp), ipaddr_string(bp + 4))); + ND_PRINT((ndo, " src %s grp %s", ipaddr_string(ndo, bp), ipaddr_string(ndo, bp + 4))); bp += 8; ND_PRINT((ndo, " timer ")); relts_print(ndo, EXTRACT_32BITS(bp)); @@ -348,7 +348,7 @@ print_graft(netdissect_options *ndo, register const u_char *bp) { ND_TCHECK2(bp[0], 8); - ND_PRINT((ndo, " src %s grp %s", ipaddr_string(bp), ipaddr_string(bp + 4))); + ND_PRINT((ndo, " src %s grp %s", ipaddr_string(ndo, bp), ipaddr_string(ndo, bp + 4))); return (0); trunc: return (-1); @@ -359,7 +359,7 @@ print_graft_ack(netdissect_options *ndo, register const u_char *bp) { ND_TCHECK2(bp[0], 8); - ND_PRINT((ndo, " src %s grp %s", ipaddr_string(bp), ipaddr_string(bp + 4))); + ND_PRINT((ndo, " src %s grp %s", ipaddr_string(ndo, bp), ipaddr_string(ndo, bp + 4))); return (0); trunc: return (-1); |