X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/e847135d66e822a96198a8d15771cf3a827b1ee9..e01c9bf76740802025c9328901b55ee4a0c49ed6:/print.c

diff --git a/print.c b/print.c
index 66a07ee1..c76f3441 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,30 +223,22 @@ static const struct printer printers[] = {
 	{ NULL,			0 },
 };
 
-
 static void	ndo_default_print(netdissect_options *ndo, const u_char *bp,
 		    u_int length);
 
-static void	ndo_error(netdissect_options *ndo _U_, const char *fmt, ...)
-		    __attribute__((noreturn))
-#ifdef __ATTRIBUTE___FORMAT_OK
-		    __attribute__((format (printf, 2, 3)))
-#endif /* __ATTRIBUTE___FORMAT_OK */
-		    ;
-static void	ndo_warning(netdissect_options *ndo _U_, const char *fmt, ...)
-#ifdef __ATTRIBUTE___FORMAT_OK
-		    __attribute__((format (printf, 2, 3)))
-#endif /* __ATTRIBUTE___FORMAT_OK */
-		    ;
-
-static int	tcpdump_printf(netdissect_options *ndo _U_, const char *fmt, ...)
-#ifdef __ATTRIBUTE___FORMAT_OK
-		     __attribute ((format (printf, 2, 3)))
-#endif /* __ATTRIBUTE___FORMAT_OK */
-		     ;
+static void	ndo_error(netdissect_options *ndo,
+		    FORMAT_STRING(const char *fmt), ...)
+		    NORETURN PRINTFLIKE(2, 3);
+static void	ndo_warning(netdissect_options *ndo,
+		    FORMAT_STRING(const char *fmt), ...)
+		    PRINTFLIKE(2, 3);
+
+static int	ndo_printf(netdissect_options *ndo,
+		     FORMAT_STRING(const char *fmt), ...)
+		     PRINTFLIKE(2, 3);
 
 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 +287,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 +307,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 +329,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
@@ -408,7 +394,7 @@ pretty_print_packet(struct print_info *print_info, const struct pcap_pkthdr *h,
 		}
 	}
 
-	putchar('\n');
+	ND_PRINT((ndo, "\n"));
 }
 
 /*
@@ -422,11 +408,12 @@ ndo_default_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
 /* VARARGS */
 static void
-ndo_error(netdissect_options *ndo _U_, const char *fmt, ...)
+ndo_error(netdissect_options *ndo, const char *fmt, ...)
 {
 	va_list ap;
 
-	(void)fprintf(stderr, "%s: ", program_name);
+	if(ndo->program_name)
+		(void)fprintf(stderr, "%s: ", ndo->program_name);
 	va_start(ap, fmt);
 	(void)vfprintf(stderr, fmt, ap);
 	va_end(ap);
@@ -435,17 +422,20 @@ ndo_error(netdissect_options *ndo _U_, const char *fmt, ...)
 		if (fmt[-1] != '\n')
 			(void)fputc('\n', stderr);
 	}
+	nd_cleanup();
 	exit(1);
 	/* NOTREACHED */
 }
 
 /* VARARGS */
 static void
-ndo_warning(netdissect_options *ndo _U_, const char *fmt, ...)
+ndo_warning(netdissect_options *ndo, const char *fmt, ...)
 {
 	va_list ap;
 
-	(void)fprintf(stderr, "%s: WARNING: ", program_name);
+	if(ndo->program_name)
+		(void)fprintf(stderr, "%s: ", ndo->program_name);
+	(void)fprintf(stderr, "WARNING: ");
 	va_start(ap, fmt);
 	(void)vfprintf(stderr, fmt, ap);
 	va_end(ap);
@@ -457,7 +447,7 @@ ndo_warning(netdissect_options *ndo _U_, const char *fmt, ...)
 }
 
 static int
-tcpdump_printf(netdissect_options *ndo _U_, const char *fmt, ...)
+ndo_printf(netdissect_options *ndo, const char *fmt, ...)
 {
 	va_list args;
 	int ret;
@@ -466,15 +456,16 @@ tcpdump_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=tcpdump_printf;
+	ndo->ndo_printf=ndo_printf;
 	ndo->ndo_error=ndo_error;
 	ndo->ndo_warning=ndo_warning;
 }