Improve printout of DHCPv6 options.

[tcpdump] / print-cip.c

diff --git a/print-cip.c b/print-cip.c
index 55cd84187e1ca789c21f100e4a07b828dc829dc5..e9d672fe761b5f0bb80fe2845bae93bd2b369083 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
  * Tampere University of Technology - Telecommunications Laboratory
  *
  * Permission to use, copy, modify and distribute this


@@ -12,17 +12,17 @@
  * documentation, and that the use of this software is
  * acknowledged in any publications resulting from using
  * the software.
  * 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.
  * 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
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.15 2001-09-17 21:57:58 fenner Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.26 2005-07-07 01:22:17 guy Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -31,13 +31,7 @@ static const char rcsid[] =
 
 #include <string.h>
 
 
 #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>
 
 #include <stdio.h>
 #include <pcap.h>


@@ -47,7 +41,7 @@ static const char rcsid[] =
 #include "ethertype.h"
 #include "ether.h"
 
 #include "ethertype.h"
 #include "ether.h"
 

-#define RFC1483LLC_LEN 8 
+#define RFC1483LLC_LEN 8

 
 static unsigned char rfcllc[] = {
        0xaa,   /* DSAP: non-ISO */
 
 static unsigned char rfcllc[] = {
        0xaa,   /* DSAP: non-ISO */


@@ -58,105 +52,65 @@ static unsigned char rfcllc[] = {
        0x00 };
 
 static inline void
        0x00 };
 
 static inline void

-cip_print(register const u_char *bp, int length)
+cip_print(int length)

 {
 {

-       int i;
-
-       if (memcmp(rfcllc, bp, sizeof(rfcllc))) {
-               if (qflag) {
-                       for (i = 0;i < RFC1483LLC_LEN; i++)
-                       (void)printf("%2.2x ",bp[i]);
-               } else {
-                       for (i = 0;i < RFC1483LLC_LEN - 2; i++)
-                               (void)printf("%2.2x ",bp[i]);
-                       etherproto_string(((const u_short *)bp)[3]);
-               } 
-       } else {
-               if (qflag)
-                       (void)printf("(null encapsulation)");
-               else {
-                       (void)printf("(null encap)");
-                       etherproto_string(ETHERTYPE_IP);
-               }
-       }
+       /*
+        * There is no MAC-layer header, so just print the length.
+        */
+       printf("%d: ", 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.
  */
  * 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_int caplen = h->caplen;
        u_int length = h->len;

-       u_short ether_type;

        u_short extracted_ethertype;
        u_short extracted_ethertype;

-       const u_short *bp;
-
-       ++infodelay;
-       ts_print(&h->ts);

 
        if (memcmp(rfcllc, p, sizeof(rfcllc))==0 && caplen < RFC1483LLC_LEN) {
                printf("[|cip]");
 
        if (memcmp(rfcllc, p, sizeof(rfcllc))==0 && caplen < RFC1483LLC_LEN) {
                printf("[|cip]");

-               goto out;
+               return (0);

        }
 
        if (eflag)
        }
 
        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;
-
-       if (memcmp(rfcllc, p, sizeof(rfcllc))==0) {
-               length -= RFC1483LLC_LEN;
-               caplen -= RFC1483LLC_LEN;
-               bp = (const u_short *)p;
-               p += RFC1483LLC_LEN;
-               ether_type = ntohs(bp[3]);
-       } else {
-               ether_type = ETHERTYPE_IP;
-               bp = (const u_short *)p;
-       }
+               cip_print(length);

 
 

-       /*
-        * Is it (gag) an 802.3 encapsulation?
-        */
-       extracted_ethertype = 0;
-       if (ether_type < ETHERMTU) {
-               /* Try to print the LLC-layer header & higher layers */
+       if (memcmp(rfcllc, p, sizeof(rfcllc)) == 0) {
+               /*
+                * LLC header is present.  Try to print it & higher layers.
+                */

                if (llc_print(p, length, caplen, NULL, NULL,
                if (llc_print(p, length, caplen, NULL, NULL,

-                   &extracted_ethertype)==0) {
+                   &extracted_ethertype) == 0) {

                        /* ether_type not known, print raw packet */
                        if (!eflag)
                        /* ether_type not known, print raw packet */
                        if (!eflag)

-                               cip_print((u_char *)bp, length + RFC1483LLC_LEN);
+                               cip_print(length);

                        if (extracted_ethertype) {
                                printf("(LLC %s) ",
                               etherproto_string(htons(extracted_ethertype)));
                        }
                        if (extracted_ethertype) {
                                printf("(LLC %s) ",
                               etherproto_string(htons(extracted_ethertype)));
                        }

-                       if (!xflag && !qflag)
+                       if (!suppress_default_print)

                                default_print(p, caplen);
                }
                                default_print(p, caplen);
                }

-       } else if (ether_encap_print(ether_type, p, length, caplen,
-           &extracted_ethertype) == 0) {
-               /* ether_type not known, print raw packet */
-               if (!eflag)
-                       cip_print((u_char *)bp, length + RFC1483LLC_LEN);
-               if (!xflag && !qflag)
-                       default_print(p, caplen);
+       } else {
+               /*
+                * LLC header is absent; treat it as just IP.
+                */
+               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:
+ */