From Andrew Feren (bug 2462):
[obnox/wireshark/wip.git] / capture_info.c
index c2e66fb13a14923980f73c8bc831f93f716a66be..ea236eccd3989d557703cd4ec224d437fd8b8dcd 100644 (file)
@@ -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>
@@ -113,13 +113,13 @@ cf_open_error_message(int err, gchar *err_info, gboolean for_writing,
 
     case WTAP_ERR_FILE_UNKNOWN_FORMAT:
       /* Seen only when opening a capture file for reading. */
-      errmsg = "The file \"%s\" isn't a capture file in a format Tethereal understands.";
+      errmsg = "The file \"%s\" isn't a capture file in a format TShark understands.";
       break;
 
     case WTAP_ERR_UNSUPPORTED:
       /* Seen only when opening a capture file for reading. */
       g_snprintf(errmsg_errno, sizeof(errmsg_errno),
-               "The file \"%%s\" isn't a capture file in a format Tethereal understands.\n"
+               "The file \"%%s\" isn't a capture file in a format TShark understands.\n"
                "(%s)", err_info);
       g_free(err_info);
       errmsg = errmsg_errno;
@@ -135,15 +135,15 @@ cf_open_error_message(int err, gchar *err_info, gboolean for_writing,
 
     case WTAP_ERR_UNSUPPORTED_FILE_TYPE:
       /* Seen only when opening a capture file for writing. */
-      errmsg = "Tethereal doesn't support writing capture files in that format.";
+      errmsg = "TShark doesn't support writing capture files in that format.";
       break;
 
     case WTAP_ERR_UNSUPPORTED_ENCAP:
       if (for_writing)
-        errmsg = "Tethereal can't save this capture in that format.";
+        errmsg = "TShark can't save this capture in that format.";
       else {
         g_snprintf(errmsg_errno, sizeof(errmsg_errno),
-                 "The file \"%%s\" is a capture for a network type that Tethereal doesn't support.\n"
+                 "The file \"%%s\" is a capture for a network type that TShark doesn't support.\n"
                  "(%s)", err_info);
         g_free(err_info);
         errmsg = errmsg_errno;
@@ -152,9 +152,9 @@ cf_open_error_message(int err, gchar *err_info, gboolean for_writing,
 
     case WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED:
       if (for_writing)
-        errmsg = "Tethereal can't save this capture in that format.";
+        errmsg = "TShark can't save this capture in that format.";
       else
-        errmsg = "The file \"%s\" is a capture for a network type that Tethereal doesn't support.";
+        errmsg = "The file \"%s\" is a capture for a network type that TShark doesn't support.";
       break;
 
     case WTAP_ERR_BAD_RECORD:
@@ -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. */