X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/d8b3af528a3af5d3715f0d05c3583420acfb8a22..refs/heads/mcr-macro-update-1:/print-cip.c

diff --git a/print-cip.c b/print-cip.c
index 1a8d1054..8838dc99 100644
--- a/print-cip.c
+++ b/print-cip.c
@@ -20,28 +20,18 @@
  *
  */
 
-#ifndef lint
-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
+/* \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"
+#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 */
@@ -51,13 +41,13 @@ static const unsigned char rfcllc[] = {
 	0x00,
 	0x00 };
 
-static inline void
-cip_print(int length)
+static void
+cip_print(netdissect_options *ndo, u_int length)
 {
 	/*
 	 * There is no MAC-layer header, so just print the length.
 	 */
-	printf("%d: ", length);
+	ND_PRINT("%u: ", length);
 }
 
 /*
@@ -66,51 +56,46 @@ cip_print(int length)
  * '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;
-
-	if (memcmp(rfcllc, p, sizeof(rfcllc))==0 && caplen < RFC1483LLC_LEN) {
-		printf("[|cip]");
-		return (0);
+	size_t cmplen;
+	int llc_hdrlen;
+
+	ndo->ndo_protocol = "cip";
+	cmplen = sizeof(rfcllc);
+	if (cmplen > caplen)
+		cmplen = caplen;
+	if (cmplen > length)
+		cmplen = length;
+
+	if (ndo->ndo_eflag)
+		cip_print(ndo, length);
+
+	if (cmplen == 0) {
+		nd_print_trunc(ndo);
+		return;
 	}
-
-	if (eflag)
-		cip_print(length);
-
-	if (memcmp(rfcllc, p, sizeof(rfcllc)) == 0) {
+	if (memcmp(rfcllc, p, cmplen) == 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:
- */