diff options
Diffstat (limited to 'print-vrrp.c')
| -rw-r--r-- | print-vrrp.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/print-vrrp.c b/print-vrrp.c index ee97974e..7ac59556 100644 --- a/print-vrrp.c +++ b/print-vrrp.c @@ -105,16 +105,18 @@ static const struct tok auth2str[] = { void vrrp_print(netdissect_options *ndo, const u_char *bp, u_int len, - const u_char *bp2, int ttl) + const u_char *bp2, int ttl, + int ver) { int version, type, auth_type = VRRP_AUTH_NONE; /* keep compiler happy */ const char *type_s; ndo->ndo_protocol = "vrrp"; + nd_print_protocol_caps(ndo); version = (GET_U_1(bp) & 0xf0) >> 4; type = GET_U_1(bp) & 0x0f; type_s = tok2str(type2str, "unknown type (%u)", type); - ND_PRINT("VRRPv%u, %s", version, type_s); + ND_PRINT("v%u, %s", version, type_s); if (ttl != 255) ND_PRINT(", (ttl %u)", ttl); if (version < 2 || version > 3 || type != VRRP_TYPE_ADVERTISEMENT) @@ -146,8 +148,14 @@ vrrp_print(netdissect_options *ndo, } if (version == 3 && ND_TTEST_LEN(bp, len)) { - uint16_t cksum = nextproto4_cksum(ndo, (const struct ip *)bp2, bp, - len, len, IPPROTO_VRRP); + uint16_t cksum; + + if (ver == 4) + cksum = nextproto4_cksum(ndo, (const struct ip *)bp2, bp, + len, len, IPPROTO_VRRP); + else + cksum = nextproto6_cksum(ndo, (const struct ip6_hdr *)bp2, bp, + len, len, IPPROTO_VRRP); if (cksum) ND_PRINT(", (bad vrrp cksum %x)", GET_BE_U_2(bp + 6)); @@ -160,9 +168,14 @@ vrrp_print(netdissect_options *ndo, c = ' '; bp += 8; for (i = 0; i < naddrs; i++) { - ND_PRINT("%c%s", c, GET_IPADDR_STRING(bp)); + if (ver == 4) { + ND_PRINT("%c%s", c, GET_IPADDR_STRING(bp)); + bp += 4; + } else { + ND_PRINT("%c%s", c, GET_IP6ADDR_STRING(bp)); + bp += 16; + } c = ','; - bp += 4; } if (version == 2 && auth_type == VRRP_AUTH_SIMPLE) { /* simple text password */ ND_PRINT(" auth \""); |