Fixed some warnings, added print-zep.c to CMakeLists

[tcpdump] / print-eigrp.c

diff --git a/print-eigrp.c b/print-eigrp.c
index 706a9c4318bcc256f0a6ac9ec0330874c0fd41f5..d206237dd22f1306290a6742719f455c5a5c4426 100644 (file)
--- a/print-eigrp.c
+++ b/print-eigrp.c
@@ -35,6 +35,7 @@
 #include "extract.h"
 #include "addrtoname.h"
 
+
 struct eigrp_common_header {
     nd_uint8_t  version;
     nd_uint8_t  opcode;
@@ -226,6 +227,7 @@ 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;
 
+    ndo->ndo_protocol = "eigrp";
     tptr=pptr;
     eigrp_com_header = (const struct eigrp_common_header *)pptr;
     ND_TCHECK_SIZE(eigrp_com_header);
@@ -362,7 +364,8 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
             if (EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_int->nexthop) == 0)
                 ND_PRINT("self");
             else
-                ND_PRINT("%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("\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),
@@ -396,10 +399,11 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
             if (EXTRACT_BE_U_4(tlv_ptr.eigrp_tlv_ip_ext->nexthop) == 0)
                 ND_PRINT("self");
             else
-                ND_PRINT("%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("\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),
+                   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),
@@ -519,5 +523,5 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
     }
     return;
 trunc:
-    ND_PRINT("\n\t\t packet exceeded snapshot");
+    nd_print_trunc(ndo);
 }