Handle very large -f files by rejecting them.

[tcpdump] / print-cip.c

diff --git a/print-cip.c b/print-cip.c
index 27986986bcc4e878231065aaa64009aba54ffc6f..a123b69f51bf4f619ce9b04dab8924cbe699069d 100644 (file)
--- a/print-cip.c
+++ b/print-cip.c
@@ -20,10 +20,7 @@
  *
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.20 2002-12-18 08:53:20 guy Exp $ (LBL)";
-#endif
+/* \summary: Classical-IP over ATM printer */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -31,19 +28,12 @@ static const char rcsid[] =
 
 #include <string.h>
 
-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <pcap.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
-#include "ethertype.h"
-#include "ether.h"
 
-#define RFC1483LLC_LEN 8
-
-static unsigned char rfcllc[] = {
+static const unsigned char rfcllc[] = {
        0xaa,   /* DSAP: non-ISO */
        0xaa,   /* SSAP: non-ISO */
        0x03,   /* Ctrl: Unnumbered Information Command PDU */
@@ -52,73 +42,67 @@ static unsigned char rfcllc[] = {
        0x00 };
 
 static inline void
-cip_print(int length)
+cip_print(netdissect_options *ndo, u_int length)
 {
        /*
         * There is no MAC-layer header, so just print the length.
         */
-       printf("%d: ", length);
+       ND_PRINT((ndo, "%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,
- * 'h->length' is the length of the packet off the wire, and 'h->caplen'
+ * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-void
-cip_if_print(u_char *user _U_, const struct pcap_pkthdr *h, const u_char *p)
+u_int
+cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
        u_int caplen = h->caplen;
        u_int length = h->len;
-       u_short extracted_ethertype;
+       size_t cmplen;
+       int llc_hdrlen;
 
-       ++infodelay;
-       ts_print(&h->ts);
+       cmplen = sizeof(rfcllc);
+       if (cmplen > caplen)
+               cmplen = caplen;
+       if (cmplen > length)
+               cmplen = length;
 
-       if (memcmp(rfcllc, p, sizeof(rfcllc))==0 && caplen < RFC1483LLC_LEN) {
-               printf("[|cip]");
-               goto out;
-       }
+       if (ndo->ndo_eflag)
+               cip_print(ndo, length);
 
-       if (eflag)
-               cip_print(length);
-
-       /*
-        * Some printers want to check that they're not walking off the
-        * end of the packet.
-        * Rather than pass it all the way down, we set this global.
-        */
-       snapend = p + caplen;
-
-       if (memcmp(rfcllc, p, sizeof(rfcllc)) == 0) {
+       if (cmplen == 0) {
+               ND_PRINT((ndo, "[|cip]"));
+               return 0;
+       }
+       if (memcmp(rfcllc, p, cmplen) == 0) {
                /*
                 * LLC header is present.  Try to print it & higher layers.
                 */
-               if (llc_print(p, length, caplen, NULL, NULL,
-                   &extracted_ethertype) == 0) {
-                       /* ether_type not known, print raw packet */
-                       if (!eflag)
-                               cip_print(length);
-                       if (extracted_ethertype) {
-                               printf("(LLC %s) ",
-                              etherproto_string(htons(extracted_ethertype)));
-                       }
-                       if (!xflag && !qflag)
-                               default_print(p, caplen);
+               llc_hdrlen = llc_print(ndo, p, length, caplen, NULL, NULL);
+               if (llc_hdrlen < 0) {
+                       /* packet type not known, print raw packet */
+                       if (!ndo->ndo_suppress_default_print)
+                               ND_DEFAULTPRINT(p, caplen);
+                       llc_hdrlen = -llc_hdrlen;
                }
        } else {
                /*
                 * LLC header is absent; treat it as just IP.
                 */
-               ip_print(p, length);
+               llc_hdrlen = 0;
+               ip_print(ndo, p, length);
        }
 
-       if (xflag)
-               default_print(p, caplen);
- out:
-       putchar('\n');
-       --infodelay;
-       if (infoprint)
-               info(0);
+       return (llc_hdrlen);
 }
+
+
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */