#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"
#endif
#ifdef HAVE_PCAP_USB_H
#ifdef DLT_USB_LINUX
- { usb_linux_48_byte_print, DLT_USB_LINUX},
+ { usb_linux_48_byte_if_print, DLT_USB_LINUX},
#endif /* DLT_USB_LINUX */
#ifdef DLT_USB_LINUX_MMAPPED
- { usb_linux_64_byte_print, DLT_USB_LINUX_MMAPPED},
+ { usb_linux_64_byte_if_print, DLT_USB_LINUX_MMAPPED},
#endif /* DLT_USB_LINUX_MMAPPED */
#endif /* HAVE_PCAP_USB_H */
#ifdef DLT_SYMANTEC_FIREWALL
#ifdef DLT_PPP_ETHER
{ pppoe_if_print, DLT_PPP_ETHER },
#endif
-#if defined(DLT_PFLOG) && defined(HAVE_NET_PFVAR_H)
+#if defined(DLT_PFLOG) && defined(HAVE_NET_IF_PFLOG_H)
{ pflog_if_print, DLT_PFLOG },
#endif
{ token_if_print, DLT_IEEE802 },
{ ltalk_if_print, DLT_LTALK },
#endif
#ifdef DLT_JUNIPER_ATM1
- { juniper_atm1_print, DLT_JUNIPER_ATM1 },
+ { juniper_atm1_if_print, DLT_JUNIPER_ATM1 },
#endif
#ifdef DLT_JUNIPER_ATM2
- { juniper_atm2_print, DLT_JUNIPER_ATM2 },
+ { juniper_atm2_if_print, DLT_JUNIPER_ATM2 },
#endif
#ifdef DLT_JUNIPER_MFR
- { juniper_mfr_print, DLT_JUNIPER_MFR },
+ { juniper_mfr_if_print, DLT_JUNIPER_MFR },
#endif
#ifdef DLT_JUNIPER_MLFR
- { juniper_mlfr_print, DLT_JUNIPER_MLFR },
+ { juniper_mlfr_if_print, DLT_JUNIPER_MLFR },
#endif
#ifdef DLT_JUNIPER_MLPPP
- { juniper_mlppp_print, DLT_JUNIPER_MLPPP },
+ { juniper_mlppp_if_print, DLT_JUNIPER_MLPPP },
#endif
#ifdef DLT_JUNIPER_PPPOE
- { juniper_pppoe_print, DLT_JUNIPER_PPPOE },
+ { juniper_pppoe_if_print, DLT_JUNIPER_PPPOE },
#endif
#ifdef DLT_JUNIPER_PPPOE_ATM
- { juniper_pppoe_atm_print, DLT_JUNIPER_PPPOE_ATM },
+ { juniper_pppoe_atm_if_print, DLT_JUNIPER_PPPOE_ATM },
#endif
#ifdef DLT_JUNIPER_GGSN
- { juniper_ggsn_print, DLT_JUNIPER_GGSN },
+ { juniper_ggsn_if_print, DLT_JUNIPER_GGSN },
#endif
#ifdef DLT_JUNIPER_ES
- { juniper_es_print, DLT_JUNIPER_ES },
+ { juniper_es_if_print, DLT_JUNIPER_ES },
#endif
#ifdef DLT_JUNIPER_MONITOR
- { juniper_monitor_print, DLT_JUNIPER_MONITOR },
+ { juniper_monitor_if_print, DLT_JUNIPER_MONITOR },
#endif
#ifdef DLT_JUNIPER_SERVICES
- { juniper_services_print, DLT_JUNIPER_SERVICES },
+ { juniper_services_if_print, DLT_JUNIPER_SERVICES },
#endif
#ifdef DLT_JUNIPER_ETHER
- { juniper_ether_print, DLT_JUNIPER_ETHER },
+ { juniper_ether_if_print, DLT_JUNIPER_ETHER },
#endif
#ifdef DLT_JUNIPER_PPP
- { juniper_ppp_print, DLT_JUNIPER_PPP },
+ { juniper_ppp_if_print, DLT_JUNIPER_PPP },
#endif
#ifdef DLT_JUNIPER_FRELAY
- { juniper_frelay_print, DLT_JUNIPER_FRELAY },
+ { juniper_frelay_if_print, DLT_JUNIPER_FRELAY },
#endif
#ifdef DLT_JUNIPER_CHDLC
- { juniper_chdlc_print, DLT_JUNIPER_CHDLC },
+ { juniper_chdlc_if_print, DLT_JUNIPER_CHDLC },
#endif
#ifdef DLT_PKTAP
{ pktap_if_print, DLT_PKTAP },
{ 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 NORETURN ndo_error(netdissect_options *ndo,
+ FORMAT_STRING(const char *fmt), ...)
+ 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(u_int32_t localnet, u_int32_t mask, uint32_t timezone_offset)
+init_print(netdissect_options *ndo, uint32_t localnet, uint32_t mask,
+ uint32_t timezone_offset)
{
thiszone = timezone_offset;
- init_addrtoname(gndo, localnet, mask);
+ init_addrtoname(ndo, localnet, mask);
init_checksum();
}
int
has_printer(int type)
{
-
return (lookup_printer(type) != NULL);
}
-struct print_info
-get_print_info(int type)
+if_printer
+get_if_printer(netdissect_options *ndo, int type)
{
- struct print_info printinfo;
-
- printinfo.ndo = gndo;
- printinfo.printer = lookup_printer(type);
- if (printinfo.printer == NULL) {
- gndo->ndo_dltname = pcap_datalink_val_to_name(type);
- if (gndo->ndo_dltname != NULL)
- error("packet printing is not supported for link type %s: use -w",
- gndo->ndo_dltname);
+ const char *dltname;
+ if_printer printer;
+
+ printer = lookup_printer(type);
+ if (printer == NULL) {
+ dltname = pcap_datalink_val_to_name(type);
+ if (dltname != NULL)
+ (*ndo->ndo_error)(ndo,
+ "packet printing is not supported for link type %s: use -w",
+ dltname);
else
- error("packet printing is not supported for link type %d: use -w", 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));
ts_print(ndo, &h->ts);
/*
- * Some printers want to check that they're not walking off the
- * end of the packet.
+ * Printers must check that they're not walking off the end of
+ * the packet.
* Rather than pass it all the way down, we set this member
* of the netdissect_options structure.
*/
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
}
}
- putchar('\n');
+ ND_PRINT((ndo, "\n"));
}
/*
/* 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);
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);
}
static int
-tcpdump_printf(netdissect_options *ndo _U_, const char *fmt, ...)
+ndo_printf(netdissect_options *ndo, const char *fmt, ...)
{
va_list args;
int ret;
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;
}
projects / tcpdump / blobdiff