ICMPv6: Add the IPv6-Only flag

[tcpdump] / print-hsrp.c

diff --git a/print-hsrp.c b/print-hsrp.c
index e159ea91217bf7fd93a0f238227b80eff24c1f23..138a8c05c7924a33b28e4431ce74d3976a8ed150 100644 (file)
--- a/print-hsrp.c
+++ b/print-hsrp.c
@@ -90,15 +90,16 @@ struct hsrp {
        nd_uint8_t      hsrp_group;
        nd_uint8_t      hsrp_reserved;
        nd_byte         hsrp_authdata[HSRP_AUTH_SIZE];
        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
 };
 
 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;
 
 {
        const struct hsrp *hp = (const struct hsrp *) bp;
        uint8_t version;
 

+       ndo->ndo_protocol = "hsrp";

        ND_TCHECK_1(hp->hsrp_version);
        version = EXTRACT_U_1(hp->hsrp_version);
        ND_PRINT("HSRPv%u", version);
        ND_TCHECK_1(hp->hsrp_version);
        version = EXTRACT_U_1(hp->hsrp_version);
        ND_PRINT("HSRPv%u", version);


@@ -116,8 +117,8 @@ hsrp_print(netdissect_options *ndo, const uint8_t *bp, u_int len)
        if (EXTRACT_U_1(hp->hsrp_reserved) != 0) {
                ND_PRINT("[reserved=%u!] ", EXTRACT_U_1(hp->hsrp_reserved));
        }
        if (EXTRACT_U_1(hp->hsrp_reserved) != 0) {
                ND_PRINT("[reserved=%u!] ", EXTRACT_U_1(hp->hsrp_reserved));
        }

-       ND_TCHECK(hp->hsrp_virtaddr);
-       ND_PRINT("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(" hellotime=");
                unsigned_relts_print(ndo, EXTRACT_U_1(hp->hsrp_hellotime));
        if (ndo->ndo_vflag) {
                ND_PRINT(" hellotime=");
                unsigned_relts_print(ndo, EXTRACT_U_1(hp->hsrp_hellotime));


@@ -125,8 +126,8 @@ hsrp_print(netdissect_options *ndo, const uint8_t *bp, u_int len)
                unsigned_relts_print(ndo, EXTRACT_U_1(hp->hsrp_holdtime));
                ND_PRINT(" priority=%u", EXTRACT_U_1(hp->hsrp_priority));
                ND_PRINT(" auth=\"");
                unsigned_relts_print(ndo, EXTRACT_U_1(hp->hsrp_holdtime));
                ND_PRINT(" priority=%u", EXTRACT_U_1(hp->hsrp_priority));
                ND_PRINT(" auth=\"");

-               if (fn_printn(ndo, hp->hsrp_authdata, sizeof(hp->hsrp_authdata),
-                   ndo->ndo_snapend)) {
+               if (nd_printn(ndo, hp->hsrp_authdata, sizeof(hp->hsrp_authdata),
+                             ndo->ndo_snapend)) {

                        ND_PRINT("\"");
                        goto trunc;
                }
                        ND_PRINT("\"");
                        goto trunc;
                }


@@ -134,5 +135,5 @@ hsrp_print(netdissect_options *ndo, const uint8_t *bp, u_int len)
        }
        return;
 trunc:
        }
        return;
 trunc:

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

 }
 }