Makefile.in: don't remove configure and config.h.in in make distclean.

[tcpdump] / print-gre.c

diff --git a/print-gre.c b/print-gre.c
index fccff7c5982dd397687a1a42b2b72abf1970913c..136fb69d1b3ed6dba14babcf4d51d2bef3b5f668 100644 (file)
--- a/print-gre.c
+++ b/print-gre.c
@@ -79,19 +79,20 @@ static int gre_sre_asn_print(netdissect_options *, uint8_t, uint8_t, const u_cha
 void
 gre_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
-       u_int len = length, vers;
+       u_int vers;
 
        ndo->ndo_protocol = "gre";
-       ND_LCHECK_U(len, 2);
+       nd_print_protocol_caps(ndo);
+       ND_ICHECK_U(length, <, 2);
        vers = GET_BE_U_2(bp) & GRE_VERS_MASK;
-       ND_PRINT("GREv%u",vers);
+       ND_PRINT("v%u",vers);
 
        switch(vers) {
        case 0:
-               gre_print_0(ndo, bp, len);
+               gre_print_0(ndo, bp, length);
                break;
        case 1:
-               gre_print_1(ndo, bp, len);
+               gre_print_1(ndo, bp, length);
                break;
        default:
                ND_PRINT(" ERROR: unknown-version");
@@ -109,7 +110,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
        u_int len = length;
        uint16_t flags, prot;
 
-       ND_LCHECK_U(len, 2);
+       ND_ICHECK_U(len, <, 2);
        flags = GET_BE_U_2(bp);
        if (ndo->ndo_vflag)
                ND_PRINT(", Flags [%s]",
@@ -118,7 +119,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
        len -= 2;
        bp += 2;
 
-       ND_LCHECK_U(len, 2);
+       ND_ICHECK_U(len, <, 2);
        prot = GET_BE_U_2(bp);
        len -= 2;
        bp += 2;
@@ -126,28 +127,28 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
        if ((flags & GRE_CP) | (flags & GRE_RP)) {
                uint16_t sum;
 
-               ND_LCHECK_U(len, 2);
+               ND_ICHECK_U(len, <, 2);
                sum =  GET_BE_U_2(bp);
                if (ndo->ndo_vflag)
                        ND_PRINT(", sum 0x%x", sum);
                bp += 2;
                len -= 2;
 
-               ND_LCHECK_U(len, 2);
+               ND_ICHECK_U(len, <, 2);
                ND_PRINT(", off 0x%x", GET_BE_U_2(bp));
                bp += 2;
                len -= 2;
        }
 
        if (flags & GRE_KP) {
-               ND_LCHECK_U(len, 4);
+               ND_ICHECK_U(len, <, 4);
                ND_PRINT(", key=0x%x", GET_BE_U_4(bp));
                bp += 4;
                len -= 4;
        }
 
        if (flags & GRE_SP) {
-               ND_LCHECK_U(len, 4);
+               ND_ICHECK_U(len, <, 4);
                ND_PRINT(", seq %u", GET_BE_U_4(bp));
                bp += 4;
                len -= 4;
@@ -159,7 +160,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
                        uint8_t sreoff;
                        uint8_t srelen;
 
-                       ND_LCHECK_U(len, 4);
+                       ND_ICHECK_U(len, <, 4);
                        af = GET_BE_U_2(bp);
                        sreoff = GET_U_1(bp + 2);
                        srelen = GET_U_1(bp + 3);
@@ -172,7 +173,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
                        if (!gre_sre_print(ndo, af, sreoff, srelen, bp, len))
                                goto invalid;
 
-                       ND_LCHECK_U(len, srelen);
+                       ND_ICHECK_U(len, <, srelen);
                        bp += srelen;
                        len -= srelen;
                }
@@ -226,7 +227,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
        u_int len = length;
        uint16_t flags, prot;
 
-       ND_LCHECK_U(len, 2);
+       ND_ICHECK_U(len, <, 2);
        flags = GET_BE_U_2(bp);
        len -= 2;
        bp += 2;
@@ -235,7 +236,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
                ND_PRINT(", Flags [%s]",
                         bittok2str(gre_flag_values,"none",flags));
 
-       ND_LCHECK_U(len, 2);
+       ND_ICHECK_U(len, <, 2);
        prot = GET_BE_U_2(bp);
        len -= 2;
        bp += 2;
@@ -244,7 +245,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
        if (flags & GRE_KP) {
                uint32_t k;
 
-               ND_LCHECK_U(len, 4);
+               ND_ICHECK_U(len, <, 4);
                k = GET_BE_U_4(bp);
                ND_PRINT(", call %u", k & 0xffff);
                len -= 4;
@@ -252,14 +253,14 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
        }
 
        if (flags & GRE_SP) {
-               ND_LCHECK_U(len, 4);
+               ND_ICHECK_U(len, <, 4);
                ND_PRINT(", seq %u", GET_BE_U_4(bp));
                bp += 4;
                len -= 4;
        }
 
        if (flags & GRE_AP) {
-               ND_LCHECK_U(len, 4);
+               ND_ICHECK_U(len, <, 4);
                ND_PRINT(", ack %u", GET_BE_U_4(bp));
                bp += 4;
                len -= 4;
@@ -341,7 +342,7 @@ gre_sre_ip_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
        }
 
        while (srelen != 0) {
-               ND_LCHECK_U(len, 4);
+               ND_ICHECK_U(len, <, 4);
 
                ND_TCHECK_LEN(bp, sizeof(nd_ipv4));
                addrtostr(bp, buf, sizeof(buf));
@@ -378,7 +379,7 @@ gre_sre_asn_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
        }
 
        while (srelen != 0) {
-               ND_LCHECK_U(len, 2);
+               ND_ICHECK_U(len, <, 2);
 
                ND_PRINT(" %s%x",
                         ((bp - up) == sreoff) ? "*" : "", GET_BE_U_2(bp));