Use more the ND_TTEST_1() macro

[tcpdump] / print-vrrp.c

diff --git a/print-vrrp.c b/print-vrrp.c
index 20da88e6c013f6d6869c2ff223a376b347cc3e1f..b7e309d00a5fee79c0bb3920f2ff1435398ae12c 100644 (file)
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -104,8 +104,8 @@ static const struct tok auth2str[] = {
 
 void
 vrrp_print(netdissect_options *ndo,
-           register const u_char *bp, register u_int len,
-           register const u_char *bp2, int ttl)
+           const u_char *bp, u_int len,
+           const u_char *bp2, int ttl)
 {
        int version, type, auth_type = VRRP_AUTH_NONE; /* keep compiler happy */
        const char *type_s;
@@ -137,7 +137,7 @@ vrrp_print(netdissect_options *ndo,
                int i;
                char c;
 
-               if (version == 2 && ND_TTEST2(bp[0], len)) {
+               if (version == 2 && ND_TTEST_LEN(bp, len)) {
                        struct cksum_vec vec[1];
 
                        vec[0].ptr = bp;
@@ -147,7 +147,7 @@ vrrp_print(netdissect_options *ndo,
                                        EXTRACT_BE_U_2(bp + 6)));
                }
 
-               if (version == 3 && ND_TTEST2(bp[0], len)) {
+               if (version == 3 && ND_TTEST_LEN(bp, len)) {
                        uint16_t cksum = nextproto4_cksum(ndo, (const struct ip *)bp2, bp,
                                len, len, IPPROTO_VRRP);
                        if (cksum)