diff options
| author | Guy Harris <guy@alum.mit.edu> | 2020-01-19 19:55:38 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2020-01-19 19:55:38 -0800 |
| commit | 306c2a0384af923a73bf234f3c8bc186ceff0b58 (patch) | |
| tree | 0598390b879d6e9a76ff3b906989a920222d2654 | |
| parent | 2cd0a90c24ccf01ad9a034d7d5a6a651c82a4785 (diff) | |
| download | tcpdump-306c2a0384af923a73bf234f3c8bc186ceff0b58.tar.gz | |
More bounds checking when fetching addresses and converting to strings.
Replace more calls to ipaddr_string()/ip6addr_string() with calls to
GET_IPADDR_STRING()/GET_IP6ADDR_STRING() macros performing bounds
checking.
Add similar bounds-checking inline functions and macros to wrap
linkaddr_string(), etheraddr_string(), and isonsap_string() and convert
calls to them to use the macros as well.
Shuffle the inline functions in addrtoname.h around a bit, so that the
inline functions, external declarations, and macros are all in the same
order.
65 files changed, 566 insertions, 526 deletions
diff --git a/addrtoname.h b/addrtoname.h index 201ab431..8a262aa7 100644 --- a/addrtoname.h +++ b/addrtoname.h @@ -19,13 +19,12 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include "extract.h" + /* - * Definitions to let us compile most of the IPv6 code even on systems + * Definition to let us compile most of the IPv6 code even on systems * without IPv6 support. */ - -#include "extract.h" - #ifndef INET6_ADDRSTRLEN #define INET6_ADDRSTRLEN 46 #endif @@ -65,19 +64,20 @@ extern const char * ieee8021q_tci_string(const uint16_t); */ static inline const char * -get_ipaddr_string(netdissect_options *ndo, const u_char *p) +get_linkaddr_string(netdissect_options *ndo, const uint8_t *p, + const unsigned int type, const unsigned int len) { - if (!ND_TTEST_4(p)) + if (!ND_TTEST_LEN(p, len)) longjmp(ndo->ndo_truncated, 1); - return ipaddr_string(ndo, p); + return linkaddr_string(ndo, p, type, len); } static inline const char * -get_ip6addr_string(netdissect_options *ndo, const u_char *p) +get_etheraddr_string(netdissect_options *ndo, const uint8_t *p) { - if (!ND_TTEST_16(p)) + if (!ND_TTEST_LEN(p, MAC_ADDR_LEN)) longjmp(ndo->ndo_truncated, 1); - return ip6addr_string(ndo, p); + return etheraddr_string(ndo, p); } static inline const char * @@ -88,6 +88,34 @@ get_le64addr_string(netdissect_options *ndo, const u_char *p) return le64addr_string(ndo, p); } +static inline const char * +get_isonsap_string(netdissect_options *ndo, const uint8_t *nsap, + u_int nsap_length) +{ + if (!ND_TTEST_LEN(nsap, nsap_length)) + longjmp(ndo->ndo_truncated, 1); + return isonsap_string(ndo, nsap, nsap_length); +} + +static inline const char * +get_ipaddr_string(netdissect_options *ndo, const u_char *p) +{ + if (!ND_TTEST_4(p)) + longjmp(ndo->ndo_truncated, 1); + return ipaddr_string(ndo, p); +} + +static inline const char * +get_ip6addr_string(netdissect_options *ndo, const u_char *p) +{ + if (!ND_TTEST_16(p)) + longjmp(ndo->ndo_truncated, 1); + return ip6addr_string(ndo, p); +} + +#define GET_LINKADDR_STRING(p, type, len) get_linkaddr_string(ndo, (const u_char *)(p), type, len) +#define GET_ETHERADDR_STRING(p) get_etheraddr_string(ndo, (const u_char *)(p)) +#define GET_LE64ADDR_STRING(p) get_le64addr_string(ndo, (const u_char *)(p)) +#define GET_ISONSAP_STRING(nsap, nsap_length) get_isonsap_string(ndo, (const u_char *)(nsap), nsap_length) #define GET_IPADDR_STRING(p) get_ipaddr_string(ndo, (const u_char *)(p)) #define GET_IP6ADDR_STRING(p) get_ip6addr_string(ndo, (const u_char *)(p)) -#define GET_LE64ADDR_STRING(p) get_le64addr_string(ndo, (const u_char *)(p)) diff --git a/print-802_11.c b/print-802_11.c index 8ddba1e3..7e5873c8 100644 --- a/print-802_11.c +++ b/print-802_11.c @@ -1520,7 +1520,7 @@ handle_deauth(netdissect_options *ndo, if (ndo->ndo_eflag) { ND_PRINT(": %s", reason); } else { - ND_PRINT(" (%s): %s", etheraddr_string(ndo, src), reason); + ND_PRINT(" (%s): %s", GET_ETHERADDR_STRING(src), reason); } return 1; trunc: @@ -1587,7 +1587,7 @@ handle_action(netdissect_options *ndo, if (ndo->ndo_eflag) { ND_PRINT(": "); } else { - ND_PRINT(" (%s): ", etheraddr_string(ndo, src)); + ND_PRINT(" (%s): ", GET_ETHERADDR_STRING(src)); } switch (GET_U_1(p)) { case 0: ND_PRINT("Spectrum Management Act#%u", GET_U_1(p + 1)); break; @@ -1675,8 +1675,8 @@ ctrl_body_print(netdissect_options *ndo, ND_TCHECK_LEN(p, CTRL_BAR_HDRLEN); if (!ndo->ndo_eflag) ND_PRINT(" RA:%s TA:%s CTL(%x) SEQ(%u) ", - etheraddr_string(ndo, ((const struct ctrl_bar_hdr_t *)p)->ra), - etheraddr_string(ndo, ((const struct ctrl_bar_hdr_t *)p)->ta), + GET_ETHERADDR_STRING(((const struct ctrl_bar_hdr_t *)p)->ra), + GET_ETHERADDR_STRING(((const struct ctrl_bar_hdr_t *)p)->ta), GET_LE_U_2(((const struct ctrl_bar_hdr_t *)p)->ctl), GET_LE_U_2(((const struct ctrl_bar_hdr_t *)p)->seq)); break; @@ -1684,7 +1684,7 @@ ctrl_body_print(netdissect_options *ndo, ND_TCHECK_LEN(p, CTRL_BA_HDRLEN); if (!ndo->ndo_eflag) ND_PRINT(" RA:%s ", - etheraddr_string(ndo, ((const struct ctrl_ba_hdr_t *)p)->ra)); + GET_ETHERADDR_STRING(((const struct ctrl_ba_hdr_t *)p)->ra)); break; case CTRL_PS_POLL: ND_TCHECK_LEN(p, CTRL_PS_POLL_HDRLEN); @@ -1695,31 +1695,31 @@ ctrl_body_print(netdissect_options *ndo, ND_TCHECK_LEN(p, CTRL_RTS_HDRLEN); if (!ndo->ndo_eflag) ND_PRINT(" TA:%s ", - etheraddr_string(ndo, ((const struct ctrl_rts_hdr_t *)p)->ta)); + GET_ETHERADDR_STRING(((const struct ctrl_rts_hdr_t *)p)->ta)); break; case CTRL_CTS: ND_TCHECK_LEN(p, CTRL_CTS_HDRLEN); if (!ndo->ndo_eflag) ND_PRINT(" RA:%s ", - etheraddr_string(ndo, ((const struct ctrl_cts_hdr_t *)p)->ra)); + GET_ETHERADDR_STRING(((const struct ctrl_cts_hdr_t *)p)->ra)); break; case CTRL_ACK: ND_TCHECK_LEN(p, CTRL_ACK_HDRLEN); if (!ndo->ndo_eflag) ND_PRINT(" RA:%s ", - etheraddr_string(ndo, ((const struct ctrl_ack_hdr_t *)p)->ra)); + GET_ETHERADDR_STRING(((const struct ctrl_ack_hdr_t *)p)->ra)); break; case CTRL_CF_END: ND_TCHECK_LEN(p, CTRL_END_HDRLEN); if (!ndo->ndo_eflag) ND_PRINT(" RA:%s ", - etheraddr_string(ndo, ((const struct ctrl_end_hdr_t *)p)->ra)); + GET_ETHERADDR_STRING(((const struct ctrl_end_hdr_t *)p)->ra)); break; case CTRL_END_ACK: ND_TCHECK_LEN(p, CTRL_END_ACK_HDRLEN); if (!ndo->ndo_eflag) ND_PRINT(" RA:%s ", - etheraddr_string(ndo, ((const struct ctrl_end_ack_hdr_t *)p)->ra)); + GET_ETHERADDR_STRING(((const struct ctrl_end_ack_hdr_t *)p)->ra)); break; } return 1; @@ -1821,20 +1821,20 @@ data_header_print(netdissect_options *ndo, uint16_t fc, const u_char *p) if (!FC_TO_DS(fc) && !FC_FROM_DS(fc)) { ND_PRINT("DA:%s SA:%s BSSID:%s ", - etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2), - etheraddr_string(ndo, ADDR3)); + GET_ETHERADDR_STRING(ADDR1), GET_ETHERADDR_STRING(ADDR2), + GET_ETHERADDR_STRING(ADDR3)); } else if (!FC_TO_DS(fc) && FC_FROM_DS(fc)) { ND_PRINT("DA:%s BSSID:%s SA:%s ", - etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2), - etheraddr_string(ndo, ADDR3)); + GET_ETHERADDR_STRING(ADDR1), GET_ETHERADDR_STRING(ADDR2), + GET_ETHERADDR_STRING(ADDR3)); } else if (FC_TO_DS(fc) && !FC_FROM_DS(fc)) { ND_PRINT("BSSID:%s SA:%s DA:%s ", - etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2), - etheraddr_string(ndo, ADDR3)); + GET_ETHERADDR_STRING(ADDR1), GET_ETHERADDR_STRING(ADDR2), + GET_ETHERADDR_STRING(ADDR3)); } else if (FC_TO_DS(fc) && FC_FROM_DS(fc)) { ND_PRINT("RA:%s TA:%s DA:%s SA:%s ", - etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2), - etheraddr_string(ndo, ADDR3), etheraddr_string(ndo, ADDR4)); + GET_ETHERADDR_STRING(ADDR1), GET_ETHERADDR_STRING(ADDR2), + GET_ETHERADDR_STRING(ADDR3), GET_ETHERADDR_STRING(ADDR4)); } #undef ADDR1 @@ -1849,8 +1849,8 @@ mgmt_header_print(netdissect_options *ndo, const u_char *p) const struct mgmt_header_t *hp = (const struct mgmt_header_t *) p; ND_PRINT("BSSID:%s DA:%s SA:%s ", - etheraddr_string(ndo, (hp)->bssid), etheraddr_string(ndo, (hp)->da), - etheraddr_string(ndo, (hp)->sa)); + GET_ETHERADDR_STRING((hp)->bssid), GET_ETHERADDR_STRING((hp)->da), + GET_ETHERADDR_STRING((hp)->sa)); } static void @@ -1859,42 +1859,42 @@ ctrl_header_print(netdissect_options *ndo, uint16_t fc, const u_char *p) switch (FC_SUBTYPE(fc)) { case CTRL_BAR: ND_PRINT(" RA:%s TA:%s CTL(%x) SEQ(%u) ", - etheraddr_string(ndo, ((const struct ctrl_bar_hdr_t *)p)->ra), - etheraddr_string(ndo, ((const struct ctrl_bar_hdr_t *)p)->ta), + GET_ETHERADDR_STRING(((const struct ctrl_bar_hdr_t *)p)->ra), + GET_ETHERADDR_STRING(((const struct ctrl_bar_hdr_t *)p)->ta), GET_LE_U_2(((const struct ctrl_bar_hdr_t *)p)->ctl), GET_LE_U_2(((const struct ctrl_bar_hdr_t *)p)->seq)); break; case CTRL_BA: ND_PRINT("RA:%s ", - etheraddr_string(ndo, ((const struct ctrl_ba_hdr_t *)p)->ra)); + GET_ETHERADDR_STRING(((const struct ctrl_ba_hdr_t *)p)->ra)); break; case CTRL_PS_POLL: ND_PRINT("BSSID:%s TA:%s ", - etheraddr_string(ndo, ((const struct ctrl_ps_poll_hdr_t *)p)->bssid), - etheraddr_string(ndo, ((const struct ctrl_ps_poll_hdr_t *)p)->ta)); + GET_ETHERADDR_STRING(((const struct ctrl_ps_poll_hdr_t *)p)->bssid), + GET_ETHERADDR_STRING(((const struct ctrl_ps_poll_hdr_t *)p)->ta)); break; case CTRL_RTS: ND_PRINT("RA:%s TA:%s ", - etheraddr_string(ndo, ((const struct ctrl_rts_hdr_t *)p)->ra), - etheraddr_string(ndo, ((const struct ctrl_rts_hdr_t *)p)->ta)); + GET_ETHERADDR_STRING(((const struct ctrl_rts_hdr_t *)p)->ra), + GET_ETHERADDR_STRING(((const struct ctrl_rts_hdr_t *)p)->ta)); break; case CTRL_CTS: ND_PRINT("RA:%s ", - etheraddr_string(ndo, ((const struct ctrl_cts_hdr_t *)p)->ra)); + GET_ETHERADDR_STRING(((const struct ctrl_cts_hdr_t *)p)->ra)); break; case CTRL_ACK: ND_PRINT("RA:%s ", - etheraddr_string(ndo, ((const struct ctrl_ack_hdr_t *)p)->ra)); + GET_ETHERADDR_STRING(((const struct ctrl_ack_hdr_t *)p)->ra)); break; case CTRL_CF_END: ND_PRINT("RA:%s BSSID:%s ", - etheraddr_string(ndo, ((const struct ctrl_end_hdr_t *)p)->ra), - etheraddr_string(ndo, ((const struct ctrl_end_hdr_t *)p)->bssid)); + GET_ETHERADDR_STRING(((const struct ctrl_end_hdr_t *)p)->ra), + GET_ETHERADDR_STRING(((const struct ctrl_end_hdr_t *)p)->bssid)); break; case CTRL_END_ACK: ND_PRINT("RA:%s BSSID:%s ", - etheraddr_string(ndo, ((const struct ctrl_end_ack_hdr_t *)p)->ra), - etheraddr_string(ndo, ((const struct ctrl_end_ack_hdr_t *)p)->bssid)); + GET_ETHERADDR_STRING(((const struct ctrl_end_ack_hdr_t *)p)->ra), + GET_ETHERADDR_STRING(((const struct ctrl_end_ack_hdr_t *)p)->bssid)); break; default: /* We shouldn't get here - we should already have quit */ @@ -1985,11 +1985,11 @@ ieee_802_11_hdr_print(netdissect_options *ndo, ND_PRINT("MeshData (AE %u TTL %u seq %u", ae, GET_U_1(mc->ttl), GET_LE_U_4(mc->seq)); if (ae > 0) - ND_PRINT(" A4:%s", etheraddr_string(ndo, mc->addr4)); + ND_PRINT(" A4:%s", GET_ETHERADDR_STRING(mc->addr4)); if (ae > 1) - ND_PRINT(" A5:%s", etheraddr_string(ndo, mc->addr5)); + ND_PRINT(" A5:%s", GET_ETHERADDR_STRING(mc->addr5)); if (ae > 2) - ND_PRINT(" A6:%s", etheraddr_string(ndo, mc->addr6)); + ND_PRINT(" A6:%s", GET_ETHERADDR_STRING(mc->addr6)); ND_PRINT(") "); } diff --git a/print-ahcp.c b/print-ahcp.c index 63a1c864..a98d2ecf 100644 --- a/print-ahcp.c +++ b/print-ahcp.c @@ -151,7 +151,7 @@ ahcp_ipv6_addresses_print(netdissect_options *ndo, const u_char *cp, const u_cha if (cp + 16 > ep) goto invalid; ND_TCHECK_16(cp); - ND_PRINT("%s%s", sep, ip6addr_string(ndo, cp)); + ND_PRINT("%s%s", sep, GET_IP6ADDR_STRING(cp)); cp += 16; sep = ", "; } @@ -175,7 +175,7 @@ ahcp_ipv4_addresses_print(netdissect_options *ndo, const u_char *cp, const u_cha if (cp + 4 > ep) goto invalid; ND_TCHECK_4(cp); - ND_PRINT("%s%s", sep, ipaddr_string(ndo, cp)); + ND_PRINT("%s%s", sep, GET_IPADDR_STRING(cp)); cp += 4; sep = ", "; } @@ -199,7 +199,7 @@ ahcp_ipv6_prefixes_print(netdissect_options *ndo, const u_char *cp, const u_char if (cp + 17 > ep) goto invalid; ND_TCHECK_LEN(cp, 17); - ND_PRINT("%s%s/%u", sep, ip6addr_string(ndo, cp), + ND_PRINT("%s%s/%u", sep, GET_IP6ADDR_STRING(cp), GET_U_1(cp + 16)); cp += 17; sep = ", "; @@ -224,7 +224,7 @@ ahcp_ipv4_prefixes_print(netdissect_options *ndo, const u_char *cp, const u_char if (cp + 5 > ep) goto invalid; ND_TCHECK_5(cp); - ND_PRINT("%s%s/%u", sep, ipaddr_string(ndo, cp), + ND_PRINT("%s%s/%u", sep, GET_IPADDR_STRING(cp), GET_U_1(cp + 4)); cp += 5; sep = ", "; @@ -388,11 +388,11 @@ ahcp_print(netdissect_options *ndo, const u_char *cp, const u_int len) cp += 4; /* Source Id */ ND_TCHECK_8(cp); - ND_PRINT(", Source Id %s", linkaddr_string(ndo, cp, LINKADDR_OTHER, 8)); + ND_PRINT(", Source Id %s", GET_LINKADDR_STRING(cp, LINKADDR_OTHER, 8)); cp += 8; /* Destination Id */ ND_TCHECK_8(cp); - ND_PRINT(", Destination Id %s", linkaddr_string(ndo, cp, LINKADDR_OTHER, 8)); + ND_PRINT(", Destination Id %s", GET_LINKADDR_STRING(cp, LINKADDR_OTHER, 8)); cp += 8; } /* Body */ diff --git a/print-aodv.c b/print-aodv.c index da8de256..1f53f827 100644 --- a/print-aodv.c +++ b/print-aodv.c @@ -225,9 +225,9 @@ aodv_rreq(netdissect_options *ndo, const u_char *dat, u_int length) GET_U_1(ap->rreq_type) & RREQ_UNKNOWN ? "[U] " : " ", GET_U_1(ap->rreq_hops), GET_BE_U_4(ap->rreq_id), - ipaddr_string(ndo, ap->rreq_da), + GET_IPADDR_STRING(ap->rreq_da), GET_BE_U_4(ap->rreq_ds), - ipaddr_string(ndo, ap->rreq_oa), + GET_IPADDR_STRING(ap->rreq_oa), GET_BE_U_4(ap->rreq_os)); i = length - sizeof(*ap); if (i >= sizeof(struct aodv_ext)) @@ -253,9 +253,9 @@ aodv_rrep(netdissect_options *ndo, const u_char *dat, u_int length) GET_U_1(ap->rrep_type) & RREP_ACK ? "[A] " : " ", GET_U_1(ap->rrep_ps) & RREP_PREFIX_MASK, GET_U_1(ap->rrep_hops), - ipaddr_string(ndo, ap->rrep_da), + GET_IPADDR_STRING(ap->rrep_da), GET_BE_U_4(ap->rrep_ds), - ipaddr_string(ndo, ap->rrep_oa), + GET_IPADDR_STRING(ap->rrep_oa), GET_BE_U_4(ap->rrep_life)); i = length - sizeof(*ap); if (i >= sizeof(struct aodv_ext)) @@ -285,7 +285,7 @@ aodv_rerr(netdissect_options *ndo, const u_char *dat, u_int length) ND_TCHECK_SIZE(dp); if (i < sizeof(*dp)) goto trunc; - ND_PRINT(" {%s}(%u)", ipaddr_string(ndo, dp->u_da), + ND_PRINT(" {%s}(%u)", GET_IPADDR_STRING(dp->u_da), GET_BE_U_4(dp->u_ds)); dp++; i -= sizeof(*dp); @@ -314,9 +314,9 @@ aodv_v6_rreq(netdissect_options *ndo, const u_char *dat, u_int length) GET_U_1(ap->rreq_type) & RREQ_UNKNOWN ? "[U] " : " ", GET_U_1(ap->rreq_hops), GET_BE_U_4(ap->rreq_id), - ip6addr_string(ndo, ap->rreq_da), + GET_IP6ADDR_STRING(ap->rreq_da), GET_BE_U_4(ap->rreq_ds), - ip6addr_string(ndo, ap->rreq_oa), + GET_IP6ADDR_STRING(ap->rreq_oa), GET_BE_U_4(ap->rreq_os)); i = length - sizeof(*ap); if (i >= sizeof(struct aodv_ext)) @@ -342,9 +342,9 @@ aodv_v6_rrep(netdissect_options *ndo, const u_char *dat, u_int length) GET_U_1(ap->rrep_type) & RREP_ACK ? "[A] " : " ", GET_U_1(ap->rrep_ps) & RREP_PREFIX_MASK, GET_U_1(ap->rrep_hops), - ip6addr_string(ndo, ap->rrep_da), + GET_IP6ADDR_STRING(ap->rrep_da), GET_BE_U_4(ap->rrep_ds), - ip6addr_string(ndo, ap->rrep_oa), + GET_IP6ADDR_STRING(ap->rrep_oa), GET_BE_U_4(ap->rrep_life)); i = length - sizeof(*ap); if (i >= sizeof(struct aodv_ext)) @@ -374,7 +374,7 @@ aodv_v6_rerr(netdissect_options *ndo, const u_char *dat, u_int length) ND_TCHECK_SIZE(dp6); if (i < sizeof(*dp6)) goto trunc; - ND_PRINT(" {%s}(%u)", ip6addr_string(ndo, dp6->u_da), + ND_PRINT(" {%s}(%u)", GET_IP6ADDR_STRING(dp6->u_da), GET_BE_U_4(dp6->u_ds)); dp6++; i -= sizeof(*dp6); @@ -403,9 +403,9 @@ aodv_v6_draft_01_rreq(netdissect_options *ndo, const u_char *dat, u_int length) GET_U_1(ap->rreq_type) & RREQ_UNKNOWN ? "[U] " : " ", GET_U_1(ap->rreq_hops), GET_BE_U_4(ap->rreq_id), - ip6addr_string(ndo, ap->rreq_da), + GET_IP6ADDR_STRING(ap->rreq_da), GET_BE_U_4(ap->rreq_ds), - ip6addr_string(ndo, ap->rreq_oa), + GET_IP6ADDR_STRING(ap->rreq_oa), GET_BE_U_4(ap->rreq_os)); i = length - sizeof(*ap); if (i >= sizeof(struct aodv_ext)) @@ -431,9 +431,9 @@ aodv_v6_draft_01_rrep(netdissect_options *ndo, const u_char *dat, u_int length) GET_U_1(ap->rrep_type) & RREP_ACK ? "[A] " : " ", GET_U_1(ap->rrep_ps) & RREP_PREFIX_MASK, GET_U_1(ap->rrep_hops), - ip6addr_string(ndo, ap->rrep_da), + GET_IP6ADDR_STRING(ap->rrep_da), GET_BE_U_4(ap->rrep_ds), - ip6addr_string(ndo, ap->rrep_oa), + GET_IP6ADDR_STRING(ap->rrep_oa), GET_BE_U_4(ap->rrep_life)); i = length - sizeof(*ap); if (i >= sizeof(struct aodv_ext)) @@ -463,7 +463,7 @@ aodv_v6_draft_01_rerr(netdissect_options *ndo, const u_char *dat, u_int length) ND_TCHECK_SIZE(dp6); if (i < sizeof(*dp6)) goto trunc; - ND_PRINT(" {%s}(%u)", ip6addr_string(ndo, dp6->u_da), + ND_PRINT(" {%s}(%u)", GET_IP6ADDR_STRING(dp6->u_da), GET_BE_U_4(dp6->u_ds)); dp6++; i -= sizeof(*dp6); diff --git a/print-aoe.c b/print-aoe.c index 5acab319..d8a5bc05 100644 --- a/print-aoe.c +++ b/print-aoe.c @@ -292,7 +292,7 @@ aoev1_mac_print(netdissect_options *ndo, cp += 1; /* Ethernet Address */ ND_TCHECK_LEN(cp, MAC_ADDR_LEN); - ND_PRINT(", Ethernet Address: %s", etheraddr_string(ndo, cp)); + ND_PRINT(", Ethernet Address: %s", GET_ETHERADDR_STRING(cp)); cp += MAC_ADDR_LEN; } return; @@ -329,7 +329,7 @@ aoev1_reserve_print(netdissect_options *ndo, /* addresses */ for (i = 0; i < nmacs; i++) { ND_TCHECK_LEN(cp, MAC_ADDR_LEN); - ND_PRINT("\n\tEthernet Address %u: %s", i, etheraddr_string(ndo, cp)); + ND_PRINT("\n\tEthernet Address %u: %s", i, GET_ETHERADDR_STRING(cp)); cp += MAC_ADDR_LEN; } return; diff --git a/print-arp.c b/print-arp.c index add9652c..02eb6e4b 100644 --- a/print-arp.c +++ b/print-arp.c @@ -198,7 +198,7 @@ tpaddr_print_ip(netdissect_options *ndo, else if (PROTO_LEN(ap) != 4) ND_PRINT("<wrong len>"); else - ND_PRINT("%s", ipaddr_string(ndo, TPA(ap))); + ND_PRINT("%s", GET_IPADDR_STRING(TPA(ap))); } static void @@ -210,7 +210,7 @@ spaddr_print_ip(netdissect_options *ndo, else if (PROTO_LEN(ap) != 4) ND_PRINT("<wrong len>"); else - ND_PRINT("%s", ipaddr_string(ndo, SPA(ap))); + ND_PRINT("%s", GET_IPADDR_STRING(SPA(ap))); } static void @@ -221,10 +221,10 @@ atmarp_addr_print(netdissect_options *ndo, if (ha_len == 0) ND_PRINT("<No address>"); else { - ND_PRINT("%s", linkaddr_string(ndo, ha, LINKADDR_ATM, ha_len)); + ND_PRINT("%s", GET_LINKADDR_STRING(ha, LINKADDR_ATM, ha_len)); if (srca_len != 0) ND_PRINT(",%s", - linkaddr_string(ndo, srca, LINKADDR_ATM, srca_len)); + GET_LINKADDR_STRING(srca, LINKADDR_ATM, srca_len)); } } @@ -237,7 +237,7 @@ atmarp_tpaddr_print(netdissect_options *ndo, else if (ATMTPROTO_LEN(ap) != 4) ND_PRINT("<wrong tplen>"); else - ND_PRINT("%s", ipaddr_string(ndo, ATMTPA(ap))); + ND_PRINT("%s", GET_IPADDR_STRING(ATMTPA(ap))); } static void @@ -249,7 +249,7 @@ atmarp_spaddr_print(netdissect_options *ndo, else if (ATMSPROTO_LEN(ap) != 4) ND_PRINT("<wrong splen>"); else - ND_PRINT("%s", ipaddr_string(ndo, ATMSPA(ap))); + ND_PRINT("%s", GET_IPADDR_STRING(ATMSPA(ap))); } static void @@ -372,7 +372,7 @@ arp_print(netdissect_options *ndo, /* if its ATM then call the ATM ARP printer for Frame-relay ARP most of the fields are similar to Ethernet so overload the Ethernet Printer - and set the linkaddr type for linkaddr_string(ndo, ) accordingly */ + and set the linkaddr type for GET_LINKADDR_STRING() accordingly */ switch(hrd) { case ARPHRD_ATM2225: @@ -425,7 +425,7 @@ arp_print(netdissect_options *ndo, tpaddr_print_ip(ndo, ap, pro); if (isnonzero(ndo, (const u_char *)THA(ap), HRD_LEN(ap))) ND_PRINT(" (%s)", - linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap))); + GET_LINKADDR_STRING(THA(ap), linkaddr, HRD_LEN(ap))); ND_PRINT(" tell "); spaddr_print_ip(ndo, ap, pro); break; @@ -433,30 +433,30 @@ arp_print(netdissect_options *ndo, case ARPOP_REPLY: spaddr_print_ip(ndo, ap, pro); ND_PRINT(" is-at %s", - linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap))); + GET_LINKADDR_STRING(SHA(ap), linkaddr, HRD_LEN(ap))); break; case ARPOP_REVREQUEST: ND_PRINT("who-is %s tell %s", - linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)), - linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap))); + GET_LINKADDR_STRING(THA(ap), linkaddr, HRD_LEN(ap)), + GET_LINKADDR_STRING(SHA(ap), linkaddr, HRD_LEN(ap))); break; case ARPOP_REVREPLY: ND_PRINT("%s at ", - linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap))); + GET_LINKADDR_STRING(THA(ap), linkaddr, HRD_LEN(ap))); tpaddr_print_ip(ndo, ap, pro); break; case ARPOP_INVREQUEST: ND_PRINT("who-is %s tell %s", - linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)), - linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap))); + GET_LINKADDR_STRING(THA(ap), linkaddr, HRD_LEN(ap)), + GET_LINKADDR_STRING(SHA(ap), linkaddr, HRD_LEN(ap))); break; case ARPOP_INVREPLY: ND_PRINT("%s at ", - linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap))); + GET_LINKADDR_STRING(SHA(ap), linkaddr, HRD_LEN(ap))); spaddr_print_ip(ndo, ap, pro); break; diff --git a/print-atalk.c b/print-atalk.c index 57bd140f..ae342069 100644 --- a/print-atalk.c +++ b/print-atalk.c @@ -245,7 +245,7 @@ aarp_print(netdissect_options *ndo, return; case 2: /* response */ - ND_PRINT("reply %s is-at %s", AT(psaddr), etheraddr_string(ndo, ap->hsaddr)); + ND_PRINT("reply %s is-at %s", AT(psaddr), GET_ETHERADDR_STRING(ap->hsaddr)); return; case 3: /* probe (oy!) */ diff --git a/print-babel.c b/print-babel.c index 7dba0765..7ef45540 100644 --- a/print-babel.c +++ b/print-babel.c @@ -126,6 +126,12 @@ static const char * format_prefix(netdissect_options *ndo, const u_char *prefix, unsigned char plen) { static char buf[50]; + + /* + * prefix points to a buffer on the stack into which the prefix has + * been placed, so we can't use GET_IPADDR_STRING() or + * GET_IP6ADDR_STRING() on it. + */ if(plen >= 96 && memcmp(prefix, v4prefix, 12) == 0) snprintf(buf, 50, "%s/%u", ipaddr_string(ndo, prefix + 12), plen - 96); else @@ -137,6 +143,11 @@ format_prefix(netdissect_options *ndo, const u_char *prefix, unsigned char plen) static const char * format_address(netdissect_options *ndo, const u_char *prefix) { + /* + * prefix points to a buffer on the stack into which the prefix has + * been placed, so we can't use GET_IPADDR_STRING() or + * GET_IP6ADDR_STRING() on it. + */ if(memcmp(prefix, v4prefix, 12) == 0) return ipaddr_string(ndo, prefix + 12); else diff --git a/print-bgp.c b/print-bgp.c index 4d8254f0..9f6b5f21 100644 --- a/print-bgp.c +++ b/print-bgp.c @@ -685,11 +685,11 @@ bgp_vpn_ip_print(netdissect_options *ndo, switch(addr_length) { case (sizeof(nd_ipv4) << 3): /* 32 */ ND_TCHECK_LEN(pptr, sizeof(nd_ipv4)); - snprintf(pos, sizeof(addr), "%s", ipaddr_string(ndo, pptr)); + snprintf(pos, sizeof(addr), "%s", GET_IPADDR_STRING(pptr)); break; case (sizeof(nd_ipv6) << 3): /* 128 */ ND_TCHECK_LEN(pptr, sizeof(nd_ipv6)); - snprintf(pos, sizeof(addr), "%s", ip6addr_string(ndo, pptr)); + snprintf(pos, sizeof(addr), "%s", GET_IP6ADDR_STRING(pptr)); break; default: snprintf(pos, sizeof(addr), "bogus address length %u", addr_length); @@ -829,7 +829,7 @@ bgp_extended_community_print(netdissect_options *ndo, ND_PRINT("%u:%u (= %s)", GET_BE_U_2(pptr + 2), GET_BE_U_4(pptr + 4), - ipaddr_string(ndo, pptr+4)); + GET_IPADDR_STRING(pptr+4)); break; case BGP_EXT_COM_RT_1: @@ -837,7 +837,7 @@ bgp_extended_community_print(netdissect_options *ndo, case BGP_EXT_COM_L2VPN_RT_1: case BGP_EXT_COM_VRF_RT_IMP: ND_PRINT("%s:%u", - ipaddr_string(ndo, pptr+2), + GET_IPADDR_STRING(pptr+2), GET_BE_U_2(pptr + 6)); break; @@ -860,13 +860,13 @@ bgp_extended_community_print(netdissect_options *ndo, case BGP_EXT_COM_VPN_ORIGIN4: case BGP_EXT_COM_OSPF_RID: case BGP_EXT_COM_OSPF_RID2: - ND_PRINT("%s", ipaddr_string(ndo, pptr+2)); + ND_PRINT("%s", GET_IPADDR_STRING(pptr+2)); break; case BGP_EXT_COM_OSPF_RTYPE: case BGP_EXT_COM_OSPF_RTYPE2: ND_PRINT("area:%s, router-type:%s, metric-type:%s%s", - ipaddr_string(ndo, pptr+2), + GET_IPADDR_STRING(pptr+2), tok2str(bgp_extd_comm_ospf_rtype_values, "unknown (0x%02x)", GET_U_1((pptr + 6))), @@ -1034,7 +1034,7 @@ decode_mdt_vpn_nlri(netdissect_options *ndo, ND_TCHECK_LEN(pptr, sizeof(nd_ipv4)); snprintf(buf, buflen, "RD: %s, VPN IP Address: %s, MC Group Address: %s", - bgp_vpn_rd_print(ndo, rd), ipaddr_string(ndo, vpn_ip), ipaddr_string(ndo, pptr)); + bgp_vpn_rd_print(ndo, rd), GET_IPADDR_STRING(vpn_ip), GET_IPADDR_STRING(pptr)); return MDT_VPN_NLRI_LEN + 1; @@ -1192,7 +1192,7 @@ decode_labeled_vpn_l2(netdissect_options *ndo, buf[0] = '\0'; stringlen = snprintf(buf, buflen, "RD: %s, BGPNH: %s", bgp_vpn_rd_print(ndo, pptr), - ipaddr_string(ndo, pptr+8)); + GET_IPADDR_STRING(pptr+8)); UPDATE_BUF_BUFLEN(buf, buflen, stringlen); pptr += 12; tlen -= 12; @@ -1904,7 +1904,7 @@ bgp_attr_print(netdissect_options *ndo, ND_PRINT("invalid len"); else { ND_TCHECK_4(tptr); - ND_PRINT("%s", ipaddr_string(ndo, tptr)); + ND_PRINT("%s", GET_IPADDR_STRING(tptr)); } break; case BGPTYPE_MULTI_EXIT_DISC: @@ -1934,11 +1934,11 @@ bgp_attr_print(netdissect_options *ndo, if (len == 6) { ND_PRINT(" AS #%s, origin %s", as_printf(ndo, astostr, sizeof(astostr), GET_BE_U_2(tptr)), - ipaddr_string(ndo, tptr + 2)); + GET_IPADDR_STRING(tptr + 2)); } else { ND_PRINT(" AS #%s, origin %s", as_printf(ndo, astostr, sizeof(astostr), - GET_BE_U_4(tptr)), ipaddr_string(ndo, tptr + 4)); + GET_BE_U_4(tptr)), GET_IPADDR_STRING(tptr + 4)); } break; case BGPTYPE_AGGREGATOR4: @@ -1949,7 +1949,7 @@ bgp_attr_print(netdissect_options *ndo, ND_TCHECK_8(tptr); ND_PRINT(" AS #%s, origin %s", as_printf(ndo, astostr, sizeof(astostr), GET_BE_U_4(tptr)), - ipaddr_string(ndo, tptr + 4)); + GET_IPADDR_STRING(tptr + 4)); break; case BGPTYPE_COMMUNITIES: if (len % 4) { @@ -1989,7 +1989,7 @@ bgp_attr_print(netdissect_options *ndo, break; } ND_TCHECK_4(tptr); - ND_PRINT("%s",ipaddr_string(ndo, tptr)); + ND_PRINT("%s",GET_IPADDR_STRING(tptr)); break; case BGPTYPE_CLUSTER_LIST: if (len % 4) { @@ -2001,7 +2001,7 @@ bgp_attr_print(netdissect_options *ndo, if (tlen < 4) goto trunc; ND_PRINT("%s%s", - ipaddr_string(ndo, tptr), + GET_IPADDR_STRING(tptr), (tlen>4) ? ", " : ""); tlen -=4; tptr +=4; @@ -2050,7 +2050,7 @@ bgp_attr_print(netdissect_options *ndo, tnhlen = 0; } else { ND_TCHECK_LEN(tptr, sizeof(nd_ipv4)); - ND_PRINT("%s",ipaddr_string(ndo, tptr)); + ND_PRINT("%s",GET_IPADDR_STRING(tptr)); tptr += sizeof(nd_ipv4); tnhlen -= sizeof(nd_ipv4); tlen -= sizeof(nd_ipv4); @@ -2069,7 +2069,7 @@ bgp_attr_print(netdissect_options *ndo, sizeof(nd_ipv4) + BGP_VPN_RD_LEN); ND_PRINT("RD: %s, %s", bgp_vpn_rd_print(ndo, tptr), - ipaddr_string(ndo, tptr+BGP_VPN_RD_LEN)); + GET_IPADDR_STRING(tptr+BGP_VPN_RD_LEN)); tptr += (sizeof(nd_ipv4)+BGP_VPN_RD_LEN); tlen -= (sizeof(nd_ipv4)+BGP_VPN_RD_LEN); tnhlen -= (sizeof(nd_ipv4)+BGP_VPN_RD_LEN); @@ -2086,7 +2086,7 @@ bgp_attr_print(netdissect_options *ndo, tnhlen = 0; } else { ND_TCHECK_LEN(tptr, sizeof(nd_ipv6)); - ND_PRINT("%s", ip6addr_string(ndo, tptr)); + ND_PRINT("%s", GET_IP6ADDR_STRING(tptr)); tptr += sizeof(nd_ipv6); tlen -= sizeof(nd_ipv6); tnhlen -= sizeof(nd_ipv6); @@ -2105,7 +2105,7 @@ bgp_attr_print(netdissect_options *ndo, sizeof(nd_ipv6) + BGP_VPN_RD_LEN); ND_PRINT("RD: %s, %s", bgp_vpn_rd_print(ndo, tptr), - ip6addr_string(ndo, tptr+BGP_VPN_RD_LEN)); + GET_IP6ADDR_STRING(tptr+BGP_VPN_RD_LEN)); tptr += (sizeof(nd_ipv6)+BGP_VPN_RD_LEN); tlen -= (sizeof(nd_ipv6)+BGP_VPN_RD_LEN); tnhlen -= (sizeof(nd_ipv6)+BGP_VPN_RD_LEN); @@ -2122,7 +2122,7 @@ bgp_attr_print(netdissect_options *ndo, tnhlen = 0; } else { ND_TCHECK_LEN(tptr, sizeof(nd_ipv4)); - ND_PRINT("%s", ipaddr_string(ndo, tptr)); + ND_PRINT("%s", GET_IPADDR_STRING(tptr)); tptr += (sizeof(nd_ipv4)); tlen -= (sizeof(nd_ipv4)); tnhlen -= (sizeof(nd_ipv4)); @@ -2132,7 +2132,7 @@ bgp_attr_print(netdissect_options *ndo, case (AFNUM_NSAP<<8 | SAFNUM_MULTICAST): case (AFNUM_NSAP<<8 | SAFNUM_UNIMULTICAST): ND_TCHECK_LEN(tptr, tnhlen); - ND_PRINT("%s", isonsap_string(ndo, tptr, tnhlen)); + ND_PRINT("%s", GET_ISONSAP_STRING(tptr, tnhlen)); tptr += tnhlen; tlen -= tnhlen; tnhlen = 0; @@ -2150,13 +2150,13 @@ bgp_attr_print(netdissect_options *ndo, ND_TCHECK_LEN(tptr, tnhlen); ND_PRINT("RD: %s, %s", bgp_vpn_rd_print(ndo, tptr), - isonsap_string(ndo, tptr+BGP_VPN_RD_LEN,tnhlen-BGP_VPN_RD_LEN)); + GET_ISONSAP_STRING(tptr+BGP_VPN_RD_LEN,tnhlen-BGP_VPN_RD_LEN)); /* rfc986 mapped IPv4 address ? */ if (GET_BE_U_4(tptr + BGP_VPN_RD_LEN) == 0x47000601) - ND_PRINT(" = %s", ipaddr_string(ndo, tptr+BGP_VPN_RD_LEN+4)); + ND_PRINT(" = %s", GET_IPADDR_STRING(tptr+BGP_VPN_RD_LEN+4)); /* rfc1888 mapped IPv6 address ? */ else if (GET_BE_U_3(tptr + BGP_VPN_RD_LEN) == 0x350000) - ND_PRINT(" = %s", ip6addr_string(ndo, tptr+BGP_VPN_RD_LEN+3)); + ND_PRINT(" = %s", GET_IP6ADDR_STRING(tptr+BGP_VPN_RD_LEN+3)); tptr += tnhlen; tlen -= tnhlen; tnhlen = 0; @@ -2301,32 +2301,32 @@ bgp_attr_print(netdissect_options *ndo, case BGP_PMSI_TUNNEL_PIM_BIDIR: ND_TCHECK_8(tptr); ND_PRINT("\n\t Sender %s, P-Group %s", - ipaddr_string(ndo, tptr), - ipaddr_string(ndo, tptr+4)); + GET_IPADDR_STRING(tptr), + GET_IPADDR_STRING(tptr+4)); break; case BGP_PMSI_TUNNEL_PIM_SSM: ND_TCHECK_8(tptr); ND_PRINT("\n\t Root-Node %s, P-Group %s", - ipaddr_string(ndo, tptr), - ipaddr_string(ndo, tptr+4)); + GET_IPADDR_STRING(tptr), + GET_IPADDR_STRING(tptr+4)); break; case BGP_PMSI_TUNNEL_INGRESS: ND_TCHECK_4(tptr); ND_PRINT("\n\t Tunnel-Endpoint %s", - ipaddr_string(ndo, tptr)); + GET_IPADDR_STRING(tptr)); break; case BGP_PMSI_TUNNEL_LDP_P2MP: /* fall through */ case BGP_PMSI_TUNNEL_LDP_MP2MP: ND_TCHECK_8(tptr); ND_PRINT("\n\t Root-Node %s, LSP-ID 0x%08x", - ipaddr_string(ndo, tptr), + GET_IPADDR_STRING(tptr), GET_BE_U_4(tptr + 4)); break; case BGP_PMSI_TUNNEL_RSVP_P2MP: ND_TCHECK_8(tptr); ND_PRINT("\n\t Extended-Tunnel-ID %s, P2MP-ID 0x%08x", - ipaddr_string(ndo, tptr), + GET_IPADDR_STRING(tptr), GET_BE_U_4(tptr + 4)); break; default: @@ -2649,7 +2649,7 @@ bgp_open_print(netdissect_options *ndo, as_printf(ndo, astostr, sizeof(astostr), GET_BE_U_2(bgp_open_header->bgpo_myas))); ND_PRINT("Holdtime %us, ", GET_BE_U_2(bgp_open_header->bgpo_holdtime)); - ND_PRINT("ID %s", ipaddr_string(ndo, bgp_open_header->bgpo_id)); + ND_PRINT("ID %s", GET_IPADDR_STRING(bgp_open_header->bgpo_id)); optslen = GET_U_1(bgp_open_header->bgpo_optlen); ND_PRINT("\n\t Optional parameters, length: %u", optslen); diff --git a/print-bootp.c b/print-bootp.c index 2bc8bb6b..264a016b 100644 --- a/print-bootp.c +++ b/print-bootp.c @@ -299,7 +299,7 @@ bootp_print(netdissect_options *ndo, bp_hlen = GET_U_1(bp->bp_hlen); if (bp_htype == 1 && bp_hlen == 6 && bp_op == BOOTPREQUEST) { ND_TCHECK_6(bp->bp_chaddr); - ND_PRINT(" from %s", etheraddr_string(ndo, bp->bp_chaddr)); + ND_PRINT(" from %s", GET_ETHERADDR_STRING(bp->bp_chaddr)); } ND_PRINT(", length %u", length); @@ -334,27 +334,27 @@ bootp_print(netdissect_options *ndo, /* Client's ip address */ ND_TCHECK_4(bp->bp_ciaddr); if (GET_IPV4_TO_NETWORK_ORDER(bp->bp_ciaddr)) - ND_PRINT("\n\t Client-IP %s", ipaddr_string(ndo, bp->bp_ciaddr)); + ND_PRINT("\n\t Client-IP %s", GET_IPADDR_STRING(bp->bp_ciaddr)); /* 'your' ip address (bootp client) */ ND_TCHECK_4(bp->bp_yiaddr); if (GET_IPV4_TO_NETWORK_ORDER(bp->bp_yiaddr)) - ND_PRINT("\n\t Your-IP %s", ipaddr_string(ndo, bp->bp_yiaddr)); + ND_PRINT("\n\t Your-IP %s", GET_IPADDR_STRING(bp->bp_yiaddr)); /* Server's ip address */ ND_TCHECK_4(bp->bp_siaddr); if (GET_IPV4_TO_NETWORK_ORDER(bp->bp_siaddr)) - ND_PRINT("\n\t Server-IP %s", ipaddr_string(ndo, bp->bp_siaddr)); + ND_PRINT("\n\t Server-IP %s", GET_IPADDR_STRING(bp->bp_siaddr)); /* Gateway's ip address */ ND_TCHECK_4(bp->bp_giaddr); if (GET_IPV4_TO_NETWORK_ORDER(bp->bp_giaddr)) - ND_PRINT("\n\t Gateway-IP %s", ipaddr_string(ndo, bp->bp_giaddr)); + ND_PRINT("\n\t Gateway-IP %s", GET_IPADDR_STRING(bp->bp_giaddr)); /* Client's Ethernet address */ if (bp_htype == 1 && bp_hlen == 6) { ND_TCHECK_6(bp->bp_chaddr); - ND_PRINT("\n\t Client-Ethernet-Address %s", etheraddr_string(ndo, bp->bp_chaddr)); + ND_PRINT("\n\t Client-Ethernet-Address %s", GET_ETHERADDR_STRING(bp->bp_chaddr)); } ND_TCHECK_1(bp->bp_sname); /* check first char only */ @@ -728,7 +728,7 @@ rfc1048_print(netdissect_options *ndo, if (!first) ND_PRINT(","); if (c == 'i') - ND_PRINT("%s", ipaddr_string(ndo, bp)); + ND_PRINT("%s", GET_IPADDR_STRING(bp)); else if (c == 'L') ND_PRINT("%d", GET_BE_S_4(bp)); else @@ -744,10 +744,10 @@ rfc1048_print(netdissect_options *ndo, while (len >= 2*4) { if (!first) ND_PRINT(","); - ND_PRINT("(%s:", ipaddr_string(ndo, bp)); + ND_PRINT("(%s:", GET_IPADDR_STRING(bp)); bp += 4; len -= 4; - ND_PRINT("%s)", ipaddr_string(ndo, bp)); + ND_PRINT("%s)", GET_IPADDR_STRING(bp)); bp += 4; len -= 4; first = 0; @@ -984,7 +984,7 @@ rfc1048_print(netdissect_options *ndo, ND_PRINT(".0"); ND_PRINT("/%u", mask_width); } - ND_PRINT(":%s)", ipaddr_string(ndo, bp)); + ND_PRINT(":%s)", GET_IPADDR_STRING(bp)); bp += 4; len -= (significant_octets + 4); first = 0; @@ -1057,7 +1057,7 @@ trunc: #define PRINTCMUADDR(m, s) { ND_TCHECK_4(cmu->m); \ if (GET_IPV4_TO_NETWORK_ORDER(cmu->m) != 0) \ - ND_PRINT(" %s:%s", s, ipaddr_string(ndo, cmu->m)); } + ND_PRINT(" %s:%s", s, GET_IPADDR_STRING(cmu->m)); } static void cmu_print(netdissect_options *ndo, diff --git a/print-cdp.c b/print-cdp.c index 2a6c1e3a..d0e63688 100644 --- a/print-cdp.c +++ b/print-cdp.c @@ -340,7 +340,7 @@ cdp_print_addr(netdissect_options *ndo, ND_TCHECK_4(p); if (p + 4 > endp) goto trunc; - ND_PRINT("IPv4 (%u) %s", num, ipaddr_string(ndo, p)); + ND_PRINT("IPv4 (%u) %s", num, GET_IPADDR_STRING(p)); p += 4; } else if (pt == PT_IEEE_802_2 && pl == 8 && @@ -356,7 +356,7 @@ cdp_print_addr(netdissect_options *ndo, if (p + al > endp) goto trunc; - ND_PRINT("IPv6 (%u) %s", num, ip6addr_string(ndo, p)); + ND_PRINT("IPv6 (%u) %s", num, GET_IP6ADDR_STRING(p)); p += al; } else { diff --git a/print-cfm.c b/print-cfm.c index 63d58e39..5231088b 100644 --- a/print-cfm.c +++ b/print-cfm.c @@ -247,7 +247,7 @@ cfm_network_addr_print(netdissect_options *ndo, hexdump = TRUE; break; } - ND_PRINT(", %s", ipaddr_string(ndo, tptr + 1)); + ND_PRINT(", %s", GET_IPADDR_STRING(tptr + 1)); break; case AFNUM_INET6: @@ -256,7 +256,7 @@ cfm_network_addr_print(netdissect_options *ndo, hexdump = TRUE; break; } - ND_PRINT(", %s", ip6addr_string(ndo, tptr + 1)); + ND_PRINT(", %s", GET_IP6ADDR_STRING(tptr + 1)); break; default: @@ -408,8 +408,7 @@ cfm_print(netdissect_options *ndo, case CFM_CCM_MD_FORMAT_MAC: if (md_namelength == 6) { - ND_PRINT("\n\t MAC %s", etheraddr_string(ndo, - md_name)); + ND_PRINT("\n\t MAC %s", GET_ETHERADDR_STRING(md_name)); } else { ND_PRINT("\n\t MAC (length invalid)"); } @@ -487,8 +486,8 @@ cfm_print(netdissect_options *ndo, GET_U_1(msg_ptr.cfm_ltm->ttl)); ND_PRINT("\n\t Original-MAC %s, Target-MAC %s", - etheraddr_string(ndo, msg_ptr.cfm_ltm->original_mac), - etheraddr_string(ndo, msg_ptr.cfm_ltm->target_mac)); + GET_ETHERADDR_STRING(msg_ptr.cfm_ltm->original_mac), + GET_ETHERADDR_STRING(msg_ptr.cfm_ltm->target_mac)); break; case CFM_OPCODE_LTR: @@ -649,7 +648,7 @@ cfm_print(netdissect_options *ndo, hexdump = TRUE; break; } - ND_PRINT("\n\t MAC %s", etheraddr_string(ndo, tptr + 1)); + ND_PRINT("\n\t MAC %s", GET_ETHERADDR_STRING(tptr + 1)); break; case CFM_CHASSIS_ID_NETWORK_ADDRESS: diff --git a/print-chdlc.c b/print-chdlc.c index bc431774..a7793351 100644 --- a/print-chdlc.c +++ b/print-chdlc.c @@ -169,8 +169,8 @@ chdlc_slarp_print(netdissect_options *ndo, const u_char *cp, u_int length) break; case SLARP_REPLY: ND_PRINT("reply %s/%s", - ipaddr_string(ndo, slarp->un.addr.addr), - ipaddr_string(ndo, slarp->un.addr.mask)); + GET_IPADDR_STRING(slarp->un.addr.addr), + GET_IPADDR_STRING(slarp->un.addr.mask)); break; case SLARP_KEEPALIVE: ND_PRINT("keepalive: mineseen=0x%08x, yourseen=0x%08x, reliability=0x%04x", diff --git a/print-dhcp6.c b/print-dhcp6.c index 590b9c50..0b40af81 100644 --- a/print-dhcp6.c +++ b/print-dhcp6.c @@ -371,7 +371,7 @@ dhcp6opt_print(netdissect_options *ndo, break; } tp = (const u_char *)(dh6o + 1); - ND_PRINT(" %s", ip6addr_string(ndo, tp)); + ND_PRINT(" %s", GET_IP6ADDR_STRING(tp)); ND_PRINT(" pltime:%u vltime:%u", GET_BE_U_4(tp + 16), GET_BE_U_4(tp + 20)); @@ -561,7 +561,7 @@ dhcp6opt_print(netdissect_options *ndo, } tp = (const u_char *)(dh6o + 1); for (i = 0; i < optlen; i += 16) - ND_PRINT(" %s", ip6addr_string(ndo, tp + i)); + ND_PRINT(" %s", GET_IP6ADDR_STRING(tp + i)); ND_PRINT(")"); break; case DH6OPT_SIP_SERVER_D: @@ -618,7 +618,7 @@ dhcp6opt_print(netdissect_options *ndo, break; } tp = (const u_char *)(dh6o + 1); - ND_PRINT(" %s/%u", ip6addr_string(ndo, tp + 9), + ND_PRINT(" %s/%u", GET_IP6ADDR_STRING(tp + 9), GET_U_1(tp + 8)); ND_PRINT(" pltime:%u vltime:%u", GET_BE_U_4(tp), @@ -670,7 +670,7 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT(" type_%u", dh6_lq_query_type); break; } - ND_PRINT(" %s", ip6addr_string(ndo, tp + 1)); + ND_PRINT(" %s", GET_IP6ADDR_STRING(tp + 1)); if (optlen > 17) { /* there are query-options */ dhcp6opt_print(ndo, tp + 17, tp + optlen); @@ -691,7 +691,7 @@ dhcp6opt_print(netdissect_options *ndo, break; } tp = (const u_char *)(dh6o + 1); - ND_PRINT(" %s ", ip6addr_string(ndo, tp)); + ND_PRINT(" %s ", GET_IP6ADDR_STRING(tp)); /* * Print hex dump first 10 characters. */ @@ -720,7 +720,7 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT(" ?"); break; } - ND_PRINT(" %s", ip6addr_string(ndo, tp)); + ND_PRINT(" %s", GET_IP6ADDR_STRING(tp)); break; case DH6OPT_NTP_SUBOPTION_SRV_FQDN: ND_PRINT(" "); @@ -828,9 +828,9 @@ dhcp6_print(netdissect_options *ndo, } else { /* relay messages */ ND_TCHECK_16(dh6relay->dh6relay_peeraddr); - ND_PRINT("linkaddr=%s", ip6addr_string(ndo, dh6relay->dh6relay_linkaddr)); + ND_PRINT("linkaddr=%s", GET_IP6ADDR_STRING(dh6relay->dh6relay_linkaddr)); - ND_PRINT(" peeraddr=%s", ip6addr_string(ndo, dh6relay->dh6relay_peeraddr)); + ND_PRINT(" peeraddr=%s", GET_IP6ADDR_STRING(dh6relay->dh6relay_peeraddr)); dhcp6opt_print(ndo, (const u_char *)(dh6relay + 1), ep); } diff --git a/print-dtp.c b/print-dtp.c index 1ea36fce..4c3d6c78 100644 --- a/print-dtp.c +++ b/print-dtp.c @@ -102,7 +102,7 @@ dtp_print(netdissect_options *ndo, const u_char *pptr, u_int length) case DTP_NEIGHBOR_TLV: if (len < 10) goto invalid; - ND_PRINT(", %s", etheraddr_string(ndo, tptr+4)); + ND_PRINT(", %s", GET_ETHERADDR_STRING(tptr+4)); break; default: diff --git a/print-dvmrp.c b/print-dvmrp.c index 7e57a49b..744d5b3e 100644 --- a/print-dvmrp.c +++ b/print-dvmrp.c @@ -245,7 +245,7 @@ print_probe(netdissect_options *ndo, while ((len > 0) && (bp < ep)) { ND_TCHECK_4(bp); - ND_PRINT("\n\tneighbor %s", ipaddr_string(ndo, bp)); + ND_PRINT("\n\tneighbor %s", GET_IPADDR_STRING(bp)); bp += 4; len -= 4; } return (0); @@ -276,9 +276,9 @@ print_neighbors(netdissect_options *ndo, len -= 7; while (--ncount >= 0) { ND_TCHECK_4(bp); - ND_PRINT(" [%s ->", ipaddr_string(ndo, laddr)); + ND_PRINT(" [%s ->", GET_IPADDR_STRING(laddr)); ND_PRINT(" %s, (%u/%u)]", - ipaddr_string(ndo, bp), metric, thresh); + GET_IPADDR_STRING(bp), metric, thresh); bp += 4; len -= 4; } @@ -314,8 +314,8 @@ print_neighbors2(netdissect_options *ndo, bp++; len -= 8; while (--ncount >= 0 && (len >= 4) && (bp + 4) <= ep) { - ND_PRINT(" [%s -> ", ipaddr_string(ndo, laddr)); - ND_PRINT("%s (%u/%u", ipaddr_string(ndo, bp), + ND_PRINT(" [%s -> ", GET_IPADDR_STRING(laddr)); + ND_PRINT("%s (%u/%u", GET_IPADDR_STRING(bp), metric, thresh); if (flags & DVMRP_NF_TUNNEL) ND_PRINT("/tunnel"); @@ -346,7 +346,7 @@ print_prune(netdissect_options *ndo, const u_char *bp) { ND_TCHECK_LEN(bp, 12); - ND_PRINT(" src %s grp %s", ipaddr_string(ndo, bp), ipaddr_string(ndo, bp + 4)); + ND_PRINT(" src %s grp %s", GET_IPADDR_STRING(bp), GET_IPADDR_STRING(bp + 4)); bp += 8; ND_PRINT(" timer "); unsigned_relts_print(ndo, GET_BE_U_4(bp)); @@ -360,7 +360,7 @@ print_graft(netdissect_options *ndo, const u_char *bp) { ND_TCHECK_8(bp); - ND_PRINT(" src %s grp %s", ipaddr_string(ndo, bp), ipaddr_string(ndo, bp + 4)); + ND_PRINT(" src %s grp %s", GET_IPADDR_STRING(bp), GET_IPADDR_STRING(bp + 4)); return (0); trunc: return (-1); @@ -371,7 +371,7 @@ print_graft_ack(netdissect_options *ndo, const u_char *bp) { ND_TCHECK_8(bp); - ND_PRINT(" src %s grp %s", ipaddr_string(ndo, bp), ipaddr_string(ndo, bp + 4)); + ND_PRINT(" src %s grp %s", GET_IPADDR_STRING(bp), GET_IPADDR_STRING(bp + 4)); return (0); trunc: return (-1); diff --git a/print-egp.c b/print-egp.c index 15dd07d0..dda50587 100644 --- a/print-egp.c +++ b/print-egp.c @@ -357,7 +357,7 @@ egp_print(netdissect_options *ndo, ND_PRINT(" state:%s", egp_status_updown[status]); else ND_PRINT(" [status %u]", status); - ND_PRINT(" net:%s", ipaddr_string(ndo, egp->egp_sourcenet)); + ND_PRINT(" net:%s", GET_IPADDR_STRING(egp->egp_sourcenet)); break; case EGPT_UPDATE: @@ -371,7 +371,7 @@ egp_print(netdissect_options *ndo, else ND_PRINT(" [status %u]", status); ND_PRINT(" %s int %u ext %u", - ipaddr_string(ndo, egp->egp_sourcenet), + GET_IPADDR_STRING(egp->egp_sourcenet), GET_U_1(egp->egp_intgw), GET_U_1(egp->egp_extgw)); if (ndo->ndo_vflag) diff --git a/print-eigrp.c b/print-eigrp.c index 37570979..029d2458 100644 --- a/print-eigrp.c +++ b/print-eigrp.c @@ -360,13 +360,13 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len) GET_CPY_BYTES(prefix, tlv_ptr.eigrp_tlv_ip_int->destination, byte_length); ND_PRINT("\n\t IPv4 prefix: %15s/%u, nexthop: ", - ipaddr_string(ndo, prefix), + ipaddr_string(ndo, prefix), /* local buffer, not packet data; don't use GET_IPADDR_STRING() */ bit_length); if (GET_BE_U_4(tlv_ptr.eigrp_tlv_ip_int->nexthop) == 0) ND_PRINT("self"); else ND_PRINT("%s", - ipaddr_string(ndo, tlv_ptr.eigrp_tlv_ip_int->nexthop)); + GET_IPADDR_STRING(tlv_ptr.eigrp_tlv_ip_int->nexthop)); ND_PRINT("\n\t delay %u ms, bandwidth %u Kbps, mtu %u, hop %u, reliability %u, load %u", (GET_BE_U_4(tlv_ptr.eigrp_tlv_ip_int->delay)/100), @@ -395,16 +395,16 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len) GET_CPY_BYTES(prefix, tlv_ptr.eigrp_tlv_ip_ext->destination, byte_length); ND_PRINT("\n\t IPv4 prefix: %15s/%u, nexthop: ", - ipaddr_string(ndo, prefix), + ipaddr_string(ndo, prefix), /* local buffer, not packet data; don't use GET_IPADDR_STRING() */ bit_length); if (GET_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->nexthop) == 0) ND_PRINT("self"); else ND_PRINT("%s", - ipaddr_string(ndo, tlv_ptr.eigrp_tlv_ip_ext->nexthop)); + GET_IPADDR_STRING(tlv_ptr.eigrp_tlv_ip_ext->nexthop)); ND_PRINT("\n\t origin-router %s, origin-as %u, origin-proto %s, flags [0x%02x], tag 0x%08x, metric %u", - ipaddr_string(ndo, tlv_ptr.eigrp_tlv_ip_ext->origin_router), + GET_IPADDR_STRING(tlv_ptr.eigrp_tlv_ip_ext->origin_router), GET_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->origin_as), tok2str(eigrp_ext_proto_id_values,"unknown",GET_U_1(tlv_ptr.eigrp_tlv_ip_ext->proto_id)), GET_U_1(tlv_ptr.eigrp_tlv_ip_ext->flags), diff --git a/print-ether.c b/print-ether.c index 0454c9a7..c9d27d44 100644 --- a/print-ether.c +++ b/print-ether.c @@ -109,7 +109,7 @@ ether_addresses_print(netdissect_options *ndo, const u_char *src, const u_char *dst) { ND_PRINT("%s > %s, ", - etheraddr_string(ndo, src), etheraddr_string(ndo, dst)); + GET_ETHERADDR_STRING(src), GET_ETHERADDR_STRING(dst)); } static void diff --git a/print-geonet.c b/print-geonet.c index 67945800..8efc9b51 100644 --- a/print-geonet.c +++ b/print-geonet.c @@ -89,7 +89,7 @@ print_long_pos_vector(netdissect_options *ndo, uint32_t lat, lon; ND_TCHECK_LEN(bp, GEONET_ADDR_LEN); - ND_PRINT("GN_ADDR:%s ", linkaddr_string (ndo, bp, LINKADDR_OTHER, GEONET_ADDR_LEN)); + ND_PRINT("GN_ADDR:%s ", GET_LINKADDR_STRING(bp, LINKADDR_OTHER, GEONET_ADDR_LEN)); ND_TCHECK_8(bp + 12); lat = GET_BE_U_4(bp + 12); diff --git a/print-hncp.c b/print-hncp.c index 06c8c1a5..69ed9d6d 100644 --- a/print-hncp.c +++ b/print-hncp.c @@ -197,9 +197,9 @@ static const char * format_ip6addr(netdissect_options *ndo, const u_char *cp) { if (is_ipv4_mapped_address(cp)) - return ipaddr_string(ndo, cp + IPV4_MAPPED_HEADING_LEN); + return GET_IPADDR_STRING(cp + IPV4_MAPPED_HEADING_LEN); else - return ip6addr_string(ndo, cp); + return GET_IP6ADDR_STRING(cp); } static int @@ -298,7 +298,7 @@ dhcpv4_print(netdissect_options *ndo, return -1; } for (t = 0; t < optlen; t += 4) - ND_PRINT(" %s", ipaddr_string(ndo, value + t)); + ND_PRINT(" %s", GET_IPADDR_STRING(value + t)); } break; case DH4OPT_DOMAIN_SEARCH: { @@ -351,7 +351,7 @@ dhcpv6_print(netdissect_options *ndo, return -1; } for (t = 0; t < optlen; t += 16) - ND_PRINT(" %s", ip6addr_string(ndo, value + t)); + ND_PRINT(" %s", GET_IP6ADDR_STRING(value + t)); } break; case DH6OPT_DOMAIN_LIST: { diff --git a/print-hsrp.c b/print-hsrp.c index 7daed4f0..8f0ab18c 100644 --- a/print-hsrp.c +++ b/print-hsrp.c @@ -120,7 +120,7 @@ hsrp_print(netdissect_options *ndo, const u_char *bp, u_int len) ND_PRINT("[reserved=%u!] ", GET_U_1(hp->hsrp_reserved)); } ND_TCHECK_4(hp->hsrp_virtaddr); - ND_PRINT("addr=%s", ipaddr_string(ndo, hp->hsrp_virtaddr)); + ND_PRINT("addr=%s", GET_IPADDR_STRING(hp->hsrp_virtaddr)); if (ndo->ndo_vflag) { ND_PRINT(" hellotime="); unsigned_relts_print(ndo, GET_U_1(hp->hsrp_hellotime)); diff --git a/print-icmp.c b/print-icmp.c index 8d7c3636..2c4dde25 100644 --- a/print-icmp.c +++ b/print-icmp.c @@ -340,20 +340,20 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * case ICMP_UNREACH_NET: (void)snprintf(buf, sizeof(buf), "net %s unreachable", - ipaddr_string(ndo, dp->icmp_ip.ip_dst)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst)); break; case ICMP_UNREACH_HOST: (void)snprintf(buf, sizeof(buf), "host %s unreachable", - ipaddr_string(ndo, dp->icmp_ip.ip_dst)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst)); break; case ICMP_UNREACH_PROTOCOL: ND_TCHECK_1(dp->icmp_ip.ip_p); (void)snprintf(buf, sizeof(buf), "%s protocol %u unreachable", - ipaddr_string(ndo, dp->icmp_ip.ip_dst), + GET_IPADDR_STRING(dp->icmp_ip.ip_dst), GET_U_1(dp->icmp_ip.ip_p)); break; @@ -370,21 +370,21 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * case IPPROTO_TCP: (void)snprintf(buf, sizeof(buf), "%s tcp port %s unreachable", - ipaddr_string(ndo, oip->ip_dst), + GET_IPADDR_STRING(oip->ip_dst), tcpport_string(ndo, dport)); break; case IPPROTO_UDP: (void)snprintf(buf, sizeof(buf), "%s udp port %s unreachable", - ipaddr_string(ndo, oip->ip_dst), + GET_IPADDR_STRING(oip->ip_dst), udpport_string(ndo, dport)); break; default: (void)snprintf(buf, sizeof(buf), "%s protocol %u port %u unreachable", - ipaddr_string(ndo, oip->ip_dst), + GET_IPADDR_STRING(oip->ip_dst), ip_proto, dport); break; } @@ -398,11 +398,11 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * if (mtu) { (void)snprintf(buf, sizeof(buf), "%s unreachable - need to frag (mtu %u)", - ipaddr_string(ndo, dp->icmp_ip.ip_dst), mtu); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst), mtu); } else { (void)snprintf(buf, sizeof(buf), "%s unreachable - need to frag", - ipaddr_string(ndo, dp->icmp_ip.ip_dst)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst)); } } break; @@ -410,73 +410,73 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * case ICMP_UNREACH_SRCFAIL: (void)snprintf(buf, sizeof(buf), "%s unreachable - source route failed", - ipaddr_string(ndo, dp->icmp_ip.ip_dst)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst)); break; case ICMP_UNREACH_NET_UNKNOWN: (void)snprintf(buf, sizeof(buf), "net %s unreachable - unknown", - ipaddr_string(ndo, dp->icmp_ip.ip_dst)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst)); break; case ICMP_UNREACH_HOST_UNKNOWN: (void)snprintf(buf, sizeof(buf), "host %s unreachable - unknown", - ipaddr_string(ndo, dp->icmp_ip.ip_dst)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst)); break; case ICMP_UNREACH_ISOLATED: (void)snprintf(buf, sizeof(buf), "%s unreachable - source host isolated", - ipaddr_string(ndo, dp->icmp_ip.ip_dst)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst)); break; case ICMP_UNREACH_NET_PROHIB: (void)snprintf(buf, sizeof(buf), "net %s unreachable - admin prohibited", - ipaddr_string(ndo, dp->icmp_ip.ip_dst)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst)); break; case ICMP_UNREACH_HOST_PROHIB: (void)snprintf(buf, sizeof(buf), "host %s unreachable - admin prohibited", - ipaddr_string(ndo, dp->icmp_ip.ip_dst)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst)); break; case ICMP_UNREACH_TOSNET: (void)snprintf(buf, sizeof(buf), "net %s unreachable - tos prohibited", - ipaddr_string(ndo, dp->icmp_ip.ip_dst)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst)); break; case ICMP_UNREACH_TOSHOST: (void)snprintf(buf, sizeof(buf), "host %s unreachable - tos prohibited", - ipaddr_string(ndo, dp->icmp_ip.ip_dst)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst)); break; case ICMP_UNREACH_FILTER_PROHIB: (void)snprintf(buf, sizeof(buf), "host %s unreachable - admin prohibited filter", - ipaddr_string(ndo, dp->icmp_ip.ip_dst)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst)); break; case ICMP_UNREACH_HOST_PRECEDENCE: (void)snprintf(buf, sizeof(buf), "host %s unreachable - host precedence violation", - ipaddr_string(ndo, dp->icmp_ip.ip_dst)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst)); break; case ICMP_UNREACH_PRECEDENCE_CUTOFF: (void)snprintf(buf, sizeof(buf), "host %s unreachable - precedence cutoff", - ipaddr_string(ndo, dp->icmp_ip.ip_dst)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst)); break; default: (void)snprintf(buf, sizeof(buf), "%s unreachable - #%u", - ipaddr_string(ndo, dp->icmp_ip.ip_dst), + GET_IPADDR_STRING(dp->icmp_ip.ip_dst), icmp_code); break; } @@ -489,36 +489,36 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * case ICMP_REDIRECT_NET: (void)snprintf(buf, sizeof(buf), "redirect %s to net %s", - ipaddr_string(ndo, dp->icmp_ip.ip_dst), - ipaddr_string(ndo, dp->icmp_gwaddr)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst), + GET_IPADDR_STRING(dp->icmp_gwaddr)); break; case ICMP_REDIRECT_HOST: (void)snprintf(buf, sizeof(buf), "redirect %s to host %s", - ipaddr_string(ndo, dp->icmp_ip.ip_dst), - ipaddr_string(ndo, dp->icmp_gwaddr)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst), + GET_IPADDR_STRING(dp->icmp_gwaddr)); break; case ICMP_REDIRECT_TOSNET: (void)snprintf(buf, sizeof(buf), "redirect-tos %s to net %s", - ipaddr_string(ndo, dp->icmp_ip.ip_dst), - ipaddr_string(ndo, dp->icmp_gwaddr)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst), + GET_IPADDR_STRING(dp->icmp_gwaddr)); break; case ICMP_REDIRECT_TOSHOST: (void)snprintf(buf, sizeof(buf), "redirect-tos %s to host %s", - ipaddr_string(ndo, dp->icmp_ip.ip_dst), - ipaddr_string(ndo, dp->icmp_gwaddr)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst), + GET_IPADDR_STRING(dp->icmp_gwaddr)); break; default: (void)snprintf(buf, sizeof(buf), "redirect-#%u %s to %s", icmp_code, - ipaddr_string(ndo, dp->icmp_ip.ip_dst), - ipaddr_string(ndo, dp->icmp_gwaddr)); + GET_IPADDR_STRING(dp->icmp_ip.ip_dst), + GET_IPADDR_STRING(dp->icmp_gwaddr)); break; } break; @@ -566,7 +566,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * while (num > 0) { ND_TCHECK_SIZE(idp); (void)snprintf(cp, sizeof(buf) - (cp - buf), " {%s %u}", - ipaddr_string(ndo, idp->ird_addr), + GET_IPADDR_STRING(idp->ird_addr), GET_BE_U_4(idp->ird_pref)); cp = buf + strlen(buf); ++idp; diff --git a/print-icmp6.c b/print-icmp6.c index 0178a355..4fa35b2e 100644 --- a/print-icmp6.c +++ b/print-icmp6.c @@ -1090,12 +1090,12 @@ icmp6_print(netdissect_options *ndo, case ICMP6_DST_UNREACH_NOROUTE: /* fall through */ case ICMP6_DST_UNREACH_ADMIN: case ICMP6_DST_UNREACH_ADDR: - ND_PRINT(" %s",ip6addr_string(ndo, oip->ip6_dst)); + ND_PRINT(" %s",GET_IP6ADDR_STRING(oip->ip6_dst)); break; case ICMP6_DST_UNREACH_BEYONDSCOPE: ND_PRINT(" %s, source address %s", - ip6addr_string(ndo, oip->ip6_dst), - ip6addr_string(ndo, oip->ip6_src)); + GET_IP6ADDR_STRING(oip->ip6_dst), + GET_IP6ADDR_STRING(oip->ip6_src)); break; case ICMP6_DST_UNREACH_NOPORT: if ((ouh = get_upperlayer(ndo, (const u_char *)oip, &prot)) @@ -1106,17 +1106,17 @@ icmp6_print(netdissect_options *ndo, switch (prot) { case IPPROTO_TCP: ND_PRINT(", %s tcp port %s", - ip6addr_string(ndo, oip->ip6_dst), + GET_IP6ADDR_STRING(oip->ip6_dst), tcpport_string(ndo, dport)); break; case IPPROTO_UDP: ND_PRINT(", %s udp port %s", - ip6addr_string(ndo, oip->ip6_dst), + GET_IP6ADDR_STRING(oip->ip6_dst), udpport_string(ndo, dport)); break; default: ND_PRINT(", %s protocol %u port %u unreachable", - ip6addr_string(ndo, oip->ip6_dst), + GET_IP6ADDR_STRING(oip->ip6_dst), prot, dport); break; } @@ -1138,7 +1138,7 @@ icmp6_print(netdissect_options *ndo, switch (icmp6_code) { case ICMP6_TIME_EXCEED_TRANSIT: ND_PRINT(" for %s", - ip6addr_string(ndo, oip->ip6_dst)); + GET_IP6ADDR_STRING(oip->ip6_dst)); break; case ICMP6_TIME_EXCEED_REASSEMBLY: ND_PRINT(" (reassembly)"); @@ -1230,7 +1230,7 @@ icmp6_print(netdissect_options *ndo, const struct nd_neighbor_solicit *p; p = (const struct nd_neighbor_solicit *)dp; ND_TCHECK_16(p->nd_ns_target); - ND_PRINT(", who has %s", ip6addr_string(ndo, p->nd_ns_target)); + ND_PRINT(", who has %s", GET_IP6ADDR_STRING(p->nd_ns_target)); if (ndo->ndo_vflag) { #define NDSOLLEN 24 if (icmp6_opt_print(ndo, (const u_char *)dp + NDSOLLEN, @@ -1246,7 +1246,7 @@ icmp6_print(netdissect_options *ndo, p = (const struct nd_neighbor_advert *)dp; ND_TCHECK_16(p->nd_na_target); ND_PRINT(", tgt is %s", - ip6addr_string(ndo, p->nd_na_target)); + GET_IP6ADDR_STRING(p->nd_na_target)); if (ndo->ndo_vflag) { ND_PRINT(", Flags [%s]", bittok2str(icmp6_nd_na_flag_values, @@ -1266,9 +1266,9 @@ icmp6_print(netdissect_options *ndo, p = (const struct nd_redirect *)dp; ND_TCHECK_16(p->nd_rd_dst); - ND_PRINT(", %s", ip6addr_string(ndo, p->nd_rd_dst)); + ND_PRINT(", %s", GET_IP6ADDR_STRING(p->nd_rd_dst)); ND_TCHECK_16(p->nd_rd_target); - ND_PRINT(" to %s", ip6addr_string(ndo, p->nd_rd_target)); + ND_PRINT(" to %s", GET_IP6ADDR_STRING(p->nd_rd_target)); #define REDIRECTLEN 40 if (ndo->ndo_vflag) { if (icmp6_opt_print(ndo, (const u_char *)dp + REDIRECTLEN, @@ -1308,7 +1308,7 @@ icmp6_print(netdissect_options *ndo, p = (const u_char *)(dp + 1); while (p < cp) { ND_TCHECK_16(p); - ND_PRINT(", %s", ip6addr_string(ndo, p)); + ND_PRINT(", %s", GET_IP6ADDR_STRING(p)); p += 16; } } @@ -1478,7 +1478,7 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid) opp = (const struct nd_opt_prefix_info *)op; ND_TCHECK_16(opp->nd_opt_pi_prefix); ND_PRINT("%s/%u%s, Flags [%s], valid time %s", - ip6addr_string(ndo, opp->nd_opt_pi_prefix), + GET_IP6ADDR_STRING(opp->nd_opt_pi_prefix), GET_U_1(opp->nd_opt_pi_prefix_len), (opt_len != 4) ? "badlen" : "", bittok2str(icmp6_opt_pi_flag_values, "none", GET_U_1(opp->nd_opt_pi_flags_reserved)), @@ -1505,7 +1505,7 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid) for (i = 0; i < l; i++) { ND_TCHECK_16(oprd->nd_opt_rdnss_addr[i]); ND_PRINT(" addr: %s", - ip6addr_string(ndo, oprd->nd_opt_rdnss_addr[i])); + GET_IP6ADDR_STRING(oprd->nd_opt_rdnss_addr[i])); } break; case ND_OPT_DNSSL: @@ -1591,7 +1591,7 @@ mld6_print(netdissect_options *ndo, const u_char *bp) return; ND_PRINT("max resp delay: %u ", GET_BE_U_2(mp->mld6_maxdelay)); - ND_PRINT("addr: %s", ip6addr_string(ndo, mp->mld6_addr)); + ND_PRINT("addr: %s", GET_IP6ADDR_STRING(mp->mld6_addr)); } static void @@ -1620,7 +1620,7 @@ mldv2_report_print(netdissect_options *ndo, const u_char *bp, u_int len) return; } ND_TCHECK_LEN(bp + 4 + group, sizeof(nd_ipv6)); - ND_PRINT(" [gaddr %s", ip6addr_string(ndo, bp + group + 4)); + ND_PRINT(" [gaddr %s", GET_IP6ADDR_STRING(bp + group + 4)); ND_PRINT(" %s", tok2str(mldv2report2str, " [v2-report-#%u]", GET_U_1(bp + group))); nsrcs = GET_BE_U_2(bp + group + 2); @@ -1637,7 +1637,7 @@ mldv2_report_print(netdissect_options *ndo, const u_char *bp, u_int len) for (j = 0; j < nsrcs; j++) { ND_TCHECK_LEN(bp + group + 20 + (j * sizeof(nd_ipv6)), sizeof(nd_ipv6)); - ND_PRINT(" %s", ip6addr_string(ndo, bp + group + 20 + (j * sizeof(nd_ipv6)))); + ND_PRINT(" %s", GET_IP6ADDR_STRING(bp + group + 20 + (j * sizeof(nd_ipv6)))); } ND_PRINT(" }"); } @@ -1677,7 +1677,7 @@ mldv2_query_print(netdissect_options *ndo, const u_char *bp, u_int len) ND_PRINT(" [max resp delay=%u]", mrt); } ND_TCHECK_LEN(bp + 8, sizeof(nd_ipv6)); - ND_PRINT(" [gaddr %s", ip6addr_string(ndo, bp + 8)); + ND_PRINT(" [gaddr %s", GET_IP6ADDR_STRING(bp + 8)); if (ndo->ndo_vflag) { ND_TCHECK_1(bp + 25); @@ -1706,7 +1706,7 @@ mldv2_query_print(netdissect_options *ndo, const u_char *bp, u_int len) for (i = 0; i < nsrcs; i++) { ND_TCHECK_LEN(bp + 28 + (i * sizeof(nd_ipv6)), sizeof(nd_ipv6)); - ND_PRINT(" %s", ip6addr_string(ndo, bp + 28 + (i * sizeof(nd_ipv6)))); + ND_PRINT(" %s", GET_IP6ADDR_STRING(bp + 28 + (i * sizeof(nd_ipv6)))); } ND_PRINT(" }"); } else @@ -1845,7 +1845,7 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp, break; } ND_PRINT(", subject=%s", - ip6addr_string(ndo, cp)); + GET_IP6ADDR_STRING(cp)); break; case ICMP6_NI_SUBJ_FQDN: ND_PRINT(", subject=DNS name"); @@ -1872,7 +1872,7 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp, break; } ND_PRINT(", subject=%s", - ipaddr_string(ndo, cp)); + GET_IPADDR_STRING(cp)); break; default: ND_PRINT(", unknown subject"); @@ -1970,7 +1970,7 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp, if (i + sizeof(uint32_t) + sizeof(nd_ipv6) > siz) break; ND_PRINT(" %s(%u)", - ip6addr_string(ndo, bp + i + sizeof(uint32_t)), + GET_IP6ADDR_STRING(bp + i + sizeof(uint32_t)), GET_BE_U_4(bp + i)); i += sizeof(uint32_t) + sizeof(nd_ipv6); } diff --git a/print-igmp.c b/print-igmp.c index 3c7c0304..4bdcba5d 100644 --- a/print-igmp.c +++ b/print-igmp.c @@ -120,8 +120,8 @@ print_mtrace(netdissect_options *ndo, } ND_PRINT("mtrace %u: %s to %s reply-to %s", GET_BE_U_3(tr->tr_qid), - ipaddr_string(ndo, tr->tr_src), ipaddr_string(ndo, tr->tr_dst), - ipaddr_string(ndo, tr->tr_raddr)); + GET_IPADDR_STRING(tr->tr_src), GET_IPADDR_STRING(tr->tr_dst), + GET_IPADDR_STRING(tr->tr_raddr)); if (IN_CLASSD(GET_BE_U_4(tr->tr_raddr))) ND_PRINT(" with-ttl %u", GET_U_1(tr->tr_rttl)); return; @@ -142,8 +142,8 @@ print_mresp(netdissect_options *ndo, } ND_PRINT("mresp %u: %s to %s reply-to %s", GET_BE_U_3(tr->tr_qid), - ipaddr_string(ndo, tr->tr_src), ipaddr_string(ndo, tr->tr_dst), - ipaddr_string(ndo, tr->tr_raddr)); + GET_IPADDR_STRING(tr->tr_src), GET_IPADDR_STRING(tr->tr_dst), + GET_IPADDR_STRING(tr->tr_raddr)); if (IN_CLASSD(GET_BE_U_4(tr->tr_raddr))) ND_PRINT(" with-ttl %u", GET_U_1(tr->tr_rttl)); return; @@ -175,7 +175,7 @@ print_igmpv3_report(netdissect_options *ndo, return; } ND_TCHECK_4(bp + (group + 4)); - ND_PRINT(" [gaddr %s", ipaddr_string(ndo, bp + group + 4)); + ND_PRINT(" [gaddr %s", GET_IPADDR_STRING(bp + group + 4)); ND_PRINT(" %s", tok2str(igmpv3report2str, " [v3-report-#%u]", GET_U_1(bp + group))); nsrcs = GET_BE_U_2(bp + group + 2); @@ -191,7 +191,7 @@ print_igmpv3_report(netdissect_options *ndo, ND_PRINT(" {"); for (j=0; j<nsrcs; j++) { ND_TCHECK_4(bp + (group + 8 + (j << 2))); - ND_PRINT(" %s", ipaddr_string(ndo, bp + group + 8 + (j << 2))); + ND_PRINT(" %s", GET_IPADDR_STRING(bp + group + 8 + (j << 2))); } ND_PRINT(" }"); } @@ -239,7 +239,7 @@ print_igmpv3_query(netdissect_options *ndo, ND_TCHECK_4(bp + 4); if (GET_BE_U_4(bp + 4) == 0) return; - ND_PRINT(" [gaddr %s", ipaddr_string(ndo, bp + 4)); + ND_PRINT(" [gaddr %s", GET_IPADDR_STRING(bp + 4)); ND_TCHECK_2(bp + 10); nsrcs = GET_BE_U_2(bp + 10); if (nsrcs > 0) { @@ -249,7 +249,7 @@ print_igmpv3_query(netdissect_options *ndo, ND_PRINT(" {"); for (i=0; i<nsrcs; i++) { ND_TCHECK_4(bp + (12 + (i << 2))); - ND_PRINT(" %s", ipaddr_string(ndo, bp + 12 + (i << 2))); + ND_PRINT(" %s", GET_IPADDR_STRING(bp + 12 + (i << 2))); } ND_PRINT(" }"); } else @@ -289,20 +289,20 @@ igmp_print(netdissect_options *ndo, ND_PRINT(" v1"); ND_TCHECK_4(bp + 4); if (GET_BE_U_4(bp + 4)) - ND_PRINT(" [gaddr %s]", ipaddr_string(ndo, bp + 4)); + ND_PRINT(" [gaddr %s]", GET_IPADDR_STRING(bp + 4)); if (len != 8) ND_PRINT(" [len %u]", len); } break; case 0x12: ND_TCHECK_4(bp + 4); - ND_PRINT("igmp v1 report %s", ipaddr_string(ndo, bp + 4)); + ND_PRINT("igmp v1 report %s", GET_IPADDR_STRING(bp + 4)); if (len != 8) ND_PRINT(" [len %u]", len); break; case 0x16: ND_TCHECK_4(bp + 4); - ND_PRINT("igmp v2 report %s", ipaddr_string(ndo, bp + 4)); + ND_PRINT("igmp v2 report %s", GET_IPADDR_STRING(bp + 4)); break; case 0x22: ND_PRINT("igmp v3 report"); @@ -310,7 +310,7 @@ igmp_print(netdissect_options *ndo, break; case 0x17: ND_TCHECK_4(bp + 4); - ND_PRINT("igmp leave %s", ipaddr_string(ndo, bp + 4)); + ND_PRINT("igmp leave %s", GET_IPADDR_STRING(bp + 4)); break; case 0x13: ND_PRINT("igmp dvmrp"); @@ -73,7 +73,7 @@ ip_printroute(netdissect_options *ndo, for (len = 3; len < length; len += 4) { ND_TCHECK_4(cp + len); - ND_PRINT(" %s", ipaddr_string(ndo, cp + len)); + ND_PRINT(" %s", GET_IPADDR_STRING(cp + len)); if (ptr > len) ND_PRINT(","); } @@ -223,7 +223,7 @@ ip_printts(netdissect_options *ndo, type = " ^ "; ND_TCHECK_LEN(cp + len, hoplen); ND_PRINT("%s%u@%s", type, GET_BE_U_4(cp + len + hoplen - 4), - hoplen!=8 ? "" : ipaddr_string(ndo, cp + len)); + hoplen!=8 ? "" : GET_IPADDR_STRING(cp + len)); type = " "; } @@ -468,8 +468,8 @@ ip_print(netdissect_options *ndo, ND_PRINT(")\n "); if (truncated) { ND_PRINT("%s > %s: ", - ipaddr_string(ndo, ip->ip_src), - ipaddr_string(ndo, ip->ip_dst)); + GET_IPADDR_STRING(ip->ip_src), + GET_IPADDR_STRING(ip->ip_dst)); nd_print_trunc(ndo); nd_pop_packet_info(ndo); return; @@ -487,8 +487,8 @@ ip_print(netdissect_options *ndo, if (nh != IPPROTO_TCP && nh != IPPROTO_UDP && nh != IPPROTO_SCTP && nh != IPPROTO_DCCP) { ND_PRINT("%s > %s: ", - ipaddr_string(ndo, ip->ip_src), - ipaddr_string(ndo, ip->ip_dst)); + GET_IPADDR_STRING(ip->ip_src), + GET_IPADDR_STRING(ip->ip_dst)); } ip_print_demux(ndo, (const u_char *)ip + hlen, len, 4, off & IP_MF, GET_U_1(ip->ip_ttl), nh, bp); @@ -507,8 +507,8 @@ ip_print(netdissect_options *ndo, * next level protocol header. print the ip addr * and the protocol. */ - ND_PRINT("%s > %s:", ipaddr_string(ndo, ip->ip_src), - ipaddr_string(ndo, ip->ip_dst)); + ND_PRINT("%s > %s:", GET_IPADDR_STRING(ip->ip_src), + GET_IPADDR_STRING(ip->ip_dst)); if (!ndo->ndo_nflag && (p_name = netdb_protoname(ip_proto)) != NULL) ND_PRINT(" %s", p_name); else diff --git a/print-ip6.c b/print-ip6.c index a1802b1e..fd28cb23 100644 --- a/print-ip6.c +++ b/print-ip6.c @@ -333,8 +333,8 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length) if (cp == (const u_char *)(ip6 + 1) && nh != IPPROTO_TCP && nh != IPPROTO_UDP && nh != IPPROTO_DCCP && nh != IPPROTO_SCTP) { - ND_PRINT("%s > %s: ", ip6addr_string(ndo, ip6->ip6_src), - ip6addr_string(ndo, ip6->ip6_dst)); + ND_PRINT("%s > %s: ", GET_IP6ADDR_STRING(ip6->ip6_src), + GET_IP6ADDR_STRING(ip6->ip6_dst)); } switch (nh) { diff --git a/print-ip6opts.c b/print-ip6opts.c index 8ef94fab..3ac8addc 100644 --- a/print-ip6opts.c +++ b/print-ip6opts.c @@ -180,7 +180,7 @@ ip6_opt_process(netdissect_options *ndo, const u_char *bp, int len, goto trunc; } if (ndo->ndo_vflag) { - ND_PRINT("(homeaddr: %s", ip6addr_string(ndo, bp + i + 2)); + ND_PRINT("(homeaddr: %s", GET_IP6ADDR_STRING(bp + i + 2)); if (GET_U_1(bp + i + 1) > IP6OPT_HOMEADDR_MINLEN - 2) { if (ip6_sopt_print(ndo, bp + i + IP6OPT_HOMEADDR_MINLEN, (optlen - IP6OPT_HOMEADDR_MINLEN)) == -1) diff --git a/print-isakmp.c b/print-isakmp.c index 34b216df..21ca9027 100644 --- a/print-isakmp.c +++ b/print-isakmp.c @@ -1392,7 +1392,7 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_, if (len < 4) ND_PRINT(" len=%u [bad: < 4]", len); else - ND_PRINT(" len=%u %s", len, ipaddr_string(ndo, data)); + ND_PRINT(" len=%u %s", len, GET_IPADDR_STRING(data)); len = 0; break; case IPSECDOI_ID_FQDN: @@ -1413,7 +1413,7 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_, else { mask = data + sizeof(nd_ipv4); ND_PRINT(" len=%u %s/%u.%u.%u.%u", len, - ipaddr_string(ndo, data), + GET_IPADDR_STRING(data), GET_U_1(mask), GET_U_1(mask + 1), GET_U_1(mask + 2), GET_U_1(mask + 3)); @@ -1425,7 +1425,7 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_, if (len < 16) ND_PRINT(" len=%u [bad: < 16]", len); else - ND_PRINT(" len=%u %s", len, ip6addr_string(ndo, data)); + ND_PRINT(" len=%u %s", len, GET_IP6ADDR_STRING(data)); len = 0; break; case IPSECDOI_ID_IPV6_ADDR_SUBNET: @@ -1437,7 +1437,7 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_, mask = (const u_char *)(data + sizeof(nd_ipv6)); /*XXX*/ ND_PRINT(" len=%u %s/0x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", len, - ip6addr_string(ndo, data), + GET_IP6ADDR_STRING(data), GET_U_1(mask), GET_U_1(mask + 1), GET_U_1(mask + 2), GET_U_1(mask + 3), @@ -1462,8 +1462,8 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_, ND_PRINT(" len=%u [bad: < 8]", len); else { ND_PRINT(" len=%u %s-%s", len, - ipaddr_string(ndo, data), - ipaddr_string(ndo, data + sizeof(nd_ipv4))); + GET_IPADDR_STRING(data), + GET_IPADDR_STRING(data + sizeof(nd_ipv4))); } len = 0; break; @@ -1472,8 +1472,8 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_, ND_PRINT(" len=%u [bad: < 32]", len); else { ND_PRINT(" len=%u %s-%s", len, - ip6addr_string(ndo, data), - ip6addr_string(ndo, data + sizeof(nd_ipv6))); + GET_IP6ADDR_STRING(data), + GET_IP6ADDR_STRING(data + sizeof(nd_ipv6))); } len = 0; break; diff --git a/print-isoclns.c b/print-isoclns.c index b560bdfb..e0afcfb6 100644 --- a/print-isoclns.c +++ b/print-isoclns.c @@ -865,8 +865,8 @@ clnp_print(netdissect_options *ndo, if (ndo->ndo_vflag < 1) { ND_PRINT("%s%s > %s, %s, length %u", ndo->ndo_eflag ? "" : ", ", - isonsap_string(ndo, source_address, source_address_length), - isonsap_string(ndo, dest_address, dest_address_length), + GET_ISONSAP_STRING(source_address, source_address_length), + GET_ISONSAP_STRING(dest_address, dest_address_length), tok2str(clnp_pdu_values,"unknown (%u)",clnp_pdu_type), length); return (1); @@ -890,9 +890,9 @@ clnp_print(netdissect_options *ndo, ND_PRINT("\n\tsource address (length %u): %s\n\tdest address (length %u): %s", source_address_length, - isonsap_string(ndo, source_address, source_address_length), + GET_ISONSAP_STRING(source_address, source_address_length), dest_address_length, - isonsap_string(ndo, dest_address, dest_address_length)); + GET_ISONSAP_STRING(dest_address, dest_address_length)); if (clnp_flags & CLNP_SEGMENT_PART) { if (li_remaining < sizeof(struct clnp_segment_header_t)) { @@ -981,7 +981,7 @@ clnp_print(netdissect_options *ndo, source_address_length); ND_PRINT("\n\t NSAP address (length %u): %s", source_address_length, - isonsap_string(ndo, source_address, source_address_length)); + GET_ISONSAP_STRING(source_address, source_address_length)); } tlen-=source_address_length+1; } @@ -1222,7 +1222,7 @@ esis_print(netdissect_options *ndo, dst = pptr; pptr += dstl; li -= dstl; - ND_PRINT("\n\t %s", isonsap_string(ndo, dst, dstl)); + ND_PRINT("\n\t %s", GET_ISONSAP_STRING(dst, dstl)); ND_TCHECK_1(pptr); if (li < 1) { @@ -1259,15 +1259,15 @@ esis_print(netdissect_options *ndo, if (snpal == 6) ND_PRINT("\n\t SNPA (length: %u): %s", snpal, - etheraddr_string(ndo, snpa)); + GET_ETHERADDR_STRING(snpa)); else ND_PRINT("\n\t SNPA (length: %u): %s", snpal, - linkaddr_string(ndo, snpa, LINKADDR_OTHER, snpal)); + GET_LINKADDR_STRING(snpa, LINKADDR_OTHER, snpal)); if (netal != 0) ND_PRINT("\n\t NET (length: %u) %s", netal, - isonsap_string(ndo, neta, netal)); + GET_ISONSAP_STRING(neta, netal)); break; } @@ -1300,7 +1300,7 @@ esis_print(netdissect_options *ndo, } ND_PRINT("\n\t NET (length: %u): %s", source_address_length, - isonsap_string(ndo, pptr, source_address_length)); + GET_ISONSAP_STRING(pptr, source_address_length)); pptr += source_address_length; li -= source_address_length; source_address_number--; @@ -1322,7 +1322,7 @@ esis_print(netdissect_options *ndo, ND_PRINT(", bad ish/li"); return; } - ND_PRINT("\n\t NET (length: %u): %s", source_address_length, isonsap_string(ndo, pptr, source_address_length)); + ND_PRINT("\n\t NET (length: %u): %s", source_address_length, GET_ISONSAP_STRING(pptr, source_address_length)); pptr += source_address_length; li -= source_address_length; break; @@ -1784,12 +1784,12 @@ isis_print_tlv_ip_reach(netdissect_options *ndo, if (prefix_len == -1) ND_PRINT("%sIPv4 prefix: %s mask %s", ident, - ipaddr_string(ndo, (tlv_ip_reach->prefix)), - ipaddr_string(ndo, (tlv_ip_reach->mask))); + GET_IPADDR_STRING(tlv_ip_reach->prefix), + GET_IPADDR_STRING(tlv_ip_reach->mask)); else ND_PRINT("%sIPv4 prefix: %15s/%u", ident, - ipaddr_string(ndo, (tlv_ip_reach->prefix)), + GET_IPADDR_STRING(tlv_ip_reach->prefix), prefix_len); ND_PRINT(", Distribution: %s, Metric: %u, %s", @@ -1972,7 +1972,7 @@ isis_print_ext_is_reach(netdissect_options *ndo, case ISIS_SUBTLV_EXT_IS_REACH_IPV4_INTF_ADDR: case ISIS_SUBTLV_EXT_IS_REACH_IPV4_NEIGHBOR_ADDR: if (subtlv_len >= sizeof(nd_ipv4)) - ND_PRINT(", %s", ipaddr_string(ndo, tptr)); + ND_PRINT(", %s", GET_IPADDR_STRING(tptr)); break; case ISIS_SUBTLV_EXT_IS_REACH_MAX_LINK_BW : case ISIS_SUBTLV_EXT_IS_REACH_RESERVABLE_BW: @@ -2216,12 +2216,12 @@ isis_print_extd_ip_reach(netdissect_options *ndo, if (afi == AF_INET) ND_PRINT("%sIPv4 prefix: %15s/%u", ident, - ipaddr_string(ndo, prefix), + ipaddr_string(ndo, prefix), /* local buffer, not packet data; don't use GET_IPADDR_STRING() */ bit_length); else if (afi == AF_INET6) ND_PRINT("%sIPv6 prefix: %s/%u", ident, - ip6addr_string(ndo, prefix), + ip6addr_string(ndo, prefix), /* local buffer, not packet data; don't use GET_IP6ADDR_STRING() */ bit_length); ND_PRINT(", Distribution: %s, Metric: %u", @@ -2711,7 +2711,7 @@ isis_print(netdissect_options *ndo, ND_TCHECK_LEN(tptr, alen); ND_PRINT("\n\t Area address (length: %u): %s", alen, - isonsap_string(ndo, tptr, alen)); + GET_ISONSAP_STRING(tptr, alen)); tptr += alen; tlen -= alen; } @@ -2927,7 +2927,7 @@ isis_print(netdissect_options *ndo, ND_TCHECK_LEN(tptr, sizeof(nd_ipv6)); ND_PRINT("\n\t IPv6 interface address: %s", - ip6addr_string(ndo, tptr)); + GET_IP6ADDR_STRING(tptr)); tptr += sizeof(nd_ipv6); tlen -= sizeof(nd_ipv6); @@ -3071,7 +3071,7 @@ isis_print(netdissect_options *ndo, if (tlen < sizeof(nd_ipv4)) goto tlv_trunc; ND_TCHECK_LEN(pptr, sizeof(nd_ipv4)); - ND_PRINT("\n\t Traffic Engineering Router ID: %s", ipaddr_string(ndo, pptr)); + ND_PRINT("\n\t Traffic Engineering Router ID: %s", GET_IPADDR_STRING(pptr)); break; case ISIS_TLV_IPADDR: @@ -3079,7 +3079,7 @@ isis_print(netdissect_options *ndo, if (tlen < sizeof(nd_ipv4)) goto tlv_trunc; ND_TCHECK_LEN(tptr, sizeof(nd_ipv4)); - ND_PRINT("\n\t IPv4 interface address: %s", ipaddr_string(ndo, tptr)); + ND_PRINT("\n\t IPv4 interface address: %s", GET_IPADDR_STRING(tptr)); tptr += sizeof(nd_ipv4); tlen -= sizeof(nd_ipv4); } @@ -3110,14 +3110,14 @@ isis_print(netdissect_options *ndo, if (tlen < sizeof(nd_ipv4)) break; ND_TCHECK_LEN(tptr, sizeof(nd_ipv4)); - ND_PRINT("\n\t IPv4 interface address: %s", ipaddr_string(ndo, tptr)); + ND_PRINT("\n\t IPv4 interface address: %s", GET_IPADDR_STRING(tptr)); tptr+=sizeof(nd_ipv4); tlen-=sizeof(nd_ipv4); if (tlen < sizeof(nd_ipv4)) break; ND_TCHECK_LEN(tptr, sizeof(nd_ipv4)); - ND_PRINT("\n\t IPv4 neighbor address: %s", ipaddr_string(ndo, tptr)); + ND_PRINT("\n\t IPv4 neighbor address: %s", GET_IPADDR_STRING(tptr)); tptr+=sizeof(nd_ipv4); tlen-=sizeof(nd_ipv4); @@ -3309,7 +3309,7 @@ isis_print(netdissect_options *ndo, break; ND_TCHECK_LEN(tptr, prefix_len / 2); ND_PRINT("\n\t\tAddress: %s/%u", - isonsap_string(ndo, tptr, prefix_len / 2), prefix_len * 4); + GET_ISONSAP_STRING(tptr, prefix_len / 2), prefix_len * 4); tptr+=prefix_len/2; tlen-=prefix_len/2; } @@ -3329,7 +3329,7 @@ isis_print(netdissect_options *ndo, break; } ND_TCHECK_5(tptr); /* router-id + flags */ - ND_PRINT("\n\t\tRouter-id: %s", ipaddr_string(ndo, tptr)); + ND_PRINT("\n\t\tRouter-id: %s", GET_IPADDR_STRING(tptr)); ND_PRINT("\n\t\tFlags: [%s]", bittok2str(isis_tlv_router_capability_flags, "none", diff --git a/print-juniper.c b/print-juniper.c index 416b2f19..91d5755b 100644 --- a/print-juniper.c +++ b/print-juniper.c @@ -576,8 +576,8 @@ juniper_es_if_print(netdissect_options *ndo, tok2str(juniper_ipsec_type_values,"Unknown",GET_U_1(ih->type)), GET_U_1(ih->type), GET_BE_U_4(ih->spi), - ipaddr_string(ndo, ih->src_ip), - ipaddr_string(ndo, ih->dst_ip), + GET_IPADDR_STRING(ih->src_ip), + GET_IPADDR_STRING(ih->dst_ip), l2info.length); } else { ND_PRINT("ES SA, index %u, ttl %u type %s (%u), length %u\n", diff --git a/print-lisp.c b/print-lisp.c index 5c6825ae..ab8feca6 100644 --- a/print-lisp.c +++ b/print-lisp.c @@ -308,14 +308,16 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) switch (eid_afi) { case IPv4_AFI: ND_TCHECK_4(packet_iterator + packet_offset); - ND_PRINT(" EID %s/%u,", ipaddr_string(ndo, - packet_iterator + packet_offset), mask_len); + ND_PRINT(" EID %s/%u,", + GET_IPADDR_STRING(packet_iterator + packet_offset), + mask_len); packet_offset += 4; break; case IPv6_AFI: ND_TCHECK_16(packet_iterator + packet_offset); - ND_PRINT(" EID %s/%u,", ip6addr_string(ndo, - packet_iterator + packet_offset), mask_len); + ND_PRINT(" EID %s/%u,", + GET_IP6ADDR_STRING(packet_iterator + packet_offset), + mask_len); packet_offset += 16; break; default: @@ -342,12 +344,12 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) switch (loc_afi) { case IPv4_AFI: ND_TCHECK_4(packet_iterator + packet_offset); - ND_PRINT(" LOC %s", ipaddr_string(ndo, loc_ip_pointer)); + ND_PRINT(" LOC %s", GET_IPADDR_STRING(loc_ip_pointer)); packet_offset += 4; break; case IPv6_AFI: ND_TCHECK_16(packet_iterator + packet_offset); - ND_PRINT(" LOC %s", ip6addr_string(ndo, loc_ip_pointer)); + ND_PRINT(" LOC %s", GET_IP6ADDR_STRING(loc_ip_pointer)); packet_offset += 16; break; default: diff --git a/print-lldp.c b/print-lldp.c index a578f4ea..54745e5b 100644 --- a/print-lldp.c +++ b/print-lldp.c @@ -1495,7 +1495,7 @@ lldp_print(netdissect_options *ndo, if (tlv_len < 1+6) { goto trunc; } - ND_PRINT("%s", etheraddr_string(ndo, tptr + 1)); + ND_PRINT("%s", GET_ETHERADDR_STRING(tptr + 1)); break; case LLDP_CHASSIS_INTF_NAME_SUBTYPE: /* fall through */ @@ -1536,7 +1536,7 @@ lldp_print(netdissect_options *ndo, if (tlv_len < 1+6) { goto trunc; } - ND_PRINT("%s", etheraddr_string(ndo, tptr + 1)); + ND_PRINT("%s", GET_ETHERADDR_STRING(tptr + 1)); break; case LLDP_PORT_INTF_NAME_SUBTYPE: /* fall through */ diff --git a/print-lmp.c b/print-lmp.c index 1e2d4b98..c38d2d13 100644 --- a/print-lmp.c +++ b/print-lmp.c @@ -551,7 +551,7 @@ lmp_print(netdissect_options *ndo, break; } ND_PRINT("\n\t IPv4 Link ID: %s (0x%08x)", - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_4(obj_tptr)); break; case LMP_CTYPE_IPV6_LOC: @@ -561,7 +561,7 @@ lmp_print(netdissect_options *ndo, break; } ND_PRINT("\n\t IPv6 Link ID: %s (0x%08x)", - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_BE_U_4(obj_tptr)); break; case LMP_CTYPE_UNMD_LOC: @@ -613,7 +613,7 @@ lmp_print(netdissect_options *ndo, break; } ND_PRINT("\n\t Node ID: %s (0x%08x)", - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_4(obj_tptr)); break; @@ -670,9 +670,9 @@ lmp_print(netdissect_options *ndo, ND_PRINT("\n\t Local Link-ID: %s (0x%08x)" "\n\t Remote Link-ID: %s (0x%08x)", - ipaddr_string(ndo, obj_tptr+4), + GET_IPADDR_STRING(obj_tptr+4), GET_BE_U_4(obj_tptr + 4), - ipaddr_string(ndo, obj_tptr+8), + GET_IPADDR_STRING(obj_tptr+8), GET_BE_U_4(obj_tptr + 8)); break; @@ -688,9 +688,9 @@ lmp_print(netdissect_options *ndo, ND_PRINT("\n\t Local Link-ID: %s (0x%08x)" "\n\t Remote Link-ID: %s (0x%08x)", - ip6addr_string(ndo, obj_tptr+4), + GET_IP6ADDR_STRING(obj_tptr+4), GET_BE_U_4(obj_tptr + 4), - ip6addr_string(ndo, obj_tptr+20), + GET_IP6ADDR_STRING(obj_tptr+20), GET_BE_U_4(obj_tptr + 20)); break; @@ -730,9 +730,9 @@ lmp_print(netdissect_options *ndo, GET_U_1(obj_tptr))); ND_PRINT("\n\t Local Interface ID: %s (0x%08x)" "\n\t Remote Interface ID: %s (0x%08x)", - ipaddr_string(ndo, obj_tptr+4), + GET_IPADDR_STRING(obj_tptr+4), GET_BE_U_4(obj_tptr + 4), - ipaddr_string(ndo, obj_tptr+8), + GET_IPADDR_STRING(obj_tptr+8), GET_BE_U_4(obj_tptr + 8)); if (lmp_print_data_link_subobjs(ndo, obj_tptr, obj_tlen - 12, 12)) @@ -750,9 +750,9 @@ lmp_print(netdissect_options *ndo, GET_U_1(obj_tptr))); ND_PRINT("\n\t Local Interface ID: %s (0x%08x)" "\n\t Remote Interface ID: %s (0x%08x)", - ip6addr_string(ndo, obj_tptr+4), + GET_IP6ADDR_STRING(obj_tptr+4), GET_BE_U_4(obj_tptr + 4), - ip6addr_string(ndo, obj_tptr+20), + GET_IP6ADDR_STRING(obj_tptr+20), GET_BE_U_4(obj_tptr + 20)); if (lmp_print_data_link_subobjs(ndo, obj_tptr, obj_tlen - 36, 36)) @@ -857,7 +857,7 @@ lmp_print(netdissect_options *ndo, /* Decode pairs: <Interface_ID (4 bytes), Channel_status (4 bytes)> */ while (offset+8 <= obj_tlen) { ND_PRINT("\n\t Interface ID: %s (0x%08x)", - ipaddr_string(ndo, obj_tptr+offset), + GET_IPADDR_STRING(obj_tptr+offset), GET_BE_U_4(obj_tptr + offset)); ND_PRINT("\n\t\t Active: %s (%u)", @@ -884,7 +884,7 @@ lmp_print(netdissect_options *ndo, /* Decode pairs: <Interface_ID (16 bytes), Channel_status (4 bytes)> */ while (offset+20 <= obj_tlen) { ND_PRINT("\n\t Interface ID: %s (0x%08x)", - ip6addr_string(ndo, obj_tptr+offset), + GET_IP6ADDR_STRING(obj_tptr+offset), GET_BE_U_4(obj_tptr + offset)); ND_PRINT("\n\t\t Active: %s (%u)", @@ -944,7 +944,7 @@ lmp_print(netdissect_options *ndo, offset = 0; while (offset+4 <= obj_tlen) { ND_PRINT("\n\t Interface ID: %s (0x%08x)", - ipaddr_string(ndo, obj_tptr+offset), + GET_IPADDR_STRING(obj_tptr+offset), GET_BE_U_4(obj_tptr + offset)); offset+=4; } @@ -954,7 +954,7 @@ lmp_print(netdissect_options *ndo, offset = 0; while (offset+16 <= obj_tlen) { ND_PRINT("\n\t Interface ID: %s (0x%08x)", - ip6addr_string(ndo, obj_tptr+offset), + GET_IP6ADDR_STRING(obj_tptr+offset), GET_BE_U_4(obj_tptr + offset)); offset+=16; } @@ -1074,7 +1074,7 @@ lmp_print(netdissect_options *ndo, GET_BE_U_2(obj_tptr + 10)); ND_PRINT("\n\t Local Interface ID: %s (0x%08x)", - ipaddr_string(ndo, obj_tptr+12), + GET_IPADDR_STRING(obj_tptr+12), GET_BE_U_4(obj_tptr + 12)); break; diff --git a/print-loopback.c b/print-loopback.c index 47535d03..07fbcbdd 100644 --- a/print-loopback.c +++ b/print-loopback.c @@ -83,7 +83,7 @@ loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int le goto invalid; /* forwarding address */ ND_TCHECK_LEN(cp, MAC_ADDR_LEN); - ND_PRINT(", forwarding address %s", etheraddr_string(ndo, cp)); + ND_PRINT(", forwarding address %s", GET_ETHERADDR_STRING(cp)); cp += MAC_ADDR_LEN; /* data */ ND_PRINT(", data (%u octets)", len - 8); diff --git a/print-lspping.c b/print-lspping.c index cf2abb2b..b51a3738 100644 --- a/print-lspping.c +++ b/print-lspping.c @@ -687,7 +687,7 @@ lspping_print(netdissect_options *ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4 = (const struct lspping_tlv_targetfec_subtlv_ldp_ipv4_t *)subtlv_tptr; ND_PRINT("\n\t %s/%u", - ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4->prefix), + GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4->prefix), GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4->prefix_len)); } break; @@ -701,7 +701,7 @@ lspping_print(netdissect_options *ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6 = (const struct lspping_tlv_targetfec_subtlv_ldp_ipv6_t *)subtlv_tptr; ND_PRINT("\n\t %s/%u", - ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6->prefix), + GET_IP6ADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6->prefix), GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6->prefix_len)); } break; @@ -715,7 +715,7 @@ lspping_print(netdissect_options *ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4 = (const struct lspping_tlv_targetfec_subtlv_bgp_ipv4_t *)subtlv_tptr; ND_PRINT("\n\t %s/%u", - ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4->prefix), + GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4->prefix), GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4->prefix_len)); } break; @@ -729,7 +729,7 @@ lspping_print(netdissect_options *ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6 = (const struct lspping_tlv_targetfec_subtlv_bgp_ipv6_t *)subtlv_tptr; ND_PRINT("\n\t %s/%u", - ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6->prefix), + GET_IP6ADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6->prefix), GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6->prefix_len)); } break; @@ -744,11 +744,11 @@ lspping_print(netdissect_options *ndo, (const struct lspping_tlv_targetfec_subtlv_rsvp_ipv4_t *)subtlv_tptr; ND_PRINT("\n\t tunnel end-point %s, tunnel sender %s, lsp-id 0x%04x" "\n\t tunnel-id 0x%04x, extended tunnel-id %s", - ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_endpoint), - ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_sender), + GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_endpoint), + GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_sender), GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->lsp_id), GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_id), - ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->extended_tunnel_id)); + GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->extended_tunnel_id)); } break; @@ -762,11 +762,11 @@ lspping_print(netdissect_options *ndo, (const struct lspping_tlv_targetfec_subtlv_rsvp_ipv6_t *)subtlv_tptr; ND_PRINT("\n\t tunnel end-point %s, tunnel sender %s, lsp-id 0x%04x" "\n\t tunnel-id 0x%04x, extended tunnel-id %s", - ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_endpoint), - ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_sender), + GET_IP6ADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_endpoint), + GET_IP6ADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_sender), GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->lsp_id), GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_id), - ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->extended_tunnel_id)); + GET_IP6ADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->extended_tunnel_id)); } break; @@ -780,7 +780,7 @@ lspping_print(netdissect_options *ndo, (const struct lspping_tlv_targetfec_subtlv_l3vpn_ipv4_t *)subtlv_tptr; ND_PRINT("\n\t RD: %s, %s/%u", bgp_vpn_rd_print(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->rd), - ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->prefix), + GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->prefix), GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->prefix_len)); } break; @@ -795,7 +795,7 @@ lspping_print(netdissect_options *ndo, (const struct lspping_tlv_targetfec_subtlv_l3vpn_ipv6_t *)subtlv_tptr; ND_PRINT("\n\t RD: %s, %s/%u", bgp_vpn_rd_print(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->rd), - ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->prefix), + GET_IP6ADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->prefix), GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->prefix_len)); } break; @@ -831,7 +831,7 @@ lspping_print(netdissect_options *ndo, (const struct lspping_tlv_targetfec_subtlv_fec_128_pw_old *)subtlv_tptr; ND_PRINT("\n\t Remote PE: %s" "\n\t PW ID: 0x%08x, PW Type: %s (%u)", - ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->remote_pe_address), + GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->remote_pe_address), GET_BE_U_4(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->pw_id), tok2str(mpls_pw_types_values, "unknown", @@ -850,8 +850,8 @@ lspping_print(netdissect_options *ndo, (const struct lspping_tlv_targetfec_subtlv_fec_128_pw *)subtlv_tptr; ND_PRINT("\n\t Sender PE: %s, Remote PE: %s" "\n\t PW ID: 0x%08x, PW Type: %s (%u)", - ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->sender_pe_address), - ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->remote_pe_address), + GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->sender_pe_address), + GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->remote_pe_address), GET_BE_U_4(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->pw_id), tok2str(mpls_pw_types_values, "unknown", @@ -927,8 +927,8 @@ lspping_print(netdissect_options *ndo, (const struct lspping_tlv_downstream_map_ipv4_t *)tlv_tptr; ND_PRINT("\n\t Downstream IP: %s" "\n\t Downstream Interface IP: %s", - ipaddr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv4->downstream_ip), - ipaddr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv4->downstream_interface)); + GET_IPADDR_STRING(tlv_ptr.lspping_tlv_downstream_map_ipv4->downstream_ip), + GET_IPADDR_STRING(tlv_ptr.lspping_tlv_downstream_map_ipv4->downstream_interface)); tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv4_t); tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv4_t); break; @@ -947,7 +947,7 @@ lspping_print(netdissect_options *ndo, (const struct lspping_tlv_downstream_map_ipv4_unmb_t *)tlv_tptr; ND_PRINT("\n\t Downstream IP: %s" "\n\t Downstream Interface Index: 0x%08x", - ipaddr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb->downstream_ip), + GET_IPADDR_STRING(tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb->downstream_ip), GET_BE_U_4(tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb->downstream_interface)); tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv4_unmb_t); tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv4_unmb_t); @@ -967,8 +967,8 @@ lspping_print(netdissect_options *ndo, (const struct lspping_tlv_downstream_map_ipv6_t *)tlv_tptr; ND_PRINT("\n\t Downstream IP: %s" "\n\t Downstream Interface IP: %s", - ip6addr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv6->downstream_ip), - ip6addr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv6->downstream_interface)); + GET_IP6ADDR_STRING(tlv_ptr.lspping_tlv_downstream_map_ipv6->downstream_ip), + GET_IP6ADDR_STRING(tlv_ptr.lspping_tlv_downstream_map_ipv6->downstream_interface)); tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv6_t); tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv6_t); break; @@ -987,7 +987,7 @@ lspping_print(netdissect_options *ndo, (const struct lspping_tlv_downstream_map_ipv6_unmb_t *)tlv_tptr; ND_PRINT("\n\t Downstream IP: %s" "\n\t Downstream Interface Index: 0x%08x", - ip6addr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb->downstream_ip), + GET_IP6ADDR_STRING(tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb->downstream_ip), GET_BE_U_4(tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb->downstream_interface)); tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv6_unmb_t); tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv6_unmb_t); diff --git a/print-lwapp.c b/print-lwapp.c index e1b2d94b..10a2e0be 100644 --- a/print-lwapp.c +++ b/print-lwapp.c @@ -217,7 +217,7 @@ lwapp_control_print(netdissect_options *ndo, tlen); if (has_ap_ident) { - ND_PRINT("\n\tAP identity: %s", etheraddr_string(ndo, tptr)); + ND_PRINT("\n\tAP identity: %s", GET_ETHERADDR_STRING(tptr)); tptr+=sizeof(struct lwapp_transport_header)+6; } else { tptr+=sizeof(struct lwapp_transport_header); diff --git a/print-lwres.c b/print-lwres.c index 6f7d9aaa..ed1753a3 100644 --- a/print-lwres.c +++ b/print-lwres.c @@ -280,13 +280,13 @@ lwres_printaddr(netdissect_options *ndo, case 1: /* IPv4 */ if (l < 4) return -1; - ND_PRINT(" %s", ipaddr_string(ndo, p)); + ND_PRINT(" %s", GET_IPADDR_STRING(p)); p += sizeof(nd_ipv4); break; case 2: /* IPv6 */ if (l < 16) return -1; - ND_PRINT(" %s", ip6addr_string(ndo, p)); + ND_PRINT(" %s", GET_IP6ADDR_STRING(p)); p += sizeof(nd_ipv6); break; default: diff --git a/print-mobile.c b/print-mobile.c index 50bcd3eb..528da79c 100644 --- a/print-mobile.c +++ b/print-mobile.c @@ -88,12 +88,12 @@ mobile_print(netdissect_options *ndo, const u_char *bp, u_int length) if (osp) { ND_PRINT("[S] "); if (ndo->ndo_vflag) - ND_PRINT("%s ", ipaddr_string(ndo, mob->osrc)); + ND_PRINT("%s ", GET_IPADDR_STRING(mob->osrc)); } else { ND_PRINT("[] "); } if (ndo->ndo_vflag) { - ND_PRINT("> %s ", ipaddr_string(ndo, mob->odst)); + ND_PRINT("> %s ", GET_IPADDR_STRING(mob->odst)); ND_PRINT("(oproto=%u)", proto>>8); } vec[0].ptr = (const uint8_t *)(const void *)mob; diff --git a/print-mobility.c b/print-mobility.c index 329f84a8..cdb43167 100644 --- a/print-mobility.c +++ b/print-mobility.c @@ -159,7 +159,7 @@ mobility_opt_print(netdissect_options *ndo, goto trunc; } ND_TCHECK_16(bp + i + 2); - ND_PRINT("(alt-CoA: %s)", ip6addr_string(ndo, bp + i + 2)); + ND_PRINT("(alt-CoA: %s)", GET_IP6ADDR_STRING(bp + i + 2)); break; case IP6MOPT_NONCEID: if (len - i < IP6MOPT_NONCEID_MINLEN) { @@ -326,7 +326,7 @@ mobility_print(netdissect_options *ndo, /* Reserved */ hlen = IP6M_MINLEN; ND_TCHECK_16(bp + hlen); - ND_PRINT(" homeaddr %s", ip6addr_string(ndo, bp + hlen)); + ND_PRINT(" homeaddr %s", GET_IP6ADDR_STRING(bp + hlen)); hlen += 16; break; default: diff --git a/print-mptcp.c b/print-mptcp.c index 0f5df402..e3a82fe6 100644 --- a/print-mptcp.c +++ b/print-mptcp.c @@ -341,12 +341,12 @@ add_addr_print(netdissect_options *ndo, ND_PRINT(" id %u", GET_U_1(add_addr->addr_id)); switch (ipver) { case 4: - ND_PRINT(" %s", ipaddr_string(ndo, add_addr->u.v4.addr)); + ND_PRINT(" %s", GET_IPADDR_STRING(add_addr->u.v4.addr)); if (opt_len == 10) ND_PRINT(":%u", GET_BE_U_2(add_addr->u.v4.port)); break; case 6: - ND_PRINT(" %s", ip6addr_string(ndo, add_addr->u.v6.addr)); + ND_PRINT(" %s", GET_IP6ADDR_STRING(add_addr->u.v6.addr)); if (opt_len == 22) ND_PRINT(":%u", GET_BE_U_2(add_addr->u.v6.port)); break; diff --git a/print-msdp.c b/print-msdp.c index 297fbbb3..8680486c 100644 --- a/print-msdp.c +++ b/print-msdp.c @@ -77,7 +77,7 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length) case 2: ND_PRINT(" SA-Request"); ND_TCHECK_5(sp); - ND_PRINT(" for %s", ipaddr_string(ndo, sp + 1)); + ND_PRINT(" for %s", GET_IPADDR_STRING(sp + 1)); break; case 4: ND_PRINT(" Keepalive"); diff --git a/print-msnlb.c b/print-msnlb.c index 5d25f568..99b22a02 100644 --- a/print-msnlb.c +++ b/print-msnlb.c @@ -58,8 +58,8 @@ msnlb_print(netdissect_options *ndo, const u_char *bp) ND_PRINT("MS NLB heartbeat, host priority: %u,", GET_LE_U_4((hb->host_prio))); - ND_PRINT(" cluster IP: %s,", ipaddr_string(ndo, hb->virtual_ip)); - ND_PRINT(" host IP: %s", ipaddr_string(ndo, hb->host_ip)); + ND_PRINT(" cluster IP: %s,", GET_IPADDR_STRING(hb->virtual_ip)); + ND_PRINT(" host IP: %s", GET_IPADDR_STRING(hb->host_ip)); return; trunc: nd_print_trunc(ndo); diff --git a/print-nfs.c b/print-nfs.c index d493cade..555a42dd 100644 --- a/print-nfs.c +++ b/print-nfs.c @@ -209,14 +209,14 @@ print_nfsaddr(netdissect_options *ndo, switch (IP_V((const struct ip *)bp)) { case 4: ip = (const struct ip *)bp; - strlcpy(srcaddr, ipaddr_string(ndo, ip->ip_src), sizeof(srcaddr)); - strlcpy(dstaddr, ipaddr_string(ndo, ip->ip_dst), sizeof(dstaddr)); + strlcpy(srcaddr, GET_IPADDR_STRING(ip->ip_src), sizeof(srcaddr)); + strlcpy(dstaddr, GET_IPADDR_STRING(ip->ip_dst), sizeof(dstaddr)); break; case 6: ip6 = (const struct ip6_hdr *)bp; - strlcpy(srcaddr, ip6addr_string(ndo, ip6->ip6_src), + strlcpy(srcaddr, GET_IP6ADDR_STRING(ip6->ip6_src), sizeof(srcaddr)); - strlcpy(dstaddr, ip6addr_string(ndo, ip6->ip6_dst), + strlcpy(dstaddr, GET_IP6ADDR_STRING(ip6->ip6_dst), sizeof(dstaddr)); break; default: diff --git a/print-ntp.c b/print-ntp.c index b60b5523..57bbf54d 100644 --- a/print-ntp.c +++ b/print-ntp.c @@ -304,12 +304,12 @@ ntp_time_print(netdissect_options *ndo, break; case INFO_QUERY: - ND_PRINT("%s INFO_QUERY", ipaddr_string(ndo, bp->refid)); + ND_PRINT("%s INFO_QUERY", GET_IPADDR_STRING(bp->refid)); /* this doesn't have more content */ return; case INFO_REPLY: - ND_PRINT("%s INFO_REPLY", ipaddr_string(ndo, bp->refid)); + ND_PRINT("%s INFO_REPLY", GET_IPADDR_STRING(bp->refid)); /* this is too complex to be worth printing */ return; diff --git a/print-olsr.c b/print-olsr.c index a8ab62f2..e640ee18 100644 --- a/print-olsr.c +++ b/print-olsr.c @@ -244,7 +244,7 @@ olsr_print_lq_neighbor4(netdissect_options *ndo, ND_PRINT("\n\t neighbor %s, link-quality %.2f%%" ", neighbor-link-quality %.2f%%", - ipaddr_string(ndo, lq_neighbor->neighbor), + GET_IPADDR_STRING(lq_neighbor->neighbor), ((double) GET_U_1(lq_neighbor->link_quality)/2.55), ((double) GET_U_1(lq_neighbor->neighbor_link_quality)/2.55)); @@ -269,7 +269,7 @@ olsr_print_lq_neighbor6(netdissect_options *ndo, ND_PRINT("\n\t neighbor %s, link-quality %.2f%%" ", neighbor-link-quality %.2f%%", - ip6addr_string(ndo, lq_neighbor->neighbor), + GET_IP6ADDR_STRING(lq_neighbor->neighbor), ((double) GET_U_1(lq_neighbor->link_quality)/2.55), ((double) GET_U_1(lq_neighbor->neighbor_link_quality)/2.55)); @@ -298,7 +298,7 @@ olsr_print_neighbor(netdissect_options *ndo, ND_TCHECK_LEN(msg_data, sizeof(nd_ipv4)); /* print 4 neighbors per line */ - ND_PRINT("%s%s", ipaddr_string(ndo, msg_data), + ND_PRINT("%s%s", GET_IPADDR_STRING(msg_data), neighbor % 4 == 0 ? "\n\t\t" : " "); msg_data += sizeof(nd_ipv4); @@ -382,7 +382,7 @@ olsr_print(netdissect_options *ndo, ND_PRINT("\n\t%s Message (%#04x), originator %s, ttl %u, hop %u" "\n\t vtime %.3fs, msg-seq 0x%04x, length %u%s", tok2str(olsr_msg_values, "Unknown", msg_type), - msg_type, ip6addr_string(ndo, msgptr.v6->originator), + msg_type, GET_IP6ADDR_STRING(msgptr.v6->originator), GET_U_1(msgptr.v6->ttl), GET_U_1(msgptr.v6->hopcount), ME_TO_DOUBLE(GET_U_1(msgptr.v6->vtime)), @@ -413,7 +413,7 @@ olsr_print(netdissect_options *ndo, ND_PRINT("\n\t%s Message (%#04x), originator %s, ttl %u, hop %u" "\n\t vtime %.3fs, msg-seq 0x%04x, length %u%s", tok2str(olsr_msg_values, "Unknown", msg_type), - msg_type, ipaddr_string(ndo, msgptr.v4->originator), + msg_type, GET_IPADDR_STRING(msgptr.v4->originator), GET_U_1(msgptr.v4->ttl), GET_U_1(msgptr.v4->hopcount), ME_TO_DOUBLE(GET_U_1(msgptr.v4->vtime)), @@ -527,8 +527,8 @@ olsr_print(netdissect_options *ndo, while (msg_tlen >= addr_size) { ND_TCHECK_LEN(msg_data, addr_size); ND_PRINT("\n\t interface address %s", - is_ipv6 ? ip6addr_string(ndo, msg_data) : - ipaddr_string(ndo, msg_data)); + is_ipv6 ? GET_IP6ADDR_STRING(msg_data) : + GET_IPADDR_STRING(msg_data)); msg_data += addr_size; msg_tlen -= addr_size; @@ -552,7 +552,7 @@ olsr_print(netdissect_options *ndo, hna6 = (const struct olsr_hna6 *)msg_data; ND_PRINT("\n\t #%i: %s/%u", - i, ip6addr_string(ndo, hna6->network), + i, GET_IP6ADDR_STRING(hna6->network), mask62plen (hna6->mask)); msg_data += sizeof(struct olsr_hna6); @@ -608,7 +608,7 @@ olsr_print(netdissect_options *ndo, /* normal route */ ND_PRINT("%s%s/%u", col == 0 ? "\n\t " : ", ", - ipaddr_string(ndo, ptr.hna->network), + GET_IPADDR_STRING(ptr.hna->network), mask2plen(GET_BE_U_4(ptr.hna->mask))); } @@ -687,10 +687,10 @@ olsr_print(netdissect_options *ndo, if (is_ipv6) ND_PRINT(", address %s, name \"", - ip6addr_string(ndo, msg_data)); + GET_IP6ADDR_STRING(msg_data)); else ND_PRINT(", address %s, name \"", - ipaddr_string(ndo, msg_data)); + GET_IPADDR_STRING(msg_data)); (void)nd_printn(ndo, msg_data + addr_size, name_entry_len, NULL); ND_PRINT("\""); diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c index 4cf766bc..047b1666 100644 --- a/print-openflow-1.0.c +++ b/print-openflow-1.0.c @@ -813,7 +813,7 @@ of10_bsn_message_print(netdissect_options *ndo, cp += 3; /* mask */ ND_TCHECK_4(cp); - ND_PRINT(", mask %s", ipaddr_string(ndo, cp)); + ND_PRINT(", mask %s", GET_IPADDR_STRING(cp)); cp += 4; break; case BSN_SET_MIRRORING: @@ -1155,7 +1155,7 @@ of10_phy_ports_print(netdissect_options *ndo, cp += 2; /* hw_addr */ ND_TCHECK_LEN(cp, MAC_ADDR_LEN); - ND_PRINT(", hw_addr %s", etheraddr_string(ndo, cp)); + ND_PRINT(", hw_addr %s", GET_ETHERADDR_STRING(cp)); cp += MAC_ADDR_LEN; /* name */ ND_TCHECK_LEN(cp, OFP_MAX_PORT_NAME_LEN); @@ -1369,12 +1369,12 @@ of10_match_print(netdissect_options *ndo, /* dl_src */ ND_TCHECK_LEN(cp, MAC_ADDR_LEN); if (! (wildcards & OFPFW_DL_SRC)) - ND_PRINT("%smatch dl_src %s", pfx, etheraddr_string(ndo, cp)); + ND_PRINT("%smatch dl_src %s", pfx, GET_ETHERADDR_STRING(cp)); cp += MAC_ADDR_LEN; /* dl_dst */ ND_TCHECK_LEN(cp, MAC_ADDR_LEN); if (! (wildcards & OFPFW_DL_DST)) - ND_PRINT("%smatch dl_dst %s", pfx, etheraddr_string(ndo, cp)); + ND_PRINT("%smatch dl_dst %s", pfx, GET_ETHERADDR_STRING(cp)); cp += MAC_ADDR_LEN; /* dl_vlan */ ND_TCHECK_2(cp); @@ -1416,13 +1416,13 @@ of10_match_print(netdissect_options *ndo, ND_TCHECK_4(cp); nw_bits = (wildcards & OFPFW_NW_SRC_MASK) >> OFPFW_NW_SRC_SHIFT; if (nw_bits < 32) - ND_PRINT("%smatch nw_src %s/%u", pfx, ipaddr_string(ndo, cp), 32 - nw_bits); + ND_PRINT("%smatch nw_src %s/%u", pfx, GET_IPADDR_STRING(cp), 32 - nw_bits); cp += 4; /* nw_dst */ ND_TCHECK_4(cp); nw_bits = (wildcards & OFPFW_NW_DST_MASK) >> OFPFW_NW_DST_SHIFT; if (nw_bits < 32) - ND_PRINT("%smatch nw_dst %s/%u", pfx, ipaddr_string(ndo, cp), 32 - nw_bits); + ND_PRINT("%smatch nw_dst %s/%u", pfx, GET_IPADDR_STRING(cp), 32 - nw_bits); cp += 4; /* tp_src */ ND_TCHECK_2(cp); @@ -1546,7 +1546,7 @@ of10_actions_print(netdissect_options *ndo, case OFPAT_SET_DL_DST: /* dl_addr */ ND_TCHECK_LEN(cp, MAC_ADDR_LEN); - ND_PRINT(", dl_addr %s", etheraddr_string(ndo, cp)); + ND_PRINT(", dl_addr %s", GET_ETHERADDR_STRING(cp)); cp += MAC_ADDR_LEN; /* pad */ ND_TCHECK_6(cp); @@ -1556,7 +1556,7 @@ of10_actions_print(netdissect_options *ndo, case OFPAT_SET_NW_DST: /* nw_addr */ ND_TCHECK_4(cp); - ND_PRINT(", nw_addr %s", ipaddr_string(ndo, cp)); + ND_PRINT(", nw_addr %s", GET_IPADDR_STRING(cp)); cp += 4; break; case OFPAT_SET_NW_TOS: @@ -1727,7 +1727,7 @@ of10_port_mod_print(netdissect_options *ndo, cp += 2; /* hw_addr */ ND_TCHECK_LEN(cp, MAC_ADDR_LEN); - ND_PRINT(", hw_addr %s", etheraddr_string(ndo, cp)); + ND_PRINT(", hw_addr %s", GET_ETHERADDR_STRING(cp)); cp += MAC_ADDR_LEN; /* config */ ND_TCHECK_4(cp); diff --git a/print-ospf.c b/print-ospf.c index c7491617..43f9dcc2 100644 --- a/print-ospf.c +++ b/print-ospf.c @@ -238,7 +238,7 @@ ospf_grace_lsa_print(netdissect_options *ndo, ND_PRINT("\n\t Bogus length %u != 4", tlv_length); return -1; } - ND_PRINT("%s", ipaddr_string(ndo, tptr)); + ND_PRINT("%s", GET_IPADDR_STRING(tptr)); break; default: @@ -338,11 +338,11 @@ ospf_te_lsa_print(netdissect_options *ndo, goto invalid; } ND_PRINT(", %s (0x%08x)", - ipaddr_string(ndo, tptr), + GET_IPADDR_STRING(tptr), GET_BE_U_4(tptr)); if (subtlv_length == 8) /* rfc4203 */ ND_PRINT(", %s (0x%08x)", - ipaddr_string(ndo, tptr+4), + GET_IPADDR_STRING(tptr+4), GET_BE_U_4(tptr + 4)); break; case LS_OPAQUE_TE_LINK_SUBTLV_LOCAL_IP: @@ -351,7 +351,7 @@ ospf_te_lsa_print(netdissect_options *ndo, ND_PRINT(" != 4"); goto invalid; } - ND_PRINT(", %s", ipaddr_string(ndo, tptr)); + ND_PRINT(", %s", GET_IPADDR_STRING(tptr)); break; case LS_OPAQUE_TE_LINK_SUBTLV_MAX_BW: case LS_OPAQUE_TE_LINK_SUBTLV_MAX_RES_BW: @@ -483,7 +483,7 @@ ospf_te_lsa_print(netdissect_options *ndo, return -1; } ND_TCHECK_4(tptr); - ND_PRINT(", %s", ipaddr_string(ndo, tptr)); + ND_PRINT(", %s", GET_IPADDR_STRING(tptr)); break; default: @@ -524,7 +524,7 @@ ospf_print_lshdr(netdissect_options *ndo, ND_TCHECK_4(lshp->ls_seq); /* XXX - ls_length check checked this */ ND_PRINT("\n\t Advertising Router %s, seq 0x%08x, age %us, length %u", - ipaddr_string(ndo, lshp->ls_router), + GET_IPADDR_STRING(lshp->ls_router), GET_BE_U_4(lshp->ls_seq), GET_BE_U_2(lshp->ls_age), ls_length - (u_int)sizeof(struct lsa_hdr)); @@ -554,7 +554,7 @@ ospf_print_lshdr(netdissect_options *ndo, ND_PRINT("\n\t %s LSA (%u), LSA-ID: %s", tok2str(lsa_values,"unknown",ls_type), ls_type, - ipaddr_string(ndo, lshp->un_lsa_id.lsa_id)); + GET_IPADDR_STRING(lshp->un_lsa_id.lsa_id)); break; } @@ -652,26 +652,26 @@ ospf_print_lsa(netdissect_options *ndo, case RLA_TYPE_VIRTUAL: ND_PRINT("\n\t Virtual Link: Neighbor Router-ID: %s, Interface Address: %s", - ipaddr_string(ndo, rlp->link_id), - ipaddr_string(ndo, rlp->link_data)); + GET_IPADDR_STRING(rlp->link_id), + GET_IPADDR_STRING(rlp->link_data)); break; case RLA_TYPE_ROUTER: ND_PRINT("\n\t Neighbor Router-ID: %s, Interface Address: %s", - ipaddr_string(ndo, rlp->link_id), - ipaddr_string(ndo, rlp->link_data)); + GET_IPADDR_STRING(rlp->link_id), + GET_IPADDR_STRING(rlp->link_data)); break; case RLA_TYPE_TRANSIT: ND_PRINT("\n\t Neighbor Network-ID: %s, Interface Address: %s", - ipaddr_string(ndo, rlp->link_id), - ipaddr_string(ndo, rlp->link_data)); + GET_IPADDR_STRING(rlp->link_id), + GET_IPADDR_STRING(rlp->link_data)); break; case RLA_TYPE_STUB: ND_PRINT("\n\t Stub Network: %s, Mask: %s", - ipaddr_string(ndo, rlp->link_id), - ipaddr_string(ndo, rlp->link_data)); + GET_IPADDR_STRING(rlp->link_id), + GET_IPADDR_STRING(rlp->link_data)); break; default: @@ -691,11 +691,11 @@ ospf_print_lsa(netdissect_options *ndo, case LS_TYPE_NETWORK: ND_TCHECK_4(lsap->lsa_un.un_nla.nla_mask); ND_PRINT("\n\t Mask %s\n\t Connected Routers:", - ipaddr_string(ndo, lsap->lsa_un.un_nla.nla_mask)); + GET_IPADDR_STRING(lsap->lsa_un.un_nla.nla_mask)); ap = lsap->lsa_un.un_nla.nla_router; while ((const u_char *)ap < ls_end) { ND_TCHECK_SIZE(ap); - ND_PRINT("\n\t %s", ipaddr_string(ndo, *ap)); + ND_PRINT("\n\t %s", GET_IPADDR_STRING(*ap)); ++ap; } break; @@ -703,7 +703,7 @@ ospf_print_lsa(netdissect_options *ndo, case LS_TYPE_SUM_IP: ND_TCHECK_4(lsap->lsa_un.un_nla.nla_mask); ND_PRINT("\n\t Mask %s", - ipaddr_string(ndo, lsap->lsa_un.un_sla.sla_mask)); + GET_IPADDR_STRING(lsap->lsa_un.un_sla.sla_mask)); ND_TCHECK_SIZE(lsap->lsa_un.un_sla.sla_tosmetric); lp = (const uint8_t *)lsap->lsa_un.un_sla.sla_tosmetric; while (lp < ls_end) { @@ -741,7 +741,7 @@ ospf_print_lsa(netdissect_options *ndo, case LS_TYPE_NSSA: /* fall through - those LSAs share the same format */ ND_TCHECK_4(lsap->lsa_un.un_nla.nla_mask); ND_PRINT("\n\t Mask %s", - ipaddr_string(ndo, lsap->lsa_un.un_asla.asla_mask)); + GET_IPADDR_STRING(lsap->lsa_un.un_asla.asla_mask)); ND_TCHECK_SIZE(lsap->lsa_un.un_sla.sla_tosmetric); almp = lsap->lsa_un.un_asla.asla_metric; @@ -762,11 +762,11 @@ ospf_print_lsa(netdissect_options *ndo, ND_TCHECK_4(almp->asla_forward); if (GET_IPV4_TO_NETWORK_ORDER(almp->asla_forward) != 0) { - ND_PRINT(", forward %s", ipaddr_string(ndo, almp->asla_forward)); + ND_PRINT(", forward %s", GET_IPADDR_STRING(almp->asla_forward)); } ND_TCHECK_4(almp->asla_tag); if (GET_IPV4_TO_NETWORK_ORDER(almp->asla_tag) != 0) { - ND_PRINT(", tag %s", ipaddr_string(ndo, almp->asla_tag)); + ND_PRINT(", tag %s", GET_IPADDR_STRING(almp->asla_tag)); } ++almp; } @@ -781,12 +781,12 @@ ospf_print_lsa(netdissect_options *ndo, case MCLA_VERTEX_ROUTER: ND_PRINT("\n\t Router Router-ID %s", - ipaddr_string(ndo, mcp->mcla_vid)); + GET_IPADDR_STRING(mcp->mcla_vid)); break; case MCLA_VERTEX_NETWORK: ND_PRINT("\n\t Network Designated Router %s", - ipaddr_string(ndo, mcp->mcla_vid)); + GET_IPADDR_STRING(mcp->mcla_vid)); break; default: @@ -1000,25 +1000,25 @@ ospf_decode_v2(netdissect_options *ndo, ND_PRINT("\n\t Hello Timer %us, Dead Timer %us, Mask %s, Priority %u", GET_BE_U_2(op->ospf_hello.hello_helloint), GET_BE_U_4(op->ospf_hello.hello_deadint), - ipaddr_string(ndo, op->ospf_hello.hello_mask), + GET_IPADDR_STRING(op->ospf_hello.hello_mask), GET_U_1(op->ospf_hello.hello_priority)); ND_TCHECK_4(op->ospf_hello.hello_dr); if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_hello.hello_dr) != 0) ND_PRINT("\n\t Designated Router %s", - ipaddr_string(ndo, op->ospf_hello.hello_dr)); + GET_IPADDR_STRING(op->ospf_hello.hello_dr)); ND_TCHECK_4(op->ospf_hello.hello_bdr); if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_hello.hello_bdr) != 0) ND_PRINT(", Backup Designated Router %s", - ipaddr_string(ndo, op->ospf_hello.hello_bdr)); + GET_IPADDR_STRING(op->ospf_hello.hello_bdr)); ap = op->ospf_hello.hello_neighbor; if ((const u_char *)ap < dataend) ND_PRINT("\n\t Neighbor List:"); while ((const u_char *)ap < dataend) { ND_TCHECK_SIZE(ap); - ND_PRINT("\n\t %s", ipaddr_string(ndo, *ap)); + ND_PRINT("\n\t %s", GET_IPADDR_STRING(*ap)); ++ap; } break; /* HELLO */ @@ -1051,7 +1051,7 @@ ospf_decode_v2(netdissect_options *ndo, ND_TCHECK_SIZE(lsrp); ND_PRINT("\n\t Advertising Router: %s, %s LSA (%u)", - ipaddr_string(ndo, lsrp->ls_router), + GET_IPADDR_STRING(lsrp->ls_router), tok2str(lsa_values,"unknown",GET_BE_U_4(lsrp->ls_type)), GET_BE_U_4(lsrp->ls_type)); @@ -1067,7 +1067,7 @@ ospf_decode_v2(netdissect_options *ndo, break; default: ND_PRINT(", LSA-ID: %s", - ipaddr_string(ndo, lsrp->un_ls_stateid.ls_stateid)); + GET_IPADDR_STRING(lsrp->un_ls_stateid.ls_stateid)); break; } @@ -1147,11 +1147,11 @@ ospf_print(netdissect_options *ndo, } ND_TCHECK_4(op->ospf_routerid); - ND_PRINT("\n\tRouter-ID %s", ipaddr_string(ndo, op->ospf_routerid)); + ND_PRINT("\n\tRouter-ID %s", GET_IPADDR_STRING(op->ospf_routerid)); ND_TCHECK_4(op->ospf_areaid); if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_areaid) != 0) - ND_PRINT(", Area %s", ipaddr_string(ndo, op->ospf_areaid)); + ND_PRINT(", Area %s", GET_IPADDR_STRING(op->ospf_areaid)); else ND_PRINT(", Backbone Area"); diff --git a/print-ospf6.c b/print-ospf6.c index b50cd5ca..c94a7793 100644 --- a/print-ospf6.c +++ b/print-ospf6.c @@ -379,7 +379,7 @@ ospf6_print_ls_type(netdissect_options *ndo, ls_type & LS_TYPE_MASK, tok2str(ospf6_ls_scope_values, "Unknown", ls_type & LS_SCOPE_MASK), ls_type &0x8000 ? ", transitive" : "", /* U-bit */ - ipaddr_string(ndo, (const u_char *)ls_stateid)); + GET_IPADDR_STRING((const u_char *)ls_stateid)); } static int @@ -391,7 +391,7 @@ ospf6_print_lshdr(netdissect_options *ndo, ND_TCHECK_4(lshp->ls_router); ND_PRINT("\n\t Advertising Router %s, seq 0x%08x, age %us, length %u", - ipaddr_string(ndo, lshp->ls_router), + GET_IPADDR_STRING(lshp->ls_router), GET_BE_U_4(lshp->ls_seq), GET_BE_U_2(lshp->ls_age), GET_BE_U_2(lshp->ls_length)-(u_int)sizeof(struct lsa6_hdr)); @@ -427,7 +427,7 @@ ospf6_print_lsaprefix(netdissect_options *ndo, ND_TCHECK_LEN(lsapp->lsa_p_prefix, wordlen * 4); memset(prefix, 0, sizeof(prefix)); memcpy(prefix, lsapp->lsa_p_prefix, wordlen * 4); - ND_PRINT("\n\t\t%s/%u", ip6addr_string(ndo, prefix), + ND_PRINT("\n\t\t%s/%u", ip6addr_string(ndo, prefix), /* local buffer, not packet data; don't use GET_IP6ADDR_STRING() */ GET_U_1(lsapp->lsa_p_len)); if (GET_U_1(lsapp->lsa_p_opt)) { ND_PRINT(", Options [%s]", @@ -509,25 +509,25 @@ ospf6_print_lsa(netdissect_options *ndo, case RLA_TYPE_VIRTUAL: ND_PRINT("\n\t Virtual Link: Neighbor Router-ID %s" "\n\t Neighbor Interface-ID %s, Interface %s", - ipaddr_string(ndo, rlp->link_nrtid), - ipaddr_string(ndo, rlp->link_nifid), - ipaddr_string(ndo, rlp->link_ifid)); + GET_IPADDR_STRING(rlp->link_nrtid), + GET_IPADDR_STRING(rlp->link_nifid), + GET_IPADDR_STRING(rlp->link_ifid)); break; case RLA_TYPE_ROUTER: ND_PRINT("\n\t Neighbor Router-ID %s" "\n\t Neighbor Interface-ID %s, Interface %s", - ipaddr_string(ndo, rlp->link_nrtid), - ipaddr_string(ndo, rlp->link_nifid), - ipaddr_string(ndo, rlp->link_ifid)); + GET_IPADDR_STRING(rlp->link_nrtid), + GET_IPADDR_STRING(rlp->link_nifid), + GET_IPADDR_STRING(rlp->link_ifid)); break; case RLA_TYPE_TRANSIT: ND_PRINT("\n\t Neighbor Network-ID %s" "\n\t Neighbor Interface-ID %s, Interface %s", - ipaddr_string(ndo, rlp->link_nrtid), - ipaddr_string(ndo, rlp->link_nifid), - ipaddr_string(ndo, rlp->link_ifid)); + GET_IPADDR_STRING(rlp->link_nrtid), + GET_IPADDR_STRING(rlp->link_nifid), + GET_IPADDR_STRING(rlp->link_ifid)); break; default: @@ -556,7 +556,7 @@ ospf6_print_lsa(netdissect_options *ndo, return (1); lsa_length -= sizeof (*ap); ND_TCHECK_SIZE(ap); - ND_PRINT("\n\t\t%s", ipaddr_string(ndo, *ap)); + ND_PRINT("\n\t\t%s", GET_IPADDR_STRING(*ap)); ++ap; } break; @@ -605,7 +605,7 @@ ospf6_print_lsa(netdissect_options *ndo, lsa_length -= sizeof (nd_ipv6); ND_TCHECK_16(tptr); ND_PRINT(" forward %s", - ip6addr_string(ndo, tptr)); + GET_IP6ADDR_STRING(tptr)); tptr += sizeof(nd_ipv6); } @@ -615,7 +615,7 @@ ospf6_print_lsa(netdissect_options *ndo, lsa_length -= sizeof (uint32_t); ND_TCHECK_4(tptr); ND_PRINT(" tag %s", - ipaddr_string(ndo, tptr)); + GET_IPADDR_STRING(tptr)); tptr += sizeof(uint32_t); } @@ -625,7 +625,7 @@ ospf6_print_lsa(netdissect_options *ndo, lsa_length -= sizeof (uint32_t); ND_TCHECK_4(tptr); ND_PRINT(" RefLSID: %s", - ipaddr_string(ndo, tptr)); + GET_IPADDR_STRING(tptr)); tptr += sizeof(uint32_t); } break; @@ -648,7 +648,7 @@ ospf6_print_lsa(netdissect_options *ndo, prefixes = GET_BE_U_4(llsap->llsa_nprefix); ND_PRINT("\n\t Priority %u, Link-local address %s, Prefixes %u:", GET_U_1(llsap->llsa_priority), - ip6addr_string(ndo, llsap->llsa_lladdr), + GET_IP6ADDR_STRING(llsap->llsa_lladdr), prefixes); tptr = (const uint8_t *)llsap->llsa_prefix; @@ -741,23 +741,23 @@ ospf6_decode_v3(netdissect_options *ndo, ND_PRINT("\n\t Hello Timer %us, Dead Timer %us, Interface-ID %s, Priority %u", GET_BE_U_2(hellop->hello_helloint), GET_BE_U_2(hellop->hello_deadint), - ipaddr_string(ndo, hellop->hello_ifid), + GET_IPADDR_STRING(hellop->hello_ifid), GET_U_1(hellop->hello_priority)); ND_TCHECK_4(hellop->hello_dr); if (GET_BE_U_4(hellop->hello_dr) != 0) ND_PRINT("\n\t Designated Router %s", - ipaddr_string(ndo, hellop->hello_dr)); + GET_IPADDR_STRING(hellop->hello_dr)); ND_TCHECK_4(hellop->hello_bdr); if (GET_BE_U_4(hellop->hello_bdr) != 0) ND_PRINT(", Backup Designated Router %s", - ipaddr_string(ndo, hellop->hello_bdr)); + GET_IPADDR_STRING(hellop->hello_bdr)); if (ndo->ndo_vflag > 1) { ND_PRINT("\n\t Neighbor List:"); ap = hellop->hello_neighbor; while ((const u_char *)ap < dataend) { ND_TCHECK_SIZE(ap); - ND_PRINT("\n\t %s", ipaddr_string(ndo, *ap)); + ND_PRINT("\n\t %s", GET_IPADDR_STRING(*ap)); ++ap; } } @@ -796,7 +796,7 @@ ospf6_decode_v3(netdissect_options *ndo, while ((const u_char *)lsrp < dataend) { ND_TCHECK_SIZE(lsrp); ND_PRINT("\n\t Advertising Router %s", - ipaddr_string(ndo, lsrp->ls_router)); + GET_IPADDR_STRING(lsrp->ls_router)); ospf6_print_ls_type(ndo, GET_BE_U_2(lsrp->ls_type), &lsrp->ls_stateid); @@ -989,11 +989,11 @@ ospf6_print(netdissect_options *ndo, dataend = bp + datalen; ND_TCHECK_4(op->ospf6_routerid); - ND_PRINT("\n\tRouter-ID %s", ipaddr_string(ndo, op->ospf6_routerid)); + ND_PRINT("\n\tRouter-ID %s", GET_IPADDR_STRING(op->ospf6_routerid)); ND_TCHECK_4(op->ospf6_areaid); if (GET_BE_U_4(op->ospf6_areaid) != 0) - ND_PRINT(", Area %s", ipaddr_string(ndo, op->ospf6_areaid)); + ND_PRINT(", Area %s", GET_IPADDR_STRING(op->ospf6_areaid)); else ND_PRINT(", Backbone Area"); ND_TCHECK_1(op->ospf6_instanceid); diff --git a/print-pim.c b/print-pim.c index 35fb476e..bbc3badc 100644 --- a/print-pim.c +++ b/print-pim.c @@ -169,17 +169,17 @@ pimv1_join_prune_print(netdissect_options *ndo, ((njoin = GET_BE_U_2(bp + 20)) + GET_BE_U_2(bp + 22)) == 1) { u_int hold; - ND_PRINT(" RPF %s ", ipaddr_string(ndo, bp)); + ND_PRINT(" RPF %s ", GET_IPADDR_STRING(bp)); hold = GET_BE_U_2(bp + 6); if (hold != 180) { ND_PRINT("Hold "); unsigned_relts_print(ndo, hold); } ND_PRINT("%s (%s/%u, %s", njoin ? "Join" : "Prune", - ipaddr_string(ndo, bp + 26), GET_U_1(bp + 25) & 0x3f, - ipaddr_string(ndo, bp + 12)); + GET_IPADDR_STRING(bp + 26), GET_U_1(bp + 25) & 0x3f, + GET_IPADDR_STRING(bp + 12)); if (GET_BE_U_4(bp + 16) != 0xffffffff) - ND_PRINT("/%s", ipaddr_string(ndo, bp + 16)); + ND_PRINT("/%s", GET_IPADDR_STRING(bp + 16)); ND_PRINT(") %s%s %s", (GET_U_1(bp + 24) & 0x01) ? "Sparse" : "Dense", (GET_U_1(bp + 25) & 0x80) ? " WC" : "", @@ -192,7 +192,7 @@ pimv1_join_prune_print(netdissect_options *ndo, ND_TCHECK_LEN(bp, sizeof(nd_ipv4)); if (ndo->ndo_vflag > 1) ND_PRINT("\n"); - ND_PRINT(" Upstream Nbr: %s", ipaddr_string(ndo, bp)); + ND_PRINT(" Upstream Nbr: %s", GET_IPADDR_STRING(bp)); bp += 4; len -= 4; if (len < 4) @@ -221,14 +221,14 @@ pimv1_join_prune_print(netdissect_options *ndo, if (len < 4) goto trunc; ND_TCHECK_LEN(bp, sizeof(nd_ipv4)); - ND_PRINT("\n\tGroup: %s", ipaddr_string(ndo, bp)); + ND_PRINT("\n\tGroup: %s", GET_IPADDR_STRING(bp)); bp += 4; len -= 4; if (len < 4) goto trunc; ND_TCHECK_LEN(bp, sizeof(nd_ipv4)); if (GET_BE_U_4(bp) != 0xffffffff) - ND_PRINT("/%s", ipaddr_string(ndo, bp)); + ND_PRINT("/%s", GET_IPADDR_STRING(bp)); bp += 4; len -= 4; if (len < 4) @@ -253,7 +253,7 @@ pimv1_join_prune_print(netdissect_options *ndo, (GET_U_1(bp) & 0x01) ? "Sparse " : "Dense ", (GET_U_1(bp + 1) & 0x80) ? "WC " : "", (GET_U_1(bp + 1) & 0x40) ? "RP " : "SPT ", - ipaddr_string(ndo, bp + 2), + GET_IPADDR_STRING(bp + 2), GET_U_1(bp + 1) & 0x3f); bp += 6; len -= 6; @@ -305,30 +305,30 @@ pimv1_print(netdissect_options *ndo, case PIMV1_TYPE_REGISTER: ND_TCHECK_LEN(bp + 8, 20); /* ip header */ - ND_PRINT(" for %s > %s", ipaddr_string(ndo, bp + 20), - ipaddr_string(ndo, bp + 24)); + ND_PRINT(" for %s > %s", GET_IPADDR_STRING(bp + 20), + GET_IPADDR_STRING(bp + 24)); break; case PIMV1_TYPE_REGISTER_STOP: ND_TCHECK_LEN(bp + 12, sizeof(nd_ipv4)); - ND_PRINT(" for %s > %s", ipaddr_string(ndo, bp + 8), - ipaddr_string(ndo, bp + 12)); + ND_PRINT(" for %s > %s", GET_IPADDR_STRING(bp + 8), + GET_IPADDR_STRING(bp + 12)); break; case PIMV1_TYPE_RP_REACHABILITY: if (ndo->ndo_vflag) { ND_TCHECK_2(bp + 22); - ND_PRINT(" group %s", ipaddr_string(ndo, bp + 8)); + ND_PRINT(" group %s", GET_IPADDR_STRING(bp + 8)); if (GET_BE_U_4(bp + 12) != 0xffffffff) - ND_PRINT("/%s", ipaddr_string(ndo, bp + 12)); - ND_PRINT(" RP %s hold ", ipaddr_string(ndo, bp + 16)); + ND_PRINT("/%s", GET_IPADDR_STRING(bp + 12)); + ND_PRINT(" RP %s hold ", GET_IPADDR_STRING(bp + 16)); unsigned_relts_print(ndo, GET_BE_U_2(bp + 22)); } break; case PIMV1_TYPE_ASSERT: ND_TCHECK_LEN(bp + 16, sizeof(nd_ipv4)); - ND_PRINT(" for %s > %s", ipaddr_string(ndo, bp + 16), - ipaddr_string(ndo, bp + 8)); + ND_PRINT(" for %s > %s", GET_IPADDR_STRING(bp + 16), + GET_IPADDR_STRING(bp + 8)); if (GET_BE_U_4(bp + 12) != 0xffffffff) - ND_PRINT("/%s", ipaddr_string(ndo, bp + 12)); + ND_PRINT("/%s", GET_IPADDR_STRING(bp + 12)); ND_TCHECK_4(bp + 24); ND_PRINT(" %s pref %u metric %u", (GET_U_1(bp + 20) & 0x80) ? "RP-tree" : "SPT", @@ -422,7 +422,7 @@ cisco_autorp_print(netdissect_options *ndo, if (len < 4) goto trunc; ND_TCHECK_4(bp); - ND_PRINT(" RP %s", ipaddr_string(ndo, bp)); + ND_PRINT(" RP %s", GET_IPADDR_STRING(bp)); bp += 4; len -= 4; if (len < 1) @@ -454,7 +454,7 @@ cisco_autorp_print(netdissect_options *ndo, goto trunc; ND_TCHECK_6(bp); ND_PRINT("%c%s%s/%u", s, GET_U_1(bp) & 1 ? "!" : "", - ipaddr_string(ndo, bp + 2), GET_U_1(bp + 1)); + GET_IPADDR_STRING(bp + 2), GET_U_1(bp + 1)); if (GET_U_1(bp) & 0x02) { ND_PRINT(" bidir"); } @@ -632,11 +632,11 @@ pimv2_addr_print(netdissect_options *ndo, ND_TCHECK_LEN(bp, addr_len); if (af == AF_INET) { if (!silent) - ND_PRINT("%s", ipaddr_string(ndo, bp)); + ND_PRINT("%s", GET_IPADDR_STRING(bp)); } else if (af == AF_INET6) { if (!silent) - ND_PRINT("%s", ip6addr_string(ndo, bp)); + ND_PRINT("%s", GET_IP6ADDR_STRING(bp)); } return hdrlen + addr_len; case pimv2_group: @@ -646,14 +646,14 @@ pimv2_addr_print(netdissect_options *ndo, ND_TCHECK_LEN(bp, addr_len + 2); if (af == AF_INET) { if (!silent) { - ND_PRINT("%s", ipaddr_string(ndo, bp + 2)); + ND_PRINT("%s", GET_IPADDR_STRING(bp + 2)); if (GET_U_1(bp + 1) != 32) ND_PRINT("/%u", GET_U_1(bp + 1)); } } else if (af == AF_INET6) { if (!silent) { - ND_PRINT("%s", ip6addr_string(ndo, bp + 2)); + ND_PRINT("%s", GET_IP6ADDR_STRING(bp + 2)); if (GET_U_1(bp + 1) != 128) ND_PRINT("/%u", GET_U_1(bp + 1)); } @@ -940,8 +940,8 @@ pimv2_print(netdissect_options *ndo, case 0: /* Null header */ ND_TCHECK_4(ip->ip_dst); ND_PRINT("IP-Null-header %s > %s", - ipaddr_string(ndo, ip->ip_src), - ipaddr_string(ndo, ip->ip_dst)); + GET_IPADDR_STRING(ip->ip_src), + GET_IPADDR_STRING(ip->ip_dst)); break; case 4: /* IPv4 */ diff --git a/print-ppp.c b/print-ppp.c index b71f34bb..a2fa67d7 100644 --- a/print-ppp.c +++ b/print-ppp.c @@ -753,7 +753,7 @@ print_lcp_config_options(netdissect_options *ndo, return 0; } ND_TCHECK_4(p + 3); - ND_PRINT(": IPv4 %s", ipaddr_string(ndo, p + 3)); + ND_PRINT(": IPv4 %s", GET_IPADDR_STRING(p + 3)); break; case MEDCLASS_MAC: if (len != 9) { @@ -761,7 +761,7 @@ print_lcp_config_options(netdissect_options *ndo, return 0; } ND_TCHECK_6(p + 3); - ND_PRINT(": MAC %s", etheraddr_string(ndo, p + 3)); + ND_PRINT(": MAC %s", GET_ETHERADDR_STRING(p + 3)); break; case MEDCLASS_MNB: ND_PRINT(": Magic-Num-Block"); /* XXX */ @@ -1084,8 +1084,8 @@ print_ipcp_config_options(netdissect_options *ndo, } ND_TCHECK_4(p + 6); ND_PRINT(": src %s, dst %s", - ipaddr_string(ndo, p + 2), - ipaddr_string(ndo, p + 6)); + GET_IPADDR_STRING(p + 2), + GET_IPADDR_STRING(p + 6)); break; case IPCPOPT_IPCOMP: if (len < 4) { @@ -1170,7 +1170,7 @@ print_ipcp_config_options(netdissect_options *ndo, return 0; } ND_TCHECK_4(p + 2); - ND_PRINT(": %s", ipaddr_string(ndo, p + 2)); + ND_PRINT(": %s", GET_IPADDR_STRING(p + 2)); break; default: /* diff --git a/print-radius.c b/print-radius.c index ebecfbd0..78646b58 100644 --- a/print-radius.c +++ b/print-radius.c @@ -897,11 +897,11 @@ print_attr_address(netdissect_options *ndo, if (GET_BE_U_4(data) == 0xFFFFFFFE ) ND_PRINT("NAS Select"); else - ND_PRINT("%s",ipaddr_string(ndo, data)); + ND_PRINT("%s",GET_IPADDR_STRING(data)); break; default: - ND_PRINT("%s", ipaddr_string(ndo, data)); + ND_PRINT("%s", GET_IPADDR_STRING(data)); break; } @@ -930,7 +930,7 @@ print_attr_address6(netdissect_options *ndo, ND_TCHECK_16(data); - ND_PRINT("%s", ip6addr_string(ndo, data)); + ND_PRINT("%s", GET_IP6ADDR_STRING(data)); return; @@ -987,7 +987,7 @@ print_attr_mip6_home_link_prefix(netdissect_options *ndo, return; } - ND_PRINT("%s/%u", ip6addr_string(ndo, data + 1), GET_U_1(data)); + ND_PRINT("%s/%u", GET_IP6ADDR_STRING(data + 1), GET_U_1(data)); return; diff --git a/print-rip.c b/print-rip.c index c749c367..41ed7458 100644 --- a/print-rip.c +++ b/print-rip.c @@ -205,12 +205,12 @@ rip_entry_print_v1(netdissect_options *ndo, const u_char *p, } if (family == 0) { ND_PRINT("\n\t AFI 0, %s, metric: %u", - ipaddr_string(ndo, ni->rip_dest), + GET_IPADDR_STRING(ni->rip_dest), GET_BE_U_4(ni->rip_metric)); return (RIP_ROUTELEN); } /* BSD_AFNUM_INET */ ND_PRINT("\n\t %s, metric: %u", - ipaddr_string(ndo, ni->rip_dest), + GET_IPADDR_STRING(ni->rip_dest), GET_BE_U_4(ni->rip_metric)); return (RIP_ROUTELEN); trunc: @@ -274,12 +274,12 @@ rip_entry_print_v2(netdissect_options *ndo, const u_char *p, return (0); ND_PRINT("\n\t AFI %s, %15s/%-2d, tag 0x%04x, metric: %u, next-hop: ", tok2str(bsd_af_values, "%u", family), - ipaddr_string(ndo, ni->rip_dest), + GET_IPADDR_STRING(ni->rip_dest), mask2plen(GET_BE_U_4(ni->rip_dest_mask)), GET_BE_U_2(ni->rip_tag), GET_BE_U_4(ni->rip_metric)); if (GET_BE_U_4(ni->rip_router)) - ND_PRINT("%s", ipaddr_string(ndo, ni->rip_router)); + ND_PRINT("%s", GET_IPADDR_STRING(ni->rip_router)); else ND_PRINT("self"); } diff --git a/print-ripng.c b/print-ripng.c index 384fe9ca..be9c1b50 100644 --- a/print-ripng.c +++ b/print-ripng.c @@ -97,7 +97,7 @@ rip6_entry_print(netdissect_options *ndo, const struct netinfo6 *ni, u_int metri int l; uint16_t tag; - l = ND_PRINT("%s/%u", ip6addr_string(ndo, ni->rip6_dest), + l = ND_PRINT("%s/%u", GET_IP6ADDR_STRING(ni->rip6_dest), GET_U_1(ni->rip6_plen)); tag = GET_BE_U_2(ni->rip6_tag); if (tag) diff --git a/print-rpki-rtr.c b/print-rpki-rtr.c index 7457a16c..a51c4a1f 100644 --- a/print-rpki-rtr.c +++ b/print-rpki-rtr.c @@ -265,7 +265,7 @@ rpki_rtr_pdu_print(netdissect_options *ndo, const u_char *tptr, const u_int len, pdu = (const rpki_rtr_pdu_ipv4_prefix *)tptr; ND_PRINT("%sIPv4 Prefix %s/%u-%u, origin-as %u, flags 0x%02x", indent_string(indent+2), - ipaddr_string(ndo, pdu->prefix), + GET_IPADDR_STRING(pdu->prefix), GET_U_1(pdu->prefix_length), GET_U_1(pdu->max_length), GET_BE_U_4(pdu->as), GET_U_1(pdu->flags)); } @@ -281,7 +281,7 @@ rpki_rtr_pdu_print(netdissect_options *ndo, const u_char *tptr, const u_int len, pdu = (const rpki_rtr_pdu_ipv6_prefix *)tptr; ND_PRINT("%sIPv6 Prefix %s/%u-%u, origin-as %u, flags 0x%02x", indent_string(indent+2), - ip6addr_string(ndo, pdu->prefix), + GET_IP6ADDR_STRING(pdu->prefix), GET_U_1(pdu->prefix_length), GET_U_1(pdu->max_length), GET_BE_U_4(pdu->as), GET_U_1(pdu->flags)); } diff --git a/print-rrcp.c b/print-rrcp.c index 4aaae6d9..e18885f6 100644 --- a/print-rrcp.c +++ b/print-rrcp.c @@ -130,7 +130,7 @@ rrcp_print(netdissect_options *ndo, ND_PRINT(" downlink_port=%u, uplink_port=%u, uplink_mac=%s, vendor_id=%08x ,chip_id=%04x ", GET_U_1(cp + RRCP_DOWNLINK_PORT_OFFSET), GET_U_1(cp + RRCP_UPLINK_PORT_OFFSET), - etheraddr_string(ndo, cp + RRCP_UPLINK_MAC_OFFSET), + GET_ETHERADDR_STRING(cp + RRCP_UPLINK_MAC_OFFSET), GET_BE_U_4(cp + RRCP_VENDOR_ID_OFFSET), GET_BE_U_2(cp + RRCP_CHIP_ID_OFFSET)); }else if (rrcp_opcode==1 || rrcp_opcode==2 || rrcp_proto==2){ diff --git a/print-rsvp.c b/print-rsvp.c index 1be8a40c..c775425f 100644 --- a/print-rsvp.c +++ b/print-rsvp.c @@ -754,7 +754,7 @@ rsvp_obj_print(netdissect_options *ndo, return -1; ND_PRINT("%s IPv4 DestAddress: %s, Protocol ID: 0x%02x", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_U_1(obj_tptr + sizeof(nd_ipv4))); ND_PRINT("%s Flags: [0x%02x], DestPort %u", indent, @@ -768,7 +768,7 @@ rsvp_obj_print(netdissect_options *ndo, return -1; ND_PRINT("%s IPv6 DestAddress: %s, Protocol ID: 0x%02x", indent, - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_U_1(obj_tptr + sizeof(nd_ipv6))); ND_PRINT("%s Flags: [0x%02x], DestPort %u", indent, @@ -783,9 +783,9 @@ rsvp_obj_print(netdissect_options *ndo, return -1; ND_PRINT("%s IPv6 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s", indent, - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 18), - ip6addr_string(ndo, obj_tptr + 20)); + GET_IP6ADDR_STRING(obj_tptr + 20)); obj_tlen-=36; obj_tptr+=36; break; @@ -797,7 +797,7 @@ rsvp_obj_print(netdissect_options *ndo, indent, GET_BE_U_4(obj_tptr), GET_BE_U_2(obj_tptr + 6), - ip6addr_string(ndo, obj_tptr + 8)); + GET_IP6ADDR_STRING(obj_tptr + 8)); obj_tlen-=26; obj_tptr+=26; break; @@ -806,9 +806,9 @@ rsvp_obj_print(netdissect_options *ndo, return -1; ND_PRINT("%s IPv4 P2MP LSP ID: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 6), - ipaddr_string(ndo, obj_tptr + 8)); + GET_IPADDR_STRING(obj_tptr + 8)); obj_tlen-=12; obj_tptr+=12; break; @@ -818,9 +818,9 @@ rsvp_obj_print(netdissect_options *ndo, return -1; ND_PRINT("%s IPv4 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 6), - ipaddr_string(ndo, obj_tptr + 8)); + GET_IPADDR_STRING(obj_tptr + 8)); obj_tlen-=12; obj_tptr+=12; break; @@ -836,7 +836,7 @@ rsvp_obj_print(netdissect_options *ndo, return -1; ND_PRINT("%s IPv4 Receiver Address: %s", indent, - ipaddr_string(ndo, obj_tptr)); + GET_IPADDR_STRING(obj_tptr)); obj_tlen-=sizeof(nd_ipv4); obj_tptr+=sizeof(nd_ipv4); break; @@ -845,7 +845,7 @@ rsvp_obj_print(netdissect_options *ndo, return -1; ND_PRINT("%s IPv6 Receiver Address: %s", indent, - ip6addr_string(ndo, obj_tptr)); + GET_IP6ADDR_STRING(obj_tptr)); obj_tlen-=sizeof(nd_ipv6); obj_tptr+=sizeof(nd_ipv6); break; @@ -861,7 +861,7 @@ rsvp_obj_print(netdissect_options *ndo, return -1; ND_PRINT("%s IPv4 Notify Node Address: %s", indent, - ipaddr_string(ndo, obj_tptr)); + GET_IPADDR_STRING(obj_tptr)); obj_tlen-=sizeof(nd_ipv4); obj_tptr+=sizeof(nd_ipv4); break; @@ -870,7 +870,7 @@ rsvp_obj_print(netdissect_options *ndo, return-1; ND_PRINT("%s IPv6 Notify Node Address: %s", indent, - ip6addr_string(ndo, obj_tptr)); + GET_IP6ADDR_STRING(obj_tptr)); obj_tlen-=sizeof(nd_ipv6); obj_tptr+=sizeof(nd_ipv6); break; @@ -943,7 +943,7 @@ rsvp_obj_print(netdissect_options *ndo, return-1; ND_PRINT("%s Source Address: %s, Source Port: %u", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 6)); obj_tlen-=8; obj_tptr+=8; @@ -953,7 +953,7 @@ rsvp_obj_print(netdissect_options *ndo, return-1; ND_PRINT("%s Source Address: %s, Source Port: %u", indent, - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 18)); obj_tlen-=20; obj_tptr+=20; @@ -964,10 +964,10 @@ rsvp_obj_print(netdissect_options *ndo, ND_PRINT("%s IPv6 Tunnel Sender Address: %s, LSP ID: 0x%04x" "%s Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x", indent, - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 18), indent, - ip6addr_string(ndo, obj_tptr+20), + GET_IP6ADDR_STRING(obj_tptr+20), GET_BE_U_2(obj_tptr + 38)); obj_tlen-=40; obj_tptr+=40; @@ -977,7 +977,7 @@ rsvp_obj_print(netdissect_options *ndo, return-1; ND_PRINT("%s IPv4 Tunnel Sender Address: %s, LSP-ID: 0x%04x", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 6)); obj_tlen-=8; obj_tptr+=8; @@ -988,10 +988,10 @@ rsvp_obj_print(netdissect_options *ndo, ND_PRINT("%s IPv4 Tunnel Sender Address: %s, LSP ID: 0x%04x" "%s Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 6), indent, - ipaddr_string(ndo, obj_tptr+8), + GET_IPADDR_STRING(obj_tptr+8), GET_BE_U_2(obj_tptr + 12)); obj_tlen-=16; obj_tptr+=16; @@ -1121,7 +1121,7 @@ rsvp_obj_print(netdissect_options *ndo, } ND_PRINT(", %s, %s/%u, Flags: [%s]", RSVP_OBJ_XRO_MASK_LOOSE(GET_U_1(obj_tptr)) ? "Loose" : "Strict", - ipaddr_string(ndo, obj_tptr+2), + GET_IPADDR_STRING(obj_tptr+2), GET_U_1((obj_tptr + 6)), bittok2str(rsvp_obj_rro_flag_values, "none", @@ -1310,13 +1310,13 @@ rsvp_obj_print(netdissect_options *ndo, if (subobj_len < 8) return -1; ND_PRINT("%s UNI IPv4 TNA address: %s", - indent, ipaddr_string(ndo, obj_tptr + 4)); + indent, GET_IPADDR_STRING(obj_tptr + 4)); break; case AFNUM_INET6: if (subobj_len < 20) return -1; ND_PRINT("%s UNI IPv6 TNA address: %s", - indent, ip6addr_string(ndo, obj_tptr + 4)); + indent, GET_IP6ADDR_STRING(obj_tptr + 4)); break; case AFNUM_NSAP: if (subobj_len) { @@ -1379,7 +1379,7 @@ rsvp_obj_print(netdissect_options *ndo, return-1; ND_PRINT("%s Previous/Next Interface: %s, Logical Interface Handle: 0x%08x", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_4(obj_tptr + 4)); obj_tlen-=8; obj_tptr+=8; @@ -1392,7 +1392,7 @@ rsvp_obj_print(netdissect_options *ndo, return-1; ND_PRINT("%s Previous/Next Interface: %s, Logical Interface Handle: 0x%08x", indent, - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_BE_U_4(obj_tptr + 16)); obj_tlen-=20; obj_tptr+=20; @@ -1468,7 +1468,7 @@ rsvp_obj_print(netdissect_options *ndo, return-1; ND_PRINT("%s Source Address: %s, Source Port: %u", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 6)); obj_tlen-=8; obj_tptr+=8; @@ -1478,7 +1478,7 @@ rsvp_obj_print(netdissect_options *ndo, return-1; ND_PRINT("%s Source Address: %s, Source Port: %u", indent, - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 18)); obj_tlen-=20; obj_tptr+=20; @@ -1488,7 +1488,7 @@ rsvp_obj_print(netdissect_options *ndo, return-1; ND_PRINT("%s Source Address: %s, Flow Label: %u", indent, - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_BE_U_3(obj_tptr + 17)); obj_tlen-=20; obj_tptr+=20; @@ -1498,7 +1498,7 @@ rsvp_obj_print(netdissect_options *ndo, return-1; ND_PRINT("%s Source Address: %s, LSP-ID: 0x%04x", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 18)); obj_tlen-=20; obj_tptr+=20; @@ -1509,10 +1509,10 @@ rsvp_obj_print(netdissect_options *ndo, ND_PRINT("%s IPv6 Tunnel Sender Address: %s, LSP ID: 0x%04x" "%s Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x", indent, - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 18), indent, - ip6addr_string(ndo, obj_tptr+20), + GET_IP6ADDR_STRING(obj_tptr+20), GET_BE_U_2(obj_tptr + 38)); obj_tlen-=40; obj_tptr+=40; @@ -1522,7 +1522,7 @@ rsvp_obj_print(netdissect_options *ndo, return-1; ND_PRINT("%s Source Address: %s, LSP-ID: 0x%04x", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 6)); obj_tlen-=8; obj_tptr+=8; @@ -1533,10 +1533,10 @@ rsvp_obj_print(netdissect_options *ndo, ND_PRINT("%s IPv4 Tunnel Sender Address: %s, LSP ID: 0x%04x" "%s Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_BE_U_2(obj_tptr + 6), indent, - ipaddr_string(ndo, obj_tptr+8), + GET_IPADDR_STRING(obj_tptr+8), GET_BE_U_2(obj_tptr + 12)); obj_tlen-=16; obj_tptr+=16; @@ -1599,8 +1599,8 @@ rsvp_obj_print(netdissect_options *ndo, while(obj_tlen >= 8) { ND_PRINT("%s PLR-ID: %s, Avoid-Node-ID: %s", indent, - ipaddr_string(ndo, obj_tptr), - ipaddr_string(ndo, obj_tptr + 4)); + GET_IPADDR_STRING(obj_tptr), + GET_IPADDR_STRING(obj_tptr + 4)); obj_tlen-=8; obj_tptr+=8; } @@ -1635,7 +1635,7 @@ rsvp_obj_print(netdissect_options *ndo, error_value=GET_BE_U_2(obj_tptr + 6); ND_PRINT("%s Error Node Address: %s, Flags: [0x%02x]%s Error Code: %s (%u)", indent, - ipaddr_string(ndo, obj_tptr), + GET_IPADDR_STRING(obj_tptr), GET_U_1(obj_tptr + 4), indent, tok2str(rsvp_obj_error_code_values,"unknown",error_code), @@ -1667,7 +1667,7 @@ rsvp_obj_print(netdissect_options *ndo, error_value=GET_BE_U_2(obj_tptr + 18); ND_PRINT("%s Error Node Address: %s, Flags: [0x%02x]%s Error Code: %s (%u)", indent, - ip6addr_string(ndo, obj_tptr), + GET_IP6ADDR_STRING(obj_tptr), GET_U_1(obj_tptr + 16), indent, tok2str(rsvp_obj_error_code_values,"unknown",error_code), @@ -1855,7 +1855,7 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 4) return-1; ND_PRINT("%s Sub-LSP destination address: %s", - indent, ipaddr_string(ndo, obj_tptr)); + indent, GET_IPADDR_STRING(obj_tptr)); obj_tlen-=4; obj_tptr+=4; @@ -1864,7 +1864,7 @@ rsvp_obj_print(netdissect_options *ndo, if (obj_tlen < 16) return-1; ND_PRINT("%s Sub-LSP destination address: %s", - indent, ip6addr_string(ndo, obj_tptr)); + indent, GET_IP6ADDR_STRING(obj_tptr)); obj_tlen-=16; obj_tptr+=16; diff --git a/print-rt6.c b/print-rt6.c index 70301106..a6886f94 100644 --- a/print-rt6.c +++ b/print-rt6.c @@ -72,7 +72,7 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_) p = (const u_char *) dp0->ip6r0_addr; for (i = 0; i < len; i++) { ND_TCHECK_16(p); - ND_PRINT(", [%u]%s", i, ip6addr_string(ndo, p)); + ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p)); p += 16; } /*(*/ @@ -99,7 +99,7 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_) p = (const u_char *) srh->srh_segments; for (i = 0; i < len; i++) { ND_TCHECK_16(p); - ND_PRINT(", [%u]%s", i, ip6addr_string(ndo, p)); + ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p)); p += 16; } /*(*/ diff --git a/print-sflow.c b/print-sflow.c index 4a8e5a97..ba79e6a6 100644 --- a/print-sflow.c +++ b/print-sflow.c @@ -893,7 +893,7 @@ sflow_print(netdissect_options *ndo, ND_PRINT("sFlowv%u, %s agent %s, agent-id %u, length %u", GET_BE_U_4(sflow_datagram->version), GET_BE_U_4(sflow_datagram->ip_version) == 1 ? "IPv4" : "IPv6", - ipaddr_string(ndo, sflow_datagram->agent), + GET_IPADDR_STRING(sflow_datagram->agent), GET_BE_U_4(sflow_datagram->agent_id), len); return; @@ -904,7 +904,7 @@ sflow_print(netdissect_options *ndo, ND_PRINT("sFlowv%u, %s agent %s, agent-id %u, seqnum %u, uptime %u, samples %u, length %u", GET_BE_U_4(sflow_datagram->version), GET_BE_U_4(sflow_datagram->ip_version) == 1 ? "IPv4" : "IPv6", - ipaddr_string(ndo, sflow_datagram->agent), + GET_IPADDR_STRING(sflow_datagram->agent), GET_BE_U_4(sflow_datagram->agent_id), GET_BE_U_4(sflow_datagram->seqnum), GET_BE_U_4(sflow_datagram->uptime), diff --git a/print-sll.c b/print-sll.c index d165da22..50335879 100644 --- a/print-sll.c +++ b/print-sll.c @@ -163,7 +163,7 @@ sll_print(netdissect_options *ndo, const struct sll_header *sllp, u_int length) * XXX - print others as strings of hex? */ if (GET_BE_U_2(sllp->sll_halen) == 6) - ND_PRINT("%s ", etheraddr_string(ndo, sllp->sll_addr)); + ND_PRINT("%s ", GET_ETHERADDR_STRING(sllp->sll_addr)); if (!ndo->ndo_qflag) { ether_type = GET_BE_U_2(sllp->sll_protocol); @@ -352,7 +352,7 @@ sll2_print(netdissect_options *ndo, const struct sll2_header *sllp, u_int length * XXX - print others as strings of hex? */ if (GET_U_1(sllp->sll2_halen) == 6) - ND_PRINT("%s ", etheraddr_string(ndo, sllp->sll2_addr)); + ND_PRINT("%s ", GET_ETHERADDR_STRING(sllp->sll2_addr)); if (!ndo->ndo_qflag) { ether_type = GET_BE_U_2(sllp->sll2_protocol); diff --git a/print-slow.c b/print-slow.c index 1eb4c96a..27a814b9 100644 --- a/print-slow.c +++ b/print-slow.c @@ -418,7 +418,7 @@ slow_marker_lacp_print(netdissect_options *ndo, ND_PRINT("\n\t System %s, System Priority %u, Key %u" ", Port %u, Port Priority %u\n\t State Flags [%s]", - etheraddr_string(ndo, tlv_ptr.lacp_tlv_actor_partner_info->sys), + GET_ETHERADDR_STRING(tlv_ptr.lacp_tlv_actor_partner_info->sys), GET_BE_U_2(tlv_ptr.lacp_tlv_actor_partner_info->sys_pri), GET_BE_U_2(tlv_ptr.lacp_tlv_actor_partner_info->key), GET_BE_U_2(tlv_ptr.lacp_tlv_actor_partner_info->port), @@ -455,7 +455,7 @@ slow_marker_lacp_print(netdissect_options *ndo, tlv_ptr.marker_tlv_marker_info = (const struct marker_tlv_marker_info_t *)tlv_tptr; ND_PRINT("\n\t Request System %s, Request Port %u, Request Transaction ID 0x%08x", - etheraddr_string(ndo, tlv_ptr.marker_tlv_marker_info->req_sys), + GET_ETHERADDR_STRING(tlv_ptr.marker_tlv_marker_info->req_sys), GET_BE_U_2(tlv_ptr.marker_tlv_marker_info->req_port), GET_BE_U_4(tlv_ptr.marker_tlv_marker_info->req_trans_id)); diff --git a/print-vqp.c b/print-vqp.c index b0fba902..e120de16 100644 --- a/print-vqp.c +++ b/print-vqp.c @@ -181,7 +181,7 @@ vqp_print(netdissect_options *ndo, const u_char *pptr, u_int len) case VQP_OBJ_IP_ADDRESS: if (vqp_obj_len != 4) goto trunc; - ND_PRINT("%s (0x%08x)", ipaddr_string(ndo, tptr), + ND_PRINT("%s (0x%08x)", GET_IPADDR_STRING(tptr), GET_BE_U_4(tptr)); break; /* those objects have similar semantics - fall through */ @@ -196,7 +196,7 @@ vqp_print(netdissect_options *ndo, const u_char *pptr, u_int len) case VQP_OBJ_MAC_NULL: if (vqp_obj_len != MAC_ADDR_LEN) goto trunc; - ND_PRINT("%s", etheraddr_string(ndo, tptr)); + ND_PRINT("%s", GET_ETHERADDR_STRING(tptr)); break; default: if (ndo->ndo_vflag <= 1) diff --git a/print-vrrp.c b/print-vrrp.c index 400dc714..2739e37c 100644 --- a/print-vrrp.c +++ b/print-vrrp.c @@ -164,7 +164,7 @@ vrrp_print(netdissect_options *ndo, bp += 8; for (i = 0; i < naddrs; i++) { ND_TCHECK_1(bp + 3); - ND_PRINT("%c%s", c, ipaddr_string(ndo, bp)); + ND_PRINT("%c%s", c, GET_IPADDR_STRING(bp)); c = ','; bp += 4; } diff --git a/print-vtp.c b/print-vtp.c index bcd0bab3..df906108 100644 --- a/print-vtp.c +++ b/print-vtp.c @@ -184,7 +184,7 @@ vtp_print(netdissect_options *ndo, ND_TCHECK_8(tptr); ND_PRINT("\n\t Config Rev %x, Updater %s", GET_BE_U_4(tptr), - ipaddr_string(ndo, tptr+4)); + GET_IPADDR_STRING(tptr+4)); tptr += 8; ND_TCHECK_LEN(tptr, VTP_UPDATE_TIMESTAMP_LEN); ND_PRINT(", Timestamp 0x%08x 0x%08x 0x%08x", @@ -192,10 +192,10 @@ wb_id(netdissect_options *ndo, ND_PRINT(" %u/%s:%u (max %u/%s:%u) ", GET_BE_U_4(id->pi_ps.slot), - ipaddr_string(ndo, id->pi_ps.page.p_sid), + GET_IPADDR_STRING(id->pi_ps.page.p_sid), GET_BE_U_4(id->pi_ps.page.p_uid), GET_BE_U_4(id->pi_mslot), - ipaddr_string(ndo, id->pi_mpage.p_sid), + GET_IPADDR_STRING(id->pi_mpage.p_sid), GET_BE_U_4(id->pi_mpage.p_uid)); nid = GET_BE_U_2(id->pi_ps.nid); @@ -211,7 +211,7 @@ wb_id(netdissect_options *ndo, c = '<'; for (i = 0; i < nid && ND_TTEST_SIZE(io); ++io, ++i) { ND_PRINT("%c%s:%u", - c, ipaddr_string(ndo, io->id), GET_BE_U_4(io->off)); + c, GET_IPADDR_STRING(io->id), GET_BE_U_4(io->off)); c = ','; } if (i >= nid) { @@ -230,8 +230,8 @@ wb_rreq(netdissect_options *ndo, return (-1); ND_PRINT(" please repair %s %s:%u<%u:%u>", - ipaddr_string(ndo, rreq->pr_id), - ipaddr_string(ndo, rreq->pr_page.p_sid), + GET_IPADDR_STRING(rreq->pr_id), + GET_IPADDR_STRING(rreq->pr_page.p_sid), GET_BE_U_4(rreq->pr_page.p_uid), GET_BE_U_4(rreq->pr_sseq), GET_BE_U_4(rreq->pr_eseq)); @@ -248,7 +248,7 @@ wb_preq(netdissect_options *ndo, ND_PRINT(" need %u/%s:%u", GET_BE_U_4(preq->pp_low), - ipaddr_string(ndo, preq->pp_page.p_sid), + GET_IPADDR_STRING(preq->pp_page.p_sid), GET_BE_U_4(preq->pp_page.p_uid)); return (0); } @@ -272,11 +272,11 @@ wb_prep(netdissect_options *ndo, ND_PRINT(" %u/%s:%u", GET_BE_U_4(ps->slot), - ipaddr_string(ndo, ps->page.p_sid), + GET_IPADDR_STRING(ps->page.p_sid), GET_BE_U_4(ps->page.p_uid)); io = (const struct id_off *)(ps + 1); for (ie = io + GET_U_1(ps->nid); io < ie && ND_TTEST_SIZE(io); ++io) { - ND_PRINT("%c%s:%u", c, ipaddr_string(ndo, io->id), + ND_PRINT("%c%s:%u", c, GET_IPADDR_STRING(io->id), GET_BE_U_4(io->off)); c = ','; } @@ -356,8 +356,8 @@ wb_rrep(netdissect_options *ndo, len -= sizeof(*rrep); ND_PRINT(" for %s %s:%u<%u:%u>", - ipaddr_string(ndo, rrep->pr_id), - ipaddr_string(ndo, dop->pd_page.p_sid), + GET_IPADDR_STRING(rrep->pr_id), + GET_IPADDR_STRING(dop->pd_page.p_sid), GET_BE_U_4(dop->pd_page.p_uid), GET_BE_U_4(dop->pd_sseq), GET_BE_U_4(dop->pd_eseq)); @@ -379,7 +379,7 @@ wb_drawop(netdissect_options *ndo, len -= sizeof(*dop); ND_PRINT(" %s:%u<%u:%u>", - ipaddr_string(ndo, dop->pd_page.p_sid), + GET_IPADDR_STRING(dop->pd_page.p_sid), GET_BE_U_4(dop->pd_page.p_uid), GET_BE_U_4(dop->pd_sseq), GET_BE_U_4(dop->pd_eseq)); |