Default to first interface from pcap_findalldevs()

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 83cc4e5f8e750bcb11a0f2f91d6bc9dd84bba956..e7a18b3d73aecbf4ad5a19b1453d82ac8c95bd7d 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -23,9 +23,9 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"


@@ -128,7 +128,7 @@ ether_print(netdissect_options *ndo,
             const u_char *p, u_int length, u_int caplen,
             void (*print_encap_header)(netdissect_options *ndo, const u_char *), const u_char *encap_header_arg)
 {
             const u_char *p, u_int length, u_int caplen,
             void (*print_encap_header)(netdissect_options *ndo, const u_char *), const u_char *encap_header_arg)
 {

-       struct ether_header *ep;
+       const struct ether_header *ep;

        u_int orig_length;
        u_short ether_type;
        u_int hdrlen;
        u_int orig_length;
        u_short ether_type;
        u_int hdrlen;


@@ -152,7 +152,7 @@ ether_print(netdissect_options *ndo,
 
        length -= ETHER_HDRLEN;
        caplen -= ETHER_HDRLEN;
 
        length -= ETHER_HDRLEN;
        caplen -= ETHER_HDRLEN;

-       ep = (struct ether_header *)p;
+       ep = (const struct ether_header *)p;

        p += ETHER_HDRLEN;
        hdrlen = ETHER_HDRLEN;
 
        p += ETHER_HDRLEN;
        hdrlen = ETHER_HDRLEN;
 


@@ -227,7 +227,7 @@ recurse:
                        if (!ndo->ndo_eflag) {
                                if (print_encap_header != NULL)
                                        (*print_encap_header)(ndo, encap_header_arg);
                        if (!ndo->ndo_eflag) {
                                if (print_encap_header != NULL)
                                        (*print_encap_header)(ndo, encap_header_arg);

-                               ether_hdr_print(ndo, (u_char *)ep, orig_length);
+                               ether_hdr_print(ndo, (const u_char *)ep, orig_length);

                        }
 
                        if (!ndo->ndo_suppress_default_print)
                        }
 
                        if (!ndo->ndo_suppress_default_print)