Use C99 macros to define 64-bit constants and maximum 64-bit values.

[tcpdump] / print-lisp.c

diff --git a/print-lisp.c b/print-lisp.c
index ddddc2e9a2e8b66d24172475b82cdfc710ddcf54..a2a458b8b49b605aac959a4a6f82ff49d47679d0 100644 (file)
--- a/print-lisp.c
+++ b/print-lisp.c
@@ -26,9 +26,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

+/* \summary: - Locator/Identifier Separation Protocol (LISP) printer */
+

 /*
 /*

- * tcpdump filter for LISP - Locator/Identifier Separation Protocol
- * RFC 6830
+ * specification: RFC 6830

  *
  *
  * The Map-Register message format is:
  *
  *
  * The Map-Register message format is:


@@ -93,21 +94,17 @@
  *  +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
 
  *  +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
 

+#include <config.h>

 
 

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "netdissect-stdinc.h"

 
 

-#include <netdissect-stdinc.h>
-#include <netdissect.h>
-#include <string.h>
-#include <stdlib.h>
+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect.h"

 
 #include "ip.h"
 #include "ip6.h"
 
 #include "extract.h"
 
 #include "ip.h"
 #include "ip6.h"
 
 #include "extract.h"

-#include "interface.h"

 #include "addrtoname.h"
 
 #define IPv4_AFI                       1
 #include "addrtoname.h"
 
 #define IPv4_AFI                       1


@@ -131,12 +128,12 @@ enum {
 };
 
 static const struct tok lisp_type [] = {
 };
 
 static const struct tok lisp_type [] = {

-       { 0, "LISP-Reserved"                    },
-       { 1, "LISP-Map-Request"                 },
-       { 2, "LISP-Map-Reply"                   },
-       { 3, "LISP-Map-Register"                },
-       { 4, "LISP-Map-Notify"                  },
-       { 8, "LISP-Encapsulated-Contol-Message" },
+       { 0, "LISP-Reserved"                     },
+       { 1, "LISP-Map-Request"                  },
+       { 2, "LISP-Map-Reply"                    },
+       { 3, "LISP-Map-Register"                 },
+       { 4, "LISP-Map-Notify"                   },
+       { 8, "LISP-Encapsulated-Control-Message" },

        { 0, NULL }
 };
 
        { 0, NULL }
 };
 


@@ -187,49 +184,50 @@ static const struct tok lisp_loc_flag[] = {
 };
 
 typedef struct map_register_hdr {
 };
 
 typedef struct map_register_hdr {

-       uint8_t type_and_flag;
-       uint8_t reserved;
-       uint8_t reserved_and_flag2;
-       uint8_t record_count;
-       uint64_t nonce;
-       uint16_t key_id;
-       uint16_t auth_data_len;
-} UNALIGNED lisp_map_register_hdr;
+       nd_uint8_t type_and_flag;
+       nd_uint8_t reserved;
+       nd_uint8_t reserved_and_flag2;
+       nd_uint8_t record_count;
+       nd_uint64_t nonce;
+       nd_uint16_t key_id;
+       nd_uint16_t auth_data_len;
+} lisp_map_register_hdr;

 
 #define MAP_REGISTER_HDR_LEN sizeof(lisp_map_register_hdr)
 
 typedef struct map_register_eid {
 
 #define MAP_REGISTER_HDR_LEN sizeof(lisp_map_register_hdr)
 
 typedef struct map_register_eid {

-       uint32_t ttl;
-       uint8_t locator_count;
-       uint8_t eid_prefix_mask_length;
-       uint8_t act_auth_inc_res;
-       uint8_t reserved;
-       uint8_t reserved_version_hi;
-       uint8_t version_low;
-       uint16_t eid_prefix_afi;
-} UNALIGNED lisp_map_register_eid;
+       nd_uint32_t ttl;
+       nd_uint8_t locator_count;
+       nd_uint8_t eid_prefix_mask_length;
+       nd_uint8_t act_auth_inc_res;
+       nd_uint8_t reserved;
+       nd_uint16_t reserved_and_version;
+       nd_uint16_t eid_prefix_afi;
+} lisp_map_register_eid;

 
 #define MAP_REGISTER_EID_LEN sizeof(lisp_map_register_eid)
 
 typedef struct map_register_loc {
 
 #define MAP_REGISTER_EID_LEN sizeof(lisp_map_register_eid)
 
 typedef struct map_register_loc {

-       uint8_t priority;
-       uint8_t weight;
-       uint8_t m_priority;
-       uint8_t m_weight;
-       uint16_t unused_and_flag;
-       uint16_t locator_afi;
-} UNALIGNED lisp_map_register_loc;
+       nd_uint8_t priority;
+       nd_uint8_t weight;
+       nd_uint8_t m_priority;
+       nd_uint8_t m_weight;
+       nd_uint16_t unused_and_flag;
+       nd_uint16_t locator_afi;
+} lisp_map_register_loc;

 
 #define MAP_REGISTER_LOC_LEN sizeof(lisp_map_register_loc)
 
 
 #define MAP_REGISTER_LOC_LEN sizeof(lisp_map_register_loc)
 

-static inline uint8_t extract_lisp_type(uint8_t);
-static inline uint8_t is_xtr_data_present(uint8_t , uint8_t);
+static uint8_t extract_lisp_type(uint8_t);
+static uint8_t is_xtr_data_present(uint8_t, uint8_t);

 static void lisp_hdr_flag(netdissect_options *, const lisp_map_register_hdr *);
 static void action_flag(netdissect_options *, uint8_t);
 static void loc_hdr_flag(netdissect_options *, uint16_t);
 
 static void lisp_hdr_flag(netdissect_options *, const lisp_map_register_hdr *);
 static void action_flag(netdissect_options *, uint8_t);
 static void loc_hdr_flag(netdissect_options *, uint16_t);
 

-void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
+void
+lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)

 {
 {

+       uint8_t type_and_flag;

        uint8_t type;
        uint8_t mask_len;
        uint8_t loc_count;
        uint8_t type;
        uint8_t mask_len;
        uint8_t loc_count;


@@ -242,159 +240,159 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
        uint16_t packet_offset;
        uint16_t auth_data_len;
        uint32_t ttl;
        uint16_t packet_offset;
        uint16_t auth_data_len;
        uint32_t ttl;

-       const u_char *packet_iterator;
-       const u_char *loc_ip_pointer;

        const lisp_map_register_hdr *lisp_hdr;
        const lisp_map_register_eid *lisp_eid;
        const lisp_map_register_loc *lisp_loc;
 
        const lisp_map_register_hdr *lisp_hdr;
        const lisp_map_register_eid *lisp_eid;
        const lisp_map_register_loc *lisp_loc;
 

-       /* Check if enough bytes for header are available */
-       ND_TCHECK2(*bp, MAP_REGISTER_HDR_LEN);
+       ndo->ndo_protocol = "lisp";

        lisp_hdr = (const lisp_map_register_hdr *) bp;
        lisp_hdr_flag(ndo, lisp_hdr);
        /* Supporting only MAP NOTIFY and MAP REGISTER LISP packets */
        lisp_hdr = (const lisp_map_register_hdr *) bp;
        lisp_hdr_flag(ndo, lisp_hdr);
        /* Supporting only MAP NOTIFY and MAP REGISTER LISP packets */

-       type = extract_lisp_type(lisp_hdr->type_and_flag);
-       if ((type != LISP_MAP_REGISTER) && (type != LISP_MAP_NOTIFY))
+       type_and_flag = GET_U_1(lisp_hdr->type_and_flag);
+       type = extract_lisp_type(type_and_flag);
+       if ((type != LISP_MAP_REGISTER) && (type != LISP_MAP_NOTIFY)) {
+               ND_TCHECK_LEN(bp, MAP_REGISTER_HDR_LEN);

                return;
                return;

+       }

 
        /* Find if the packet contains xTR and Site-ID data */
 
        /* Find if the packet contains xTR and Site-ID data */

-       xtr_present = is_xtr_data_present(type, lisp_hdr->type_and_flag);
+       xtr_present = is_xtr_data_present(type, type_and_flag);

 
        /* Extract the number of EID records present */
 
        /* Extract the number of EID records present */

-       auth_data_len = EXTRACT_16BITS(&lisp_hdr->auth_data_len);
-       packet_iterator = (const u_char *)(lisp_hdr);
+       auth_data_len = GET_BE_U_2(lisp_hdr->auth_data_len);

        packet_offset = MAP_REGISTER_HDR_LEN;
        packet_offset = MAP_REGISTER_HDR_LEN;

-       record_count = lisp_hdr->record_count;
+       record_count = GET_U_1(lisp_hdr->record_count);

 
        if (ndo->ndo_vflag) {
 
        if (ndo->ndo_vflag) {

-               key_id = EXTRACT_16BITS(&lisp_hdr->key_id);
-               ND_PRINT((ndo, "\n    %u record(s), ", record_count));
-               ND_PRINT((ndo, "Authentication %s,",
-                       tok2str(auth_type, "unknown-type", key_id)));
-               hex_print(ndo, "\n    Authentication-Data: ", packet_iterator +
-                                               packet_offset, auth_data_len);
+               key_id = GET_BE_U_2(lisp_hdr->key_id);
+               ND_PRINT("\n    %u record(s), ", record_count);
+               ND_PRINT("Authentication %s,",
+                        tok2str(auth_type, "unknown-type", key_id));
+               ND_ICHECKMSG_ZU("authentication data length", auth_data_len, >,
+                               length - MAP_REGISTER_HDR_LEN);
+               hex_print(ndo, "\n    Authentication-Data: ",
+                         bp + packet_offset, auth_data_len);

        } else {
        } else {

-               ND_PRINT((ndo, " %u record(s),", record_count));
+               ND_PRINT(" %u record(s),", record_count);
+               ND_ICHECKMSG_ZU("authentication data length", auth_data_len, >,
+                               length - MAP_REGISTER_HDR_LEN);

        }
        packet_offset += auth_data_len;
 
        }
        packet_offset += auth_data_len;
 

-       if (record_count == 0)
-               goto malformed;
+       ND_ICHECKMSG_U("record count", record_count, ==, 0);

 
        /* Print all the EID records */
 
        /* Print all the EID records */

-       while ((length > packet_offset) && (record_count--)) {
-
-               ND_TCHECK2(*(packet_iterator + packet_offset), MAP_REGISTER_EID_LEN);
-               ND_PRINT((ndo, "\n"));
-               lisp_eid = (const lisp_map_register_eid *)
-                               ((const u_char *)lisp_hdr + packet_offset);
+       while ((length > packet_offset) && (record_count != 0)) {
+               record_count--;
+               ND_TCHECK_LEN(bp + packet_offset, MAP_REGISTER_EID_LEN);
+               ND_PRINT("\n");
+               lisp_eid = (const lisp_map_register_eid *) (bp + packet_offset);

                packet_offset += MAP_REGISTER_EID_LEN;
                packet_offset += MAP_REGISTER_EID_LEN;

-               mask_len = lisp_eid->eid_prefix_mask_length;
-               eid_afi = EXTRACT_16BITS(&lisp_eid->eid_prefix_afi);
-               loc_count = lisp_eid->locator_count;
+               mask_len = GET_U_1(lisp_eid->eid_prefix_mask_length);
+               eid_afi = GET_BE_U_2(lisp_eid->eid_prefix_afi);
+               loc_count = GET_U_1(lisp_eid->locator_count);

 
                if (ndo->ndo_vflag) {
 
                if (ndo->ndo_vflag) {

-                       ttl = EXTRACT_32BITS(&lisp_eid->ttl);
-                       ND_PRINT((ndo, "      Record TTL %u,", ttl));
-                       action_flag(ndo, lisp_eid->act_auth_inc_res);
-                       map_version = (((lisp_eid->reserved_version_hi) & 15 ) * 255) +
-                                       lisp_eid->version_low;
-                       ND_PRINT((ndo, " Map Version: %u,", map_version));
+                       ttl = GET_BE_U_4(lisp_eid->ttl);
+                       ND_PRINT("      Record TTL %u,", ttl);
+                       action_flag(ndo, GET_U_1(lisp_eid->act_auth_inc_res));
+                       map_version = GET_BE_U_2(lisp_eid->reserved_and_version) & 0x0FFF;
+                       ND_PRINT(" Map Version: %u,", map_version);

                }
 
                switch (eid_afi) {
                case IPv4_AFI:
                }
 
                switch (eid_afi) {
                case IPv4_AFI:

-                       ND_TCHECK2(*(packet_iterator + packet_offset), 4);
-                       ND_PRINT((ndo, " EID %s/%u,", getname(ndo,
-                               packet_iterator + packet_offset), mask_len));
+                       ND_PRINT(" EID %s/%u,",
+                                GET_IPADDR_STRING(bp + packet_offset),
+                                mask_len);

                        packet_offset += 4;
                        break;
                case IPv6_AFI:
                        packet_offset += 4;
                        break;
                case IPv6_AFI:

-                       ND_TCHECK2(*(packet_iterator + packet_offset), 16);
-                       ND_PRINT((ndo, " EID %s/%u,", getname6(ndo,
-                               packet_iterator + packet_offset), mask_len));
+                       ND_PRINT(" EID %s/%u,",
+                                GET_IP6ADDR_STRING(bp + packet_offset),
+                                mask_len);

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

+                       ND_PRINT(" [unsuported address family identifier %u]",
+                                eid_afi);

                        /*
                         * No support for LCAF right now.
                         */
                        return;
                        /*
                         * No support for LCAF right now.
                         */
                        return;

-                       break;

                }
 
                }
 

-               ND_PRINT((ndo, " %u locator(s)", loc_count));
+               ND_PRINT(" %u locator(s)", loc_count);

 
 

-               while (loc_count--) {
-                       ND_TCHECK2(*(packet_iterator + packet_offset), MAP_REGISTER_LOC_LEN);
-                       lisp_loc = (const lisp_map_register_loc *) (packet_iterator + packet_offset);
-                       loc_ip_pointer = (const u_char *) (lisp_loc + 1);
+               while (loc_count != 0) {
+                       loc_count--;
+                       ND_TCHECK_LEN(bp + packet_offset, MAP_REGISTER_LOC_LEN);
+                       lisp_loc = (const lisp_map_register_loc *) (bp + packet_offset);

                        packet_offset += MAP_REGISTER_LOC_LEN;
                        packet_offset += MAP_REGISTER_LOC_LEN;

-                       loc_afi = EXTRACT_16BITS(&lisp_loc->locator_afi);
+                       loc_afi = GET_BE_U_2(lisp_loc->locator_afi);

 
                        if (ndo->ndo_vflag)
 
                        if (ndo->ndo_vflag)

-                               ND_PRINT((ndo, "\n       "));
+                               ND_PRINT("\n       ");

 
                        switch (loc_afi) {
                        case IPv4_AFI:
 
                        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(" LOC %s",
+                                        GET_IPADDR_STRING(bp + packet_offset));

                                packet_offset += 4;
                                break;
                        case IPv6_AFI:
                                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(" LOC %s",
+                                        GET_IP6ADDR_STRING(bp + packet_offset));

                                packet_offset += 16;
                                break;
                        default:
                                break;
                        }
                        if (ndo->ndo_vflag) {
                                packet_offset += 16;
                                break;
                        default:
                                break;
                        }
                        if (ndo->ndo_vflag) {

-                               ND_PRINT((ndo, "\n          Priority/Weight %u/%u,"
+                               ND_PRINT("\n          Priority/Weight %u/%u,"

                                                " Multicast Priority/Weight %u/%u,",
                                                " Multicast Priority/Weight %u/%u,",

-                                               lisp_loc->priority, lisp_loc->weight,
-                                               lisp_loc->m_priority, lisp_loc->m_weight));
-                               loc_hdr_flag(ndo, EXTRACT_16BITS(&lisp_loc->unused_and_flag));
+                                               GET_U_1(lisp_loc->priority),
+                                               GET_U_1(lisp_loc->weight),
+                                               GET_U_1(lisp_loc->m_priority),
+                                               GET_U_1(lisp_loc->m_weight));
+                               loc_hdr_flag(ndo,
+                                            GET_BE_U_2(lisp_loc->unused_and_flag));

                        }
                }
        }
 
        /*
                        }
                }
        }
 
        /*

-        * Print xTR and Site ID. Handle the fact that the packet could be malformed.
-        * If the xTR_ID_Present bit is not set, and we still have data to display,
-        * show it as hex data.
+        * Print xTR and Site ID.
+        * 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 (xtr_present) {

-               if (!ND_TTEST2(*(packet_iterator + packet_offset), 24))
-                       goto malformed;
-               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(ndo, "\n    xTR-ID: ", bp + packet_offset, 16);
+               ND_PRINT("\n    SITE-ID: %" PRIu64,
+                        GET_BE_U_8(bp + packet_offset + 16));

        } else {
        } 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);
+               /* If there's at least one byte to print */
+               if (ND_TTEST_LEN(bp + packet_offset, 1)) {
+                       hex_print(ndo, "\n    Data: ", bp + packet_offset,
+                                 ND_BYTES_AVAILABLE_AFTER(bp + packet_offset));

                }
        }
        return;
                }
        }
        return;

-trunc:
-       ND_PRINT((ndo, "\n    [|LISP]"));
-       return;
-malformed:
-       ND_PRINT((ndo, "\n    (malformed-packet)"));
-       return;
-}

 
 

+invalid:
+       nd_print_invalid(ndo);
+}

 
 

-static inline uint8_t extract_lisp_type(uint8_t lisp_hdr_flags)
+static uint8_t
+extract_lisp_type(uint8_t lisp_hdr_flags)

 {
        return (lisp_hdr_flags) >> TYPE_INDEX;
 }
 
 {
        return (lisp_hdr_flags) >> TYPE_INDEX;
 }
 

-static inline uint8_t is_xtr_data_present(uint8_t type, uint8_t lisp_hdr_flags)
+static uint8_t
+is_xtr_data_present(uint8_t type, uint8_t lisp_hdr_flags)

 {
 {

-       uint8_t xtr_present;
+       uint8_t xtr_present = 0;

 
        if (type == LISP_MAP_REGISTER)
                xtr_present = (lisp_hdr_flags) & LISP_MAP_REGISTER_IBIT_MASK;
 
        if (type == LISP_MAP_REGISTER)
                xtr_present = (lisp_hdr_flags) & LISP_MAP_REGISTER_IBIT_MASK;


@@ -406,27 +404,21 @@ static inline uint8_t is_xtr_data_present(uint8_t type, uint8_t lisp_hdr_flags)
 
 static void lisp_hdr_flag(netdissect_options *ndo, const lisp_map_register_hdr *lisp_hdr)
 {
 
 static void lisp_hdr_flag(netdissect_options *ndo, const lisp_map_register_hdr *lisp_hdr)
 {

-       uint8_t type = extract_lisp_type(lisp_hdr->type_and_flag);
+       uint8_t type = extract_lisp_type(GET_U_1(lisp_hdr->type_and_flag));

 
 

-       if (!ndo->ndo_vflag) {
-               ND_PRINT((ndo, "%s,", tok2str(lisp_type, "unknown-type-%u", type)));
+       ND_PRINT("%s,", tok2str(lisp_type, "unknown-type-%u", type));
+       if (!ndo->ndo_vflag)

                return;
                return;

-       } else {
-               ND_PRINT((ndo, "%s,", tok2str(lisp_type, "unknown-type-%u", type)));
-       }

 
        if (type == LISP_MAP_REGISTER) {
 
        if (type == LISP_MAP_REGISTER) {

-               ND_PRINT((ndo, " flags [%s],", bittok2str(map_register_hdr_flag,
-                        "none", EXTRACT_32BITS(lisp_hdr))));
+               ND_PRINT(" flags [%s],", bittok2str(map_register_hdr_flag,
+                        "none", GET_BE_U_4(lisp_hdr)));

        } else if (type == LISP_MAP_NOTIFY) {
        } else if (type == LISP_MAP_NOTIFY) {

-               ND_PRINT((ndo, " flags [%s],", bittok2str(map_notify_hdr_flag,
-                        "none", EXTRACT_32BITS(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)
 {
        uint8_t action;
 static void action_flag(netdissect_options *ndo, uint8_t act_auth_inc_res)
 {
        uint8_t action;


@@ -435,17 +427,15 @@ static void action_flag(netdissect_options *ndo, uint8_t act_auth_inc_res)
        authoritative  = ((act_auth_inc_res >> 4) & 1);
 
        if (authoritative)
        authoritative  = ((act_auth_inc_res >> 4) & 1);
 
        if (authoritative)

-               ND_PRINT((ndo, " Authoritative,"));
+               ND_PRINT(" Authoritative,");

        else
        else

-               ND_PRINT((ndo, " Non-Authoritative,"));
+               ND_PRINT(" Non-Authoritative,");

 
        action = act_auth_inc_res >> 5;
 
        action = act_auth_inc_res >> 5;

-       ND_PRINT((ndo, " %s,", tok2str(lisp_eid_action, "unknown", action)));
+       ND_PRINT(" %s,", tok2str(lisp_eid_action, "unknown", action));

 }
 
 }
 

-

 static void loc_hdr_flag(netdissect_options *ndo, uint16_t flag)
 {
 static void loc_hdr_flag(netdissect_options *ndo, uint16_t flag)
 {

-       ND_PRINT((ndo, " flags [%s],", bittok2str(lisp_loc_flag, "none", flag)));
+       ND_PRINT(" flags [%s],", bittok2str(lisp_loc_flag, "none", flag));

 }
 }

-