Default to first interface from pcap_findalldevs()

[tcpdump] / print-802_15_4.c

diff --git a/print-802_15_4.c b/print-802_15_4.c
index 26c28ee652aa6e71c48d68e3154e1cb043acb73b..4a1ef49b7fd03da999c43bf50ec03a3d7c43f301 100644 (file)
--- a/print-802_15_4.c
+++ b/print-802_15_4.c
@@ -20,14 +20,13 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 
 #include "extract.h"
@@ -112,7 +111,7 @@ ieee802_15_4_if_print(netdissect_options *ndo,
        if (ndo->ndo_vflag)
                ND_PRINT((ndo,"seq %02x ", seq));
        if (hdrlen == -1) {
-               ND_PRINT((ndo,"malformed! "));
+               ND_PRINT((ndo,"invalid! "));
                return caplen;
        }
 
@@ -139,7 +138,7 @@ ieee802_15_4_if_print(netdissect_options *ndo,
                case 0x03:
                        panid = EXTRACT_LE_16BITS(p);
                        p += 2;
-                       ND_PRINT((ndo,"%04x:%s ", panid, le64addr_string(p)));
+                       ND_PRINT((ndo,"%04x:%s ", panid, le64addr_string(ndo, p)));
                        p += 8;
                        break;
                }
@@ -165,7 +164,7 @@ ieee802_15_4_if_print(netdissect_options *ndo,
                                panid = EXTRACT_LE_16BITS(p);
                                p += 2;
                        }
-                        ND_PRINT((ndo,"%04x:%s ", panid, le64addr_string(p)));
+                        ND_PRINT((ndo,"%04x:%s ", panid, le64addr_string(ndo, p)));
                        p += 8;
                        break;
                }