Update from current NetBSD version of ieee80211_radiotap.h.

[tcpdump] / print-hsrp.c

diff --git a/print-hsrp.c b/print-hsrp.c
index 2dffa160dc7946ade616c6e9e69574d9de7fe361..21ec05404e112fc3bcb82a02fe7d24bc3f4dce48 100644 (file)
--- a/print-hsrp.c
+++ b/print-hsrp.c
@@ -30,8 +30,8 @@
 /* Cisco Hot Standby Router Protocol (HSRP). */
 
 #ifndef lint
 /* Cisco Hot Standby Router Protocol (HSRP). */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-hsrp.c,v 1.6 2002-11-09 17:19:25 itojun Exp $";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-hsrp.c,v 1.9.2.1 2005-05-06 07:57:17 guy Exp $";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -95,7 +95,7 @@ struct hsrp {
        u_int8_t        hsrp_reserved;
        u_int8_t        hsrp_authdata[HSRP_AUTH_SIZE];
        struct in_addr  hsrp_virtaddr;
        u_int8_t        hsrp_reserved;
        u_int8_t        hsrp_authdata[HSRP_AUTH_SIZE];
        struct in_addr  hsrp_virtaddr;

-} __attribute__((packed));
+};

 
 void
 hsrp_print(register const u_int8_t *bp, register u_int len)
 
 void
 hsrp_print(register const u_int8_t *bp, register u_int len)


@@ -127,7 +127,11 @@ hsrp_print(register const u_int8_t *bp, register u_int len)
                relts_print(hp->hsrp_holdtime);
                printf(" priority=%d", hp->hsrp_priority);
                printf(" auth=\"");
                relts_print(hp->hsrp_holdtime);
                printf(" priority=%d", hp->hsrp_priority);
                printf(" auth=\"");

-               fn_printn(hp->hsrp_authdata, sizeof(hp->hsrp_authdata), NULL);
+               if (fn_printn(hp->hsrp_authdata, sizeof(hp->hsrp_authdata),
+                   snapend)) {
+                       printf("\"");
+                       goto trunc;
+               }

                printf("\"");
        }
        return;
                printf("\"");
        }
        return;