Update .gitignore for other configurations

[tcpdump] / print-hsrp.c

diff --git a/print-hsrp.c b/print-hsrp.c
index e9b4c2cf0abeb3af188f0eaca6487d4bed926f35..138a8c05c7924a33b28e4431ce74d3976a8ed150 100644 (file)
--- a/print-hsrp.c
+++ b/print-hsrp.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2001 Julian Cowley
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -27,24 +27,19 @@
  * SUCH DAMAGE.
  */
 
-/* Cisco Hot Standby Router Protocol (HSRP). */
+/* \summary: Cisco Hot Standby Router Protocol (HSRP) printer */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-hsrp.c,v 1.2 2001-10-08 16:12:37 fenner Exp $";
-#endif
+/* specification: RFC 2281 for version 1 */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <netinet/in.h>
+#include "netdissect-stdinc.h"
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
+#include "extract.h"
 
 /* HSRP op code types. */
 static const char *op_code_str[] = {
@@ -54,7 +49,7 @@ static const char *op_code_str[] = {
 };
 
 /* HSRP states and associated names. */
-static struct tok states[] = {
+static const struct tok states[] = {
        {  0, "initial" },
        {  1, "learn" },
        {  2, "listen" },
@@ -86,52 +81,59 @@ static struct tok states[] = {
 
 /* HSRP protocol header. */
 struct hsrp {
-       u_char          hsrp_version;
-       u_char          hsrp_op_code;
-       u_char          hsrp_state;
-       u_char          hsrp_hellotime;
-       u_char          hsrp_holdtime;
-       u_char          hsrp_priority;
-       u_char          hsrp_group;
-       u_char          hsrp_reserved;
-       u_char          hsrp_authdata[HSRP_AUTH_SIZE];
-       struct in_addr  hsrp_virtaddr;
+       nd_uint8_t      hsrp_version;
+       nd_uint8_t      hsrp_op_code;
+       nd_uint8_t      hsrp_state;
+       nd_uint8_t      hsrp_hellotime;
+       nd_uint8_t      hsrp_holdtime;
+       nd_uint8_t      hsrp_priority;
+       nd_uint8_t      hsrp_group;
+       nd_uint8_t      hsrp_reserved;
+       nd_byte         hsrp_authdata[HSRP_AUTH_SIZE];
+       nd_ipv4         hsrp_virtaddr;
 };
 
 void
-hsrp_print(register const u_char *bp, register u_int len)
+hsrp_print(netdissect_options *ndo, const u_char *bp, u_int len)
 {
-       struct hsrp *hp = (struct hsrp *) bp;
+       const struct hsrp *hp = (const struct hsrp *) bp;
+       uint8_t version;
 
-       TCHECK(hp->hsrp_version);
-       printf("HSRPv%d", hp->hsrp_version);
-       if (hp->hsrp_version != 0)
+       ndo->ndo_protocol = "hsrp";
+       ND_TCHECK_1(hp->hsrp_version);
+       version = EXTRACT_U_1(hp->hsrp_version);
+       ND_PRINT("HSRPv%u", version);
+       if (version != 0)
                return;
-       TCHECK(hp->hsrp_op_code);
-       printf("-");
-       printf("%s ", tok2strary(op_code_str, "unknown (%d)", hp->hsrp_op_code));
-       printf("%d: ", len);
-       TCHECK(hp->hsrp_state);
-       printf("state=%s ", tok2str(states, "Unknown (%d)", hp->hsrp_state));
-       TCHECK(hp->hsrp_group);
-       printf("group=%d ", hp->hsrp_group);
-       TCHECK(hp->hsrp_reserved);
-       if (hp->hsrp_reserved != 0) {
-               printf("[reserved=%d!] ", 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("[reserved=%u!] ", EXTRACT_U_1(hp->hsrp_reserved));
        }
-       TCHECK2(hp->hsrp_virtaddr, sizeof(hp->hsrp_virtaddr));
-       printf("addr=%s", ipaddr_string(&hp->hsrp_virtaddr));
-       if (vflag) {
-               printf(" hellotime=");
-               relts_print(hp->hsrp_hellotime);
-               printf(" holdtime=");
-               relts_print(hp->hsrp_holdtime);
-               printf(" priority=%d", hp->hsrp_priority);
-               printf(" auth=\"");
-               fn_printn(hp->hsrp_authdata, sizeof(hp->hsrp_authdata), NULL);
-               printf("\"");
+       ND_TCHECK_4(hp->hsrp_virtaddr);
+       ND_PRINT("addr=%s", ipaddr_string(ndo, hp->hsrp_virtaddr));
+       if (ndo->ndo_vflag) {
+               ND_PRINT(" hellotime=");
+               unsigned_relts_print(ndo, EXTRACT_U_1(hp->hsrp_hellotime));
+               ND_PRINT(" holdtime=");
+               unsigned_relts_print(ndo, EXTRACT_U_1(hp->hsrp_holdtime));
+               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("\"");
        }
        return;
 trunc:
-       printf("[|hsrp]");
+       nd_print_trunc(ndo);
 }