From Andrew Feren (bug 2462):

[obnox/wireshark/wip.git] / capture_info.c

diff --git a/capture_info.c b/capture_info.c
index e9bc1d93165736f6cd0372259854bffb8088aea1..ea236eccd3989d557703cd4ec224d437fd8b8dcd 100644 (file)
--- a/capture_info.c
+++ b/capture_info.c
@@ -46,6 +46,7 @@
 #include <epan/dissectors/packet-fddi.h>
 #include <epan/dissectors/packet-fr.h>
 #include <epan/dissectors/packet-null.h>
+#include <epan/dissectors/packet-ppi.h>
 #include <epan/dissectors/packet-ppp.h>
 #include <epan/dissectors/packet-raw.h>
 #include <epan/dissectors/packet-sll.h>
@@ -53,7 +54,6 @@
 #include <epan/dissectors/packet-ieee80211.h>
 #include <epan/dissectors/packet-radiotap.h>
 #include <epan/dissectors/packet-chdlc.h>
-#include <epan/dissectors/packet-prism.h>
 #include <epan/dissectors/packet-ipfc.h>
 #include <epan/dissectors/packet-arcnet.h>
 #include <epan/dissectors/packet-enc.h>
@@ -212,7 +212,7 @@ gboolean capture_info_new_file(const char *new_filename)
         g_snprintf(err_msg, sizeof err_msg,
                    cf_open_error_message(err, err_info, FALSE, WTAP_FILE_PCAP),
                    new_filename);
-        g_warning("capture_info_new_file: %s", err_msg);
+        g_warning("capture_info_new_file: %d (%s)", err, err_msg);
         return FALSE;
     } else
         return TRUE;
@@ -224,7 +224,7 @@ void capture_info_new_packets(int to_read)
 {
     int err;
     gchar *err_info;
-    long data_offset;
+    gint64 data_offset;
     const struct wtap_pkthdr *phdr;
     union wtap_pseudo_header *pseudo_header;
     int wtap_linktype;
@@ -300,6 +300,9 @@ capture_info_packet(packet_counts *counts, gint wtap_linktype, const guchar *pd,
     case WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP:
       capture_radiotap(pd, 0, caplen, counts);
       break;
+    case WTAP_ENCAP_IEEE_802_11_WLAN_AVS:
+      capture_wlancap(pd, 0, caplen, counts);
+      break;
     case WTAP_ENCAP_CHDLC:
       capture_chdlc(pd, 0, caplen, counts);
       break;
@@ -328,6 +331,9 @@ capture_info_packet(packet_counts *counts, gint wtap_linktype, const guchar *pd,
     case WTAP_ENCAP_ENC:
       capture_enc(pd, caplen, counts);
       break;
+    case WTAP_ENCAP_PPI:
+      capture_ppi(pd, caplen, counts);
+      break;
     /* XXX - some ATM drivers on FreeBSD might prepend a 4-byte ATM
        pseudo-header to DLT_ATM_RFC1483, with LLC header following;
        we might have to implement that at some point. */