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-dhcp6.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-dhcp6.c')
| -rw-r--r-- | print-dhcp6.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/print-dhcp6.c b/print-dhcp6.c index 28b30451..178ec6f8 100644 --- a/print-dhcp6.c +++ b/print-dhcp6.c @@ -417,7 +417,7 @@ dhcp6opt_print(netdissect_options *ndo, break; } tp = (u_char *)(dh6o + 1); - ND_PRINT((ndo, " %s", ip6addr_string(&tp[0]))); + ND_PRINT((ndo, " %s", ip6addr_string(ndo, &tp[0]))); ND_PRINT((ndo, " pltime:%u vltime:%u", EXTRACT_32BITS(&tp[16]), EXTRACT_32BITS(&tp[20]))); @@ -599,7 +599,7 @@ dhcp6opt_print(netdissect_options *ndo, } tp = (u_char *)(dh6o + 1); for (i = 0; i < optlen; i += 16) - ND_PRINT((ndo, " %s", ip6addr_string(&tp[i]))); + ND_PRINT((ndo, " %s", ip6addr_string(ndo, &tp[i]))); ND_PRINT((ndo, ")")); break; case DH6OPT_SIP_SERVER_D: @@ -656,7 +656,7 @@ dhcp6opt_print(netdissect_options *ndo, break; } tp = (u_char *)(dh6o + 1); - ND_PRINT((ndo, " %s/%d", ip6addr_string(&tp[9]), tp[8])); + ND_PRINT((ndo, " %s/%d", ip6addr_string(ndo, &tp[9]), tp[8])); ND_PRINT((ndo, " pltime:%u vltime:%u", EXTRACT_32BITS(&tp[0]), EXTRACT_32BITS(&tp[4]))); @@ -706,7 +706,7 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " type_%d", (int)*tp)); break; } - ND_PRINT((ndo, " %s", ip6addr_string(&tp[1]))); + ND_PRINT((ndo, " %s", ip6addr_string(ndo, &tp[1]))); if (optlen > 17) { /* there are query-options */ dhcp6opt_print(ndo, tp + 17, tp + optlen); @@ -727,7 +727,7 @@ dhcp6opt_print(netdissect_options *ndo, break; } tp = (u_char *)(dh6o + 1); - ND_PRINT((ndo, " %s ", ip6addr_string(&tp[0]))); + ND_PRINT((ndo, " %s ", ip6addr_string(ndo, &tp[0]))); /* * Print hex dump first 10 characters. */ @@ -756,7 +756,7 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " ?")); break; } - ND_PRINT((ndo, " %s", ip6addr_string(&tp[0]))); + ND_PRINT((ndo, " %s", ip6addr_string(ndo, &tp[0]))); break; case DH6OPT_NTP_SUBOPTION_SRV_FQDN: ND_PRINT((ndo, " ")); @@ -907,10 +907,10 @@ dhcp6_print(netdissect_options *ndo, ND_TCHECK(dh6relay->dh6relay_peeraddr); memcpy(&addr6, dh6relay->dh6relay_linkaddr, sizeof (addr6)); - ND_PRINT((ndo, "linkaddr=%s", ip6addr_string(&addr6))); + ND_PRINT((ndo, "linkaddr=%s", ip6addr_string(ndo, &addr6))); memcpy(&addr6, dh6relay->dh6relay_peeraddr, sizeof (addr6)); - ND_PRINT((ndo, " peeraddr=%s", ip6addr_string(&addr6))); + ND_PRINT((ndo, " peeraddr=%s", ip6addr_string(ndo, &addr6))); dhcp6opt_print(ndo, (u_char *)(dh6relay + 1), ep); } |