Update .gitignore for other configurations

[tcpdump] / print-hsrp.c

diff --git a/print-hsrp.c b/print-hsrp.c
index ad97a2be49aad4901642bd6501121da99d145447..138a8c05c7924a33b28e4431ce74d3976a8ed150 100644 (file)
--- a/print-hsrp.c
+++ b/print-hsrp.c
@@ -32,10 +32,10 @@
 /* specification: RFC 2281 for version 1 */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"
@@ -90,49 +90,50 @@ struct hsrp {
        nd_uint8_t      hsrp_group;
        nd_uint8_t      hsrp_reserved;
        nd_byte         hsrp_authdata[HSRP_AUTH_SIZE];
-       struct in_addr  hsrp_virtaddr;
+       nd_ipv4         hsrp_virtaddr;
 };
 
 void
-hsrp_print(netdissect_options *ndo, const uint8_t *bp, u_int len)
+hsrp_print(netdissect_options *ndo, const u_char *bp, u_int len)
 {
        const struct hsrp *hp = (const struct hsrp *) bp;
        uint8_t version;
 
-       ND_TCHECK(hp->hsrp_version);
+       ndo->ndo_protocol = "hsrp";
+       ND_TCHECK_1(hp->hsrp_version);
        version = EXTRACT_U_1(hp->hsrp_version);
-       ND_PRINT((ndo, "HSRPv%u", version));
+       ND_PRINT("HSRPv%u", version);
        if (version != 0)
                return;
-       ND_TCHECK(hp->hsrp_op_code);
-       ND_PRINT((ndo, "-"));
-       ND_PRINT((ndo, "%s ", tok2strary(op_code_str, "unknown (%u)", EXTRACT_U_1(hp->hsrp_op_code))));
-       ND_PRINT((ndo, "%u: ", len));
-       ND_TCHECK(hp->hsrp_state);
-       ND_PRINT((ndo, "state=%s ", tok2str(states, "Unknown (%u)", EXTRACT_U_1(hp->hsrp_state))));
-       ND_TCHECK(hp->hsrp_group);
-       ND_PRINT((ndo, "group=%u ", EXTRACT_U_1(hp->hsrp_group)));
-       ND_TCHECK(hp->hsrp_reserved);
+       ND_TCHECK_1(hp->hsrp_op_code);
+       ND_PRINT("-");
+       ND_PRINT("%s ", tok2strary(op_code_str, "unknown (%u)", EXTRACT_U_1(hp->hsrp_op_code)));
+       ND_PRINT("%u: ", len);
+       ND_TCHECK_1(hp->hsrp_state);
+       ND_PRINT("state=%s ", tok2str(states, "Unknown (%u)", EXTRACT_U_1(hp->hsrp_state)));
+       ND_TCHECK_1(hp->hsrp_group);
+       ND_PRINT("group=%u ", EXTRACT_U_1(hp->hsrp_group));
+       ND_TCHECK_1(hp->hsrp_reserved);
        if (EXTRACT_U_1(hp->hsrp_reserved) != 0) {
-               ND_PRINT((ndo, "[reserved=%u!] ", EXTRACT_U_1(hp->hsrp_reserved)));
+               ND_PRINT("[reserved=%u!] ", EXTRACT_U_1(hp->hsrp_reserved));
        }
-       ND_TCHECK(hp->hsrp_virtaddr);
-       ND_PRINT((ndo, "addr=%s", ipaddr_string(ndo, &hp->hsrp_virtaddr)));
+       ND_TCHECK_4(hp->hsrp_virtaddr);
+       ND_PRINT("addr=%s", ipaddr_string(ndo, hp->hsrp_virtaddr));
        if (ndo->ndo_vflag) {
-               ND_PRINT((ndo, " hellotime="));
+               ND_PRINT(" hellotime=");
                unsigned_relts_print(ndo, EXTRACT_U_1(hp->hsrp_hellotime));
-               ND_PRINT((ndo, " holdtime="));
+               ND_PRINT(" holdtime=");
                unsigned_relts_print(ndo, EXTRACT_U_1(hp->hsrp_holdtime));
-               ND_PRINT((ndo, " priority=%u", EXTRACT_U_1(hp->hsrp_priority)));
-               ND_PRINT((ndo, " auth=\""));
-               if (fn_printn(ndo, hp->hsrp_authdata, sizeof(hp->hsrp_authdata),
-                   ndo->ndo_snapend)) {
-                       ND_PRINT((ndo, "\""));
+               ND_PRINT(" priority=%u", EXTRACT_U_1(hp->hsrp_priority));
+               ND_PRINT(" auth=\"");
+               if (nd_printn(ndo, hp->hsrp_authdata, sizeof(hp->hsrp_authdata),
+                             ndo->ndo_snapend)) {
+                       ND_PRINT("\"");
                        goto trunc;
                }
-               ND_PRINT((ndo, "\""));
+               ND_PRINT("\"");
        }
        return;
 trunc:
-       ND_PRINT((ndo, "[|hsrp]"));
+       nd_print_trunc(ndo);
 }