Include <string.h> only if required.

[tcpdump] / print-lisp.c

diff --git a/print-lisp.c b/print-lisp.c
index a7d088d4b5d31c33e36483e848b1112b35e4f6b9..379bffbbbdf4cf0e9e9bfe699fa824e6cb561713 100644 (file)
--- a/print-lisp.c
+++ b/print-lisp.c
@@ -100,7 +100,6 @@
 
 #include "netdissect-stdinc.h"
 #include "netdissect.h"
-#include <string.h>
 #include <stdlib.h>
 
 #include "ip.h"
@@ -307,15 +306,15 @@ 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 +341,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:
@@ -374,14 +373,14 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
        if (xtr_present) {
                if (!ND_TTEST_LEN(packet_iterator + packet_offset, 24))
                        goto invalid;
-               hex_print_with_offset(ndo, "\n    xTR-ID: ", packet_iterator + packet_offset, 16, 0);
+               hex_print(ndo, "\n    xTR-ID: ", packet_iterator + packet_offset, 16);
                ND_PRINT("\n    SITE-ID: %" PRIu64,
                        GET_BE_U_8(packet_iterator + packet_offset + 16));
        } else {
                /* Check if packet isn't over yet */
                if (packet_iterator + packet_offset < ndo->ndo_snapend) {
-                       hex_print_with_offset(ndo, "\n    Data: ", packet_iterator + packet_offset,
-                               (ndo->ndo_snapend - (packet_iterator + packet_offset)), 0);
+                       hex_print(ndo, "\n    Data: ", packet_iterator + packet_offset,
+                               ND_BYTES_AVAILABLE_AFTER(packet_iterator + packet_offset));
                }
        }
        return;
@@ -390,7 +389,6 @@ trunc:
        return;
 invalid:
        nd_print_invalid(ndo);
-       return;
 }
 
 static uint8_t
@@ -430,8 +428,6 @@ static void lisp_hdr_flag(netdissect_options *ndo, const lisp_map_register_hdr *
                ND_PRINT(" flags [%s],", bittok2str(map_notify_hdr_flag,
                         "none", GET_BE_U_4(lisp_hdr)));
        }
-
-       return;
 }
 
 static void action_flag(netdissect_options *ndo, uint8_t act_auth_inc_res)