NDOize NFS decoder

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 49029b8988ab6486fdf4627fc41fe356673dd0a5..9b016f4743fb42cad70b61190efdf2b0cb595c84 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -29,8 +29,6 @@
 static const char copyright[] _U_ =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char copyright[] _U_ =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
 The Regents of the University of California.  All rights reserved.\n";

-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.283 2008-09-25 21:45:50 guy Exp $ (LBL)";

 #endif
 
 /*
 #endif
 
 /*


@@ -100,11 +98,15 @@ extern int SIZE_BUF;
 netdissect_options Gndo;
 netdissect_options *gndo = &Gndo;
 
 netdissect_options Gndo;
 netdissect_options *gndo = &Gndo;
 

+static int Dflag;                      /* list available devices and exit */

 static int dflag;                      /* print filter code */
 static int Lflag;                      /* list available data link types and exit */
 #ifdef HAVE_PCAP_SET_TSTAMP_TYPE
 static int Jflag;                      /* list available time stamp types */
 #endif
 static int dflag;                      /* print filter code */
 static int Lflag;                      /* list available data link types and exit */
 #ifdef HAVE_PCAP_SET_TSTAMP_TYPE
 static int Jflag;                      /* list available time stamp types */
 #endif

+#ifdef HAVE_PCAP_SETDIRECTION
+int Qflag = -1;                                /* restrict captured packet by send/receive direction */
+#endif

 static char *zflag = NULL;             /* compress each savefile using a specified command (like gzip or bzip2) */
 
 static int infodelay;
 static char *zflag = NULL;             /* compress each savefile using a specified command (like gzip or bzip2) */
 
 static int infodelay;


@@ -126,8 +128,16 @@ static void dump_packet_and_trunc(u_char *, const struct pcap_pkthdr *, const u_
 static void dump_packet(u_char *, const struct pcap_pkthdr *, const u_char *);
 static void droproot(const char *, const char *);
 static void ndo_error(netdissect_options *ndo, const char *fmt, ...)
 static void dump_packet(u_char *, const struct pcap_pkthdr *, const u_char *);
 static void droproot(const char *, const char *);
 static void ndo_error(netdissect_options *ndo, const char *fmt, ...)

-     __attribute__ ((noreturn, format (printf, 2, 3)));
-static void ndo_warning(netdissect_options *ndo, 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, const char *fmt, ...)
+#ifdef __ATTRIBUTE___FORMAT_OK
+     __attribute__((format (printf, 2, 3)))
+#endif /* __ATTRIBUTE___FORMAT_OK */
+    ;

 
 #ifdef SIGNAL_REQ_INFO
 RETSIGTYPE requestinfo(int);
 
 #ifdef SIGNAL_REQ_INFO
 RETSIGTYPE requestinfo(int);


@@ -156,14 +166,42 @@ struct ndo_printer {
 };
 
 
 };
 
 

-static struct printer printers[] = {
-       { arcnet_if_print,      DLT_ARCNET },
-#ifdef DLT_ARCNET_LINUX
-       { arcnet_linux_if_print, DLT_ARCNET_LINUX },
+static const struct printer printers[] = {
+       { ppp_if_print,         DLT_PPP },
+#ifdef DLT_PPP_WITHDIRECTION
+       { ppp_if_print,         DLT_PPP_WITHDIRECTION },

 #endif
 #endif

-       { token_if_print,       DLT_IEEE802 },
-#ifdef DLT_LANE8023
-       { lane_if_print,        DLT_LANE8023 },
+#ifdef DLT_PPP_BSDOS
+       { ppp_bsdos_if_print,   DLT_PPP_BSDOS },
+#endif
+#ifdef DLT_PPP_SERIAL
+       { ppp_hdlc_if_print,    DLT_PPP_SERIAL },
+#endif
+       { NULL,                 0 },
+};
+
+static const struct ndo_printer ndo_printers[] = {
+       { ether_if_print,       DLT_EN10MB },
+#ifdef DLT_IPNET
+       { ipnet_if_print,       DLT_IPNET },
+#endif
+#ifdef DLT_IEEE802_15_4
+       { ieee802_15_4_if_print, DLT_IEEE802_15_4 },
+#endif
+#ifdef DLT_IEEE802_15_4_NOFCS
+       { ieee802_15_4_if_print, DLT_IEEE802_15_4_NOFCS },
+#endif
+#ifdef DLT_PPI
+       { ppi_if_print,         DLT_PPI },
+#endif
+#ifdef DLT_NETANALYZER
+       { netanalyzer_if_print, DLT_NETANALYZER },
+#endif
+#ifdef DLT_NETANALYZER_TRANSPARENT
+       { netanalyzer_transparent_if_print, DLT_NETANALYZER_TRANSPARENT },
+#endif
+#if defined(DLT_NFLOG) && defined(HAVE_PCAP_NFLOG_H)
+       { nflog_if_print,       DLT_NFLOG},

 #endif
 #ifdef DLT_CIP
        { cip_if_print,         DLT_CIP },
 #endif
 #ifdef DLT_CIP
        { cip_if_print,         DLT_CIP },


@@ -171,47 +209,60 @@ static struct printer printers[] = {
 #ifdef DLT_ATM_CLIP
        { cip_if_print,         DLT_ATM_CLIP },
 #endif
 #ifdef DLT_ATM_CLIP
        { cip_if_print,         DLT_ATM_CLIP },
 #endif

-       { sl_if_print,          DLT_SLIP },
-#ifdef DLT_SLIP_BSDOS
-       { sl_bsdos_if_print,    DLT_SLIP_BSDOS },
-#endif
-       { ppp_if_print,         DLT_PPP },
-#ifdef DLT_PPP_WITHDIRECTION
-       { ppp_if_print,         DLT_PPP_WITHDIRECTION },
-#endif
-#ifdef DLT_PPP_BSDOS
-       { ppp_bsdos_if_print,   DLT_PPP_BSDOS },
+#ifdef DLT_IP_OVER_FC
+       { ipfc_if_print,        DLT_IP_OVER_FC },

 #endif
 #endif

-       { fddi_if_print,        DLT_FDDI },

        { null_if_print,        DLT_NULL },
 #ifdef DLT_LOOP
        { null_if_print,        DLT_LOOP },
        { null_if_print,        DLT_NULL },
 #ifdef DLT_LOOP
        { null_if_print,        DLT_LOOP },

+#endif
+#ifdef DLT_APPLE_IP_OVER_IEEE1394
+       { ap1394_if_print,      DLT_APPLE_IP_OVER_IEEE1394 },
+#endif
+#if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H)
+       { bt_if_print,          DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
+#endif
+#ifdef DLT_LANE8023
+       { lane_if_print,        DLT_LANE8023 },
+#endif
+       { arcnet_if_print,      DLT_ARCNET },
+#ifdef DLT_ARCNET_LINUX
+       { arcnet_linux_if_print, DLT_ARCNET_LINUX },

 #endif
        { raw_if_print,         DLT_RAW },
 #endif
        { raw_if_print,         DLT_RAW },

-       { atm_if_print,         DLT_ATM_RFC1483 },
+#ifdef DLT_IPV4
+       { raw_if_print,         DLT_IPV4 },
+#endif
+#ifdef DLT_IPV6
+       { raw_if_print,         DLT_IPV6 },
+#endif
+#ifdef HAVE_PCAP_USB_H
+#ifdef DLT_USB_LINUX
+       { usb_linux_48_byte_print, DLT_USB_LINUX},
+#endif /* DLT_USB_LINUX */
+#ifdef DLT_USB_LINUX_MMAPPED
+       { usb_linux_64_byte_print, DLT_USB_LINUX_MMAPPED},
+#endif /* DLT_USB_LINUX_MMAPPED */
+#endif /* HAVE_PCAP_USB_H */
+#ifdef DLT_SYMANTEC_FIREWALL
+       { symantec_if_print,    DLT_SYMANTEC_FIREWALL },
+#endif

 #ifdef DLT_C_HDLC
        { chdlc_if_print,       DLT_C_HDLC },
 #endif
 #ifdef DLT_HDLC
        { chdlc_if_print,       DLT_HDLC },
 #endif
 #ifdef DLT_C_HDLC
        { chdlc_if_print,       DLT_C_HDLC },
 #endif
 #ifdef DLT_HDLC
        { chdlc_if_print,       DLT_HDLC },
 #endif

-#ifdef DLT_PPP_SERIAL
-       { ppp_hdlc_if_print,    DLT_PPP_SERIAL },
-#endif

 #ifdef DLT_PPP_ETHER
        { pppoe_if_print,       DLT_PPP_ETHER },
 #endif
 #ifdef DLT_PPP_ETHER
        { pppoe_if_print,       DLT_PPP_ETHER },
 #endif

-#ifdef DLT_LINUX_SLL
-       { sll_if_print,         DLT_LINUX_SLL },
-#endif
-#ifdef DLT_IEEE802_11
-       { ieee802_11_if_print,  DLT_IEEE802_11},
-#endif
-#ifdef DLT_LTALK
-       { ltalk_if_print,       DLT_LTALK },
-#endif

 #if defined(DLT_PFLOG) && defined(HAVE_NET_PFVAR_H)
        { pflog_if_print,       DLT_PFLOG },
 #if defined(DLT_PFLOG) && defined(HAVE_NET_PFVAR_H)
        { pflog_if_print,       DLT_PFLOG },

+#endif
+       { token_if_print,       DLT_IEEE802 },
+       { fddi_if_print,        DLT_FDDI },
+#ifdef DLT_LINUX_SLL
+       { sll_if_print,         DLT_LINUX_SLL },

 #endif
 #ifdef DLT_FR
        { fr_if_print,          DLT_FR },
 #endif
 #ifdef DLT_FR
        { fr_if_print,          DLT_FR },


@@ -219,29 +270,22 @@ static struct printer printers[] = {
 #ifdef DLT_FRELAY
        { fr_if_print,          DLT_FRELAY },
 #endif
 #ifdef DLT_FRELAY
        { fr_if_print,          DLT_FRELAY },
 #endif

+#ifdef DLT_MFR
+       { mfr_if_print,         DLT_MFR },
+#endif
+       { atm_if_print,         DLT_ATM_RFC1483 },

 #ifdef DLT_SUNATM
        { sunatm_if_print,      DLT_SUNATM },
 #endif
 #ifdef DLT_SUNATM
        { sunatm_if_print,      DLT_SUNATM },
 #endif

-#ifdef DLT_IP_OVER_FC
-       { ipfc_if_print,        DLT_IP_OVER_FC },
-#endif
-#ifdef DLT_PRISM_HEADER
-       { prism_if_print,       DLT_PRISM_HEADER },
-#endif
-#ifdef DLT_IEEE802_11_RADIO
-       { ieee802_11_radio_if_print,    DLT_IEEE802_11_RADIO },
-#endif

 #ifdef DLT_ENC
        { enc_if_print,         DLT_ENC },
 #endif
 #ifdef DLT_ENC
        { enc_if_print,         DLT_ENC },
 #endif

-#ifdef DLT_SYMANTEC_FIREWALL
-       { symantec_if_print,    DLT_SYMANTEC_FIREWALL },
-#endif
-#ifdef DLT_APPLE_IP_OVER_IEEE1394
-       { ap1394_if_print,      DLT_APPLE_IP_OVER_IEEE1394 },
+       { sl_if_print,          DLT_SLIP },
+#ifdef DLT_SLIP_BSDOS
+       { sl_bsdos_if_print,    DLT_SLIP_BSDOS },

 #endif
 #endif

-#ifdef DLT_IEEE802_11_RADIO_AVS
-       { ieee802_11_radio_avs_if_print,        DLT_IEEE802_11_RADIO_AVS },
+#ifdef DLT_LTALK
+       { ltalk_if_print,       DLT_LTALK },

 #endif
 #ifdef DLT_JUNIPER_ATM1
        { juniper_atm1_print,   DLT_JUNIPER_ATM1 },
 #endif
 #ifdef DLT_JUNIPER_ATM1
        { juniper_atm1_print,   DLT_JUNIPER_ATM1 },


@@ -288,56 +332,39 @@ static struct printer printers[] = {
 #ifdef DLT_JUNIPER_CHDLC
        { juniper_chdlc_print,  DLT_JUNIPER_CHDLC },
 #endif
 #ifdef DLT_JUNIPER_CHDLC
        { juniper_chdlc_print,  DLT_JUNIPER_CHDLC },
 #endif

-#ifdef DLT_MFR
-       { mfr_if_print,         DLT_MFR },
+#ifdef DLT_PKTAP
+       { pktap_if_print,       DLT_PKTAP },

 #endif
 #endif

-#if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H)
-       { bt_if_print,          DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
+#ifdef DLT_IEEE802_11_RADIO
+       { ieee802_11_radio_if_print,    DLT_IEEE802_11_RADIO },

 #endif
 #endif

-#ifdef HAVE_PCAP_USB_H
-#ifdef DLT_USB_LINUX
-       { usb_linux_48_byte_print, DLT_USB_LINUX},
-#endif /* DLT_USB_LINUX */
-#ifdef DLT_USB_LINUX_MMAPPED
-       { usb_linux_64_byte_print, DLT_USB_LINUX_MMAPPED},
-#endif /* DLT_USB_LINUX_MMAPPED */
-#endif /* HAVE_PCAP_USB_H */
-#ifdef DLT_IPV4
-       { raw_if_print,         DLT_IPV4 },
+#ifdef DLT_IEEE802_11
+       { ieee802_11_if_print,  DLT_IEEE802_11},

 #endif
 #endif

-#ifdef DLT_IPV6
-       { raw_if_print,         DLT_IPV6 },
+#ifdef DLT_IEEE802_11_RADIO_AVS
+       { ieee802_11_radio_avs_if_print,        DLT_IEEE802_11_RADIO_AVS },
+#endif
+#ifdef DLT_PRISM_HEADER
+       { prism_if_print,       DLT_PRISM_HEADER },

 #endif
        { NULL,                 0 },
 };
 
 #endif
        { NULL,                 0 },
 };
 

-static struct ndo_printer ndo_printers[] = {
-       { ether_if_print,       DLT_EN10MB },
-#ifdef DLT_IPNET
-       { ipnet_if_print,       DLT_IPNET },
+static const struct tok status_flags[] = {
+#ifdef PCAP_IF_UP
+       { PCAP_IF_UP,       "Up"       },

 #endif
 #endif

-#ifdef DLT_IEEE802_15_4
-       { ieee802_15_4_if_print, DLT_IEEE802_15_4 },
+#ifdef PCAP_IF_RUNNING
+       { PCAP_IF_RUNNING,  "Running"  },

 #endif
 #endif

-#ifdef DLT_IEEE802_15_4_NOFCS
-       { ieee802_15_4_if_print, DLT_IEEE802_15_4_NOFCS },
-#endif
-#ifdef DLT_PPI
-       { ppi_if_print,         DLT_PPI },
-#endif
-#ifdef DLT_NETANALYZER
-       { netanalyzer_if_print, DLT_NETANALYZER },
-#endif
-#ifdef DLT_NETANALYZER_TRANSPARENT
-       { netanalyzer_transparent_if_print, DLT_NETANALYZER_TRANSPARENT },
-#endif
-       { NULL,                 0 },
+       { PCAP_IF_LOOPBACK, "Loopback" },
+       { 0, NULL }

 };
 
 if_printer
 lookup_printer(int type)
 {
 };
 
 if_printer
 lookup_printer(int type)
 {

-       struct printer *p;
+       const struct printer *p;

 
        for (p = printers; p->f; ++p)
                if (type == p->type)
 
        for (p = printers; p->f; ++p)
                if (type == p->type)


@@ -350,12 +377,36 @@ lookup_printer(int type)
 if_ndo_printer
 lookup_ndo_printer(int type)
 {
 if_ndo_printer
 lookup_ndo_printer(int type)
 {

-       struct ndo_printer *p;
+       const struct ndo_printer *p;

 
        for (p = ndo_printers; p->f; ++p)
                if (type == p->type)
                        return p->f;
 
 
        for (p = ndo_printers; p->f; ++p)
                if (type == p->type)
                        return p->f;
 

+#if defined(DLT_USER2) && defined(DLT_PKTAP)
+       /*
+        * Apple incorrectly chose to use DLT_USER2 for their PKTAP
+        * header.
+        *
+        * We map DLT_PKTAP, whether it's DLT_USER2 as it is on Darwin-
+        * based OSes or the same value as LINKTYPE_PKTAP as it is on
+        * other OSes, to LINKTYPE_PKTAP, so files written with
+        * this version of libpcap for a DLT_PKTAP capture have a link-
+        * layer header type of LINKTYPE_PKTAP.
+        *
+        * However, files written on OS X Mavericks for a DLT_PKTAP
+        * capture have a link-layer header type of LINKTYPE_USER2.
+        * If we don't have a printer for DLT_USER2, and type is
+        * DLT_USER2, we look up the printer for DLT_PKTAP and use
+        * that.
+        */
+       if (type == DLT_USER2) {
+               for (p = ndo_printers; p->f; ++p)
+                       if (DLT_PKTAP == p->type)
+                               return p->f;
+       }
+#endif
+

        return NULL;
        /* NOTREACHED */
 }
        return NULL;
        /* NOTREACHED */
 }


@@ -471,6 +522,31 @@ show_dlts_and_exit(const char *device, pcap_t *pd)
        exit(0);
 }
 
        exit(0);
 }
 

+#ifdef HAVE_PCAP_FINDALLDEVS
+static void
+show_devices_and_exit (void)
+{
+       pcap_if_t *devpointer;
+       char ebuf[PCAP_ERRBUF_SIZE];
+       int i;
+
+       if (pcap_findalldevs(&devpointer, ebuf) < 0)
+               error("%s", ebuf);
+       else {
+               for (i = 0; devpointer != NULL; i++) {
+                       printf("%d.%s", i+1, devpointer->name);
+                       if (devpointer->description != NULL)
+                               printf(" (%s)", devpointer->description);
+                       if (devpointer->flags != 0)
+                               printf(" [%s]", bittok2str(status_flags, "none", devpointer->flags));
+                       printf("\n");
+                       devpointer = devpointer->next;
+               }
+       }
+       exit(0);
+}
+#endif /* HAVE_PCAP_FINDALLDEVS */
+

 /*
  * Set up flags that might or might not be supported depending on the
  * version of libpcap we're using.
 /*
  * Set up flags that might or might not be supported depending on the
  * version of libpcap we're using.


@@ -517,6 +593,12 @@ show_dlts_and_exit(const char *device, pcap_t *pd)
 #define U_FLAG
 #endif
 
 #define U_FLAG
 #endif
 

+#ifdef HAVE_PCAP_SETDIRECTION
+#define Q_FLAG "Q:"
+#else
+#define Q_FLAG
+#endif
+

 #ifndef WIN32
 /* Drop root privileges and chroot if necessary */
 static void
 #ifndef WIN32
 /* Drop root privileges and chroot if necessary */
 static void


@@ -528,7 +610,7 @@ droproot(const char *username, const char *chroot_dir)
                fprintf(stderr, "tcpdump: Chroot without dropping root is insecure\n");
                exit(1);
        }
                fprintf(stderr, "tcpdump: Chroot without dropping root is insecure\n");
                exit(1);
        }

-       
+

        pw = getpwnam(username);
        if (pw) {
                if (chroot_dir) {
        pw = getpwnam(username);
        if (pw) {
                if (chroot_dir) {


@@ -554,7 +636,7 @@ droproot(const char *username, const char *chroot_dir)
                if (initgroups(pw->pw_name, pw->pw_gid) != 0 ||
                    setgid(pw->pw_gid) != 0 || setuid(pw->pw_uid) != 0) {
                        fprintf(stderr, "tcpdump: Couldn't change to '%.32s' uid=%lu gid=%lu: %s\n",
                if (initgroups(pw->pw_name, pw->pw_gid) != 0 ||
                    setgid(pw->pw_gid) != 0 || setuid(pw->pw_uid) != 0) {
                        fprintf(stderr, "tcpdump: Couldn't change to '%.32s' uid=%lu gid=%lu: %s\n",

-                           username, 
+                           username,

                            (unsigned long)pw->pw_uid,
                            (unsigned long)pw->pw_gid,
                            pcap_strerror(errno));
                            (unsigned long)pw->pw_uid,
                            (unsigned long)pw->pw_gid,
                            pcap_strerror(errno));


@@ -621,7 +703,7 @@ MakeFilename(char *buffer, char *orig_name, int cnt, int max_chars)
 static int tcpdump_printf(netdissect_options *ndo _U_,
                          const char *fmt, ...)
 {
 static int tcpdump_printf(netdissect_options *ndo _U_,
                          const char *fmt, ...)
 {

-  
+

   va_list args;
   int ret;
 
   va_list args;
   int ret;
 


@@ -674,7 +756,7 @@ int
 main(int argc, char **argv)
 {
        register int cnt, op, i;
 main(int argc, char **argv)
 {
        register int cnt, op, i;

-       bpf_u_int32 localnet, netmask;
+       bpf_u_int32 localnet =0 , netmask = 0;

        register char *cp, *infile, *cmdbuf, *device, *RFileName, *VFileName, *WFileName;
        pcap_handler callback;
        int type;
        register char *cp, *infile, *cmdbuf, *device, *RFileName, *VFileName, *WFileName;
        pcap_handler callback;
        int type;


@@ -713,7 +795,7 @@ main(int argc, char **argv)
        gndo->ndo_error=ndo_error;
        gndo->ndo_warning=ndo_warning;
        gndo->ndo_snaplen = DEFAULT_SNAPLEN;
        gndo->ndo_error=ndo_error;
        gndo->ndo_warning=ndo_warning;
        gndo->ndo_snaplen = DEFAULT_SNAPLEN;

-  
+

        cnt = -1;
        device = NULL;
        infile = NULL;
        cnt = -1;
        device = NULL;
        infile = NULL;


@@ -735,7 +817,7 @@ main(int argc, char **argv)
 #endif
 
        while (
 #endif
 
        while (

-           (op = getopt(argc, argv, "aAb" B_FLAG "c:C:d" D_FLAG "eE:fF:G:hHi:" I_FLAG j_FLAG J_FLAG "KlLm:M:nNOpqr:Rs:StT:u" U_FLAG "V:vw:W:xXy:Yz:Z:")) != -1)
+           (op = getopt(argc, argv, "aAb" B_FLAG "c:C:d" D_FLAG "eE:fF:G:hHi:" I_FLAG j_FLAG J_FLAG "KlLm:M:nNOpq" Q_FLAG "r:Rs:StT:u" U_FLAG "vV:w:W:xXy:Yz:Z:")) != -1)

                switch (op) {
 
                case 'a':
                switch (op) {
 
                case 'a':


@@ -774,21 +856,9 @@ main(int argc, char **argv)
                        ++dflag;
                        break;
 
                        ++dflag;
                        break;
 

-#ifdef HAVE_PCAP_FINDALLDEVS

                case 'D':
                case 'D':

-                       if (pcap_findalldevs(&devpointer, ebuf) < 0)
-                               error("%s", ebuf);
-                       else {
-                               for (i = 0; devpointer != 0; i++) {
-                                       printf("%d.%s", i+1, devpointer->name);
-                                       if (devpointer->description != NULL)
-                                               printf(" (%s)", devpointer->description);
-                                       printf("\n");
-                                       devpointer = devpointer->next;
-                               }
-                       }
-                       return 0;
-#endif /* HAVE_PCAP_FINDALLDEVS */
+                       Dflag++;
+                       break;

 
                case 'L':
                        Lflag++;
 
                case 'L':
                        Lflag++;


@@ -839,7 +909,7 @@ main(int argc, char **argv)
                case 'i':
                        if (optarg[0] == '0' && optarg[1] == 0)
                                error("Invalid adapter index");
                case 'i':
                        if (optarg[0] == '0' && optarg[1] == 0)
                                error("Invalid adapter index");

-                       
+

 #ifdef HAVE_PCAP_FINDALLDEVS
                        /*
                         * If the argument is a number, treat it as
 #ifdef HAVE_PCAP_FINDALLDEVS
                        /*
                         * If the argument is a number, treat it as


@@ -963,6 +1033,19 @@ main(int argc, char **argv)
                        ++suppress_default_print;
                        break;
 
                        ++suppress_default_print;
                        break;
 

+#ifdef HAVE_PCAP_SETDIRECTION
+               case 'Q':
+                       if (strcasecmp(optarg, "in") == 0)
+                               Qflag = PCAP_D_IN;
+                       else if (strcasecmp(optarg, "out") == 0)
+                               Qflag = PCAP_D_OUT;
+                       else if (strcasecmp(optarg, "inout") == 0)
+                               Qflag = PCAP_D_INOUT;
+                       else
+                               error("unknown capture direction `%s'", optarg);
+                       break;
+#endif /* HAVE_PCAP_SETDIRECTION */
+

                case 'r':
                        RFileName = optarg;
                        break;
                case 'r':
                        RFileName = optarg;
                        break;


@@ -1011,6 +1094,16 @@ main(int argc, char **argv)
                                packettype = PT_CARP;
                        else if (strcasecmp(optarg, "radius") == 0)
                                packettype = PT_RADIUS;
                                packettype = PT_CARP;
                        else if (strcasecmp(optarg, "radius") == 0)
                                packettype = PT_RADIUS;

+                       else if (strcasecmp(optarg, "zmtp1") == 0)
+                               packettype = PT_ZMTP1;
+                       else if (strcasecmp(optarg, "vxlan") == 0)
+                               packettype = PT_VXLAN;
+                       else if (strcasecmp(optarg, "pgm") == 0)
+                               packettype = PT_PGM;
+                       else if (strcasecmp(optarg, "pgm_zmtp1") == 0)
+                               packettype = PT_PGM_ZMTP1;
+                       else if (strcasecmp(optarg, "lmp") == 0)
+                               packettype = PT_LMP;

                        else
                                error("unknown packet type `%s'", optarg);
                        break;
                        else
                                error("unknown packet type `%s'", optarg);
                        break;


@@ -1039,7 +1132,7 @@ main(int argc, char **argv)
 
                case 'W':
                        Wflag = atoi(optarg);
 
                case 'W':
                        Wflag = atoi(optarg);

-                       if (Wflag < 0) 
+                       if (Wflag < 0)

                                error("invalid number of output files %s", optarg);
                        WflagChars = getWflagChars(Wflag);
                        break;
                                error("invalid number of output files %s", optarg);
                        WflagChars = getWflagChars(Wflag);
                        break;


@@ -1077,22 +1170,11 @@ main(int argc, char **argv)
                        break;
 #endif
                case 'z':
                        break;
 #endif
                case 'z':

-                       if (optarg) {
-                               zflag = strdup(optarg);
-                       } else {
-                               usage();
-                               /* NOTREACHED */
-                       }
+                       zflag = strdup(optarg);

                        break;
 
                case 'Z':
                        break;
 
                case 'Z':

-                       if (optarg) {
-                               username = strdup(optarg);
-                       }
-                       else {
-                               usage();
-                               /* NOTREACHED */
-                       }
+                       username = strdup(optarg);

                        break;
 
                default:
                        break;
 
                default:


@@ -1100,6 +1182,11 @@ main(int argc, char **argv)
                        /* NOTREACHED */
                }
 
                        /* NOTREACHED */
                }
 

+#ifdef HAVE_PCAP_FINDALLDEVS
+       if (Dflag)
+               show_devices_and_exit();
+#endif
+

        switch (tflag) {
 
        case 0: /* Default */
        switch (tflag) {
 
        case 0: /* Default */


@@ -1136,7 +1223,7 @@ main(int argc, char **argv)
 #ifdef WITH_USER
        /* if run as root, prepare for dropping root privileges */
        if (getuid() == 0 || geteuid() == 0) {
 #ifdef WITH_USER
        /* if run as root, prepare for dropping root privileges */
        if (getuid() == 0 || geteuid() == 0) {

-               /* Run with '-Z root' to restore old behaviour */ 
+               /* Run with '-Z root' to restore old behaviour */

                if (!username)
                        username = WITH_USER;
        }
                if (!username)
                        username = WITH_USER;
        }


@@ -1194,8 +1281,6 @@ main(int argc, char **argv)
                            RFileName, dlt_name,
                            pcap_datalink_val_to_description(dlt));
                }
                            RFileName, dlt_name,
                            pcap_datalink_val_to_description(dlt));
                }

-               localnet = 0;
-               netmask = 0;

        } else {
                /*
                 * We're doing a live capture.
        } else {
                /*
                 * We're doing a live capture.


@@ -1210,8 +1295,8 @@ main(int argc, char **argv)
                 * Print a message to the standard error on Windows.
                 * XXX - why do it here, with a different message?
                 */
                 * Print a message to the standard error on Windows.
                 * XXX - why do it here, with a different message?
                 */

-               if(strlen(device) == 1) //we assume that an ASCII string is always longer than 1 char
-               {                                               //a Unicode string has a \0 as second byte (so strlen() is 1)
+               if(strlen(device) == 1) /* we assume that an ASCII string is always longer than 1 char */
+               {                                               /* a Unicode string has a \0 as second byte (so strlen() is 1) */

                        fprintf(stderr, "%s: listening on %ws\n", program_name, device);
                }
                else
                        fprintf(stderr, "%s: listening on %ws\n", program_name, device);
                }
                else


@@ -1219,7 +1304,7 @@ main(int argc, char **argv)
                        fprintf(stderr, "%s: listening on %s\n", program_name, device);
                }
 
                        fprintf(stderr, "%s: listening on %s\n", program_name, device);
                }
 

-               fflush(stderr); 
+               fflush(stderr);

 #endif /* WIN32 */
 #ifdef HAVE_PCAP_CREATE
                pd = pcap_create(device, ebuf);
 #endif /* WIN32 */
 #ifdef HAVE_PCAP_CREATE
                pd = pcap_create(device, ebuf);


@@ -1300,6 +1385,14 @@ main(int argc, char **argv)
                                warning("%s: %s", device,
                                    pcap_statustostr(status));
                }
                                warning("%s: %s", device,
                                    pcap_statustostr(status));
                }

+#ifdef HAVE_PCAP_SETDIRECTION
+               if (Qflag != -1) {
+                       status = pcap_setdirection(pd, Qflag);
+                       if (status != 0)
+                               error("%s: pcap_setdirection() failed: %s",
+                                     device,  pcap_geterr(pd));
+               }
+#endif /* HAVE_PCAP_SETDIRECTION */

 #else
                *ebuf = '\0';
                pd = pcap_open_live(device, snaplen, !pflag, 1000, ebuf);
 #else
                *ebuf = '\0';
                pd = pcap_open_live(device, snaplen, !pflag, 1000, ebuf);


@@ -1347,11 +1440,12 @@ main(int argc, char **argv)
                        warning("snaplen raised from %d to %d", snaplen, i);
                        snaplen = i;
                }
                        warning("snaplen raised from %d to %d", snaplen, i);
                        snaplen = i;
                }

-               if (pcap_lookupnet(device, &localnet, &netmask, ebuf) < 0) {
-                       localnet = 0;
-                       netmask = 0;
-                       warning("%s", ebuf);
-               }
+                if(fflag != 0) {
+                        if (pcap_lookupnet(device, &localnet, &netmask, ebuf) < 0) {
+                                warning("foreign (-f) flag used but: %s", ebuf);
+                        }
+                }
+

        }
        if (infile)
                cmdbuf = read_infile(infile);
        }
        if (infile)
                cmdbuf = read_infile(infile);


@@ -1369,7 +1463,7 @@ main(int argc, char **argv)
        init_addrtoname(localnet, netmask);
         init_checksum();
 
        init_addrtoname(localnet, netmask);
         init_checksum();
 

-#ifndef WIN32  
+#ifndef WIN32

        (void)setsignal(SIGPIPE, cleanup);
        (void)setsignal(SIGTERM, cleanup);
        (void)setsignal(SIGINT, cleanup);
        (void)setsignal(SIGPIPE, cleanup);
        (void)setsignal(SIGTERM, cleanup);
        (void)setsignal(SIGINT, cleanup);


@@ -1378,7 +1472,7 @@ main(int argc, char **argv)
        (void)setsignal(SIGCHLD, child_cleanup);
 #endif
        /* Cooperate with nohup(1) */
        (void)setsignal(SIGCHLD, child_cleanup);
 #endif
        /* Cooperate with nohup(1) */

-#ifndef WIN32  
+#ifndef WIN32

        if ((oldhandler = setsignal(SIGHUP, cleanup)) != SIG_DFL)
                (void)setsignal(SIGHUP, oldhandler);
 #endif /* WIN32 */
        if ((oldhandler = setsignal(SIGHUP, cleanup)) != SIG_DFL)
                (void)setsignal(SIGHUP, oldhandler);
 #endif /* WIN32 */


@@ -1541,6 +1635,14 @@ main(int argc, char **argv)
                        }
                        (void)fflush(stdout);
                }
                        }
                        (void)fflush(stdout);
                }

+                if (status == -2) {
+                       /*
+                        * We got interrupted. If we are reading multiple
+                        * files (via -V) set these so that we stop.
+                        */
+                       VFileName = NULL;
+                       ret = NULL;
+               }

                if (status == -1) {
                        /*
                         * Error.  Report it.
                if (status == -1) {
                        /*
                         * Error.  Report it.


@@ -1790,6 +1892,13 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
                        dump_info->CurrentFileName = (char *)malloc(PATH_MAX + 1);
                        if (dump_info->CurrentFileName == NULL)
                                error("dump_packet_and_trunc: malloc");
                        dump_info->CurrentFileName = (char *)malloc(PATH_MAX + 1);
                        if (dump_info->CurrentFileName == NULL)
                                error("dump_packet_and_trunc: malloc");

+                       /*
+                        * Gflag was set otherwise we wouldn't be here. Reset the count
+                        * so multiple files would end with 1,2,3 in the filename.
+                        * The counting is handled with the -C flow after this.
+                        */
+                       Cflag_count = 0;
+

                        /*
                         * This is always the first file in the Cflag
                         * rotation: e.g. 0
                        /*
                         * This is always the first file in the Cflag
                         * rotation: e.g. 0


@@ -1882,6 +1991,7 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 {
        struct print_info *print_info;
        u_int hdrlen;
 {
        struct print_info *print_info;
        u_int hdrlen;

+        netdissect_options *ndo;

 
        ++packets_captured;
 
 
        ++packets_captured;
 


@@ -1889,29 +1999,30 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
        ts_print(&h->ts);
 
        print_info = (struct print_info *)user;
        ts_print(&h->ts);
 
        print_info = (struct print_info *)user;

+        ndo = print_info->ndo;

 
        /*
         * Some printers want to check that they're not walking off the
         * end of the packet.
         * Rather than pass it all the way down, we set this global.
         */
 
        /*
         * Some printers want to check that they're not walking off the
         * end of the packet.
         * Rather than pass it all the way down, we set this global.
         */

-       snapend = sp + h->caplen;
+       ndo->ndo_snapend = sp + h->caplen;

 
         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(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) {
+
+       if (ndo->ndo_Xflag) {

                /*
                 * Print the raw packet data in hex and ASCII.
                 */
                /*
                 * Print the raw packet data in hex and ASCII.
                 */

-               if (Xflag > 1) {
+               if (ndo->ndo_Xflag > 1) {

                        /*
                         * Include the link-layer header.
                         */
                        /*
                         * Include the link-layer header.
                         */

-                       hex_and_ascii_print("\n\t", sp, h->caplen);
+                       hex_and_ascii_print(ndo, "\n\t", sp, h->caplen);

                } else {
                        /*
                         * Don't include the link-layer header - and if
                } else {
                        /*
                         * Don't include the link-layer header - and if


@@ -1919,18 +2030,18 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
                         * print nothing.
                         */
                        if (h->caplen > hdrlen)
                         * print nothing.
                         */
                        if (h->caplen > hdrlen)

-                               hex_and_ascii_print("\n\t", sp + hdrlen,
+                               hex_and_ascii_print(ndo, "\n\t", sp + hdrlen,

                                    h->caplen - hdrlen);
                }
                                    h->caplen - hdrlen);
                }

-       } else if (xflag) {
+       } else if (ndo->ndo_xflag) {

                /*
                 * Print the raw packet data in hex.
                 */
                /*
                 * Print the raw packet data in hex.
                 */

-               if (xflag > 1) {
+               if (ndo->ndo_xflag > 1) {

                        /*
                         * Include the link-layer header.
                         */
                        /*
                         * Include the link-layer header.
                         */

-                       hex_print("\n\t", sp, h->caplen);
+                        hex_print(ndo, "\n\t", sp, h->caplen);

                } else {
                        /*
                         * Don't include the link-layer header - and if
                } else {
                        /*
                         * Don't include the link-layer header - and if


@@ -1938,14 +2049,14 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
                         * print nothing.
                         */
                        if (h->caplen > hdrlen)
                         * print nothing.
                         */
                        if (h->caplen > hdrlen)

-                               hex_print("\n\t", sp + hdrlen,
-                                   h->caplen - hdrlen);
+                               hex_print(ndo, "\n\t", sp + hdrlen,
+                                          h->caplen - hdrlen);

                }
                }

-       } else if (Aflag) {
+       } else if (ndo->ndo_Aflag) {

                /*
                 * Print the raw packet data in ASCII.
                 */
                /*
                 * Print the raw packet data in ASCII.
                 */

-               if (Aflag > 1) {
+               if (ndo->ndo_Aflag > 1) {

                        /*
                         * Include the link-layer header.
                         */
                        /*
                         * Include the link-layer header.
                         */


@@ -1987,11 +2098,11 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
         * version number of the Packet.dll code, to supply the
         * "Wpcap_version" information on Windows.
         */
         * version number of the Packet.dll code, to supply the
         * "Wpcap_version" information on Windows.
         */

-       char WDversion[]="current-cvs.tcpdump.org";
+       char WDversion[]="current-git.tcpdump.org";

 #if !defined(HAVE_GENERATED_VERSION)
 #if !defined(HAVE_GENERATED_VERSION)

-       char version[]="current-cvs.tcpdump.org";
+       char version[]="current-git.tcpdump.org";

 #endif
 #endif

-       char pcap_version[]="current-cvs.tcpdump.org";
+       char pcap_version[]="current-git.tcpdump.org";

        char Wpcap_version[]="3.1";
 #endif
 
        char Wpcap_version[]="3.1";
 #endif
 


@@ -1999,9 +2110,9 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
  * By default, print the specified data out in hex and ASCII.
  */
 static void
  * By default, print the specified data out in hex and ASCII.
  */
 static void

-ndo_default_print(netdissect_options *ndo _U_, const u_char *bp, u_int length)
+ndo_default_print(netdissect_options *ndo, const u_char *bp, u_int length)

 {
 {

-       hex_and_ascii_print("\n\t", bp, length); /* pass on lf and identation string */
+       hex_and_ascii_print(ndo, "\n\t", bp, length); /* pass on lf and identation string */

 }
 
 void
 }
 
 void


@@ -2077,6 +2188,10 @@ usage(void)
 "\t\t[ -C file_size ] [ -E algo:secret ] [ -F file ] [ -G seconds ]\n");
        (void)fprintf(stderr,
 "\t\t[ -i interface ]" j_FLAG_USAGE " [ -M secret ]\n");
 "\t\t[ -C file_size ] [ -E algo:secret ] [ -F file ] [ -G seconds ]\n");
        (void)fprintf(stderr,
 "\t\t[ -i interface ]" j_FLAG_USAGE " [ -M secret ]\n");

+#ifdef HAVE_PCAP_SETDIRECTION
+       (void)fprintf(stderr,
+"\t\t[ -Q in|out|inout ]\n");
+#endif

        (void)fprintf(stderr,
 "\t\t[ -r file ] [ -s snaplen ] [ -T type ] [ -V file ] [ -w file ]\n");
        (void)fprintf(stderr,
        (void)fprintf(stderr,
 "\t\t[ -r file ] [ -s snaplen ] [ -T type ] [ -V file ] [ -w file ]\n");
        (void)fprintf(stderr,


@@ -2123,3 +2238,9 @@ ndo_warning(netdissect_options *ndo _U_, const char *fmt, ...)
                        (void)fputc('\n', stderr);
        }
 }
                        (void)fputc('\n', stderr);
        }
 }

+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */