* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <string.h>
#include <errno.h>
}
int
-wtap_file_type(wtap *wth)
+wtap_file_type_subtype(wtap *wth)
+{
+ return wth->file_type_subtype;
+}
+
+gboolean
+wtap_iscompressed(wtap *wth)
{
- return wth->file_type;
+ return file_iscompressed((wth->fh == NULL) ? wth->random_fh : wth->fh);
}
guint
return wth->tsprecision;
}
-wtapng_section_t* wtap_file_get_shb_info(wtap *wth)
+wtapng_section_t *
+wtap_file_get_shb_info(wtap *wth)
{
wtapng_section_t *shb_hdr;
return shb_hdr;
}
-void wtap_write_shb_comment(wtap *wth, gchar *comment)
+void
+wtap_write_shb_comment(wtap *wth, gchar *comment)
{
g_free(wth->shb_hdr.opt_comment);
wth->shb_hdr.opt_comment = comment;
}
-wtapng_iface_descriptions_t* wtap_file_get_idb_info(wtap *wth)
+wtapng_iface_descriptions_t *
+wtap_file_get_idb_info(wtap *wth)
{
wtapng_iface_descriptions_t *idb_info;
idb_info = g_new(wtapng_iface_descriptions_t,1);
idb_info->number_of_interfaces = wth->number_of_interfaces;
- idb_info->interface_data = wth->interface_data;
+ idb_info->interface_data = wth->interface_data;
return idb_info;
}
/* WTAP_ENCAP_IEEE_802_11 */
{ "IEEE 802.11 Wireless LAN", "ieee-802-11" },
- /* WTAP_ENCAP_PRISM_HEADER */
- { "IEEE 802.11 plus Prism II monitor mode header", "prism" },
+ /* WTAP_ENCAP_IEEE_802_11_PRISM */
+ { "IEEE 802.11 plus Prism II monitor mode radio header", "ieee-802-11-prism" },
/* WTAP_ENCAP_IEEE_802_11_WITH_RADIO */
{ "IEEE 802.11 Wireless LAN with radio information", "ieee-802-11-radio" },
- /* WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP */
- { "IEEE 802.11 plus radiotap WLAN header", "ieee-802-11-radiotap" },
+ /* WTAP_ENCAP_IEEE_802_11_RADIOTAP */
+ { "IEEE 802.11 plus radiotap radio header", "ieee-802-11-radiotap" },
- /* WTAP_ENCAP_IEEE_802_11_WLAN_AVS */
- { "IEEE 802.11 plus AVS WLAN header", "ieee-802-11-avs" },
+ /* WTAP_ENCAP_IEEE_802_11_AVS */
+ { "IEEE 802.11 plus AVS radio header", "ieee-802-11-avs" },
/* WTAP_ENCAP_SLL */
{ "Linux cooked-mode capture", "linux-sll" },
{ "GCOM Serial", "gcom-serial" },
/* WTAP_ENCAP_NETTL_X25 */
- { "X25 with nettl headers", "x25-nettl" },
+ { "X.25 with nettl headers", "x25-nettl" },
/* WTAP_ENCAP_K12 */
{ "K12 protocol analyzer", "k12" },
{ "Juniper GGSN", "juniper-ggsn" },
/* WTAP_ENCAP_LINUX_LAPD */
- { "LAPD", "lapd" },
+ { "LAPD with Linux pseudo-header", "linux-lapd" },
/* WTAP_ENCAP_CATAPULT_DCT2000 */
{ "Catapult DCT2000", "dct2000" },
{ "Per-Packet Information header", "ppi" },
/* WTAP_ENCAP_ERF */
- { "Endace Record File", "erf" },
+ { "Extensible Record Format", "erf" },
/* WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR */
{ "Bluetooth H4 with linux header", "bluetooth-h4-linux" },
/* WTAP_ENCAP_SOCKETCAN */
{ "SocketCAN", "socketcan" },
- /* WTAP_ENCAP_IEEE802_11_NETMON_RADIO */
+ /* WTAP_ENCAP_IEEE_802_11_NETMON */
{ "IEEE 802.11 plus Network Monitor radio header", "ieee-802-11-netmon" },
/* WTAP_ENCAP_IEEE802_15_4_NOFCS */
{ "Raw IPv6", "rawip6" },
/* WTAP_ENCAP_LAPD */
- { "Lapd header", "lapd" },
+ { "LAPD", "lapd" },
/* WTAP_ENCAP_DVBCI */
{ "DVB-CI (Common Interface)", "dvbci"},
{ "PPP-over-Ethernet session", "pppoes" },
/* WTAP_ENCAP_NFC_LLCP */
- { "LLCP", "llcp" }
+ { "NFC LLCP", "nfc-llcp" },
+
+ /* WTAP_ENCAP_NFLOG */
+ { "NFLOG", "nflog" },
+
+ /* WTAP_ENCAP_V5_EF */
+ { "V5 Envelope Function", "v5-ef" },
+
+ /* WTAP_ENCAP_BACNET_MS_TP_WITH_PHDR */
+ { "BACnet MS/TP with Directional Info", "bacnet-ms-tp-with-direction" },
+
+ /* WTAP_ENCAP_IXVERIWAVE */
+ { "IxVeriWave header and stats block", "ixveriwave" },
+
+ /* WTAP_ENCAP_IEEE_802_11_AIROPEEK */
+ { "IEEE 802.11 plus AiroPeek radio header", "ieee-802-11-airopeek" },
+
+ /* WTAP_ENCAP_SDH */
+ { "SDH", "sdh" },
+
+ /* WTAP_ENCAP_DBUS */
+ { "D-Bus", "dbus" },
+
+ /* WTAP_ENCAP_AX25_KISS */
+ { "AX.25 with KISS header", "ax25-kiss" },
+
+ /* WTAP_ENCAP_AX25 */
+ { "Amateur Radio AX.25", "ax25" },
+
+ /* WTAP_ENCAP_SCTP */
+ { "SCTP", "sctp" },
+
+ /* WTAP_ENCAP_INFINIBAND */
+ { "InfiniBand", "infiniband" },
+
+ /* WTAP_ENCAP_JUNIPER_SVCS */
+ { "Juniper Services", "juniper-svcs" },
+
+ /* WTAP_ENCAP_USBPCAP */
+ { "USB packets with USBPcap header", "usb-usbpcap" },
+
+ /* WTAP_ENCAP_RTAC_SERIAL */
+ { "RTAC serial-line", "rtac-serial" },
+
+ /* WTAP_ENCAP_BLUETOOTH_LE_LL */
+ { "Bluetooth Low Energy Link Layer", "bluetooth-le-ll" },
+
+ /* WTAP_ENCAP_WIRESHARK_UPPER_PDU */
+ { "Wireshark Upper PDU export", "wireshark-upper-pdu" },
};
+WS_DLL_LOCAL
gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info);
static GArray* encap_table_arr = NULL;
-static const struct encap_type_info* encap_table = NULL;
+
+#define encap_table_entry(encap) \
+ g_array_index(encap_table_arr, struct encap_type_info, encap)
static void wtap_init_encap_types(void) {
encap_table_arr = g_array_new(FALSE,TRUE,sizeof(struct encap_type_info));
g_array_append_vals(encap_table_arr,encap_table_base,wtap_num_encap_types);
-
- encap_table = (void*)encap_table_arr->data;
}
int wtap_get_num_encap_types(void) {
}
-int wtap_register_encap_type(char* name, char* short_name) {
+int wtap_register_encap_type(const char* name, const char* short_name) {
struct encap_type_info e;
wtap_init_encap_types();
g_array_append_val(encap_table_arr,e);
- encap_table = (void*)encap_table_arr->data;
-
return wtap_num_encap_types++;
}
/* Name that should be somewhat descriptive. */
-const char
-*wtap_encap_string(int encap)
+const char *
+wtap_encap_string(int encap)
{
if (encap < WTAP_ENCAP_PER_PACKET || encap >= WTAP_NUM_ENCAP_TYPES)
return "Illegal";
else if (encap == WTAP_ENCAP_PER_PACKET)
return "Per packet";
else
- return encap_table[encap].name;
+ return encap_table_entry(encap).name;
}
/* Name to use in, say, a command-line flag specifying the type. */
-const char
-*wtap_encap_short_string(int encap)
+const char *
+wtap_encap_short_string(int encap)
{
if (encap < WTAP_ENCAP_PER_PACKET || encap >= WTAP_NUM_ENCAP_TYPES)
return "illegal";
else if (encap == WTAP_ENCAP_PER_PACKET)
return "per-packet";
else
- return encap_table[encap].short_name;
+ return encap_table_entry(encap).short_name;
}
/* Translate a short name to a capture file type. */
int encap;
for (encap = 0; encap < WTAP_NUM_ENCAP_TYPES; encap++) {
- if (encap_table[encap].short_name != NULL &&
- strcmp(short_name, encap_table[encap].short_name) == 0)
+ if (encap_table_entry(encap).short_name != NULL &&
+ strcmp(short_name, encap_table_entry(encap).short_name) == 0)
return encap;
}
return -1; /* no such encapsulation type */
"The standard input cannot be opened for random access",
"That file format doesn't support compression",
NULL,
+ NULL,
"Uncompression error",
"Internal error"
};
#define WTAP_ERRLIST_SIZE (sizeof wtap_errlist / sizeof wtap_errlist[0])
-const char
-*wtap_strerror(int err)
+const char *
+wtap_strerror(int err)
{
static char errbuf[128];
unsigned int wtap_errlist_index;
g_free(data);
}
+/*
+ * Close the file descriptors for the sequential and random streams, but
+ * don't discard any information about those streams. Used on Windows if
+ * we need to rename a file that we have open or if we need to rename on
+ * top of a file we have open.
+ */
+void
+wtap_fdclose(wtap *wth)
+{
+ if (wth->fh != NULL)
+ file_fdclose(wth->fh);
+ if (wth->random_fh != NULL)
+ file_fdclose(wth->random_fh);
+}
+
void
wtap_close(wtap *wth)
{
- gint i;
+ gint i, j;
wtapng_if_descr_t *wtapng_if_descr;
wtapng_if_stats_t *if_stats;
if(wtapng_if_descr->if_os != NULL){
g_free(wtapng_if_descr->if_os);
}
- for(i = 0; i < (gint)wtapng_if_descr->num_stat_entries; i++) {
- if_stats = &g_array_index(wtapng_if_descr->interface_statistics, wtapng_if_stats_t, i);
+ for(j = 0; j < (gint)wtapng_if_descr->num_stat_entries; j++) {
+ if_stats = &g_array_index(wtapng_if_descr->interface_statistics, wtapng_if_stats_t, j);
if(if_stats->opt_comment != NULL){
g_free(if_stats->opt_comment);
}
return TRUE; /* success */
}
+/*
+ * Read packet data into a Buffer, growing the buffer as necessary.
+ *
+ * This returns an error on a short read, even if the short read hit
+ * the EOF immediately. (The assumption is that each packet has a
+ * header followed by raw packet data, and that we've already read the
+ * header, so if we get an EOF trying to read the packet data, the file
+ * has been cut short, even if the read didn't read any data at all.)
+ */
+gboolean
+wtap_read_packet_bytes(FILE_T fh, Buffer *buf, guint length, int *err,
+ gchar **err_info)
+{
+ int bytes_read;
+
+ buffer_assure_space(buf, length);
+ errno = WTAP_ERR_CANT_READ;
+ bytes_read = file_read(buffer_start_ptr(buf), length, fh);
+
+ if (bytes_read < 0 || (guint)bytes_read != length) {
+ *err = file_error(fh, err_info);
+ if (*err == 0)
+ *err = WTAP_ERR_SHORT_READ;
+ return FALSE;
+ }
+ return TRUE;
+}
+
/*
* Return an approximation of the amount of data we've read sequentially
* from the file so far. (gint64, in case that's 64 bits.)
return file_tell_raw(wth->fh);
}
-struct wtap_pkthdr*
+struct wtap_pkthdr *
wtap_phdr(wtap *wth)
{
return &wth->phdr;
}
-union wtap_pseudo_header*
-wtap_pseudoheader(wtap *wth)
-{
- return &wth->pseudo_header;
-}
-
-guint8*
+guint8 *
wtap_buf_ptr(wtap *wth)
{
return buffer_start_ptr(wth->frame_buffer);
gboolean
wtap_seek_read(wtap *wth, gint64 seek_off,
- union wtap_pseudo_header *pseudo_header, guint8 *pd, int len,
+ struct wtap_pkthdr *phdr, Buffer *buf, int len,
int *err, gchar **err_info)
{
- return wth->subtype_seek_read(wth, seek_off, pseudo_header, pd, len,
+ return wth->subtype_seek_read(wth, seek_off, phdr, buf, len,
err, err_info);
}
git.samba.org / metze / wireshark / wip.git / blobdiff