Use nd_ types, add EXTRACT_ calls, clean up signed vs. unsigned.

[tcpdump] / print-eigrp.c

diff --git a/print-eigrp.c b/print-eigrp.c
index 83a9f31ac949efc55da30e0ed4b0b7f733f248ee..d7260cd91231585f3ab76ac02e5e0c4c517f1680 100644 (file)
--- a/print-eigrp.c
+++ b/print-eigrp.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 1998-2004  Hannes Gredler <hannes@tcpdump.org>
+ * Copyright (c) 1998-2004  Hannes Gredler <hannes@gredler.at>

  *      The TCPDUMP project
  *
  * Redistribution and use in source and binary forms, with or without
  *      The TCPDUMP project
  *
  * Redistribution and use in source and binary forms, with or without


@@ -14,32 +14,35 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
  * FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED
+/* \summary: Enhanced Interior Gateway Routing Protocol (EIGRP) printer */
+
+/*
+ * specification:
+ *
+ * http://www.rhyshaden.com/eigrp.htm
+ * RFC 7868
+ */
+

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

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 #include <string.h>
 
 
 #include <string.h>
 

-#include "interface.h"
+#include "netdissect.h"

 #include "extract.h"
 #include "addrtoname.h"
 
 #include "extract.h"
 #include "addrtoname.h"
 

-/*
- * packet format documented at
- * http://www.rhyshaden.com/eigrp.htm
- */
-

 struct eigrp_common_header {
 struct eigrp_common_header {

-    u_int8_t version;
-    u_int8_t opcode;
-    u_int8_t checksum[2];
-    u_int8_t flags[4];
-    u_int8_t seq[4];
-    u_int8_t ack[4];
-    u_int8_t asn[4];
+    nd_uint8_t  version;
+    nd_uint8_t  opcode;
+    nd_uint16_t checksum;
+    nd_uint32_t flags;
+    nd_uint32_t seq;
+    nd_uint32_t ack;
+    nd_uint32_t asn;

 };
 
 #define        EIGRP_VERSION                        2
 };
 
 #define        EIGRP_VERSION                        2


@@ -68,8 +71,8 @@ static const struct tok eigrp_common_header_flag_values[] = {
 };
 
 struct eigrp_tlv_header {
 };
 
 struct eigrp_tlv_header {

-    u_int8_t type[2];
-    u_int8_t length[2];
+    nd_uint16_t type;
+    nd_uint16_t length;

 };
 
 #define EIGRP_TLV_GENERAL_PARM   0x0001
 };
 
 #define EIGRP_TLV_GENERAL_PARM   0x0001


@@ -102,91 +105,91 @@ static const struct tok eigrp_tlv_values[] = {
 };
 
 struct eigrp_tlv_general_parm_t {
 };
 
 struct eigrp_tlv_general_parm_t {

-    u_int8_t k1;
-    u_int8_t k2;
-    u_int8_t k3;
-    u_int8_t k4;
-    u_int8_t k5;
-    u_int8_t res;
-    u_int8_t holdtime[2];
+    nd_uint8_t  k1;
+    nd_uint8_t  k2;
+    nd_uint8_t  k3;
+    nd_uint8_t  k4;
+    nd_uint8_t  k5;
+    nd_uint8_t  res;
+    nd_uint16_t holdtime;

 };
 
 struct eigrp_tlv_sw_version_t {
 };
 
 struct eigrp_tlv_sw_version_t {

-    u_int8_t ios_major;
-    u_int8_t ios_minor;
-    u_int8_t eigrp_major;
-    u_int8_t eigrp_minor;
+    nd_uint8_t ios_major;
+    nd_uint8_t ios_minor;
+    nd_uint8_t eigrp_major;
+    nd_uint8_t eigrp_minor;

 };
 
 struct eigrp_tlv_ip_int_t {
 };
 
 struct eigrp_tlv_ip_int_t {

-    u_int8_t nexthop[4];
-    u_int8_t delay[4];
-    u_int8_t bandwidth[4];
-    u_int8_t mtu[3];
-    u_int8_t hopcount;
-    u_int8_t reliability;
-    u_int8_t load;
-    u_int8_t reserved[2];
-    u_int8_t plen;
-    u_int8_t destination; /* variable length [1-4] bytes encoding */
+    nd_ipv4     nexthop;
+    nd_uint32_t delay;
+    nd_uint32_t bandwidth;
+    nd_uint24_t mtu;
+    nd_uint8_t  hopcount;
+    nd_uint8_t  reliability;
+    nd_uint8_t  load;
+    nd_byte     reserved[2];
+    nd_uint8_t  plen;
+    nd_uint8_t  destination; /* variable length [1-4] bytes encoding */

 };
 
 struct eigrp_tlv_ip_ext_t {
 };
 
 struct eigrp_tlv_ip_ext_t {

-    u_int8_t nexthop[4];
-    u_int8_t origin_router[4];
-    u_int8_t origin_as[4];
-    u_int8_t tag[4];
-    u_int8_t metric[4];
-    u_int8_t reserved[2];
-    u_int8_t proto_id;
-    u_int8_t flags;
-    u_int8_t delay[4];
-    u_int8_t bandwidth[4];
-    u_int8_t mtu[3];
-    u_int8_t hopcount;
-    u_int8_t reliability;
-    u_int8_t load;
-    u_int8_t reserved2[2];
-    u_int8_t plen;
-    u_int8_t destination; /* variable length [1-4] bytes encoding */
+    nd_ipv4     nexthop;
+    nd_ipv4     origin_router;
+    nd_uint32_t origin_as;
+    nd_uint32_t tag;
+    nd_uint32_t metric;
+    nd_byte     reserved[2];
+    nd_uint8_t  proto_id;
+    nd_uint8_t  flags;
+    nd_uint32_t delay;
+    nd_uint32_t bandwidth;
+    nd_uint24_t mtu;
+    nd_uint8_t  hopcount;
+    nd_uint8_t  reliability;
+    nd_uint8_t  load;
+    nd_byte     reserved2[2];
+    nd_uint8_t  plen;
+    nd_uint8_t  destination; /* variable length [1-4] bytes encoding */

 };
 
 struct eigrp_tlv_at_cable_setup_t {
 };
 
 struct eigrp_tlv_at_cable_setup_t {

-    u_int8_t cable_start[2];
-    u_int8_t cable_end[2];
-    u_int8_t router_id[4];
+    nd_uint16_t cable_start;
+    nd_uint16_t cable_end;
+    nd_uint32_t router_id;

 };
 
 struct eigrp_tlv_at_int_t {
 };
 
 struct eigrp_tlv_at_int_t {

-    u_int8_t nexthop[4];
-    u_int8_t delay[4];
-    u_int8_t bandwidth[4];
-    u_int8_t mtu[3];
-    u_int8_t hopcount;
-    u_int8_t reliability;
-    u_int8_t load;
-    u_int8_t reserved[2];
-    u_int8_t cable_start[2];
-    u_int8_t cable_end[2];
+    nd_byte     nexthop[4];
+    nd_uint32_t delay;
+    nd_uint32_t bandwidth;
+    nd_uint24_t mtu;
+    nd_uint8_t  hopcount;
+    nd_uint8_t  reliability;
+    nd_uint8_t  load;
+    nd_byte     reserved[2];
+    nd_uint16_t cable_start;
+    nd_uint16_t cable_end;

 };
 
 struct eigrp_tlv_at_ext_t {
 };
 
 struct eigrp_tlv_at_ext_t {

-    u_int8_t nexthop[4];
-    u_int8_t origin_router[4];
-    u_int8_t origin_as[4];
-    u_int8_t tag[4];
-    u_int8_t proto_id;
-    u_int8_t flags;
-    u_int8_t metric[2];
-    u_int8_t delay[4];
-    u_int8_t bandwidth[4];
-    u_int8_t mtu[3];
-    u_int8_t hopcount;
-    u_int8_t reliability;
-    u_int8_t load;
-    u_int8_t reserved2[2];
-    u_int8_t cable_start[2];
-    u_int8_t cable_end[2];
+    nd_byte     nexthop[4];
+    nd_uint32_t origin_router;
+    nd_uint32_t origin_as;
+    nd_uint32_t tag;
+    nd_uint8_t  proto_id;
+    nd_uint8_t  flags;
+    nd_uint16_t metric;
+    nd_uint32_t delay;
+    nd_uint32_t bandwidth;
+    nd_uint24_t mtu;
+    nd_uint8_t  hopcount;
+    nd_uint8_t  reliability;
+    nd_uint8_t  load;
+    nd_byte     reserved2[2];
+    nd_uint16_t cable_start;
+    nd_uint16_t cable_end;

 };
 
 static const struct tok eigrp_ext_proto_id_values[] = {
 };
 
 static const struct tok eigrp_ext_proto_id_values[] = {


@@ -205,13 +208,13 @@ static const struct tok eigrp_ext_proto_id_values[] = {
 };
 
 void
 };
 
 void

-eigrp_print(netdissect_options *ndo, register const u_char *pptr, register u_int len) {
-
+eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
+{

     const struct eigrp_common_header *eigrp_com_header;
     const struct eigrp_tlv_header *eigrp_tlv_header;
     const u_char *tptr,*tlv_tptr;
     u_int tlen,eigrp_tlv_len,eigrp_tlv_type,tlv_tlen, byte_length, bit_length;
     const struct eigrp_common_header *eigrp_com_header;
     const struct eigrp_tlv_header *eigrp_tlv_header;
     const u_char *tptr,*tlv_tptr;
     u_int tlen,eigrp_tlv_len,eigrp_tlv_type,tlv_tlen, byte_length, bit_length;

-    u_int8_t prefix[4];
+    uint8_t prefix[4];

 
     union {
         const struct eigrp_tlv_general_parm_t *eigrp_tlv_general_parm;
 
     union {
         const struct eigrp_tlv_general_parm_t *eigrp_tlv_general_parm;


@@ -230,46 +233,52 @@ eigrp_print(netdissect_options *ndo, register const u_char *pptr, register u_int
     /*
      * Sanity checking of the header.
      */
     /*
      * Sanity checking of the header.
      */

-    if (eigrp_com_header->version != EIGRP_VERSION) {
-       ND_PRINT((ndo, "EIGRP version %u packet not supported",eigrp_com_header->version));
+    if (EXTRACT_U_1(eigrp_com_header->version) != EIGRP_VERSION) {
+       ND_PRINT((ndo, "EIGRP version %u packet not supported",EXTRACT_U_1(eigrp_com_header->version)));

        return;
     }
 
     /* in non-verbose mode just lets print the basic Message Type*/
     if (ndo->ndo_vflag < 1) {
         ND_PRINT((ndo, "EIGRP %s, length: %u",
        return;
     }
 
     /* in non-verbose mode just lets print the basic Message Type*/
     if (ndo->ndo_vflag < 1) {
         ND_PRINT((ndo, "EIGRP %s, length: %u",

-               tok2str(eigrp_opcode_values, "unknown (%u)",eigrp_com_header->opcode),
+               tok2str(eigrp_opcode_values, "unknown (%u)",EXTRACT_U_1(eigrp_com_header->opcode)),

                len));
         return;
     }
 
     /* ok they seem to want to know everything - lets fully decode it */
 
                len));
         return;
     }
 
     /* ok they seem to want to know everything - lets fully decode it */
 

+    if (len < sizeof(struct eigrp_common_header)) {
+        ND_PRINT((ndo, "EIGRP %s, length: %u (too short, < %u)",
+               tok2str(eigrp_opcode_values, "unknown (%u)",EXTRACT_U_1(eigrp_com_header->opcode)),
+               len, (u_int) sizeof(struct eigrp_common_header)));
+        return;
+    }

     tlen=len-sizeof(struct eigrp_common_header);
 
     /* FIXME print other header info */
     ND_PRINT((ndo, "\n\tEIGRP v%u, opcode: %s (%u), chksum: 0x%04x, Flags: [%s]\n\tseq: 0x%08x, ack: 0x%08x, AS: %u, length: %u",
     tlen=len-sizeof(struct eigrp_common_header);
 
     /* FIXME print other header info */
     ND_PRINT((ndo, "\n\tEIGRP v%u, opcode: %s (%u), chksum: 0x%04x, Flags: [%s]\n\tseq: 0x%08x, ack: 0x%08x, AS: %u, length: %u",

-           eigrp_com_header->version,
-           tok2str(eigrp_opcode_values, "unknown, type: %u",eigrp_com_header->opcode),
-           eigrp_com_header->opcode,
-           EXTRACT_16BITS(&eigrp_com_header->checksum),
+           EXTRACT_U_1(eigrp_com_header->version),
+           tok2str(eigrp_opcode_values, "unknown, type: %u",EXTRACT_U_1(eigrp_com_header->opcode)),
+           EXTRACT_U_1(eigrp_com_header->opcode),
+           EXTRACT_BE_U_2(eigrp_com_header->checksum),

            tok2str(eigrp_common_header_flag_values,
                    "none",
            tok2str(eigrp_common_header_flag_values,
                    "none",

-                   EXTRACT_32BITS(&eigrp_com_header->flags)),
-           EXTRACT_32BITS(&eigrp_com_header->seq),
-           EXTRACT_32BITS(&eigrp_com_header->ack),
-           EXTRACT_32BITS(&eigrp_com_header->asn),
+                   EXTRACT_BE_U_4(eigrp_com_header->flags)),
+           EXTRACT_BE_U_4(eigrp_com_header->seq),
+           EXTRACT_BE_U_4(eigrp_com_header->ack),
+           EXTRACT_BE_U_4(eigrp_com_header->asn),

            tlen));
 
            tlen));
 

-    tptr+=sizeof(const struct eigrp_common_header);
+    tptr+=sizeof(struct eigrp_common_header);

 
     while(tlen>0) {
         /* did we capture enough for fully decoding the object header ? */
 
     while(tlen>0) {
         /* did we capture enough for fully decoding the object header ? */

-        ND_TCHECK2(*tptr, sizeof(struct eigrp_tlv_header));
+        ND_TCHECK_LEN(tptr, sizeof(struct eigrp_tlv_header));

 
         eigrp_tlv_header = (const struct eigrp_tlv_header *)tptr;
 
         eigrp_tlv_header = (const struct eigrp_tlv_header *)tptr;

-        eigrp_tlv_len=EXTRACT_16BITS(&eigrp_tlv_header->length);
-        eigrp_tlv_type=EXTRACT_16BITS(&eigrp_tlv_header->type);
+        eigrp_tlv_len=EXTRACT_BE_U_2(eigrp_tlv_header->length);
+        eigrp_tlv_type=EXTRACT_BE_U_2(eigrp_tlv_header->type);

 
 
         if (eigrp_tlv_len < sizeof(struct eigrp_tlv_header) ||
 
 
         if (eigrp_tlv_len < sizeof(struct eigrp_tlv_header) ||


@@ -285,163 +294,203 @@ eigrp_print(netdissect_options *ndo, register const u_char *pptr, register u_int
                eigrp_tlv_type,
                eigrp_tlv_len));
 
                eigrp_tlv_type,
                eigrp_tlv_len));
 

+        if (eigrp_tlv_len < sizeof(struct eigrp_tlv_header)) {
+                ND_PRINT((ndo, " (too short, < %u)",
+                        (u_int) sizeof(struct eigrp_tlv_header)));
+                break;
+        }

         tlv_tptr=tptr+sizeof(struct eigrp_tlv_header);
         tlv_tlen=eigrp_tlv_len-sizeof(struct eigrp_tlv_header);
 
         /* did we capture enough for fully decoding the object ? */
         tlv_tptr=tptr+sizeof(struct eigrp_tlv_header);
         tlv_tlen=eigrp_tlv_len-sizeof(struct eigrp_tlv_header);
 
         /* did we capture enough for fully decoding the object ? */

-        ND_TCHECK2(*tptr, eigrp_tlv_len);
+        ND_TCHECK_LEN(tptr, eigrp_tlv_len);

 
         switch(eigrp_tlv_type) {
 
         case EIGRP_TLV_GENERAL_PARM:
             tlv_ptr.eigrp_tlv_general_parm = (const struct eigrp_tlv_general_parm_t *)tlv_tptr;
 
         switch(eigrp_tlv_type) {
 
         case EIGRP_TLV_GENERAL_PARM:
             tlv_ptr.eigrp_tlv_general_parm = (const struct eigrp_tlv_general_parm_t *)tlv_tptr;

+            if (tlv_tlen < sizeof(*tlv_ptr.eigrp_tlv_general_parm)) {
+                ND_PRINT((ndo, " (too short, < %u)",
+                    (u_int) (sizeof(struct eigrp_tlv_header) + sizeof(*tlv_ptr.eigrp_tlv_general_parm))));
+                break;
+            }

 
             ND_PRINT((ndo, "\n\t    holdtime: %us, k1 %u, k2 %u, k3 %u, k4 %u, k5 %u",
 
             ND_PRINT((ndo, "\n\t    holdtime: %us, k1 %u, k2 %u, k3 %u, k4 %u, k5 %u",

-                   EXTRACT_16BITS(tlv_ptr.eigrp_tlv_general_parm->holdtime),
-                   tlv_ptr.eigrp_tlv_general_parm->k1,
-                   tlv_ptr.eigrp_tlv_general_parm->k2,
-                   tlv_ptr.eigrp_tlv_general_parm->k3,
-                   tlv_ptr.eigrp_tlv_general_parm->k4,
-                   tlv_ptr.eigrp_tlv_general_parm->k5));
+                   EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_general_parm->holdtime),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_general_parm->k1),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_general_parm->k2),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_general_parm->k3),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_general_parm->k4),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_general_parm->k5)));

             break;
 
         case EIGRP_TLV_SW_VERSION:
             tlv_ptr.eigrp_tlv_sw_version = (const struct eigrp_tlv_sw_version_t *)tlv_tptr;
             break;
 
         case EIGRP_TLV_SW_VERSION:
             tlv_ptr.eigrp_tlv_sw_version = (const struct eigrp_tlv_sw_version_t *)tlv_tptr;

+            if (tlv_tlen < sizeof(*tlv_ptr.eigrp_tlv_sw_version)) {
+                ND_PRINT((ndo, " (too short, < %u)",
+                    (u_int) (sizeof(struct eigrp_tlv_header) + sizeof(*tlv_ptr.eigrp_tlv_sw_version))));
+                break;
+            }

 
             ND_PRINT((ndo, "\n\t    IOS version: %u.%u, EIGRP version %u.%u",
 
             ND_PRINT((ndo, "\n\t    IOS version: %u.%u, EIGRP version %u.%u",

-                   tlv_ptr.eigrp_tlv_sw_version->ios_major,
-                   tlv_ptr.eigrp_tlv_sw_version->ios_minor,
-                   tlv_ptr.eigrp_tlv_sw_version->eigrp_major,
-                   tlv_ptr.eigrp_tlv_sw_version->eigrp_minor));
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_sw_version->ios_major),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_sw_version->ios_minor),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_sw_version->eigrp_major),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_sw_version->eigrp_minor)));

             break;
 
         case EIGRP_TLV_IP_INT:
             tlv_ptr.eigrp_tlv_ip_int = (const struct eigrp_tlv_ip_int_t *)tlv_tptr;
             break;
 
         case EIGRP_TLV_IP_INT:
             tlv_ptr.eigrp_tlv_ip_int = (const struct eigrp_tlv_ip_int_t *)tlv_tptr;

+            if (tlv_tlen < sizeof(*tlv_ptr.eigrp_tlv_ip_int)) {
+                ND_PRINT((ndo, " (too short, < %u)",
+                    (u_int) (sizeof(struct eigrp_tlv_header) + sizeof(*tlv_ptr.eigrp_tlv_ip_int))));
+                break;
+            }

 
 

-            bit_length = tlv_ptr.eigrp_tlv_ip_int->plen;
+            bit_length = EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_int->plen);

             if (bit_length > 32) {
                 ND_PRINT((ndo, "\n\t    illegal prefix length %u",bit_length));
                 break;
             }
             byte_length = (bit_length + 7) / 8; /* variable length encoding */
             memset(prefix, 0, 4);
             if (bit_length > 32) {
                 ND_PRINT((ndo, "\n\t    illegal prefix length %u",bit_length));
                 break;
             }
             byte_length = (bit_length + 7) / 8; /* variable length encoding */
             memset(prefix, 0, 4);

-            memcpy(prefix,&tlv_ptr.eigrp_tlv_ip_int->destination,byte_length);
+            memcpy(prefix, tlv_ptr.eigrp_tlv_ip_int->destination, byte_length);

 
             ND_PRINT((ndo, "\n\t    IPv4 prefix: %15s/%u, nexthop: ",
 
             ND_PRINT((ndo, "\n\t    IPv4 prefix: %15s/%u, nexthop: ",

-                   ipaddr_string(prefix),
+                   ipaddr_string(ndo, prefix),

                    bit_length));
                    bit_length));

-            if (EXTRACT_32BITS(&tlv_ptr.eigrp_tlv_ip_int->nexthop) == 0)
+            if (EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_int->nexthop) == 0)

                 ND_PRINT((ndo, "self"));
             else
                 ND_PRINT((ndo, "self"));
             else

-                ND_PRINT((ndo, "%s",ipaddr_string(&tlv_ptr.eigrp_tlv_ip_int->nexthop)));
+                ND_PRINT((ndo, "%s",ipaddr_string(ndo, &tlv_ptr.eigrp_tlv_ip_int->nexthop)));

 
             ND_PRINT((ndo, "\n\t      delay %u ms, bandwidth %u Kbps, mtu %u, hop %u, reliability %u, load %u",
 
             ND_PRINT((ndo, "\n\t      delay %u ms, bandwidth %u Kbps, mtu %u, hop %u, reliability %u, load %u",

-                   (EXTRACT_32BITS(&tlv_ptr.eigrp_tlv_ip_int->delay)/100),
-                   EXTRACT_32BITS(&tlv_ptr.eigrp_tlv_ip_int->bandwidth),
-                   EXTRACT_24BITS(&tlv_ptr.eigrp_tlv_ip_int->mtu),
-                   tlv_ptr.eigrp_tlv_ip_int->hopcount,
-                   tlv_ptr.eigrp_tlv_ip_int->reliability,
-                   tlv_ptr.eigrp_tlv_ip_int->load));
+                   (EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_int->delay)/100),
+                   EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_int->bandwidth),
+                   EXTRACT_BE_U_3(tlv_ptr.eigrp_tlv_ip_int->mtu),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_int->hopcount),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_int->reliability),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_int->load)));

             break;
 
         case EIGRP_TLV_IP_EXT:
             tlv_ptr.eigrp_tlv_ip_ext = (const struct eigrp_tlv_ip_ext_t *)tlv_tptr;
             break;
 
         case EIGRP_TLV_IP_EXT:
             tlv_ptr.eigrp_tlv_ip_ext = (const struct eigrp_tlv_ip_ext_t *)tlv_tptr;

+            if (tlv_tlen < sizeof(*tlv_ptr.eigrp_tlv_ip_ext)) {
+                ND_PRINT((ndo, " (too short, < %u)",
+                    (u_int) (sizeof(struct eigrp_tlv_header) + sizeof(*tlv_ptr.eigrp_tlv_ip_ext))));
+                break;
+            }

 
 

-            bit_length = tlv_ptr.eigrp_tlv_ip_ext->plen;
+            bit_length = EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_ext->plen);

             if (bit_length > 32) {
                 ND_PRINT((ndo, "\n\t    illegal prefix length %u",bit_length));
                 break;
             }
             byte_length = (bit_length + 7) / 8; /* variable length encoding */
             memset(prefix, 0, 4);
             if (bit_length > 32) {
                 ND_PRINT((ndo, "\n\t    illegal prefix length %u",bit_length));
                 break;
             }
             byte_length = (bit_length + 7) / 8; /* variable length encoding */
             memset(prefix, 0, 4);

-            memcpy(prefix,&tlv_ptr.eigrp_tlv_ip_ext->destination,byte_length);
+            memcpy(prefix, tlv_ptr.eigrp_tlv_ip_ext->destination, byte_length);

 
             ND_PRINT((ndo, "\n\t    IPv4 prefix: %15s/%u, nexthop: ",
 
             ND_PRINT((ndo, "\n\t    IPv4 prefix: %15s/%u, nexthop: ",

-                   ipaddr_string(prefix),
+                   ipaddr_string(ndo, prefix),

                    bit_length));
                    bit_length));

-            if (EXTRACT_32BITS(&tlv_ptr.eigrp_tlv_ip_ext->nexthop) == 0)
+            if (EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->nexthop) == 0)

                 ND_PRINT((ndo, "self"));
             else
                 ND_PRINT((ndo, "self"));
             else

-                ND_PRINT((ndo, "%s",ipaddr_string(&tlv_ptr.eigrp_tlv_ip_ext->nexthop)));
+                ND_PRINT((ndo, "%s",ipaddr_string(ndo, &tlv_ptr.eigrp_tlv_ip_ext->nexthop)));

 
             ND_PRINT((ndo, "\n\t      origin-router %s, origin-as %u, origin-proto %s, flags [0x%02x], tag 0x%08x, metric %u",
 
             ND_PRINT((ndo, "\n\t      origin-router %s, origin-as %u, origin-proto %s, flags [0x%02x], tag 0x%08x, metric %u",

-                   ipaddr_string(tlv_ptr.eigrp_tlv_ip_ext->origin_router),
-                   EXTRACT_32BITS(tlv_ptr.eigrp_tlv_ip_ext->origin_as),
-                   tok2str(eigrp_ext_proto_id_values,"unknown",tlv_ptr.eigrp_tlv_ip_ext->proto_id),
-                   tlv_ptr.eigrp_tlv_ip_ext->flags,
-                   EXTRACT_32BITS(tlv_ptr.eigrp_tlv_ip_ext->tag),
-                   EXTRACT_32BITS(tlv_ptr.eigrp_tlv_ip_ext->metric)));
+                   ipaddr_string(ndo, &tlv_ptr.eigrp_tlv_ip_ext->origin_router),
+                   EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->origin_as),
+                   tok2str(eigrp_ext_proto_id_values,"unknown",EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_ext->proto_id)),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_ext->flags),
+                   EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->tag),
+                   EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->metric)));

 
             ND_PRINT((ndo, "\n\t      delay %u ms, bandwidth %u Kbps, mtu %u, hop %u, reliability %u, load %u",
 
             ND_PRINT((ndo, "\n\t      delay %u ms, bandwidth %u Kbps, mtu %u, hop %u, reliability %u, load %u",

-                   (EXTRACT_32BITS(&tlv_ptr.eigrp_tlv_ip_ext->delay)/100),
-                   EXTRACT_32BITS(&tlv_ptr.eigrp_tlv_ip_ext->bandwidth),
-                   EXTRACT_24BITS(&tlv_ptr.eigrp_tlv_ip_ext->mtu),
-                   tlv_ptr.eigrp_tlv_ip_ext->hopcount,
-                   tlv_ptr.eigrp_tlv_ip_ext->reliability,
-                   tlv_ptr.eigrp_tlv_ip_ext->load));
+                   (EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->delay)/100),
+                   EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->bandwidth),
+                   EXTRACT_BE_U_3(tlv_ptr.eigrp_tlv_ip_ext->mtu),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_ext->hopcount),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_ext->reliability),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_ext->load)));

             break;
 
         case EIGRP_TLV_AT_CABLE_SETUP:
             tlv_ptr.eigrp_tlv_at_cable_setup = (const struct eigrp_tlv_at_cable_setup_t *)tlv_tptr;
             break;
 
         case EIGRP_TLV_AT_CABLE_SETUP:
             tlv_ptr.eigrp_tlv_at_cable_setup = (const struct eigrp_tlv_at_cable_setup_t *)tlv_tptr;

+            if (tlv_tlen < sizeof(*tlv_ptr.eigrp_tlv_at_cable_setup)) {
+                ND_PRINT((ndo, " (too short, < %u)",
+                    (u_int) (sizeof(struct eigrp_tlv_header) + sizeof(*tlv_ptr.eigrp_tlv_at_cable_setup))));
+                break;
+            }

 
             ND_PRINT((ndo, "\n\t    Cable-range: %u-%u, Router-ID %u",
 
             ND_PRINT((ndo, "\n\t    Cable-range: %u-%u, Router-ID %u",

-                   EXTRACT_16BITS(&tlv_ptr.eigrp_tlv_at_cable_setup->cable_start),
-                   EXTRACT_16BITS(&tlv_ptr.eigrp_tlv_at_cable_setup->cable_end),
-                   EXTRACT_32BITS(&tlv_ptr.eigrp_tlv_at_cable_setup->router_id)));
+                   EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_cable_setup->cable_start),
+                   EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_cable_setup->cable_end),
+                   EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_cable_setup->router_id)));

             break;
 
         case EIGRP_TLV_AT_INT:
             tlv_ptr.eigrp_tlv_at_int = (const struct eigrp_tlv_at_int_t *)tlv_tptr;
             break;
 
         case EIGRP_TLV_AT_INT:
             tlv_ptr.eigrp_tlv_at_int = (const struct eigrp_tlv_at_int_t *)tlv_tptr;

+            if (tlv_tlen < sizeof(*tlv_ptr.eigrp_tlv_at_int)) {
+                ND_PRINT((ndo, " (too short, < %u)",
+                    (u_int) (sizeof(struct eigrp_tlv_header) + sizeof(*tlv_ptr.eigrp_tlv_at_int))));
+                break;
+            }

 
             ND_PRINT((ndo, "\n\t     Cable-Range: %u-%u, nexthop: ",
 
             ND_PRINT((ndo, "\n\t     Cable-Range: %u-%u, nexthop: ",

-                   EXTRACT_16BITS(&tlv_ptr.eigrp_tlv_at_int->cable_start),
-                   EXTRACT_16BITS(&tlv_ptr.eigrp_tlv_at_int->cable_end)));
+                   EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_int->cable_start),
+                   EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_int->cable_end)));

 
 

-            if (EXTRACT_32BITS(&tlv_ptr.eigrp_tlv_at_int->nexthop) == 0)
+            if (EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_int->nexthop) == 0)

                 ND_PRINT((ndo, "self"));
             else
                 ND_PRINT((ndo, "%u.%u",
                 ND_PRINT((ndo, "self"));
             else
                 ND_PRINT((ndo, "%u.%u",

-                       EXTRACT_16BITS(&tlv_ptr.eigrp_tlv_at_int->nexthop),
-                       EXTRACT_16BITS(&tlv_ptr.eigrp_tlv_at_int->nexthop[2])));
+                       EXTRACT_BE_U_2(&tlv_ptr.eigrp_tlv_at_int->nexthop[0]),
+                       EXTRACT_BE_U_2(&tlv_ptr.eigrp_tlv_at_int->nexthop[2])));

 
             ND_PRINT((ndo, "\n\t      delay %u ms, bandwidth %u Kbps, mtu %u, hop %u, reliability %u, load %u",
 
             ND_PRINT((ndo, "\n\t      delay %u ms, bandwidth %u Kbps, mtu %u, hop %u, reliability %u, load %u",

-                   (EXTRACT_32BITS(&tlv_ptr.eigrp_tlv_at_int->delay)/100),
-                   EXTRACT_32BITS(&tlv_ptr.eigrp_tlv_at_int->bandwidth),
-                   EXTRACT_24BITS(&tlv_ptr.eigrp_tlv_at_int->mtu),
-                   tlv_ptr.eigrp_tlv_at_int->hopcount,
-                   tlv_ptr.eigrp_tlv_at_int->reliability,
-                   tlv_ptr.eigrp_tlv_at_int->load));
+                   (EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_int->delay)/100),
+                   EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_int->bandwidth),
+                   EXTRACT_BE_U_3(tlv_ptr.eigrp_tlv_at_int->mtu),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_at_int->hopcount),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_at_int->reliability),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_at_int->load)));

             break;
 
         case EIGRP_TLV_AT_EXT:
             tlv_ptr.eigrp_tlv_at_ext = (const struct eigrp_tlv_at_ext_t *)tlv_tptr;
             break;
 
         case EIGRP_TLV_AT_EXT:
             tlv_ptr.eigrp_tlv_at_ext = (const struct eigrp_tlv_at_ext_t *)tlv_tptr;

+            if (tlv_tlen < sizeof(*tlv_ptr.eigrp_tlv_at_ext)) {
+                ND_PRINT((ndo, " (too short, < %u)",
+                    (u_int) (sizeof(struct eigrp_tlv_header) + sizeof(*tlv_ptr.eigrp_tlv_at_ext))));
+                break;
+            }

 
             ND_PRINT((ndo, "\n\t     Cable-Range: %u-%u, nexthop: ",
 
             ND_PRINT((ndo, "\n\t     Cable-Range: %u-%u, nexthop: ",

-                   EXTRACT_16BITS(&tlv_ptr.eigrp_tlv_at_ext->cable_start),
-                   EXTRACT_16BITS(&tlv_ptr.eigrp_tlv_at_ext->cable_end)));
+                   EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_ext->cable_start),
+                   EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_ext->cable_end)));

 
 

-            if (EXTRACT_32BITS(&tlv_ptr.eigrp_tlv_at_ext->nexthop) == 0)
+            if (EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_ext->nexthop) == 0)

                 ND_PRINT((ndo, "self"));
             else
                 ND_PRINT((ndo, "%u.%u",
                 ND_PRINT((ndo, "self"));
             else
                 ND_PRINT((ndo, "%u.%u",

-                       EXTRACT_16BITS(&tlv_ptr.eigrp_tlv_at_ext->nexthop),
-                       EXTRACT_16BITS(&tlv_ptr.eigrp_tlv_at_ext->nexthop[2])));
+                       EXTRACT_BE_U_2(&tlv_ptr.eigrp_tlv_at_ext->nexthop[0]),
+                       EXTRACT_BE_U_2(&tlv_ptr.eigrp_tlv_at_ext->nexthop[2])));

 
             ND_PRINT((ndo, "\n\t      origin-router %u, origin-as %u, origin-proto %s, flags [0x%02x], tag 0x%08x, metric %u",
 
             ND_PRINT((ndo, "\n\t      origin-router %u, origin-as %u, origin-proto %s, flags [0x%02x], tag 0x%08x, metric %u",

-                   EXTRACT_32BITS(tlv_ptr.eigrp_tlv_at_ext->origin_router),
-                   EXTRACT_32BITS(tlv_ptr.eigrp_tlv_at_ext->origin_as),
-                   tok2str(eigrp_ext_proto_id_values,"unknown",tlv_ptr.eigrp_tlv_at_ext->proto_id),
-                   tlv_ptr.eigrp_tlv_at_ext->flags,
-                   EXTRACT_32BITS(tlv_ptr.eigrp_tlv_at_ext->tag),
-                   EXTRACT_16BITS(tlv_ptr.eigrp_tlv_at_ext->metric)));
+                   EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_ext->origin_router),
+                   EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_ext->origin_as),
+                   tok2str(eigrp_ext_proto_id_values,"unknown",EXTRACT_U_1(tlv_ptr.eigrp_tlv_at_ext->proto_id)),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_at_ext->flags),
+                   EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_ext->tag),
+                   EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_ext->metric)));

 
             ND_PRINT((ndo, "\n\t      delay %u ms, bandwidth %u Kbps, mtu %u, hop %u, reliability %u, load %u",
 
             ND_PRINT((ndo, "\n\t      delay %u ms, bandwidth %u Kbps, mtu %u, hop %u, reliability %u, load %u",

-                   (EXTRACT_32BITS(&tlv_ptr.eigrp_tlv_at_ext->delay)/100),
-                   EXTRACT_32BITS(&tlv_ptr.eigrp_tlv_at_ext->bandwidth),
-                   EXTRACT_24BITS(&tlv_ptr.eigrp_tlv_at_ext->mtu),
-                   tlv_ptr.eigrp_tlv_at_ext->hopcount,
-                   tlv_ptr.eigrp_tlv_at_ext->reliability,
-                   tlv_ptr.eigrp_tlv_at_ext->load));
+                   (EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_ext->delay)/100),
+                   EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_at_ext->bandwidth),
+                   EXTRACT_BE_U_3(tlv_ptr.eigrp_tlv_at_ext->mtu),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_at_ext->hopcount),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_at_ext->reliability),
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_at_ext->load)));

             break;
 
             /*
             break;
 
             /*