Revert partially the commit 21b1273

[tcpdump] / print-vrrp.c

diff --git a/print-vrrp.c b/print-vrrp.c
index 71f70f0cf1b62a90637ae4b2b959fe3065cc0d3f..972a8cd79481c4d8bda34053722f9878b91ce4d4 100644 (file)
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -111,30 +111,27 @@ vrrp_print(netdissect_options *ndo,
        const char *type_s;
 
        ndo->ndo_protocol = "vrrp";
        const char *type_s;
 
        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)
                ND_PRINT(", (ttl %u)", ttl);
        if (version < 2 || version > 3 || type != VRRP_TYPE_ADVERTISEMENT)
                return;
        type_s = tok2str(type2str, "unknown type (%u)", type);
        ND_PRINT("VRRPv%u, %s", version, type_s);
        if (ttl != 255)
                ND_PRINT(", (ttl %u)", ttl);
        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_TCHECK_1(bp + 5);
+       ND_PRINT(", vrid %u, prio %u", GET_U_1(bp + 1), GET_U_1(bp + 2));

 
        if (version == 2) {
 
        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(", 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 */
        } 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) {
                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;
 
                u_int i;
                char c;
 


@@ -145,7 +142,7 @@ vrrp_print(netdissect_options *ndo,
                        vec[0].len = len;
                        if (in_cksum(vec, 1))
                                ND_PRINT(", (bad vrrp cksum %x)",
                        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)) {
                }
 
                if (version == 3 && ND_TTEST_LEN(bp, len)) {


@@ -153,7 +150,7 @@ vrrp_print(netdissect_options *ndo,
                                len, len, IPPROTO_VRRP);
                        if (cksum)
                                ND_PRINT(", (bad vrrp cksum %x)",
                                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");
                }
 
                ND_PRINT(", addrs");


@@ -163,8 +160,7 @@ vrrp_print(netdissect_options *ndo,
                c = ' ';
                bp += 8;
                for (i = 0; i < naddrs; i++) {
                c = ' ';
                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;
                }
                        c = ',';
                        bp += 4;
                }