X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=tethereal.c;h=75318067d735d6061306d2cd3e1f7ea25e7d3730;hp=9035db8e0ccc7dd541f81fe1507fdecf951516cb;hb=538ae42820ad785fdeab04489c17154cd3a1fee2;hpb=82c946ad85c1f801dd4f20a9078d91c584419c9a

diff --git a/tethereal.c b/tethereal.c
index 9035db8e0c..75318067d7 100644
--- a/tethereal.c
+++ b/tethereal.c
@@ -1,6 +1,6 @@
 /* tethereal.c
  *
- * $Id: tethereal.c,v 1.95 2001/10/26 18:28:16 gram Exp $
+ * $Id: tethereal.c,v 1.97 2001/11/09 07:44:48 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -96,6 +96,9 @@
 #include "print.h"
 #include "resolv.h"
 #include "util.h"
+#ifdef HAVE_LIBPCAP
+#include "pcap-util.h"
+#endif
 #include "conversation.h"
 #include "reassemble.h"
 #include "plugins.h"
@@ -446,6 +449,7 @@ main(int argc, char *argv[])
           break;
 
         case PREFS_SET_NO_SUCH_PREF:
+        case PREFS_SET_OBSOLETE:
           fprintf(stderr, "tethereal: -o flag \"%s\" specifies unknown preference\n",
 			optarg);
           exit(1);
@@ -744,7 +748,8 @@ capture(int packet_count, int out_file_type)
     }
   }
 
-  ld.linktype = wtap_pcap_encap_to_wtap_encap(pcap_datalink(ld.pch));
+  ld.linktype = wtap_pcap_encap_to_wtap_encap(get_pcap_linktype(ld.pch,
+	cfile.iface));
   if (cfile.save_file != NULL) {
     /* Set up to write to the capture file. */
     if (ld.linktype == WTAP_ENCAP_UNKNOWN) {