OpenFlow: Have a function for each message type.

[tcpdump] / print-lisp.c

diff --git a/print-lisp.c b/print-lisp.c
index ab8feca66934338973b6a369b3a1e29d903dbfcc..920bfceb1ea1784a5ca7dbdcf2ca281158d10199 100644 (file)
--- a/print-lisp.c
+++ b/print-lisp.c
@@ -307,14 +307,12 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
                switch (eid_afi) {
                case IPv4_AFI:
 
                switch (eid_afi) {
                case IPv4_AFI:

-                       ND_TCHECK_4(packet_iterator + packet_offset);

                        ND_PRINT(" EID %s/%u,",
                                GET_IPADDR_STRING(packet_iterator + packet_offset),
                                mask_len);
                        packet_offset += 4;
                        break;
                case IPv6_AFI:
                        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,",
                                GET_IP6ADDR_STRING(packet_iterator + packet_offset),
                                mask_len);
                        ND_PRINT(" EID %s/%u,",
                                GET_IP6ADDR_STRING(packet_iterator + packet_offset),
                                mask_len);


@@ -376,14 +374,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;
        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) {
                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,
-                               ND_BYTES_AVAILABLE_AFTER(packet_iterator + packet_offset), 0);
+                       hex_print(ndo, "\n    Data: ", packet_iterator + packet_offset,
+                               ND_BYTES_AVAILABLE_AFTER(packet_iterator + packet_offset));

                }
        }
        return;
                }
        }
        return;


@@ -392,7 +390,6 @@ trunc:
        return;
 invalid:
        nd_print_invalid(ndo);
        return;
 invalid:
        nd_print_invalid(ndo);

-       return;

 }
 
 static uint8_t
 }
 
 static uint8_t


@@ -432,8 +429,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)));
        }
                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)
 }
 
 static void action_flag(netdissect_options *ndo, uint8_t act_auth_inc_res)