IPX: Add a length check

[tcpdump] / print-eigrp.c

diff --git a/print-eigrp.c b/print-eigrp.c
index d7260cd91231585f3ab76ac02e5e0c4c517f1680..d206237dd22f1306290a6742719f455c5a5c4426 100644 (file)
--- a/print-eigrp.c
+++ b/print-eigrp.c
@@ -24,10 +24,10 @@
  */
 
 #ifdef HAVE_CONFIG_H
  */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

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

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


@@ -35,6 +35,7 @@
 #include "extract.h"
 #include "addrtoname.h"
 
 #include "extract.h"
 #include "addrtoname.h"
 

+

 struct eigrp_common_header {
     nd_uint8_t  version;
     nd_uint8_t  opcode;
 struct eigrp_common_header {
     nd_uint8_t  version;
     nd_uint8_t  opcode;


@@ -226,38 +227,39 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
         const struct eigrp_tlv_at_ext_t *eigrp_tlv_at_ext;
     } tlv_ptr;
 
         const struct eigrp_tlv_at_ext_t *eigrp_tlv_at_ext;
     } tlv_ptr;
 

+    ndo->ndo_protocol = "eigrp";

     tptr=pptr;
     eigrp_com_header = (const struct eigrp_common_header *)pptr;
     tptr=pptr;
     eigrp_com_header = (const struct eigrp_common_header *)pptr;

-    ND_TCHECK(*eigrp_com_header);
+    ND_TCHECK_SIZE(eigrp_com_header);

 
     /*
      * Sanity checking of the header.
      */
     if (EXTRACT_U_1(eigrp_com_header->version) != EIGRP_VERSION) {
 
     /*
      * Sanity checking of the header.
      */
     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)));
+       ND_PRINT("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) {
        return;
     }
 
     /* in non-verbose mode just lets print the basic Message Type*/
     if (ndo->ndo_vflag < 1) {

-        ND_PRINT((ndo, "EIGRP %s, length: %u",
+        ND_PRINT("EIGRP %s, length: %u",

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

-               len));
+               len);

         return;
     }
 
     /* ok they seem to want to know everything - lets fully decode it */
 
     if (len < sizeof(struct eigrp_common_header)) {
         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)",
+        ND_PRINT("EIGRP %s, length: %u (too short, < %u)",

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

-               len, (u_int) sizeof(struct eigrp_common_header)));
+               len, (u_int) sizeof(struct eigrp_common_header));

         return;
     }
     tlen=len-sizeof(struct eigrp_common_header);
 
     /* FIXME print other header info */
         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",
+    ND_PRINT("\n\tEIGRP v%u, opcode: %s (%u), chksum: 0x%04x, Flags: [%s]\n\tseq: 0x%08x, ack: 0x%08x, AS: %u, length: %u",

            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_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),


@@ -268,7 +270,7 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
            EXTRACT_BE_U_4(eigrp_com_header->seq),
            EXTRACT_BE_U_4(eigrp_com_header->ack),
            EXTRACT_BE_U_4(eigrp_com_header->asn),
            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(struct eigrp_common_header);
 
 
     tptr+=sizeof(struct eigrp_common_header);
 


@@ -287,16 +289,16 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
             return;
         }
 
             return;
         }
 

-        ND_PRINT((ndo, "\n\t  %s TLV (0x%04x), length: %u",
+        ND_PRINT("\n\t  %s TLV (0x%04x), length: %u",

                tok2str(eigrp_tlv_values,
                        "Unknown",
                        eigrp_tlv_type),
                eigrp_tlv_type,
                tok2str(eigrp_tlv_values,
                        "Unknown",
                        eigrp_tlv_type),
                eigrp_tlv_type,

-               eigrp_tlv_len));
+               eigrp_tlv_len);

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

-                ND_PRINT((ndo, " (too short, < %u)",
-                        (u_int) sizeof(struct eigrp_tlv_header)));
+                ND_PRINT(" (too short, < %u)",
+                        (u_int) sizeof(struct eigrp_tlv_header));

                 break;
         }
         tlv_tptr=tptr+sizeof(struct eigrp_tlv_header);
                 break;
         }
         tlv_tptr=tptr+sizeof(struct eigrp_tlv_header);


@@ -310,187 +312,189 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
         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)) {
         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))));
+                ND_PRINT(" (too short, < %u)",
+                    (u_int) (sizeof(struct eigrp_tlv_header) + sizeof(*tlv_ptr.eigrp_tlv_general_parm)));

                 break;
             }
 
                 break;
             }
 

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

                    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_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)));
+                   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;
             if (tlv_tlen < sizeof(*tlv_ptr.eigrp_tlv_sw_version)) {
             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))));
+                ND_PRINT(" (too short, < %u)",
+                    (u_int) (sizeof(struct eigrp_tlv_header) + sizeof(*tlv_ptr.eigrp_tlv_sw_version)));

                 break;
             }
 
                 break;
             }
 

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

                    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->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)));
+                   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;
             if (tlv_tlen < sizeof(*tlv_ptr.eigrp_tlv_ip_int)) {
             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))));
+                ND_PRINT(" (too short, < %u)",
+                    (u_int) (sizeof(struct eigrp_tlv_header) + sizeof(*tlv_ptr.eigrp_tlv_ip_int)));

                 break;
             }
 
             bit_length = EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_int->plen);
             if (bit_length > 32) {
                 break;
             }
 
             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));
+                ND_PRINT("\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);
 
                 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);
 

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

                    ipaddr_string(ndo, prefix),
                    ipaddr_string(ndo, prefix),

-                   bit_length));
+                   bit_length);

             if (EXTRACT_BE_U_4(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"));
+                ND_PRINT("self");

             else
             else

-                ND_PRINT((ndo, "%s",ipaddr_string(ndo, &tlv_ptr.eigrp_tlv_ip_int->nexthop)));
+                ND_PRINT("%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("\n\t      delay %u ms, bandwidth %u Kbps, mtu %u, hop %u, reliability %u, load %u",

                    (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_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)));
+                   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;
             if (tlv_tlen < sizeof(*tlv_ptr.eigrp_tlv_ip_ext)) {
             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))));
+                ND_PRINT(" (too short, < %u)",
+                    (u_int) (sizeof(struct eigrp_tlv_header) + sizeof(*tlv_ptr.eigrp_tlv_ip_ext)));

                 break;
             }
 
             bit_length = EXTRACT_U_1(tlv_ptr.eigrp_tlv_ip_ext->plen);
             if (bit_length > 32) {
                 break;
             }
 
             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));
+                ND_PRINT("\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);
 
                 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);
 

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

                    ipaddr_string(ndo, prefix),
                    ipaddr_string(ndo, prefix),

-                   bit_length));
+                   bit_length);

             if (EXTRACT_BE_U_4(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"));
+                ND_PRINT("self");

             else
             else

-                ND_PRINT((ndo, "%s",ipaddr_string(ndo, &tlv_ptr.eigrp_tlv_ip_ext->nexthop)));
+                ND_PRINT("%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",
-                   ipaddr_string(ndo, &tlv_ptr.eigrp_tlv_ip_ext->origin_router),
+            ND_PRINT("\n\t      origin-router %s, origin-as %u, origin-proto %s, flags [0x%02x], tag 0x%08x, metric %u",
+                   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->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)));
+                   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("\n\t      delay %u ms, bandwidth %u Kbps, mtu %u, hop %u, reliability %u, load %u",

                    (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_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)));
+                   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;
             if (tlv_tlen < sizeof(*tlv_ptr.eigrp_tlv_at_cable_setup)) {
             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))));
+                ND_PRINT(" (too short, < %u)",
+                    (u_int) (sizeof(struct eigrp_tlv_header) + sizeof(*tlv_ptr.eigrp_tlv_at_cable_setup)));

                 break;
             }
 
                 break;
             }
 

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

                    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_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)));
+                   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;
             if (tlv_tlen < sizeof(*tlv_ptr.eigrp_tlv_at_int)) {
             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))));
+                ND_PRINT(" (too short, < %u)",
+                    (u_int) (sizeof(struct eigrp_tlv_header) + sizeof(*tlv_ptr.eigrp_tlv_at_int)));

                 break;
             }
 
                 break;
             }
 

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

                    EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_int->cable_start),
                    EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_int->cable_start),

-                   EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_int->cable_end)));
+                   EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_int->cable_end));

 
             if (EXTRACT_BE_U_4(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"));
+                ND_PRINT("self");

             else
             else

-                ND_PRINT((ndo, "%u.%u",
+                ND_PRINT("%u.%u",

                        EXTRACT_BE_U_2(&tlv_ptr.eigrp_tlv_at_int->nexthop[0]),
                        EXTRACT_BE_U_2(&tlv_ptr.eigrp_tlv_at_int->nexthop[0]),

-                       EXTRACT_BE_U_2(&tlv_ptr.eigrp_tlv_at_int->nexthop[2])));
+                       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("\n\t      delay %u ms, bandwidth %u Kbps, mtu %u, hop %u, reliability %u, load %u",

                    (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_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)));
+                   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;
             if (tlv_tlen < sizeof(*tlv_ptr.eigrp_tlv_at_ext)) {
             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))));
+                ND_PRINT(" (too short, < %u)",
+                    (u_int) (sizeof(struct eigrp_tlv_header) + sizeof(*tlv_ptr.eigrp_tlv_at_ext)));

                 break;
             }
 
                 break;
             }
 

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

                    EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_ext->cable_start),
                    EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_ext->cable_start),

-                   EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_ext->cable_end)));
+                   EXTRACT_BE_U_2(tlv_ptr.eigrp_tlv_at_ext->cable_end));

 
             if (EXTRACT_BE_U_4(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"));
+                ND_PRINT("self");

             else
             else

-                ND_PRINT((ndo, "%u.%u",
+                ND_PRINT("%u.%u",

                        EXTRACT_BE_U_2(&tlv_ptr.eigrp_tlv_at_ext->nexthop[0]),
                        EXTRACT_BE_U_2(&tlv_ptr.eigrp_tlv_at_ext->nexthop[0]),

-                       EXTRACT_BE_U_2(&tlv_ptr.eigrp_tlv_at_ext->nexthop[2])));
+                       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("\n\t      origin-router %u, origin-as %u, origin-proto %s, flags [0x%02x], tag 0x%08x, metric %u",

                    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_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)));
+                   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("\n\t      delay %u ms, bandwidth %u Kbps, mtu %u, hop %u, reliability %u, load %u",

                    (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_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)));
+                   EXTRACT_U_1(tlv_ptr.eigrp_tlv_at_ext->load));

             break;
 
             /*
             break;
 
             /*


@@ -519,5 +523,5 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
     }
     return;
 trunc:
     }
     return;
 trunc:

-    ND_PRINT((ndo, "\n\t\t packet exceeded snapshot"));
+    nd_print_trunc(ndo);

 }
 }