Add changes in 4.2.1.

[tcpdump] / print-cip.c

diff --git a/print-cip.c b/print-cip.c
index 71889f3e3349c3864cfaf9d0177256070a9429cd..e9d672fe761b5f0bb80fe2845bae93bd2b369083 100644 (file)
--- a/print-cip.c
+++ b/print-cip.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.23 2003-11-16 09:36:16 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.26 2005-07-07 01:22:17 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -63,7 +63,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 +94,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:
+ */