More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / print-cip.c

diff --git a/print-cip.c b/print-cip.c
index 28102325aab5357e0b95886e6fa37459fa4d1961..82e1de65db2c79267d7847d4b1ead090b1ee606d 100644 (file)
--- a/print-cip.c
+++ b/print-cip.c
@@ -1,6 +1,6 @@
 /*
- * Marko Kiiskila [email protected] 
- * 
+ * Marko Kiiskila [email protected]
+ *
  * Tampere University of Technology - Telecommunications Laboratory
  *
  * Permission to use, copy, modify and distribute this
@@ -12,32 +12,21 @@
  * documentation, and that the use of this software is
  * acknowledged in any publications resulting from using
  * the software.
- * 
+ *
  * TUT ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION AND DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS
  * SOFTWARE.
- * 
+ *
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.16 2001-09-23 21:52:38 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <string.h>
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-
-#include <netinet/in.h>
+#include <tcpdump-stdinc.h>
 
 #include <stdio.h>
 #include <pcap.h>
@@ -47,9 +36,9 @@ static const char rcsid[] =
 #include "ethertype.h"
 #include "ether.h"
 
-#define RFC1483LLC_LEN 8 
+#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 */
@@ -58,7 +47,7 @@ static unsigned char rfcllc[] = {
        0x00 };
 
 static inline void
-cip_print(register const u_char *bp, int length)
+cip_print(int length)
 {
        /*
         * There is no MAC-layer header, so just print the length.
@@ -67,36 +56,25 @@ cip_print(register const u_char *bp, int length)
 }
 
 /*
- * This is the top level routine of the printer.  'p' is the points
- * to the raw header of the packet, 'tvp' is the timestamp,
- * 'length' is the length of the packet off the wire, and 'caplen'
+ * 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->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, const struct pcap_pkthdr *h, const u_char *p)
+u_int
+cip_if_print(const struct pcap_pkthdr *h, const u_char *p)
 {
        u_int caplen = h->caplen;
        u_int length = h->len;
        u_short extracted_ethertype;
 
-       ++infodelay;
-       ts_print(&h->ts);
-
        if (memcmp(rfcllc, p, sizeof(rfcllc))==0 && caplen < RFC1483LLC_LEN) {
                printf("[|cip]");
-               goto out;
+               return (0);
        }
 
        if (eflag)
-               cip_print(p, length);
-
-       /*
-        * Some printers want to get back at the ethernet addresses,
-        * and/or check that they're not walking off the end of the packet.
-        * Rather than pass them all the way down, we set these globals.
-        */
-       packetp = p;
-       snapend = p + caplen;
+               cip_print(length);
 
        if (memcmp(rfcllc, p, sizeof(rfcllc)) == 0) {
                /*
@@ -106,26 +84,28 @@ cip_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
                    &extracted_ethertype) == 0) {
                        /* ether_type not known, print raw packet */
                        if (!eflag)
-                               cip_print(p, length);
+                               cip_print(length);
                        if (extracted_ethertype) {
                                printf("(LLC %s) ",
                               etherproto_string(htons(extracted_ethertype)));
                        }
-                       if (!xflag && !qflag)
+                       if (!suppress_default_print)
                                default_print(p, caplen);
                }
        } else {
                /*
                 * LLC header is absent; treat it as just IP.
                 */
-               ip_print(p, length);
+               ip_print(gndo, p, length);
        }
 
-       if (xflag)
-               default_print(p, caplen);
- out:
-       putchar('\n');
-       --infodelay;
-       if (infoprint)
-               info(0);
+       return (0);
 }
+
+
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */