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

diff --git a/print-cip.c b/print-cip.c
index e69999a0..8838dc99 100644
--- a/print-cip.c
+++ b/print-cip.c
@@ -56,7 +56,7 @@ cip_print(netdissect_options *ndo, u_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
+void
 cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
 	u_int caplen = h->caplen;
@@ -64,7 +64,7 @@ cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 	size_t cmplen;
 	int llc_hdrlen;
 
-	ndo->ndo_protocol = "cip_if";
+	ndo->ndo_protocol = "cip";
 	cmplen = sizeof(rfcllc);
 	if (cmplen > caplen)
 		cmplen = caplen;
@@ -76,7 +76,7 @@ cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 
 	if (cmplen == 0) {
 		nd_print_trunc(ndo);
-		return 0;
+		return;
 	}
 	if (memcmp(rfcllc, p, cmplen) == 0) {
 		/*
@@ -97,5 +97,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;
 }