*
* 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 <string.h>
#include <errno.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
#include "wtap-int.h"
+#include "wtap.h"
+
#include "file_wrappers.h"
+#include <wsutil/file_util.h>
#include "buffer.h"
-int
-wtap_fd(wtap *wth)
+/*
+ * Return the size of the file, as reported by the OS.
+ * (gint64, in case that's 64 bits.)
+ */
+gint64
+wtap_file_size(wtap *wth, int *err)
{
- return wth->fd;
+ struct stat statb;
+
+ if (fstat(wth->fd, &statb) == -1) {
+ if (err != NULL)
+ *err = errno;
+ return -1;
+ }
+ return statb.st_size;
}
int
return wth->file_encap;
}
+int
+wtap_file_tsprecision(wtap *wth)
+{
+ return wth->tsprecision;
+}
+
/* Table of the encapsulation types we know about. */
-static const struct encap_type_info {
+struct encap_type_info {
const char *name;
const char *short_name;
-} encap_table[WTAP_NUM_ENCAP_TYPES] = {
+};
+
+static struct encap_type_info encap_table_base[] = {
/* WTAP_ENCAP_UNKNOWN */
{ "Unknown", NULL },
/* WTAP_ENCAP_BACNET_MS_TP */
{ "BACnet MS/TP", "bacnet-ms-tp" },
- /* WTAP_ENCAP_RAW_ICMP */
- { "Raw ICMP", "raw-icmp" },
+ /* WTAP_ENCAP_NETTL_RAW_ICMP */
+ { "Raw ICMP with nettl headers", "raw-icmp-nettl" },
+
+ /* WTAP_ENCAP_NETTL_RAW_ICMPV6 */
+ { "Raw ICMPv6 with nettl headers", "raw-icmpv6-nettl" },
+
+ /* WTAP_ENCAP_GPRS_LLC */
+ { "GPRS LLC", "gprs-llc" },
+
+ /* WTAP_ENCAP_JUNIPER_ATM1 */
+ { "Juniper ATM1", "juniper-atm1" },
+
+ /* WTAP_ENCAP_JUNIPER_ATM2 */
+ { "Juniper ATM2", "juniper-atm2" },
+
+ /* WTAP_ENCAP_REDBACK */
+ { "Redback SmartEdge", "redback" },
+
+ /* WTAP_ENCAP_NETTL_RAW_IP */
+ { "Raw IP with nettl headers", "rawip-nettl" },
+
+ /* WTAP_ENCAP_NETTL_ETHERNET */
+ { "Ethernet with nettl headers", "ether-nettl" },
+
+ /* WTAP_ENCAP_NETTL_TOKEN_RING */
+ { "Token Ring with nettl headers", "tr-nettl" },
+
+ /* WTAP_ENCAP_NETTL_FDDI */
+ { "FDDI with nettl headers", "fddi-nettl" },
+
+ /* WTAP_ENCAP_NETTL_UNKNOWN */
+ { "Unknown link-layer type with nettl headers", "unknown-nettl" },
+
+ /* WTAP_ENCAP_MTP2_WITH_PHDR */
+ { "MTP2 with pseudoheader", "mtp2-with-phdr" },
+
+ /* WTAP_ENCAP_JUNIPER_PPPOE */
+ { "Juniper PPPoE", "juniper-pppoe" },
+
+ /* WTAP_ENCAP_GCOM_TIE1 */
+ { "GCOM TIE1", "gcom-tie1" },
+
+ /* WTAP_ENCAP_GCOM_SERIAL */
+ { "GCOM Serial", "gcom-serial" },
+
+ /* WTAP_ENCAP_NETTL_X25 */
+ { "X25 with nettl headers", "x25-nettl" },
+
+ /* WTAP_ENCAP_K12 */
+ { "K12 protocol analyzer", "k12" },
+
+ /* WTAP_ENCAP_JUNIPER_MLPPP */
+ { "Juniper MLPPP", "juniper-mlppp" },
+
+ /* WTAP_ENCAP_JUNIPER_MLFR */
+ { "Juniper MLFR", "juniper-mlfr" },
+
+ /* WTAP_ENCAP_JUNIPER_ETHER */
+ { "Juniper Ethernet", "juniper-ether" },
+
+ /* WTAP_ENCAP_JUNIPER_PPP */
+ { "Juniper PPP", "juniper-ppp" },
+
+ /* WTAP_ENCAP_JUNIPER_FRELAY */
+ { "Juniper Frame-Relay", "juniper-frelay" },
+
+ /* WTAP_ENCAP_JUNIPER_CHDLC */
+ { "Juniper C-HDLC", "juniper-chdlc" },
+
+ /* WTAP_ENCAP_JUNIPER_GGSN */
+ { "Juniper GGSN", "juniper-ggsn" },
+
+ /* WTAP_ENCAP_LINUX_LAPD */
+ { "LAPD", "lapd" },
+
+ /* WTAP_ENCAP_CATAPULT_DCT2000 */
+ { "Catapult DCT2000", "dct2000" },
+
+ /* WTAP_ENCAP_BER */
+ { "ASN.1 Basic Encoding Rules", "ber" },
+
+ /* WTAP_ENCAP_JUNIPER_VP */
+ { "Juniper Voice PIC", "juniper-vp" },
+
+ /* WTAP_ENCAP_USB */
+ { "Raw USB packets", "usb" },
+
+ /* WTAP_ENCAP_IEEE802_16_MAC_CPS */
+ { "IEEE 802.16 MAC Common Part Sublayer", "ieee-802-16-mac-cps" },
+
+ /* WTAP_ENCAP_NETTL_RAW_TELNET */
+ { "Raw telnet with nettl headers", "raw-telnet-nettl" },
+
+ /* WTAP_ENCAP_USB_LINUX */
+ { "USB packets with Linux header", "usb-linux" },
+
+ /* WTAP_ENCAP_MPEG */
+ { "MPEG", "mpeg" },
+
+ /* WTAP_ENCAP_PPI */
+ { "Per-Packet Information header", "ppi" },
- /* WTAP_ENCAP_RAW_ICMPV6 */
- { "Raw ICMPv6", "raw-icmpv6" },
+ /* WTAP_ENCAP_ERF */
+ { "Endace Record File", "erf" },
+
+ /* WTAP_ENCAP_BT_H4 */
+ { "Bluetooth H4 with linux header", "bluetooth-h4" },
+
+ /* WTAP_ENCAP_SITA */
+ { "SITA WAN packets", "sita-wan" },
+
+ /* WTAP_ENCAP_SCCP */
+ { "SS7 SCCP", "sccp" },
+
+ /* WTAP_ENCAP_BLUETOOTH_HCI */
+ { "Bluetooth without transport layer", "bluetooth-hci" },
+
+ /* WTAP_ENCAP_IPMB */
+ { "Intelligent Platform Management Bus", "ipmb" },
+
+ /* WTAP_ENCAP_IEEE802_15_4 */
+ { "IEEE 802.15.4 Wireless PAN", "wpan" },
+
+ /* WTAP_ENCAP_X2E_XORAYA */
+ { "X2E Xoraya", "x2e-xoraya" },
+
+ /* WTAP_ENCAP_FLEXRAY */
+ { "FlexRay", "flexray" },
+
+ /* WTAP_ENCAP_LIN */
+ { "Local Interconnect Network", "lin" },
+
+ /* WTAP_ENCAP_MOST */
+ { "Media Oriented Systems Transport", "most" },
+
+ /* WTAP_ENCAP_CAN20B */
+ { "Controller Area Network 2.0B", "can20b" },
+
+ /* WTAP_ENCAP_LAYER1_EVENT */
+ { "EyeSDN Layer 1 event", "layer1-event" },
+
+ /* WTAP_ENCAP_X2E_SERIAL */
+ { "X2E serial line capture", "x2e-serial" },
+
+ /* WTAP_ENCAP_I2C */
+ { "I2C", "i2c" },
+
+ /* WTAP_ENCAP_IEEE802_15_4_NONASK_PHY */
+ { "IEEE 802.15.4 Wireless PAN non-ASK PHY", "wpan-nonask-phy" }
};
+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;
+
+static void wtap_init_encap_types(void) {
+
+ if (encap_table_arr) return;
+
+ 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) {
+ wtap_init_encap_types();
+ return wtap_num_encap_types;
+}
+
+
+int wtap_register_encap_type(char* name, char* short_name) {
+ struct encap_type_info e;
+ wtap_init_encap_types();
+
+ e.name = g_strdup(name);
+ e.short_name = g_strdup(short_name);
+
+ 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)
"Uncompression error: data oddly truncated",
"Uncompression error: data would overflow buffer",
"Uncompression error: bad LZ77 offset",
+ "The standard input cannot be opened for random access"
};
#define WTAP_ERRLIST_SIZE (sizeof wtap_errlist / sizeof wtap_errlist[0])
#ifdef HAVE_LIBZ
if (err >= WTAP_ERR_ZLIB_MIN && err <= WTAP_ERR_ZLIB_MAX) {
/* Assume it's a zlib error. */
- sprintf(errbuf, "Uncompression error: %s",
+ g_snprintf(errbuf, 128, "Uncompression error: %s",
zError(err - WTAP_ERR_ZLIB));
return errbuf;
}
#endif
wtap_errlist_index = -1 - err;
if (wtap_errlist_index >= WTAP_ERRLIST_SIZE) {
- sprintf(errbuf, "Error %d", err);
+ g_snprintf(errbuf, 128, "Error %d", err);
return errbuf;
}
if (wtap_errlist[wtap_errlist_index] == NULL)
}
gboolean
-wtap_read(wtap *wth, int *err, gchar **err_info, long *data_offset)
+wtap_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
{
/*
* Set the packet encapsulation to the file's encapsulation
return TRUE; /* success */
}
+/*
+ * Return an approximation of the amount of data we've read sequentially
+ * from the file so far. (gint64, in case that's 64 bits.)
+ */
+gint64
+wtap_read_so_far(wtap *wth, int *err)
+{
+ off_t file_pos;
+
+ file_pos = ws_lseek(wth->fd, 0, SEEK_CUR);
+ if (file_pos == -1) {
+ if (err != NULL)
+ *err = errno;
+ return -1;
+ }
+ return file_pos;
+}
+
struct wtap_pkthdr*
wtap_phdr(wtap *wth)
{
}
gboolean
-wtap_loop(wtap *wth, int count, wtap_handler callback, guchar* user, int *err,
- gchar **err_info)
-{
- long data_offset;
- int loop = 0;
-
- /* Start by clearing error flag */
- *err = 0;
-
- while ( (wtap_read(wth, err, err_info, &data_offset)) ) {
- callback(user, &wth->phdr, data_offset,
- &wth->pseudo_header, buffer_start_ptr(wth->frame_buffer));
- if (count > 0 && ++loop >= count)
- break;
- }
-
- if (*err == 0)
- return TRUE; /* success */
- else
- return FALSE; /* failure */
-}
-
-gboolean
-wtap_seek_read(wtap *wth, long seek_off,
+wtap_seek_read(wtap *wth, gint64 seek_off,
union wtap_pseudo_header *pseudo_header, guint8 *pd, int len,
int *err, gchar **err_info)
{