/* capture_info.c
* capture info functions
*
- * $Id$
- *
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
* 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
#include <glib.h>
#include <epan/packet.h>
-/* XXX - try to remove this later */
-#include <epan/prefs.h>
-/* XXX - try to remove this later */
-#include <epan/filesystem.h>
+#include <wiretap/wtap.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>
-#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>
-#include <epan/dissectors/packet-tr.h>
-#include <epan/dissectors/packet-ieee80211.h>
-#include <epan/dissectors/packet-ieee80211-radiotap.h>
-#include <epan/dissectors/packet-chdlc.h>
-#include <epan/dissectors/packet-ipfc.h>
-#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>
-
-static void capture_info_packet(
-packet_counts *counts, gint wtap_linktype, const guchar *pd, guint32 caplen, union wtap_pseudo_header *pseudo_header);
-
-
-
-typedef struct _info_data {
- packet_counts counts; /* several packet type counters */
- struct wtap* wtap; /* current wtap file */
- capture_info ui; /* user interface data */
-} info_data_t;
-
-
-static info_data_t info_data;
+#include <epan/capture_dissectors.h>
+#include <wsutil/filesystem.h>
/* open the info */
-void capture_info_open(capture_options *capture_opts)
+void capture_info_open(capture_session *cap_session, info_data_t* cap_info)
{
- info_data.counts.total = 0;
- info_data.counts.sctp = 0;
- info_data.counts.tcp = 0;
- info_data.counts.udp = 0;
- info_data.counts.icmp = 0;
- info_data.counts.ospf = 0;
- info_data.counts.gre = 0;
- info_data.counts.ipx = 0;
- info_data.counts.netbios = 0;
- info_data.counts.vines = 0;
- info_data.counts.other = 0;
- info_data.counts.arp = 0;
- info_data.counts.i2c_event = 0;
- info_data.counts.i2c_data = 0;
-
- info_data.wtap = NULL;
- info_data.ui.counts = &info_data.counts;
-
- capture_info_ui_create(&info_data.ui, capture_opts);
+ if (cap_info->counts.counts_hash != NULL)
+ {
+ /* Clean up any previous lists of packet counts */
+ g_hash_table_destroy(cap_info->counts.counts_hash);
+ }
+ cap_info->counts.counts_hash = g_hash_table_new_full( g_direct_hash, g_direct_equal, NULL, g_free );
+ cap_info->counts.other = 0;
+ cap_info->counts.total = 0;
+
+ cap_info->wtap = NULL;
+ cap_info->ui.counts = &cap_info->counts;
+
+ capture_info_ui_create(&cap_info->ui, cap_session);
}
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 TShark understands.";
+ errmsg = "The file \"%s\" isn't a capture file in a format Wireshark 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 TShark understands.\n"
- "(%s)", err_info);
+ "The file \"%%s\" contains record data that Wireshark doesn't support.\n"
+ "(%s)", err_info != NULL ? err_info : "no information supplied");
g_free(err_info);
errmsg = errmsg_errno;
break;
/* 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;
- case WTAP_ERR_UNSUPPORTED_FILE_TYPE:
+ case WTAP_ERR_UNWRITABLE_FILE_TYPE:
/* Seen only when opening a capture file for writing. */
- errmsg = "TShark doesn't support writing capture files in that format.";
+ errmsg = "Wireshark doesn't support writing capture files in that format.";
break;
- case WTAP_ERR_UNSUPPORTED_ENCAP:
- if (for_writing)
- 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 TShark doesn't support.\n"
- "(%s)", err_info);
- g_free(err_info);
- errmsg = errmsg_errno;
- }
+ case WTAP_ERR_UNWRITABLE_ENCAP:
+ /* Seen only when opening a capture file for writing. */
+ errmsg = "Wireshark can't save this capture in that format.";
break;
case WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED:
if (for_writing)
- errmsg = "TShark can't save this capture in that format.";
+ errmsg = "Wireshark can't save this capture in that format.";
else
- errmsg = "The file \"%s\" is a capture for a network type that TShark doesn't support.";
+ errmsg = "The file \"%s\" is a capture for a network type that Wireshark doesn't support.";
break;
case WTAP_ERR_BAD_FILE:
/* Seen only when opening a capture file for reading. */
g_snprintf(errmsg_errno, sizeof(errmsg_errno),
"The file \"%%s\" appears to be damaged or corrupt.\n"
- "(%s)", err_info);
+ "(%s)", err_info != NULL ? err_info : "no information supplied");
g_free(err_info);
errmsg = errmsg_errno;
break;
case WTAP_ERR_DECOMPRESS:
g_snprintf(errmsg_errno, sizeof(errmsg_errno),
"The compressed file \"%%s\" appears to be damaged or corrupt.\n"
- "(%s)", err_info);
+ "(%s)", err_info != NULL ? err_info : "no information supplied");
g_free(err_info);
errmsg = errmsg_errno;
break;
}
/* new file arrived */
-gboolean capture_info_new_file(const char *new_filename)
+gboolean capture_info_new_file(const char *new_filename, info_data_t* cap_info)
{
int err;
gchar *err_info;
gchar *err_msg;
- if(info_data.wtap != NULL) {
- wtap_close(info_data.wtap);
+ if(cap_info->wtap != NULL) {
+ wtap_close(cap_info->wtap);
}
- 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),
+ cap_info->wtap = wtap_open_offline(new_filename, WTAP_TYPE_AUTO, &err, &err_info, FALSE);
+ if (!cap_info->wtap) {
+ 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);
return TRUE;
}
+static void
+capture_info_packet(info_data_t* cap_info, gint wtap_linktype, const guchar *pd, guint32 caplen, union wtap_pseudo_header *pseudo_header)
+{
+ capture_packet_info_t cpinfo;
+
+ /* Setup the capture packet structure */
+ cpinfo.counts = cap_info->counts.counts_hash;
+
+ cap_info->counts.total++;
+ if (!try_capture_dissector("wtap_encap", wtap_linktype, pd, 0, caplen, &cpinfo, pseudo_header))
+ cap_info->counts.other++;
+}
/* new packets arrived */
-void capture_info_new_packets(int to_read)
+void capture_info_new_packets(int to_read, info_data_t* cap_info)
{
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;
- info_data.ui.new_packets = to_read;
+ cap_info->ui.new_packets = to_read;
/*g_warning("new packets: %u", to_read);*/
while (to_read > 0) {
- 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);
+ wtap_cleareof(cap_info->wtap);
+ if (wtap_read(cap_info->wtap, &err, &err_info, &data_offset)) {
+ phdr = wtap_phdr(cap_info->wtap);
+ pseudo_header = &phdr->pseudo_header;
wtap_linktype = phdr->pkt_encap;
- buf = wtap_buf_ptr(info_data.wtap);
+ buf = wtap_buf_ptr(cap_info->wtap);
- capture_info_packet(&info_data.counts, wtap_linktype, buf, phdr->caplen, pseudo_header);
+ capture_info_packet(cap_info, wtap_linktype, buf, phdr->caplen, pseudo_header);
/*g_warning("new packet");*/
to_read--;
}
}
- capture_info_ui_update(&info_data.ui);
+ capture_info_ui_update(&cap_info->ui);
}
/* close the info */
-void capture_info_close(void)
-{
- capture_info_ui_destroy(&info_data.ui);
- if(info_data.wtap)
- wtap_close(info_data.wtap);
-}
-
-
-static void
-capture_info_packet(packet_counts *counts, gint wtap_linktype, const guchar *pd, guint32 caplen, union wtap_pseudo_header *pseudo_header)
+void capture_info_close(info_data_t* cap_info)
{
- counts->total++;
- switch (wtap_linktype) {
- case WTAP_ENCAP_ETHERNET:
- capture_eth(pd, 0, caplen, counts);
- break;
- case WTAP_ENCAP_FDDI:
- case WTAP_ENCAP_FDDI_BITSWAPPED:
- capture_fddi(pd, caplen, counts);
- break;
- case WTAP_ENCAP_IEEE_802_11_PRISM:
- capture_prism(pd, 0, caplen, counts);
- break;
- case WTAP_ENCAP_TOKEN_RING:
- capture_tr(pd, 0, caplen, counts);
- break;
- case WTAP_ENCAP_NULL:
- capture_null(pd, caplen, counts);
- break;
- case WTAP_ENCAP_PPP:
- capture_ppp_hdlc(pd, 0, caplen, counts);
- break;
- case WTAP_ENCAP_RAW_IP:
- capture_raw(pd, caplen, counts);
- break;
- case WTAP_ENCAP_SLL:
- capture_sll(pd, caplen, counts);
- break;
- case WTAP_ENCAP_LINUX_ATM_CLIP:
- capture_clip(pd, caplen, counts);
- break;
- case WTAP_ENCAP_IEEE_802_11:
- case WTAP_ENCAP_IEEE_802_11_WITH_RADIO:
- capture_ieee80211(pd, 0, caplen, counts);
- break;
- case WTAP_ENCAP_IEEE_802_11_RADIOTAP:
- capture_radiotap(pd, 0, caplen, counts);
- break;
- case WTAP_ENCAP_IEEE_802_11_AVS:
- capture_wlancap(pd, 0, caplen, counts);
- break;
- case WTAP_ENCAP_CHDLC:
- capture_chdlc(pd, 0, caplen, counts);
- break;
- case WTAP_ENCAP_LOCALTALK:
- capture_llap(counts);
- break;
- case WTAP_ENCAP_ATM_PDUS:
- capture_atm(pseudo_header, pd, caplen, counts);
- break;
- case WTAP_ENCAP_IP_OVER_FC:
- capture_ipfc(pd, caplen, counts);
- break;
- case WTAP_ENCAP_ARCNET:
- capture_arcnet(pd, caplen, counts, FALSE, TRUE);
- break;
- case WTAP_ENCAP_ARCNET_LINUX:
- capture_arcnet(pd, caplen, counts, TRUE, FALSE);
- break;
- case WTAP_ENCAP_APPLE_IP_OVER_IEEE1394:
- capture_ap1394(pd, 0, caplen, counts);
- break;
- case WTAP_ENCAP_FRELAY:
- case WTAP_ENCAP_FRELAY_WITH_PHDR:
- capture_fr(pd, 0, caplen, counts);
- break;
- case WTAP_ENCAP_ENC:
- capture_enc(pd, caplen, counts);
- break;
- case WTAP_ENCAP_PPI:
- capture_ppi(pd, caplen, counts);
- break;
- 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. */
- }
+ capture_info_ui_destroy(&cap_info->ui);
+ if(cap_info->wtap)
+ wtap_close(cap_info->wtap);
}
-
#endif /* HAVE_LIBPCAP */
+
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
git.samba.org / metze / wireshark / wip.git / blobdiff