X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b751376719cfe1924aa07ab8fd364ec1a55c04b3..refs/pull/1034/head:/print-cip.c

diff --git a/print-cip.c b/print-cip.c
index e69999a0..b8ef77fd 100644
--- a/print-cip.c
+++ b/print-cip.c
@@ -30,6 +30,7 @@
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "addrtoname.h"
 
@@ -41,44 +42,29 @@ static const unsigned char rfcllc[] = {
 	0x00,
 	0x00 };
 
-static void
-cip_print(netdissect_options *ndo, u_int length)
-{
-	/*
-	 * There is no MAC-layer header, so just print the length.
-	 */
-	ND_PRINT("%u: ", 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
+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;
-	size_t cmplen;
 	int llc_hdrlen;
 
-	ndo->ndo_protocol = "cip_if";
-	cmplen = sizeof(rfcllc);
-	if (cmplen > caplen)
-		cmplen = caplen;
-	if (cmplen > length)
-		cmplen = length;
+	ndo->ndo_protocol = "cip";
 
 	if (ndo->ndo_eflag)
-		cip_print(ndo, length);
+		/*
+		 * There is no MAC-layer header, so just print the length.
+		 */
+		ND_PRINT("%u: ", length);
 
-	if (cmplen == 0) {
-		nd_print_trunc(ndo);
-		return 0;
-	}
-	if (memcmp(rfcllc, p, cmplen) == 0) {
+	ND_TCHECK_LEN(p, sizeof(rfcllc));
+	if (memcmp(rfcllc, p, sizeof(rfcllc)) == 0) {
 		/*
 		 * LLC header is present.  Try to print it & higher layers.
 		 */
@@ -97,5 +83,5 @@ cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 		ip_print(ndo, p, length);
 	}
 
-	return (llc_hdrlen);
+	ndo->ndo_ll_hdr_len += llc_hdrlen;
 }