Merge pull request #372 from fxlb/print-telnet

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 3156671bba2ab40410faf21e403f7c075718fcbc..aeb43cc4f55050bcd41193326bc76fe10148d09e 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -98,6 +98,7 @@ extern int SIZE_BUF;
 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
@@ -173,12 +174,6 @@ static const struct printer printers[] = {
        { token_if_print,       DLT_IEEE802 },
 #ifdef DLT_LANE8023
        { lane_if_print,        DLT_LANE8023 },
-#endif
-#ifdef DLT_CIP
-       { cip_if_print,         DLT_CIP },
-#endif
-#ifdef DLT_ATM_CLIP
-       { cip_if_print,         DLT_ATM_CLIP },
 #endif
        { sl_if_print,          DLT_SLIP },
 #ifdef DLT_SLIP_BSDOS
@@ -192,10 +187,6 @@ static const struct printer printers[] = {
        { ppp_bsdos_if_print,   DLT_PPP_BSDOS },
 #endif
        { fddi_if_print,        DLT_FDDI },
-       { null_if_print,        DLT_NULL },
-#ifdef DLT_LOOP
-       { null_if_print,        DLT_LOOP },
-#endif
        { raw_if_print,         DLT_RAW },
        { atm_if_print,         DLT_ATM_RFC1483 },
 #ifdef DLT_C_HDLC
@@ -231,9 +222,6 @@ static const struct printer printers[] = {
 #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
@@ -340,12 +328,36 @@ static const struct ndo_printer ndo_printers[] = {
 #ifdef DLT_NETANALYZER_TRANSPARENT
        { netanalyzer_transparent_if_print, DLT_NETANALYZER_TRANSPARENT },
 #endif
-#ifdef DLT_NFLOG
+#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_ATM_CLIP
+       { cip_if_print,         DLT_ATM_CLIP },
+#endif
+#ifdef DLT_IP_OVER_FC
+       { ipfc_if_print,        DLT_IP_OVER_FC },
+#endif
+       { null_if_print,        DLT_NULL },
+#ifdef DLT_LOOP
+       { null_if_print,        DLT_LOOP },
 #endif
        { NULL,                 0 },
 };
 
+static const struct tok status_flags[] = {
+#ifdef PCAP_IF_UP
+       { PCAP_IF_UP,       "Up"       },
+#endif
+#ifdef PCAP_IF_RUNNING
+       { PCAP_IF_RUNNING,  "Running"  },
+#endif
+       { PCAP_IF_LOOPBACK, "Loopback" },
+       { 0, NULL }
+};
+
 if_printer
 lookup_printer(int type)
 {
@@ -483,6 +495,31 @@ show_dlts_and_exit(const char *device, pcap_t *pd)
        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.
@@ -692,7 +729,7 @@ int
 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;
@@ -792,29 +829,9 @@ main(int argc, char **argv)
                        ++dflag;
                        break;
 
-#ifdef HAVE_PCAP_FINDALLDEVS
                case 'D':
-                       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) {
-                                           struct tok status_flags[] = {
-                                               { PCAP_IF_UP, "Up" },
-                                               { PCAP_IF_RUNNING, "Running" },
-                                               { PCAP_IF_LOOPBACK, "Loopback" }
-                                           };
-                                       printf(" [%s]", bittok2str(status_flags, "none", devpointer->flags));
-                               }
-                                       printf("\n");
-                                       devpointer = devpointer->next;
-                               }
-                       }
-                       return 0;
-#endif /* HAVE_PCAP_FINDALLDEVS */
+                       Dflag++;
+                       break;
 
                case 'L':
                        Lflag++;
@@ -1126,22 +1143,11 @@ main(int argc, char **argv)
                        break;
 #endif
                case 'z':
-                       if (optarg) {
-                               zflag = strdup(optarg);
-                       } else {
-                               usage();
-                               /* NOTREACHED */
-                       }
+                       zflag = strdup(optarg);
                        break;
 
                case 'Z':
-                       if (optarg) {
-                               username = strdup(optarg);
-                       }
-                       else {
-                               usage();
-                               /* NOTREACHED */
-                       }
+                       username = strdup(optarg);
                        break;
 
                default:
@@ -1149,6 +1155,11 @@ main(int argc, char **argv)
                        /* NOTREACHED */
                }
 
+#ifdef HAVE_PCAP_FINDALLDEVS
+       if (Dflag)
+               show_devices_and_exit();
+#endif
+
        switch (tflag) {
 
        case 0: /* Default */
@@ -1243,8 +1254,6 @@ main(int argc, char **argv)
                            RFileName, dlt_name,
                            pcap_datalink_val_to_description(dlt));
                }
-               localnet = 0;
-               netmask = 0;
        } else {
                /*
                 * We're doing a live capture.
@@ -1404,11 +1413,12 @@ main(int argc, char **argv)
                        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);