CIP: Modernize packet parsing style.

Enable ND_LONGJMP_FROM_TCHECK. Lose a function and a variable. Require
at least the LLC header worth of data. Update a test.

diff --git a/print-cip.c b/print-cip.c
index 8838dc99c9227a50eb6ea9eb05a84d897de41238..b8ef77fd2fb3ab80407a5292fafdb42417f189e4 100644 (file)
--- a/print-cip.c
+++ b/print-cip.c
@@ -30,6 +30,7 @@
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "addrtoname.h"
 
@@ -41,15 +42,6 @@ static const unsigned char rfcllc[] = {
        0x00,
        0x00 };
 
-static void
-cip_print(netdissect_options *ndo, u_int length)
-{
-       /*
-        * There is no MAC-layer header, so just print the length.
-        */
-       ND_PRINT("%u: ", length);
-}
-
 /*
  * This is the top level routine of the printer.  'p' points
  * to the LLC/SNAP or raw header of the packet, 'h->ts' is the timestamp,
@@ -61,24 +53,18 @@ cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 {
        u_int caplen = h->caplen;
        u_int length = h->len;
-       size_t cmplen;
        int llc_hdrlen;
 
        ndo->ndo_protocol = "cip";
-       cmplen = sizeof(rfcllc);
-       if (cmplen > caplen)
-               cmplen = caplen;
-       if (cmplen > length)
-               cmplen = length;
 
        if (ndo->ndo_eflag)
-               cip_print(ndo, length);
+               /*
+                * There is no MAC-layer header, so just print the length.
+                */
+               ND_PRINT("%u: ", length);
 
-       if (cmplen == 0) {
-               nd_print_trunc(ndo);
-               return;
-       }
-       if (memcmp(rfcllc, p, cmplen) == 0) {
+       ND_TCHECK_LEN(p, sizeof(rfcllc));
+       if (memcmp(rfcllc, p, sizeof(rfcllc)) == 0) {
                /*
                 * LLC header is present.  Try to print it & higher layers.
                 */

diff --git a/tests/heap-overflow-2.out b/tests/heap-overflow-2.out
index ed6135c7e8ac4e307c3f617e0638e54ddd5a3034..771634c52294bbd2130cffd80c8df7d1997bd523 100644 (file)
--- a/tests/heap-overflow-2.out
+++ b/tests/heap-overflow-2.out
@@ -1 +1 @@
-    1  05:27:12.808464432 IP3 (invalid)
+    1  05:27:12.808464432  [|cip]