X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/f253e110096ed673dc9de26da43ca80eaa2baec1..c0af6af3011d4c55bdadf3dd76cd5fc1115c50d0:/print.c

diff --git a/print.c b/print.c
index 274ac202..9ee88eb1 100644
--- a/print.c
+++ b/print.c
@@ -37,6 +37,9 @@
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "print.h"
+#include "netdissect-alloc.h"
+
+#include "pcap-missing.h"
 
 struct printer {
 	if_printer f;
@@ -63,11 +66,11 @@ static const struct printer printers[] = {
 #ifdef DLT_NETANALYZER_TRANSPARENT
 	{ netanalyzer_transparent_if_print, DLT_NETANALYZER_TRANSPARENT },
 #endif
-#if defined(DLT_NFLOG) && defined(HAVE_PCAP_NFLOG_H)
+#ifdef DLT_NFLOG
 	{ nflog_if_print,	DLT_NFLOG},
 #endif
 #ifdef DLT_CIP
-	{ cip_if_print,	 	DLT_CIP },
+	{ cip_if_print,		DLT_CIP },
 #endif
 #ifdef DLT_ATM_CLIP
 	{ cip_if_print,		DLT_ATM_CLIP },
@@ -82,7 +85,7 @@ static const struct printer printers[] = {
 #ifdef DLT_APPLE_IP_OVER_IEEE1394
 	{ ap1394_if_print,	DLT_APPLE_IP_OVER_IEEE1394 },
 #endif
-#if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H)
+#ifdef DLT_BLUETOOTH_HCI_H4_WITH_PHDR
 	{ bt_if_print,		DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
 #endif
 #ifdef DLT_LANE8023
@@ -125,6 +128,9 @@ static const struct printer printers[] = {
 #ifdef DLT_LINUX_SLL
 	{ sll_if_print,		DLT_LINUX_SLL },
 #endif
+#ifdef DLT_LINUX_SLL2
+	{ sll2_if_print,	DLT_LINUX_SLL2 },
+#endif
 #ifdef DLT_FR
 	{ fr_if_print,		DLT_FR },
 #endif
@@ -217,6 +223,12 @@ static const struct printer printers[] = {
 #endif
 #ifdef DLT_PPP_SERIAL
 	{ ppp_hdlc_if_print,	DLT_PPP_SERIAL },
+#endif
+#ifdef DLT_DSA_TAG_BRCM
+	{ brcm_tag_if_print,	DLT_DSA_TAG_BRCM },
+#endif
+#ifdef DLT_DSA_TAG_BRCM_PREPEND
+	{ brcm_tag_prepend_if_print, DLT_DSA_TAG_BRCM_PREPEND },
 #endif
 	{ NULL,			0 },
 };
@@ -225,8 +237,9 @@ static void	ndo_default_print(netdissect_options *ndo, const u_char *bp,
 		    u_int length);
 
 static void NORETURN ndo_error(netdissect_options *ndo,
+		     status_exit_codes_t status,
 		     FORMAT_STRING(const char *fmt), ...)
-		     PRINTFLIKE(2, 3);
+		     PRINTFLIKE(3, 4);
 static void	ndo_warning(netdissect_options *ndo,
 		    FORMAT_STRING(const char *fmt), ...)
 		    PRINTFLIKE(2, 3);
@@ -236,11 +249,9 @@ static int	ndo_printf(netdissect_options *ndo,
 		     PRINTFLIKE(2, 3);
 
 void
-init_print(netdissect_options *ndo, uint32_t localnet, uint32_t mask,
-	   uint32_t timezone_offset)
+init_print(netdissect_options *ndo, uint32_t localnet, uint32_t mask)
 {
 
-	thiszone = timezone_offset;
 	init_addrtoname(ndo, localnet, mask);
 	init_checksum();
 }
@@ -298,11 +309,11 @@ get_if_printer(netdissect_options *ndo, int type)
 	if (printer == NULL) {
 		dltname = pcap_datalink_val_to_name(type);
 		if (dltname != NULL)
-			(*ndo->ndo_error)(ndo,
+			(*ndo->ndo_error)(ndo, S_ERR_ND_NO_PRINTER,
 					  "packet printing is not supported for link type %s: use -w",
 					  dltname);
 		else
-			(*ndo->ndo_error)(ndo,
+			(*ndo->ndo_error)(ndo, S_ERR_ND_NO_PRINTER,
 					  "packet printing is not supported for link type %d: use -w", type);
 	}
 	return printer;
@@ -315,11 +326,11 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
 	u_int hdrlen;
 	int invalid_header = 0;
 
-	if(ndo->ndo_packet_number)
+	if (ndo->ndo_packet_number)
 		ND_PRINT("%5u  ", packets_captured);
 
 	/* Sanity checks on packet length / capture length */
-	if(h->caplen == 0) {
+	if (h->caplen == 0) {
 		invalid_header = 1;
 		ND_PRINT("[Invalid header: caplen==0");
 	}
@@ -447,6 +458,7 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
 	}
 
 	ND_PRINT("\n");
+	nd_free_all(ndo);
 }
 
 /*
@@ -460,11 +472,12 @@ ndo_default_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
 /* VARARGS */
 static void
-ndo_error(netdissect_options *ndo, const char *fmt, ...)
+ndo_error(netdissect_options *ndo, status_exit_codes_t status,
+	  const char *fmt, ...)
 {
 	va_list ap;
 
-	if(ndo->program_name)
+	if (ndo->program_name)
 		(void)fprintf(stderr, "%s: ", ndo->program_name);
 	va_start(ap, fmt);
 	(void)vfprintf(stderr, fmt, ap);
@@ -475,7 +488,7 @@ ndo_error(netdissect_options *ndo, const char *fmt, ...)
 			(void)fputc('\n', stderr);
 	}
 	nd_cleanup();
-	exit(1);
+	exit(status);
 	/* NOTREACHED */
 }
 
@@ -485,7 +498,7 @@ ndo_warning(netdissect_options *ndo, const char *fmt, ...)
 {
 	va_list ap;
 
-	if(ndo->program_name)
+	if (ndo->program_name)
 		(void)fprintf(stderr, "%s: ", ndo->program_name);
 	(void)fprintf(stderr, "WARNING: ");
 	va_start(ap, fmt);
@@ -509,7 +522,8 @@ ndo_printf(netdissect_options *ndo, const char *fmt, ...)
 	va_end(args);
 
 	if (ret < 0)
-		ndo_error(ndo, "Unable to write output: %s", pcap_strerror(errno));
+		ndo_error(ndo, S_ERR_ND_WRITE_FILE,
+			  "Unable to write output: %s", pcap_strerror(errno));
 	return (ret);
 }
 
@@ -521,9 +535,3 @@ ndo_set_function_pointers(netdissect_options *ndo)
 	ndo->ndo_error=ndo_error;
 	ndo->ndo_warning=ndo_warning;
 }
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */