More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / print-cip.c

diff --git a/print-cip.c b/print-cip.c
index f889acf2f8a16d10d9e8faeefcb347677080c050..82e1de65db2c79267d7847d4b1ead090b1ee606d 100644 (file)
--- a/print-cip.c
+++ b/print-cip.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -37,13 +36,9 @@
 #include "ethertype.h"
 #include "ether.h"
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.22 2003-11-15 00:39:18 guy Exp $ (LBL)";
-#endif
 #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 */
@@ -63,7 +58,7 @@ cip_print(int 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.
  */
 u_int
@@ -94,15 +89,23 @@ cip_if_print(const struct pcap_pkthdr *h, const u_char *p)
                                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);
        }
 
        return (0);
 }
+
+
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */