Upgrade tcpdump to tcpdump-4.99.1
Test: make
Change-Id: I052ed8f5279c806e4d2ff925f581b71db3ac03c0
diff --git a/print-cip.c b/print-cip.c
index a123b69..b8ef77f 100644
--- a/print-cip.c
+++ b/print-cip.c
@@ -20,16 +20,17 @@
*
*/
-/* \summary: Classical-IP over ATM printer */
+/* \summary: Linux Classical IP over ATM printer */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
#include <string.h>
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
+#define ND_LONGJMP_FROM_TCHECK
#include "netdissect.h"
#include "addrtoname.h"
@@ -41,43 +42,29 @@
0x00,
0x00 };
-static inline void
-cip_print(netdissect_options *ndo, u_int length)
-{
- /*
- * There is no MAC-layer header, so just print the length.
- */
- ND_PRINT((ndo, "%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;
- 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((ndo, "[|cip]"));
- 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.
*/
@@ -96,13 +83,5 @@
ip_print(ndo, p, length);
}
- return (llc_hdrlen);
+ ndo->ndo_ll_hdr_len += llc_hdrlen;
}
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */