Travis CI: Revert to libpcap master branch (updated)

[tcpdump] / print-ip.c

diff --git a/print-ip.c b/print-ip.c
index 69e621d28792a016ac3caad7162d311aa5152fda..f8e02c1e79c85c92e70b058a6422dc2e912060a5 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -54,7 +54,7 @@ static const struct tok ip_option_values[] = {
 /*
  * print the recorded route in an IP RR, LSRR or SSRR option.
  */
 /*
  * print the recorded route in an IP RR, LSRR or SSRR option.
  */

-static void
+static int

 ip_printroute(netdissect_options *ndo,
               register const u_char *cp, u_int length)
 {
 ip_printroute(netdissect_options *ndo,
               register const u_char *cp, u_int length)
 {


@@ -63,19 +63,25 @@ ip_printroute(netdissect_options *ndo,
 
        if (length < 3) {
                ND_PRINT((ndo, " [bad length %u]", length));
 
        if (length < 3) {
                ND_PRINT((ndo, " [bad length %u]", length));

-               return;
+               return (0);

        }
        if ((length + 1) & 3)
                ND_PRINT((ndo, " [bad length %u]", length));
        }
        if ((length + 1) & 3)
                ND_PRINT((ndo, " [bad length %u]", length));

+       ND_TCHECK(cp[2]);

        ptr = cp[2] - 1;
        if (ptr < 3 || ((ptr + 1) & 3) || ptr > length + 1)
                ND_PRINT((ndo, " [bad ptr %u]", cp[2]));
 
        for (len = 3; len < length; len += 4) {
        ptr = cp[2] - 1;
        if (ptr < 3 || ((ptr + 1) & 3) || ptr > length + 1)
                ND_PRINT((ndo, " [bad ptr %u]", cp[2]));
 
        for (len = 3; len < length; len += 4) {

+               ND_TCHECK2(cp[len], 4);

                ND_PRINT((ndo, " %s", ipaddr_string(ndo, &cp[len])));
                if (ptr > len)
                        ND_PRINT((ndo, ","));
        }
                ND_PRINT((ndo, " %s", ipaddr_string(ndo, &cp[len])));
                if (ptr > len)
                        ND_PRINT((ndo, ","));
        }

+       return (0);
+
+trunc:
+       return (-1);

 }
 
 /*
 }
 
 /*


@@ -162,7 +168,7 @@ nextproto4_cksum(netdissect_options *ndo,
        return (in_cksum(vec, 2));
 }
 
        return (in_cksum(vec, 2));
 }
 

-static void
+static int

 ip_printts(netdissect_options *ndo,
            register const u_char *cp, u_int length)
 {
 ip_printts(netdissect_options *ndo,
            register const u_char *cp, u_int length)
 {


@@ -173,16 +179,18 @@ ip_printts(netdissect_options *ndo,
 
        if (length < 4) {
                ND_PRINT((ndo, "[bad length %u]", length));
 
        if (length < 4) {
                ND_PRINT((ndo, "[bad length %u]", length));

-               return;
+               return (0);

        }
        ND_PRINT((ndo, " TS{"));
        hoplen = ((cp[3]&0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
        if ((length - 4) & (hoplen-1))
                ND_PRINT((ndo, "[bad length %u]", length));
        }
        ND_PRINT((ndo, " TS{"));
        hoplen = ((cp[3]&0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
        if ((length - 4) & (hoplen-1))
                ND_PRINT((ndo, "[bad length %u]", length));

+       ND_TCHECK(cp[2]);

        ptr = cp[2] - 1;
        len = 0;
        if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)
                ND_PRINT((ndo, "[bad ptr %u]", cp[2]));
        ptr = cp[2] - 1;
        len = 0;
        if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)
                ND_PRINT((ndo, "[bad ptr %u]", cp[2]));

+       ND_TCHECK(cp[3]);

        switch (cp[3]&0xF) {
        case IPOPT_TS_TSONLY:
                ND_PRINT((ndo, "TSONLY"));
        switch (cp[3]&0xF) {
        case IPOPT_TS_TSONLY:
                ND_PRINT((ndo, "TSONLY"));


@@ -211,6 +219,7 @@ ip_printts(netdissect_options *ndo,
        for (len = 4; len < length; len += hoplen) {
                if (ptr == len)
                        type = " ^ ";
        for (len = 4; len < length; len += hoplen) {
                if (ptr == len)
                        type = " ^ ";

+               ND_TCHECK2(cp[len], hoplen);

                ND_PRINT((ndo, "%s%d@%s", type, EXTRACT_32BITS(&cp[len+hoplen-4]),
                       hoplen!=8 ? "" : ipaddr_string(ndo, &cp[len])));
                type = " ";
                ND_PRINT((ndo, "%s%d@%s", type, EXTRACT_32BITS(&cp[len+hoplen-4]),
                       hoplen!=8 ? "" : ipaddr_string(ndo, &cp[len])));
                type = " ";


@@ -223,6 +232,10 @@ done:
                ND_PRINT((ndo, " [%d hops not recorded]} ", cp[3]>>4));
        else
                ND_PRINT((ndo, "}"));
                ND_PRINT((ndo, " [%d hops not recorded]} ", cp[3]>>4));
        else
                ND_PRINT((ndo, "}"));

+       return (0);
+
+trunc:
+       return (-1);

 }
 
 /*
 }
 
 /*


@@ -272,13 +285,15 @@ ip_optprint(netdissect_options *ndo,
                        return;
 
                case IPOPT_TS:
                        return;
 
                case IPOPT_TS:

-                       ip_printts(ndo, cp, option_len);
+                       if (ip_printts(ndo, cp, option_len) == -1)
+                               goto trunc;

                        break;
 
                case IPOPT_RR:       /* fall through */
                case IPOPT_SSRR:
                case IPOPT_LSRR:
                        break;
 
                case IPOPT_RR:       /* fall through */
                case IPOPT_SSRR:
                case IPOPT_LSRR:

-                       ip_printroute(ndo, cp, option_len);
+                       if (ip_printroute(ndo, cp, option_len) == -1)
+                               goto trunc;

                        break;
 
                case IPOPT_RA:
                        break;
 
                case IPOPT_RA:


@@ -324,12 +339,16 @@ static void
 ip_print_demux(netdissect_options *ndo,
               struct ip_print_demux_state *ipds)
 {
 ip_print_demux(netdissect_options *ndo,
               struct ip_print_demux_state *ipds)
 {

-       struct protoent *proto;
+       const char *p_name;

 
 again:
        switch (ipds->nh) {
 
        case IPPROTO_AH:
 
 again:
        switch (ipds->nh) {
 
        case IPPROTO_AH:

+               if (!ND_TTEST(*ipds->cp)) {
+                       ND_PRINT((ndo, "[|AH]"));
+                       break;
+               }

                ipds->nh = *ipds->cp;
                ipds->advance = ah_print(ndo, ipds->cp);
                if (ipds->advance <= 0)
                ipds->nh = *ipds->cp;
                ipds->advance = ah_print(ndo, ipds->cp);
                if (ipds->advance <= 0)


@@ -354,14 +373,14 @@ again:
 
        case IPPROTO_IPCOMP:
        {
 
        case IPPROTO_IPCOMP:
        {

-               int enh;
-               ipds->advance = ipcomp_print(ndo, ipds->cp, &enh);
-               if (ipds->advance <= 0)
-                       break;
-               ipds->cp += ipds->advance;
-               ipds->len -= ipds->advance;
-               ipds->nh = enh & 0xff;
-               goto again;
+               ipcomp_print(ndo, ipds->cp);
+               /*
+                * Either this has decompressed the payload and
+                * printed it, in which case there's nothing more
+                * to do, or it hasn't, in which case there's
+                * nothing more to do.
+                */
+               break;

        }
 
        case IPPROTO_SCTP:
        }
 
        case IPPROTO_SCTP:


@@ -480,8 +499,8 @@ again:
                break;
 
        default:
                break;
 
        default:

-               if (ndo->ndo_nflag==0 && (proto = getprotobynumber(ipds->nh)) != NULL)
-                       ND_PRINT((ndo, " %s", proto->p_name));
+               if (ndo->ndo_nflag==0 && (p_name = netdb_protoname(ipds->nh)) != NULL)
+                       ND_PRINT((ndo, " %s", p_name));

                else
                        ND_PRINT((ndo, " ip-proto-%d", ipds->nh));
                ND_PRINT((ndo, " %d", ipds->len));
                else
                        ND_PRINT((ndo, " ip-proto-%d", ipds->nh));
                ND_PRINT((ndo, " %d", ipds->len));


@@ -522,17 +541,18 @@ ip_print(netdissect_options *ndo,
        u_int hlen;
        struct cksum_vec vec[1];
        uint16_t sum, ip_sum;
        u_int hlen;
        struct cksum_vec vec[1];
        uint16_t sum, ip_sum;

-       struct protoent *proto;
+       const char *p_name;

 
        ipds->ip = (const struct ip *)bp;
        ND_TCHECK(ipds->ip->ip_vhl);
 
        ipds->ip = (const struct ip *)bp;
        ND_TCHECK(ipds->ip->ip_vhl);

-       if (IP_V(ipds->ip) != 4) { /* print version if != 4 */
+       if (IP_V(ipds->ip) != 4) { /* print version and fail if != 4 */

            if (IP_V(ipds->ip) == 6)
              ND_PRINT((ndo, "IP6, wrong link-layer encapsulation "));
            else
              ND_PRINT((ndo, "IP%u ", IP_V(ipds->ip)));
            if (IP_V(ipds->ip) == 6)
              ND_PRINT((ndo, "IP6, wrong link-layer encapsulation "));
            else
              ND_PRINT((ndo, "IP%u ", IP_V(ipds->ip)));

+           return;

        }
        }

-       else if (!ndo->ndo_eflag)
+       if (!ndo->ndo_eflag)

                ND_PRINT((ndo, "IP "));
 
        ND_TCHECK(*ipds->ip);
                ND_PRINT((ndo, "IP "));
 
        ND_TCHECK(*ipds->ip);


@@ -666,8 +686,8 @@ ip_print(netdissect_options *ndo,
                 */
                ND_PRINT((ndo, "%s > %s:", ipaddr_string(ndo, &ipds->ip->ip_src),
                          ipaddr_string(ndo, &ipds->ip->ip_dst)));
                 */
                ND_PRINT((ndo, "%s > %s:", ipaddr_string(ndo, &ipds->ip->ip_src),
                          ipaddr_string(ndo, &ipds->ip->ip_dst)));

-               if (!ndo->ndo_nflag && (proto = getprotobynumber(ipds->ip->ip_p)) != NULL)
-                       ND_PRINT((ndo, " %s", proto->p_name));
+               if (!ndo->ndo_nflag && (p_name = netdb_protoname(ipds->ip->ip_p)) != NULL)
+                       ND_PRINT((ndo, " %s", p_name));

                else
                        ND_PRINT((ndo, " ip-proto-%d", ipds->ip->ip_p));
        }
                else
                        ND_PRINT((ndo, " ip-proto-%d", ipds->ip->ip_p));
        }


@@ -681,24 +701,28 @@ trunc:
 void
 ipN_print(netdissect_options *ndo, register const u_char *bp, register u_int length)
 {
 void
 ipN_print(netdissect_options *ndo, register const u_char *bp, register u_int length)
 {

-       struct ip hdr;
-
-       if (length < 4) {
+       if (length < 1) {

                ND_PRINT((ndo, "truncated-ip %d", length));
                return;
        }
                ND_PRINT((ndo, "truncated-ip %d", length));
                return;
        }

-       memcpy (&hdr, bp, 4);
-       switch (IP_V(&hdr)) {
-       case 4:
+
+       ND_TCHECK(*bp);
+       switch (*bp & 0xF0) {
+       case 0x40:

                ip_print (ndo, bp, length);
                ip_print (ndo, bp, length);

-               return;
-       case 6:
+               break;
+       case 0x60:

                ip6_print (ndo, bp, length);
                ip6_print (ndo, bp, length);

-               return;
+               break;

        default:
        default:

-               ND_PRINT((ndo, "unknown ip %d", IP_V(&hdr)));
-               return;
+               ND_PRINT((ndo, "unknown ip %d", (*bp & 0xF0) >> 4));
+               break;

        }
        }

+       return;
+
+trunc:
+       ND_PRINT((ndo, "%s", tstr));
+       return;

 }
 
 /*
 }
 
 /*