X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/9e90deb655887260d70ec9baad25df01f0594b20..d6aacc676d8540f31d1df72b12b43fc9cde93df6:/print.c

diff --git a/print.c b/print.c
index 876d09c6..9fedd9fb 100644
--- a/print.c
+++ b/print.c
@@ -32,10 +32,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include "netdissect.h"
-#include "interface.h"
 #include "addrtoname.h"
 #include "print.h"
 
@@ -224,7 +223,6 @@ static const struct printer printers[] = {
 	{ NULL,			0 },
 };
 
-
 static void	ndo_default_print(netdissect_options *ndo, const u_char *bp,
 		    u_int length);
 
@@ -247,7 +245,7 @@ static int	ndo_printf(netdissect_options *ndo _U_, const char *fmt, ...)
 		     ;
 
 void
-init_print(netdissect_options *ndo, u_int32_t localnet, u_int32_t mask,
+init_print(netdissect_options *ndo, uint32_t localnet, uint32_t mask,
     uint32_t timezone_offset)
 {
 
@@ -296,19 +294,17 @@ lookup_printer(int type)
 int
 has_printer(int type)
 {
-
 	return (lookup_printer(type) != NULL);
 }
 
-struct print_info
-get_print_info(netdissect_options *ndo, int type)
+if_printer
+get_if_printer(netdissect_options *ndo, int type)
 {
 	const char *dltname;
-	struct print_info printinfo;
+	if_printer printer;
 
-	printinfo.ndo = ndo;
-	printinfo.printer = lookup_printer(type);
-	if (printinfo.printer == NULL) {
+	printer = lookup_printer(type);
+	if (printer == NULL) {
 		dltname = pcap_datalink_val_to_name(type);
 		if (dltname != NULL)
 			(*ndo->ndo_error)(ndo,
@@ -318,17 +314,14 @@ get_print_info(netdissect_options *ndo, int type)
 			(*ndo->ndo_error)(ndo,
 					  "packet printing is not supported for link type %d: use -w", type);
 	}
-	return (printinfo);
+	return printer;
 }
 
 void
-pretty_print_packet(struct print_info *print_info, const struct pcap_pkthdr *h,
+pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
     const u_char *sp, u_int packets_captured)
 {
 	u_int hdrlen;
-        netdissect_options *ndo;
-
-        ndo = print_info->ndo;
 
 	if(ndo->ndo_packet_number)
 		ND_PRINT((ndo, "%5u  ", packets_captured));
@@ -343,7 +336,7 @@ pretty_print_packet(struct print_info *print_info, const struct pcap_pkthdr *h,
 	 */
 	ndo->ndo_snapend = sp + h->caplen;
 
-        hdrlen = (*print_info->printer)(print_info->ndo, h, sp);
+        hdrlen = (ndo->ndo_if_printer)(ndo, h, sp);
 
 	/*
 	 * Restore the original snapend, as a printer might have
@@ -469,13 +462,14 @@ ndo_printf(netdissect_options *ndo _U_, const char *fmt, ...)
 	ret = vfprintf(stdout, fmt, args);
 	va_end(args);
 
+	if (ret < 0)
+		ndo_error(ndo, "Unable to write output: %s", pcap_strerror(errno));
 	return (ret);
 }
 
 void
 ndo_set_function_pointers(netdissect_options *ndo)
 {
-
 	ndo->ndo_default_print=ndo_default_print;
 	ndo->ndo_printf=ndo_printf;
 	ndo->ndo_error=ndo_error;