Default to first interface from pcap_findalldevs()

[tcpdump] / print.c

diff --git a/print.c b/print.c
index 8f68bae380381ec1fdffc085a9cc8e259fd1e4e6..ee8ee97b28d9fbe77c33f2876e7935ef1d6a689c 100644 (file)
--- a/print.c
+++ b/print.c
@@ -223,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);
 
@@ -246,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)
 {
 
@@ -295,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,
@@ -317,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));
@@ -342,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
@@ -474,7 +468,6 @@ ndo_printf(netdissect_options *ndo _U_, const char *fmt, ...)
 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;