travis: try removing the matrix: clause and putting back the Coverity stuff.

[tcpdump] / print-vrrp.c

diff --git a/print-vrrp.c b/print-vrrp.c
index 71f70f0cf1b62a90637ae4b2b959fe3065cc0d3f..2739e37c6294222a3a453723981e136a9dd44329 100644 (file)
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -112,8 +112,8 @@ vrrp_print(netdissect_options *ndo,
 
        ndo->ndo_protocol = "vrrp";
        ND_TCHECK_1(bp);
-       version = (EXTRACT_U_1(bp) & 0xf0) >> 4;
-       type = EXTRACT_U_1(bp) & 0x0f;
+       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);
        if (ttl != 255)
@@ -121,20 +121,20 @@ vrrp_print(netdissect_options *ndo,
        if (version < 2 || version > 3 || type != VRRP_TYPE_ADVERTISEMENT)
                return;
        ND_TCHECK_1(bp + 2);
-       ND_PRINT(", vrid %u, prio %u", EXTRACT_U_1(bp + 1), EXTRACT_U_1(bp + 2));
+       ND_PRINT(", vrid %u, prio %u", GET_U_1(bp + 1), GET_U_1(bp + 2));
        ND_TCHECK_1(bp + 5);
 
        if (version == 2) {
-               auth_type = EXTRACT_U_1(bp + 4);
+               auth_type = GET_U_1(bp + 4);
                ND_PRINT(", authtype %s", tok2str(auth2str, NULL, auth_type));
-               ND_PRINT(", intvl %us, length %u", EXTRACT_U_1(bp + 5), len);
+               ND_PRINT(", intvl %us, length %u", GET_U_1(bp + 5), len);
        } else { /* version == 3 */
-               uint16_t intvl = (EXTRACT_U_1(bp + 4) & 0x0f) << 8 | EXTRACT_U_1(bp + 5);
+               uint16_t intvl = (GET_U_1(bp + 4) & 0x0f) << 8 | GET_U_1(bp + 5);
                ND_PRINT(", intvl %ucs, length %u", intvl, len);
        }
 
        if (ndo->ndo_vflag) {
-               u_int naddrs = EXTRACT_U_1(bp + 3);
+               u_int naddrs = GET_U_1(bp + 3);
                u_int i;
                char c;
 
@@ -145,7 +145,7 @@ vrrp_print(netdissect_options *ndo,
                        vec[0].len = len;
                        if (in_cksum(vec, 1))
                                ND_PRINT(", (bad vrrp cksum %x)",
-                                       EXTRACT_BE_U_2(bp + 6));
+                                       GET_BE_U_2(bp + 6));
                }
 
                if (version == 3 && ND_TTEST_LEN(bp, len)) {
@@ -153,7 +153,7 @@ vrrp_print(netdissect_options *ndo,
                                len, len, IPPROTO_VRRP);
                        if (cksum)
                                ND_PRINT(", (bad vrrp cksum %x)",
-                                       EXTRACT_BE_U_2(bp + 6));
+                                       GET_BE_U_2(bp + 6));
                }
 
                ND_PRINT(", addrs");
@@ -164,7 +164,7 @@ vrrp_print(netdissect_options *ndo,
                bp += 8;
                for (i = 0; i < naddrs; i++) {
                        ND_TCHECK_1(bp + 3);
-                       ND_PRINT("%c%s", c, ipaddr_string(ndo, bp));
+                       ND_PRINT("%c%s", c, GET_IPADDR_STRING(bp));
                        c = ',';
                        bp += 4;
                }