Introduce --time-stamp-precision

[tcpdump] / print-hsrp.c

diff --git a/print-hsrp.c b/print-hsrp.c
index ccb6866bbdea1af10ffe463736108d4c869fbf2a..0e2420f712762934c61fc9cb26823199cef380a9 100644 (file)
--- a/print-hsrp.c
+++ b/print-hsrp.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2001 Julian Cowley
  * All rights reserved.
 /*
  * 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:
  * 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.
  * 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
  * 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


@@ -29,19 +29,12 @@
 
 /* Cisco Hot Standby Router Protocol (HSRP). */
 
 
 /* Cisco Hot Standby Router Protocol (HSRP). */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-hsrp.c,v 1.3 2002-05-07 18:31:49 fenner Exp $";
-#endif
-
+#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <sys/types.h>
-
-#include <stdio.h>
-#include <netinet/in.h>
+#include <tcpdump-stdinc.h>

 
 #include "interface.h"
 #include "addrtoname.h"
 
 #include "interface.h"
 #include "addrtoname.h"


@@ -54,7 +47,7 @@ static const char *op_code_str[] = {
 };
 
 /* HSRP states and associated names. */
 };
 
 /* HSRP states and associated names. */

-static struct tok states[] = {
+static const struct tok states[] = {

        {  0, "initial" },
        {  1, "learn" },
        {  2, "listen" },
        {  0, "initial" },
        {  1, "learn" },
        {  2, "listen" },


@@ -86,52 +79,56 @@ static struct tok states[] = {
 
 /* HSRP protocol header. */
 struct hsrp {
 
 /* 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];
+       uint8_t         hsrp_version;
+       uint8_t         hsrp_op_code;
+       uint8_t         hsrp_state;
+       uint8_t         hsrp_hellotime;
+       uint8_t         hsrp_holdtime;
+       uint8_t         hsrp_priority;
+       uint8_t         hsrp_group;
+       uint8_t         hsrp_reserved;
+       uint8_t         hsrp_authdata[HSRP_AUTH_SIZE];

        struct in_addr  hsrp_virtaddr;
 };
 
 void
        struct in_addr  hsrp_virtaddr;
 };
 
 void

-hsrp_print(register const u_char *bp, register u_int len)
+hsrp_print(netdissect_options *ndo, register const uint8_t *bp, register u_int len)

 {
        struct hsrp *hp = (struct hsrp *) bp;
 
 {
        struct hsrp *hp = (struct hsrp *) bp;
 

-       TCHECK(hp->hsrp_version);
-       printf("HSRPv%d", hp->hsrp_version);
+       ND_TCHECK(hp->hsrp_version);
+       ND_PRINT((ndo, "HSRPv%d", hp->hsrp_version));

        if (hp->hsrp_version != 0)
                return;
        if (hp->hsrp_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);
+       ND_TCHECK(hp->hsrp_op_code);
+       ND_PRINT((ndo, "-"));
+       ND_PRINT((ndo, "%s ", tok2strary(op_code_str, "unknown (%d)", hp->hsrp_op_code)));
+       ND_PRINT((ndo, "%d: ", len));
+       ND_TCHECK(hp->hsrp_state);
+       ND_PRINT((ndo, "state=%s ", tok2str(states, "Unknown (%d)", hp->hsrp_state)));
+       ND_TCHECK(hp->hsrp_group);
+       ND_PRINT((ndo, "group=%d ", hp->hsrp_group));
+       ND_TCHECK(hp->hsrp_reserved);

        if (hp->hsrp_reserved != 0) {
        if (hp->hsrp_reserved != 0) {

-               printf("[reserved=%d!] ", hp->hsrp_reserved);
+               ND_PRINT((ndo, "[reserved=%d!] ", hp->hsrp_reserved));

        }
        }

-       TCHECK(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(hp->hsrp_virtaddr);
+       ND_PRINT((ndo, "addr=%s", ipaddr_string(ndo, &hp->hsrp_virtaddr)));
+       if (ndo->ndo_vflag) {
+               ND_PRINT((ndo, " hellotime="));
+               relts_print(ndo, hp->hsrp_hellotime);
+               ND_PRINT((ndo, " holdtime="));
+               relts_print(ndo, hp->hsrp_holdtime);
+               ND_PRINT((ndo, " priority=%d", hp->hsrp_priority));
+               ND_PRINT((ndo, " auth=\""));
+               if (fn_printn(ndo, hp->hsrp_authdata, sizeof(hp->hsrp_authdata),
+                   ndo->ndo_snapend)) {
+                       ND_PRINT((ndo, "\""));
+                       goto trunc;
+               }
+               ND_PRINT((ndo, "\""));

        }
        return;
 trunc:
        }
        return;
 trunc:

-       printf("[|hsrp]");
+       ND_PRINT((ndo, "[|hsrp]"));

 }
 }