From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Fri, 7 Feb 2020 19:31:51 +0000 (+0100)
Subject: ENC: Update the link-layer dissector to a void function
X-Git-Tag: tcpdump-4.99-bp~526
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/c3f8e04764b5f9dcb424722aaeee9598e705faed

ENC: Update the link-layer dissector to a void function

Moreover:
Remove trailing "_if" from protocol name.
Remove a no longer used 'out' label.
---

diff --git a/netdissect.h b/netdissect.h
index 1edfdbdb..b6fe0b51 100644
--- a/netdissect.h
+++ b/netdissect.h
@@ -472,7 +472,7 @@ extern u_int chdlc_if_print IF_PRINTER_ARGS;
 extern u_int cip_if_print IF_PRINTER_ARGS;
 extern u_int dsa_if_print IF_PRINTER_ARGS;
 extern u_int edsa_if_print IF_PRINTER_ARGS;
-extern u_int enc_if_print IF_PRINTER_ARGS;
+extern void enc_if_print IF_PRINTER_ARGS;
 extern u_int ether_if_print IF_PRINTER_ARGS;
 extern u_int fddi_if_print IF_PRINTER_ARGS;
 extern u_int fr_if_print IF_PRINTER_ARGS;
diff --git a/print-enc.c b/print-enc.c
index e6c27870..aeacd6c6 100644
--- a/print-enc.c
+++ b/print-enc.c
@@ -94,7 +94,7 @@ struct enchdr {
 #define	SWAPLONG(y) \
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 
-u_int
+void
 enc_if_print(netdissect_options *ndo,
              const struct pcap_pkthdr *h, const u_char *p)
 {
@@ -103,11 +103,13 @@ enc_if_print(netdissect_options *ndo,
 	u_int af, flags;
 	const struct enchdr *hdr;
 
-	ndo->ndo_protocol = "enc_if";
+	ndo->ndo_protocol = "enc";
 	if (caplen < ENC_HDRLEN) {
+		ndo->ndo_ll_header_length += caplen;
 		nd_print_trunc(ndo);
-		goto out;
+		return;
 	}
+	ndo->ndo_ll_header_length += ENC_HDRLEN;
 
 	hdr = (const struct enchdr *)p;
 	/*
@@ -159,6 +161,5 @@ enc_if_print(netdissect_options *ndo,
 		break;
 	}
 
-out:
-	return (ENC_HDRLEN);
+	return;
 }
diff --git a/print.c b/print.c
index a4bc1ec2..8543a8b3 100644
--- a/print.c
+++ b/print.c
@@ -127,9 +127,6 @@ static const struct uint_printer uint_printers[] = {
 	{ mfr_if_print,		DLT_MFR },
 #endif
 	{ atm_if_print,		DLT_ATM_RFC1483 },
-#ifdef DLT_ENC
-	{ enc_if_print,		DLT_ENC },
-#endif
 	{ sl_if_print,		DLT_SLIP },
 #ifdef DLT_SLIP_BSDOS
 	{ sl_bsdos_if_print,	DLT_SLIP_BSDOS },
@@ -231,6 +228,9 @@ static const struct void_printer void_printers[] = {
 #endif
 #ifdef DLT_BLUETOOTH_HCI_H4_WITH_PHDR
 	{ bt_if_print,		DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
+#endif
+#ifdef DLT_ENC
+	{ enc_if_print,		DLT_ENC },
 #endif
 	{ null_if_print,	DLT_NULL },
 #ifdef DLT_LOOP