X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/513f782ae18791f0c925b9235da749b38159b607..d2777156522f139a858bd6b5b51e364826bc95a7:/print-ipfc.c

diff --git a/print-ipfc.c b/print-ipfc.c
index 8a050ed4..ab5a8131 100644
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -24,16 +24,18 @@
 /* specification: RFC 2625 */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "netdissect-stdinc.h"
 
 #include <string.h>
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "addrtoname.h"
 
+
 struct ipfc_header {
 	nd_byte ipfc_dhost[2+MAC_ADDR_LEN];
 	nd_byte ipfc_shost[2+MAC_ADDR_LEN];
@@ -42,9 +44,9 @@ struct ipfc_header {
 #define IPFC_HDRLEN 16
 
 /* Extract src, dst addresses */
-static inline void
+static void
 extract_ipfc_addrs(const struct ipfc_header *ipfcp, char *ipfcsrc,
-    char *ipfcdst)
+		   char *ipfcdst)
 {
 	/*
 	 * We assume that, as per RFC 2625, the lower 48 bits of the
@@ -57,11 +59,10 @@ extract_ipfc_addrs(const struct ipfc_header *ipfcp, char *ipfcsrc,
 /*
  * Print the Network_Header
  */
-static inline void
+static void
 ipfc_hdr_print(netdissect_options *ndo,
-	   const struct ipfc_header *ipfcp _U_,
-	   u_int length, const u_char *ipfcsrc,
-	   const u_char *ipfcdst)
+	       const struct ipfc_header *ipfcp _U_, u_int length,
+	       const u_char *ipfcsrc, const u_char *ipfcdst)
 {
 	const char *srcname, *dstname;
 
@@ -94,10 +95,8 @@ ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 	struct lladdr_info src, dst;
 	int llc_hdrlen;
 
-	if (caplen < IPFC_HDRLEN) {
-		ND_PRINT("[|ipfc]");
-		return (caplen);
-	}
+	ndo->ndo_protocol = "ipfc";
+	ND_TCHECK_LEN(p, IPFC_HDRLEN);
 	/*
 	 * Get the network addresses into a canonical form
 	 */
@@ -136,8 +135,9 @@ ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
+void
 ipfc_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
-	return (ipfc_print(ndo, p, h->len, h->caplen));
+	ndo->ndo_protocol = "ipfc";
+	ndo->ndo_ll_hdr_len += ipfc_print(ndo, p, h->len, h->caplen);
 }