X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/944e93fa4c29c4e5cdecd858ead5a37430a418af..1bcd37991fa57d9e966a6f96e7cbff59b16c28bd:/print-ipfc.c

diff --git a/print-ipfc.c b/print-ipfc.c
index 6c751380..5222e512 100644
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -34,6 +34,7 @@
 #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];
@@ -44,7 +45,7 @@ struct ipfc_header {
 /* Extract src, dst addresses */
 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
@@ -59,9 +60,8 @@ extract_ipfc_addrs(const struct ipfc_header *ipfcp, char *ipfcsrc,
  */
 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,13 +94,13 @@ 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";
+	if (caplen < IPFC_HDRLEN)
+		goto trunc;
 	/*
 	 * Get the network addresses into a canonical form
 	 */
+	ND_TCHECK_SIZE(ipfcp);
 	extract_ipfc_addrs(ipfcp, (char *)srcmac, (char *)dstmac);
 
 	if (ndo->ndo_eflag)
@@ -128,6 +128,9 @@ ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 		llc_hdrlen = -llc_hdrlen;
 	}
 	return (IPFC_HDRLEN + llc_hdrlen);
+trunc:
+	nd_print_trunc(ndo);
+	return caplen;
 }
 
 /*
@@ -136,8 +139,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);
 }