X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/24598ce6b7cfe72ada92aed48691fdf092d94fc7..b07acab03ae9f76fe822ff9239d705f48efd270d:/print-vrrp.c diff --git a/print-vrrp.c b/print-vrrp.c index 4e5da145..a3976676 100644 --- a/print-vrrp.c +++ b/print-vrrp.c @@ -23,14 +23,15 @@ * FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED +/* \summary: Virtual Router Redundancy Protocol (VRRP) printer */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include +#include -#include "interface.h" +#include "netdissect.h" #include "extract.h" #include "addrtoname.h" @@ -127,7 +128,7 @@ vrrp_print(netdissect_options *ndo, ND_PRINT((ndo, ", authtype %s", tok2str(auth2str, NULL, auth_type))); ND_PRINT((ndo, ", intvl %us, length %u", bp[5], len)); } else { /* version == 3 */ - u_int16_t intvl = (bp[4] & 0x0f) << 8 | bp[5]; + uint16_t intvl = (bp[4] & 0x0f) << 8 | bp[5]; ND_PRINT((ndo, ", intvl %ucs, length %u", intvl, len)); } @@ -141,17 +142,21 @@ vrrp_print(netdissect_options *ndo, vec[0].ptr = bp; vec[0].len = len; - if (in_cksum(vec, 1)) + if (in_cksum(vec, 1)) { + ND_TCHECK_16BITS(&bp[6]); ND_PRINT((ndo, ", (bad vrrp cksum %x)", EXTRACT_16BITS(&bp[6]))); + } } if (version == 3 && ND_TTEST2(bp[0], len)) { - u_int16_t cksum = nextproto4_cksum(ndo, (struct ip *)bp2, bp, + uint16_t cksum = nextproto4_cksum(ndo, (const struct ip *)bp2, bp, len, len, IPPROTO_VRRP); - if (cksum) + if (cksum) { + ND_TCHECK_16BITS(&bp[6]); ND_PRINT((ndo, ", (bad vrrp cksum %x)", EXTRACT_16BITS(&bp[6]))); + } } ND_PRINT((ndo, ", addrs"));