X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/32e24ead3b2a171e5f5eff50d7231c2514eda9b4..94366a69b0ea80c2e85aa89f7b7f30d7f335bd76:/print-fddi.c

diff --git a/print-fddi.c b/print-fddi.c
index d73d92d6..75a1055f 100644
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -240,8 +240,7 @@ extract_fddi_addrs(const struct fddi_header *fddip, char *fsrc, char *fdst)
 			fdst[i] = fddi_bit_swap[fddip->fddi_dhost[i]];
 		for (i = 0; i < 6; ++i)
 			fsrc[i] = fddi_bit_swap[fddip->fddi_shost[i]];
-	}
-	else {
+	} else {
 		memcpy(fdst, (const char *)fddip->fddi_dhost, 6);
 		memcpy(fsrc, (const char *)fddip->fddi_shost, 6);
 	}
@@ -261,7 +260,7 @@ fddi_hdr_print(netdissect_options *ndo,
 	dstname = etheraddr_string(ndo, fdst);
 
 	if (!ndo->ndo_qflag)
-		print_fddi_fc(ndo, EXTRACT_U_1(fddip->fddi_fc));
+		print_fddi_fc(ndo, GET_U_1(fddip->fddi_fc));
 	ND_PRINT("%s > %s, length %u: ",
 	       srcname, dstname,
 	       length);
@@ -288,7 +287,7 @@ fddi_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 		return (caplen);
 	}
 
-	fc = EXTRACT_U_1(fddip->fddi_fc);
+	fc = GET_U_1(fddip->fddi_fc);
 
 	/*
 	 * Get the FDDI addresses into a canonical form
@@ -342,9 +341,9 @@ fddi_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
 fddi_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
-	ndo->ndo_protocol = "fddi_if";
-	return (fddi_print(ndo, p, h->len, h->caplen));
+	ndo->ndo_protocol = "fddi";
+	ndo->ndo_ll_hdr_len += fddi_print(ndo, p, h->len, h->caplen);
 }