Makefile.in: don't remove configure and config.h.in in make distclean.

[tcpdump] / print-cip.c

diff --git a/print-cip.c b/print-cip.c
index 82e1de65db2c79267d7847d4b1ead090b1ee606d..b8ef77fd2fb3ab80407a5292fafdb42417f189e4 100644 (file)
--- a/print-cip.c
+++ b/print-cip.c
@@ -20,23 +20,19 @@
  *
  */
 
+/* \summary: Linux Classical IP over ATM printer */
+
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <string.h>
 
-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <pcap.h>
+#include "netdissect-stdinc.h"
 
-#include "interface.h"
+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect.h"
 #include "addrtoname.h"
-#include "ethertype.h"
-#include "ether.h"
-
-#define RFC1483LLC_LEN 8
 
 static const unsigned char rfcllc[] = {
        0xaa,   /* DSAP: non-ISO */
@@ -46,66 +42,46 @@ static const unsigned char rfcllc[] = {
        0x00,
        0x00 };
 
-static inline void
-cip_print(int length)
-{
-       /*
-        * There is no MAC-layer header, so just print the length.
-        */
-       printf("%d: ", 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->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
-cip_if_print(const struct pcap_pkthdr *h, const u_char *p)
+void
+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;
+       int llc_hdrlen;
 
-       if (memcmp(rfcllc, p, sizeof(rfcllc))==0 && caplen < RFC1483LLC_LEN) {
-               printf("[|cip]");
-               return (0);
-       }
+       ndo->ndo_protocol = "cip";
 
-       if (eflag)
-               cip_print(length);
+       if (ndo->ndo_eflag)
+               /*
+                * There is no MAC-layer header, so just print the length.
+                */
+               ND_PRINT("%u: ", length);
 
+       ND_TCHECK_LEN(p, sizeof(rfcllc));
        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,
-                   &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 (!suppress_default_print)
-                               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(gndo, p, length);
+               llc_hdrlen = 0;
+               ip_print(ndo, p, length);
        }
 
-       return (0);
+       ndo->ndo_ll_hdr_len += llc_hdrlen;
 }
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */