fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9448

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

diff --git a/capture_info.c b/capture_info.c
index ee9539e36d1c441536ea69f75299f05326d2bded..b792845fb5c8f41fa00c295008576bddb1aced40 100644 (file)
--- a/capture_info.c
+++ b/capture_info.c
@@ -19,12 +19,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #ifdef HAVE_LIBPCAP
 
@@ -34,13 +32,13 @@
 /* XXX - try to remove this later */
 #include <epan/prefs.h>
 /* XXX - try to remove this later */
-#include <epan/filesystem.h>
 
 #include "capture_info.h"
 
 #include <epan/dissectors/packet-ap1394.h>
 #include <epan/dissectors/packet-atalk.h>
 #include <epan/dissectors/packet-atm.h>
+#include <epan/dissectors/packet-ax25.h>
 #include <epan/dissectors/packet-clip.h>
 #include <epan/dissectors/packet-eth.h>
 #include <epan/dissectors/packet-fddi.h>
@@ -58,6 +56,9 @@
 #include <epan/dissectors/packet-arcnet.h>
 #include <epan/dissectors/packet-enc.h>
 #include <epan/dissectors/packet-i2c.h>
+#include <epan/dissectors/packet-ax25-kiss.h>
+
+#include <wsutil/filesystem.h>
 
 static void capture_info_packet(
 packet_counts *counts, gint wtap_linktype, const guchar *pd, guint32 caplen, union wtap_pseudo_header *pseudo_header);
@@ -75,7 +76,7 @@ static info_data_t info_data;
 
 
 /* open the info */
-void capture_info_open(capture_options *capture_opts)
+void capture_info_open(capture_session *cap_session)
 {
     info_data.counts.total      = 0;
     info_data.counts.sctp       = 0;
@@ -95,7 +96,7 @@ void capture_info_open(capture_options *capture_opts)
     info_data.wtap = NULL;
     info_data.ui.counts = &info_data.counts;
 
-    capture_info_ui_create(&info_data.ui, capture_opts);
+    capture_info_ui_create(&info_data.ui, cap_session);
 }
 
 
@@ -132,7 +133,7 @@ cf_open_error_message(int err, gchar *err_info, gboolean for_writing,
             /* Seen only when opening a capture file for writing. */
             g_snprintf(errmsg_errno, sizeof(errmsg_errno),
                        "The file \"%%s\" is a pipe, and %s capture files can't be "
-                       "written to a pipe.", wtap_file_type_string(file_type));
+                       "written to a pipe.", wtap_file_type_subtype_string(file_type));
             errmsg = errmsg_errno;
             break;
 
@@ -220,7 +221,7 @@ gboolean capture_info_new_file(const char *new_filename)
 
     info_data.wtap = wtap_open_offline(new_filename, &err, &err_info, FALSE);
     if (!info_data.wtap) {
-        err_msg = g_strdup_printf(cf_open_error_message(err, err_info, FALSE, WTAP_FILE_PCAP),
+        err_msg = g_strdup_printf(cf_open_error_message(err, err_info, FALSE, WTAP_FILE_TYPE_SUBTYPE_UNKNOWN),
                                   new_filename);
         g_warning("capture_info_new_file: %d (%s)", err, err_msg);
         g_free (err_msg);
@@ -236,7 +237,7 @@ void capture_info_new_packets(int to_read)
     int err;
     gchar *err_info;
     gint64 data_offset;
-    const struct wtap_pkthdr *phdr;
+    struct wtap_pkthdr *phdr;
     union wtap_pseudo_header *pseudo_header;
     int wtap_linktype;
     const guchar *buf;
@@ -250,7 +251,7 @@ void capture_info_new_packets(int to_read)
         wtap_cleareof(info_data.wtap);
         if (wtap_read(info_data.wtap, &err, &err_info, &data_offset)) {
             phdr = wtap_phdr(info_data.wtap);
-            pseudo_header = wtap_pseudoheader(info_data.wtap);
+            pseudo_header = &phdr->pseudo_header;
             wtap_linktype = phdr->pkt_encap;
             buf = wtap_buf_ptr(info_data.wtap);
 
@@ -351,6 +352,12 @@ capture_info_packet(packet_counts *counts, gint wtap_linktype, const guchar *pd,
     case WTAP_ENCAP_I2C:
         capture_i2c(pseudo_header, counts);
         break;
+    case WTAP_ENCAP_AX25_KISS:
+        capture_ax25_kiss(pd, 0, caplen, counts);
+        break;
+    case WTAP_ENCAP_AX25:
+        capture_ax25(pd, 0, 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. */