This commit makes ipnet_if_print the first NDO aware top-level

printer.
Merge commit 'origin/master'

Conflicts:
	netdissect.h

diff --combined netdissect.h
index 86b66a09bf672453e02595ebe80b33bb092f93ca,dd9f4b966bfd87ff12cd80558f1dabafa6e41308..7e87555cb3aee796f3977b8bde97b0f0f353734a
--- 1/netdissect.h
--- 2/netdissect.h
+++ b/netdissect.h
@@@ -274,6 -274,8 +274,8 @@@ extern int esp_print(netdissect_option
                     register const u_char *bp, int len, register const u_char *bp2,
                     int *nhdr, int *padlen);
  extern void arp_print(netdissect_options *,const u_char *, u_int, u_int);
+ extern void icmp6_print(netdissect_options *ndo, const u_char *,
+                         u_int, const u_char *, int);
  extern void isakmp_print(netdissect_options *,const u_char *,
                         u_int, const u_char *);
  extern void isakmp_rfc3948_print(netdissect_options *,const u_char *,
@@@ -329,8 -331,6 +331,6 @@@ extern void fddi_if_print(u_char *,cons
  extern void gre_print(netdissect_options *,const u_char *, u_int);
  extern void icmp_print(netdissect_options *,const u_char *, u_int,
                       const u_char *);
- extern void icmp6_print(netdissect_options *ndo, const u_char *,
-                         u_int, const u_char *, int);
  extern void hsrp_print(netdissect_options *ndo,
                       register const u_char *bp, register u_int len);
  extern void ieee802_11_if_print(u_char *,const struct pcap_pkthdr *, const u_char *);
@@@ -437,9 -437,6 +437,8 @@@ extern void lwres_print(netdissect_opti
  extern void pptp_print(netdissect_options *,const u_char *, u_int);
  #endif
  
- extern void ipnet_print(netdissect_options *,const u_char *, u_int, u_int);
 +extern u_int ipnet_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *);
 +
  #if 0
  #ifdef INET6
  extern void ip6_print(netdissect_options *,const u_char *, u_int);

diff --combined print-ipnet.c
index 32aaeae660ddee3a79769f1453ef5718b4ce83f2,3a5b5a1aa18390d89b9045d12336a0840014d3e1..957bd4f52341ea74f0a6d4f0cde3d5d63fcd9b31
--- 1/print-ipnet.c
--- 2/print-ipnet.c
+++ b/print-ipnet.c
@@@ -43,7 -43,7 +43,7 @@@ ipnet_hdr_print(struct netdissect_optio
        ND_PRINT((ndo, ", length %u: ", length));
  }
  
- void
+ static void
  ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
  {
        ipnet_hdr_t *hdr;
@@@ -91,9 -91,9 +91,10 @@@
   * is the number of bytes actually captured.
   */
  u_int
- ipnet_if_print(struct netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 -ipnet_if_print(const struct pcap_pkthdr *h, const u_char *p)
++ipnet_if_print(struct netdissect_options *ndo,
++               const struct pcap_pkthdr *h, const u_char *p)
  {
 -      ipnet_print(gndo, p, h->len, h->caplen);
 +      ipnet_print(ndo, p, h->len, h->caplen);
  
        return (sizeof(ipnet_hdr_t));
  }

diff --combined tcpdump.c
index b0c5ad6c05696e4c17242881800b5d7a2d23aff5,d50feb0896940ca2f040909d8ab506708d01fe1b..c60cb6b4f5990b302c1c983def59445faa6fc218
--- 1/tcpdump.c
--- 2/tcpdump.c
+++ b/tcpdump.c
@@@ -105,7 -105,7 +105,7 @@@ int32_t thiszone;          /* seconds offset fr
  static RETSIGTYPE cleanup(int);
  static RETSIGTYPE child_cleanup(int);
  static void usage(void) __attribute__((noreturn));
- static void show_dlts_and_exit(pcap_t *pd) __attribute__((noreturn));
+ static void show_dlts_and_exit(const char *device, pcap_t *pd) __attribute__((noreturn));
  
  static void print_packet(u_char *, const struct pcap_pkthdr *, const u_char *);
  static void ndo_default_print(netdissect_options *, const u_char *, u_int);
@@@ -131,21 -131,12 +131,21 @@@ static void info(int)
  static u_int packets_captured;
  
  typedef u_int (*if_printer)(const struct pcap_pkthdr *, const u_char *);
 +typedef u_int (*if_ndo_printer)(struct netdissect_options *ndo,
 +                                const struct pcap_pkthdr *, const u_char *);
  
  struct printer {
 -      if_printer f;
 +        if_printer f;
        int type;
  };
  
 +
 +struct ndo_printer {
 +        if_ndo_printer f;
 +      int type;
 +};
 +
 +
  static struct printer printers[] = {
        { arcnet_if_print,      DLT_ARCNET },
  #ifdef DLT_ARCNET_LINUX
@@@ -160,7 -151,7 +160,7 @@@
        { cip_if_print,         DLT_CIP },
  #endif
  #ifdef DLT_ATM_CLIP
-       { cip_if_print,         DLT_ATM_CLIP },
+       { cip_if_print,         DLT_ATM_CLIP },
  #endif
        { sl_if_print,          DLT_SLIP },
  #ifdef DLT_SLIP_BSDOS
@@@ -187,7 -178,7 +187,7 @@@
        { chdlc_if_print,       DLT_HDLC },
  #endif
  #ifdef DLT_PPP_SERIAL
-       { ppp_hdlc_if_print,    DLT_PPP_SERIAL },
+       { ppp_hdlc_if_print,    DLT_PPP_SERIAL },
  #endif
  #ifdef DLT_PPP_ETHER
        { pppoe_if_print,       DLT_PPP_ETHER },
@@@ -202,7 -193,7 +202,7 @@@
        { ltalk_if_print,       DLT_LTALK },
  #endif
  #if defined(DLT_PFLOG) && defined(HAVE_NET_PFVAR_H)
-       { pflog_if_print,       DLT_PFLOG },
+       { pflog_if_print,       DLT_PFLOG },
  #endif
  #ifdef DLT_FR
        { fr_if_print,          DLT_FR },
@@@ -223,10 -214,10 +223,10 @@@
        { ieee802_11_radio_if_print,    DLT_IEEE802_11_RADIO },
  #endif
  #ifdef DLT_ENC
-       { enc_if_print,         DLT_ENC },
+       { enc_if_print,         DLT_ENC },
  #endif
  #ifdef DLT_SYMANTEC_FIREWALL
-       { symantec_if_print,    DLT_SYMANTEC_FIREWALL },
+       { symantec_if_print,    DLT_SYMANTEC_FIREWALL },
  #endif
  #ifdef DLT_APPLE_IP_OVER_IEEE1394
        { ap1394_if_print,      DLT_APPLE_IP_OVER_IEEE1394 },
@@@ -268,35 -259,37 +268,41 @@@
        { juniper_services_print, DLT_JUNIPER_SERVICES },
  #endif
  #ifdef DLT_JUNIPER_ETHER
-       { juniper_ether_print, DLT_JUNIPER_ETHER },
+       { juniper_ether_print,  DLT_JUNIPER_ETHER },
  #endif
  #ifdef DLT_JUNIPER_PPP
-       { juniper_ppp_print, DLT_JUNIPER_PPP },
+       { juniper_ppp_print,    DLT_JUNIPER_PPP },
  #endif
  #ifdef DLT_JUNIPER_FRELAY
-       { juniper_frelay_print, DLT_JUNIPER_FRELAY },
+       { juniper_frelay_print, DLT_JUNIPER_FRELAY },
  #endif
  #ifdef DLT_JUNIPER_CHDLC
-       { juniper_chdlc_print, DLT_JUNIPER_CHDLC },
+       { juniper_chdlc_print,  DLT_JUNIPER_CHDLC },
  #endif
  #ifdef DLT_MFR
-       { mfr_if_print, DLT_MFR },
+       { mfr_if_print,         DLT_MFR },
  #endif
  #if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H)
-       { bt_if_print, DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
+       { bt_if_print,          DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
  #endif
  #if defined(HAVE_PCAP_USB_H) && defined(DLT_USB_LINUX)
-       { usb_linux_print, DLT_USB_LINUX},
+       { usb_linux_print,      DLT_USB_LINUX},
  #endif
  #if defined(HAVE_PCAP_USB_H) && defined(DLT_USB_LINUX_MMAPPED)
-       { usb_linux_print, DLT_USB_LINUX_MMAPPED},
+       { usb_linux_print,      DLT_USB_LINUX_MMAPPED},
  #endif
 +      { NULL,                 0 },
 +};
 +
 +static struct ndo_printer ndo_printers[] = {
  #ifdef DLT_IPNET
-       { ipnet_if_print, DLT_IPNET },
+       { ipnet_if_print,       DLT_IPNET },
+ #endif
+ #ifdef DLT_IPV4
+       { raw_if_print,         DLT_IPV4 },
+ #endif
+ #ifdef DLT_IPV6
+       { raw_if_print,         DLT_IPV6 },
  #endif
        { NULL,                 0 },
  };
@@@ -314,32 -307,16 +320,34 @@@ lookup_printer(int type
        /* NOTREACHED */
  }
  
 +static if_ndo_printer
 +lookup_ndo_printer(int type)
 +{
 +      struct ndo_printer *p;
 +
 +      for (p = ndo_printers; p->f; ++p)
 +              if (type == p->type)
 +                      return p->f;
 +
 +      return NULL;
 +      /* NOTREACHED */
 +}
 +
  static pcap_t *pd;
  
+ static int supports_monitor_mode;
+ 
  extern int optind;
  extern int opterr;
  extern char *optarg;
  
  struct print_info {
 -      if_printer printer;
 +        netdissect_options *ndo;
 +        union {
 +                if_printer     printer;
 +                if_ndo_printer ndo_printer;
 +        } p;
 +        int ndo_type;
  };
  
  struct dump_info {
@@@ -350,7 -327,7 +358,7 @@@
  };
  
  static void
- show_dlts_and_exit(pcap_t *pd)
+ show_dlts_and_exit(const char *device, pcap_t *pd)
  {
        int n_dlts;
        int *dlts = 0;
@@@ -362,7 -339,21 +370,21 @@@
        else if (n_dlts == 0 || !dlts)
                error("No data link types.");
  
-       (void) fprintf(stderr, "Data link types (use option -y to set):\n");
+       /*
+        * If the interface is known to support monitor mode, indicate
+        * whether these are the data link types available when not in
+        * monitor mode, if -I wasn't specified, or when in monitor mode,
+        * when -I was specified (the link-layer types available in
+        * monitor mode might be different from the ones available when
+        * not in monitor mode).
+        */
+       if (supports_monitor_mode)
+               (void) fprintf(stderr, "Data link types for %s %s (use option -y to set):\n",
+                   device,
+                   Iflag ? "when in monitor mode" : "when not in monitor mode");
+       else
+               (void) fprintf(stderr, "Data link types for %s (use option -y to set):\n",
+                   device);
  
        while (--n_dlts >= 0) {
                dlt_name = pcap_datalink_val_to_name(dlts[n_dlts]);
@@@ -373,8 -364,7 +395,8 @@@
                        /*
                         * OK, does tcpdump handle that type?
                         */
 -                      if (lookup_printer(dlts[n_dlts]) == NULL)
 +                      if (lookup_printer(dlts[n_dlts]) == NULL
 +                            && lookup_ndo_printer(dlts[n_dlts]) == NULL)
                                (void) fprintf(stderr, " (printing not supported)");
                        putchar('\n');
                } else {
@@@ -1007,6 -997,13 +1029,13 @@@ main(int argc, char **argv
                pd = pcap_create(device, ebuf);
                if (pd == NULL)
                        error("%s", ebuf);
+               /*
+                * Is this an interface that supports monitor mode?
+                */
+               if (pcap_can_set_rfmon(pd) == 1)
+                       supports_monitor_mode = 1;
+               else
+                       supports_monitor_mode = 0;
                status = pcap_set_snaplen(pd, snaplen);
                if (status != 0)
                        error("%s: pcap_set_snaplen failed: %s",
@@@ -1085,7 -1082,7 +1114,7 @@@
                        }
  #endif /* !defined(HAVE_PCAP_CREATE) && defined(WIN32) */
                if (Lflag)
-                       show_dlts_and_exit(pd);
+                       show_dlts_and_exit(device, pd);
                if (gndo->ndo_dlt >= 0) {
  #ifdef HAVE_PCAP_SET_DATALINK
                        if (pcap_set_datalink(pd, gndo->ndo_dlt) < 0)
@@@ -1175,21 -1172,15 +1204,21 @@@
                }
        } else {
                type = pcap_datalink(pd);
 -              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);
 -                      else
 -                              error("packet printing is not supported for link type %d: use -w", type);
 -              }
 +                printinfo.ndo_type = 1;
 +                printinfo.ndo = gndo;
 +              printinfo.p.ndo_printer = lookup_ndo_printer(type);
 +                if (printinfo.p.ndo_printer == NULL) {
 +                        printinfo.p.printer = lookup_printer(type);
 +                        printinfo.ndo_type = 0;
 +                        if (printinfo.p.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);
 +                                else
 +                                        error("packet printing is not supported for link type %d: use -w", type);
 +                        }
 +                }
                callback = print_packet;
                pcap_userdata = (u_char *)&printinfo;
        }
@@@ -1573,12 -1564,7 +1602,12 @@@ print_packet(u_char *user, const struc
         */
        snapend = sp + h->caplen;
  
 -      hdrlen = (*print_info->printer)(h, sp);
 +        if(print_info->ndo_type) {
 +                hdrlen = (*print_info->p.ndo_printer)(print_info->ndo, h, sp);
 +        } else {
 +                hdrlen = (*print_info->p.printer)(h, sp);
 +        }
 +                
        if (Xflag) {
                /*
                 * Print the raw packet data in hex and ASCII.