bumped version

[tcpdump] / print-lisp.c

diff --git a/print-lisp.c b/print-lisp.c
index 325f9840fa00c14ff2a29dde7485a0c301ea6129..e9a2bc136df83de043a84d8aaecd8561395ec79c 100644 (file)
--- a/print-lisp.c
+++ b/print-lisp.c
@@ -93,7 +93,6 @@
  *  +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
 
  *  +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
 

-

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif


@@ -109,6 +108,8 @@
 #include "extract.h"
 #include "addrtoname.h"
 
 #include "extract.h"
 #include "addrtoname.h"
 

+static const char tstr[] = " [|LISP]";
+

 #define IPv4_AFI                       1
 #define IPv6_AFI                       2
 #define TYPE_INDEX                     4
 #define IPv4_AFI                       1
 #define IPv6_AFI                       2
 #define TYPE_INDEX                     4


@@ -278,7 +279,7 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
        packet_offset += auth_data_len;
 
        if (record_count == 0)
        packet_offset += auth_data_len;
 
        if (record_count == 0)

-               goto malformed;
+               goto invalid;

 
        /* Print all the EID records */
        while ((length > packet_offset) && (record_count--)) {
 
        /* Print all the EID records */
        while ((length > packet_offset) && (record_count--)) {


@@ -304,13 +305,13 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
                switch (eid_afi) {
                case IPv4_AFI:
                        ND_TCHECK2(*(packet_iterator + packet_offset), 4);
                switch (eid_afi) {
                case IPv4_AFI:
                        ND_TCHECK2(*(packet_iterator + packet_offset), 4);

-                       ND_PRINT((ndo, " EID %s/%u,", getname(ndo,
+                       ND_PRINT((ndo, " EID %s/%u,", ipaddr_string(ndo,

                                packet_iterator + packet_offset), mask_len));
                        packet_offset += 4;
                        break;
                case IPv6_AFI:
                        ND_TCHECK2(*(packet_iterator + packet_offset), 16);
                                packet_iterator + packet_offset), mask_len));
                        packet_offset += 4;
                        break;
                case IPv6_AFI:
                        ND_TCHECK2(*(packet_iterator + packet_offset), 16);

-                       ND_PRINT((ndo, " EID %s/%u,", getname6(ndo,
+                       ND_PRINT((ndo, " EID %s/%u,", ip6addr_string(ndo,

                                packet_iterator + packet_offset), mask_len));
                        packet_offset += 16;
                        break;
                                packet_iterator + packet_offset), mask_len));
                        packet_offset += 16;
                        break;


@@ -337,12 +338,12 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
                        switch (loc_afi) {
                        case IPv4_AFI:
                                ND_TCHECK2(*(packet_iterator + packet_offset), 4);
                        switch (loc_afi) {
                        case IPv4_AFI:
                                ND_TCHECK2(*(packet_iterator + packet_offset), 4);

-                               ND_PRINT((ndo, " LOC %s", getname(ndo, loc_ip_pointer)));
+                               ND_PRINT((ndo, " LOC %s", ipaddr_string(ndo, loc_ip_pointer)));

                                packet_offset += 4;
                                break;
                        case IPv6_AFI:
                                ND_TCHECK2(*(packet_iterator + packet_offset), 16);
                                packet_offset += 4;
                                break;
                        case IPv6_AFI:
                                ND_TCHECK2(*(packet_iterator + packet_offset), 16);

-                               ND_PRINT((ndo, " LOC %s", getname6(ndo, loc_ip_pointer)));
+                               ND_PRINT((ndo, " LOC %s", ip6addr_string(ndo, loc_ip_pointer)));

                                packet_offset += 16;
                                break;
                        default:
                                packet_offset += 16;
                                break;
                        default:


@@ -359,13 +360,13 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
        }
 
        /*
        }
 
        /*

-        * Print xTR and Site ID. Handle the fact that the packet could be malformed.
+        * Print xTR and Site ID. Handle the fact that the packet could be invalid.

         * If the xTR_ID_Present bit is not set, and we still have data to display,
         * show it as hex data.
         */
        if (xtr_present) {
                if (!ND_TTEST2(*(packet_iterator + packet_offset), 24))
         * If the xTR_ID_Present bit is not set, and we still have data to display,
         * show it as hex data.
         */
        if (xtr_present) {
                if (!ND_TTEST2(*(packet_iterator + packet_offset), 24))

-                       goto malformed;
+                       goto invalid;

                hex_print_with_offset(ndo, "\n    xTR-ID: ", packet_iterator + packet_offset, 16, 0);
                ND_PRINT((ndo, "\n    SITE-ID: %" PRIu64,
                        EXTRACT_64BITS(packet_iterator + packet_offset + 16)));
                hex_print_with_offset(ndo, "\n    xTR-ID: ", packet_iterator + packet_offset, 16, 0);
                ND_PRINT((ndo, "\n    SITE-ID: %" PRIu64,
                        EXTRACT_64BITS(packet_iterator + packet_offset + 16)));


@@ -378,14 +379,13 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
        }
        return;
 trunc:
        }
        return;
 trunc:

-       ND_PRINT((ndo, "\n    [|LISP]"));
+       ND_PRINT((ndo, "\n   %s", tstr));

        return;
        return;

-malformed:
-       ND_PRINT((ndo, "\n    (malformed-packet)"));
+invalid:
+       ND_PRINT((ndo, "\n   %s", istr));

        return;
 }
 
        return;
 }
 

-

 static inline uint8_t extract_lisp_type(uint8_t lisp_hdr_flags)
 {
        return (lisp_hdr_flags) >> TYPE_INDEX;
 static inline uint8_t extract_lisp_type(uint8_t lisp_hdr_flags)
 {
        return (lisp_hdr_flags) >> TYPE_INDEX;


@@ -425,7 +425,6 @@ static void lisp_hdr_flag(netdissect_options *ndo, const lisp_map_register_hdr *
        return;
 }
 
        return;
 }
 

-

 static void action_flag(netdissect_options *ndo, uint8_t act_auth_inc_res)
 {
        uint8_t action;
 static void action_flag(netdissect_options *ndo, uint8_t act_auth_inc_res)
 {
        uint8_t action;


@@ -442,7 +441,6 @@ static void action_flag(netdissect_options *ndo, uint8_t act_auth_inc_res)
        ND_PRINT((ndo, " %s,", tok2str(lisp_eid_action, "unknown", action)));
 }
 
        ND_PRINT((ndo, " %s,", tok2str(lisp_eid_action, "unknown", action)));
 }
 

-

 static void loc_hdr_flag(netdissect_options *ndo, uint16_t flag)
 {
        ND_PRINT((ndo, " flags [%s],", bittok2str(lisp_loc_flag, "none", flag)));
 static void loc_hdr_flag(netdissect_options *ndo, uint16_t flag)
 {
        ND_PRINT((ndo, " flags [%s],", bittok2str(lisp_loc_flag, "none", flag)));