From 3db38df8ed9dcd8191438bb69e2ddbda6d90ed61 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 30 Jan 2018 17:29:33 -0800 Subject: Use nd_ipv6 rather than struct in6_addr in packet-layout structures. Also, use it, and nd_ipv4, in sizeof() operations. --- print-ldp.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'print-ldp.c') diff --git a/print-ldp.c b/print-ldp.c index ce0489b0..4f89186a 100644 --- a/print-ldp.c +++ b/print-ldp.c @@ -303,19 +303,19 @@ ldp_tlv_print(netdissect_options *ndo, tok2str(af_values, "Unknown (%u)", af)); switch (af) { case AFNUM_INET: - while(tlv_tlen >= sizeof(struct in_addr)) { - ND_TCHECK_LEN(tptr, sizeof(struct in_addr)); + while(tlv_tlen >= sizeof(nd_ipv4)) { + ND_TCHECK_LEN(tptr, sizeof(nd_ipv4)); ND_PRINT(" %s", ipaddr_string(ndo, tptr)); - tlv_tlen-=sizeof(struct in_addr); - tptr+=sizeof(struct in_addr); + tlv_tlen-=sizeof(nd_ipv4); + tptr+=sizeof(nd_ipv4); } break; case AFNUM_INET6: - while(tlv_tlen >= sizeof(struct in6_addr)) { - ND_TCHECK_LEN(tptr, sizeof(struct in6_addr)); + while(tlv_tlen >= sizeof(nd_ipv6)) { + ND_TCHECK_LEN(tptr, sizeof(nd_ipv6)); ND_PRINT(" %s", ip6addr_string(ndo, tptr)); - tlv_tlen-=sizeof(struct in6_addr); - tptr+=sizeof(struct in6_addr); + tlv_tlen-=sizeof(nd_ipv6); + tptr+=sizeof(nd_ipv6); } break; default: -- cgit v1.2.1