#include <stdlib.h>
#include <string.h>
#include <errno.h>
+
+/* Needed for addrinfo */
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+
+#ifdef HAVE_NETDB_H
+# include <netdb.h>
+#endif
+
+#ifdef HAVE_WINSOCK2_H
+# include <winsock2.h>
+#endif
+
+#if defined(_WIN32) && defined(INET6)
+# include <ws2tcpip.h>
+#endif
+
#include "wtap-int.h"
#include "file_wrappers.h"
#include "buffer.h"
+#include "libpcap.h"
+#include "pcap-common.h"
+#include "pcap-encap.h"
+#include "pcapng.h"
+
+#if 0
+#define pcapng_debug0(str) g_warning(str)
+#define pcapng_debug1(str,p1) g_warning(str,p1)
+#define pcapng_debug2(str,p1,p2) g_warning(str,p1,p2)
+#define pcapng_debug3(str,p1,p2,p3) g_warning(str,p1,p2,p3)
+#else
+#define pcapng_debug0(str)
+#define pcapng_debug1(str,p1)
+#define pcapng_debug2(str,p1,p2)
+#define pcapng_debug3(str,p1,p2,p3)
+#endif
-
-static gboolean
+static gboolean
pcapng_read(wtap *wth, int *err, gchar **err_info,
gint64 *data_offset);
static gboolean
pcapng_seek_read(wtap *wth, gint64 seek_off,
- union wtap_pseudo_header *pseudo_header, guchar *pd, int length,
+ union wtap_pseudo_header *pseudo_header, guint8 *pd, int length,
int *err, gchar **err_info);
static void
pcapng_close(wtap *wth);
-
/* pcapng: common block header for every block type */
typedef struct pcapng_block_header_s {
guint32 block_type;
/* pcapng: packet block (obsolete) */
typedef struct pcapng_packet_block_s {
guint16 interface_id;
- guint16 reserved;
+ guint16 drops_count;
guint32 timestamp_high;
guint32 timestamp_low;
guint32 captured_len;
/* ... Padding ... */
} pcapng_simple_packet_block_t;
+/* pcapng: name resolution block */
+typedef struct pcapng_name_resolution_block_s {
+ guint16 record_type;
+ guint16 record_len;
+ /* ... Record ... */
+} pcapng_name_resolution_block_t;
+
+/* pcapng: interface statistics block */
+typedef struct pcapng_interface_statistics_block_s {
+ guint32 interface_id;
+ guint32 timestamp_high;
+ guint32 timestamp_low;
+ /* ... Options ... */
+} pcapng_interface_statistics_block_t;
+
/* pcapng: common option header for every option type */
typedef struct pcapng_option_header_s {
guint16 option_code;
guint16 option_length;
/* ... x bytes Option Body ... */
- /* ... Padding ... */
+ /* ... Padding ... */
} pcapng_option_header_t;
+struct option {
+ guint16 type;
+ guint16 value_length;
+};
+
/* Block types */
#define BLOCK_TYPE_IDB 0x00000001 /* Interface Description Block */
#define BLOCK_TYPE_PB 0x00000002 /* Packet Block (obsolete) */
#define BLOCK_TYPE_EPB 0x00000006 /* Enhanced Packet Block */
#define BLOCK_TYPE_SHB 0x0A0D0D0A /* Section Header Block */
-
+/* Options */
+#define OPT_COMMENT 1
+#define OPT_SHB_HARDWARE 2
+#define OPT_SHB_OS 3
+#define OPT_SHB_USERAPPL 4
/* Capture section */
+#if 0
+/* Moved to wtap.h */
typedef struct wtapng_section_s {
/* mandatory */
guint64 section_length;
gchar *shb_os; /* NULL if not available */
gchar *shb_user_appl; /* NULL if not available */
} wtapng_section_t;
+#endif
+
+#if 0
+/* Moved to wtap.h */
+
+/* Interface Description
+ *
+ * Options:
+ * if_name 2 A UTF-8 string containing the name of the device used to capture data. "eth0" / "\Device\NPF_{AD1CE675-96D0-47C5-ADD0-2504B9126B68}" / ...
+ * if_description 3 A UTF-8 string containing the description of the device used to capture data. "Broadcom NetXtreme" / "First Ethernet Interface" / ...
+ * if_IPv4addr 4 Interface network address and netmask. This option can be repeated multiple times within the same Interface Description Block when multiple IPv4 addresses are assigned to the interface. 192 168 1 1 255 255 255 0
+ * if_IPv6addr 5 Interface network address and prefix length (stored in the last byte). This option can be repeated multiple times within the same Interface Description Block when multiple IPv6 addresses are assigned to the interface. 2001:0db8:85a3:08d3:1319:8a2e:0370:7344/64 is written (in hex) as "20 01 0d b8 85 a3 08 d3 13 19 8a 2e 03 70 73 44 40"
+ * if_MACaddr 6 Interface Hardware MAC address (48 bits). 00 01 02 03 04 05
+ * if_EUIaddr 7 Interface Hardware EUI address (64 bits), if available. TODO: give a good example
+ * if_speed 8 Interface speed (in bps). 100000000 for 100Mbps
+ * if_tsresol 9 Resolution of timestamps. If the Most Significant Bit is equal to zero, the remaining bits indicates the resolution of the timestamp as as a negative power of 10 (e.g. 6 means microsecond resolution, timestamps are the number of microseconds since 1/1/1970). If the Most Significant Bit is equal to one, the remaining bits indicates the resolution as as negative power of 2 (e.g. 10 means 1/1024 of second). If this option is not present, a resolution of 10^-6 is assumed (i.e. timestamps have the same resolution of the standard 'libpcap' timestamps). 6
+ * if_tzone 10 Time zone for GMT support (TODO: specify better). TODO: give a good example
+ * if_filter 11 The filter (e.g. "capture only TCP traffic") used to capture traffic. The first byte of the Option Data keeps a code of the filter used (e.g. if this is a libpcap string, or BPF bytecode, and more). More details about this format will be presented in Appendix XXX (TODO). (TODO: better use different options for different fields? e.g. if_filter_pcap, if_filter_bpf, ...) 00 "tcp port 23 and host 10.0.0.5"
+ * if_os 12 A UTF-8 string containing the name of the operating system of the machine in which this interface is installed. This can be different from the same information that can be contained by the Section Header Block (Section 3.1 (Section Header Block (mandatory))) because the capture can have been done on a remote machine. "Windows XP SP2" / "openSUSE 10.2" / ...
+ * if_fcslen 13 An integer value that specified the length of the Frame Check Sequence (in bits) for this interface. For link layers whose FCS length can change during time, the Packet Block Flags Word can be used (see Appendix A (Packet Block Flags Word)). 4
+ * if_tsoffset 14 A 64 bits integer value that specifies an offset (in seconds) that must be added to the timestamp of each packet to obtain the absolute timestamp of a packet. If the option is missing, the timestamps stored in the packet must be considered absolute timestamps. The time zone of the offset can be specified with the option if_tzone. TODO: won't a if_tsoffset_low for fractional second offsets be useful for highly syncronized capture systems? 1234
+ */
-/* Interface Description */
typedef struct wtapng_if_descr_s {
/* mandatory */
guint16 link_type;
+ guint encap;
guint32 snap_len;
/* options */
gchar *opt_comment; /* NULL if not available */
- gchar *if_name; /* NULL if not available */
- gchar *if_description;/* NULL if not available */
- /* XXX: if_IPv4addr */
- /* XXX: if_IPv6addr */
- /* XXX: if_MACaddr */
- /* XXX: if_EUIaddr */
- guint64 if_speed; /* 0xFFFFFFFF if unknown */
- guint8 if_tsaccur; /* default is 6 for microsecond resolution */
- /* XXX: if_filter */
- gchar *if_os; /* NULL if not available */
- gchar if_fcslen; /* -1 if unknown or changes between packets */
- /* XXX: guint64 if_tsoffset; */
+ gchar *if_name; /* NULL if not available, opt 2 A UTF-8 string containing the name of the device used to capture data. */
+ gchar *if_description;/* NULL if not available, opt 3 A UTF-8 string containing the description of the device used to capture data. */
+ /* XXX: if_IPv4addr opt 4 Interface network address and netmask.*/
+ /* XXX: if_IPv6addr opt 5 Interface network address and prefix length (stored in the last byte).*/
+ /* XXX: if_MACaddr opt 6 Interface Hardware MAC address (48 bits).*/
+ /* XXX: if_EUIaddr opt 7 Interface Hardware EUI address (64 bits)*/
+ guint64 if_speed; /* 0xFFFFFFFF if unknown, opt 8 Interface speed (in bps). 100000000 for 100Mbps */
+ guint8 if_tsresol; /* default is 6 for microsecond resolution, opt 9 Resolution of timestamps.
+ * If the Most Significant Bit is equal to zero, the remaining bits indicates the resolution of the timestamp as as a negative power of 10
+ */
+ /* XXX: if_tzone 10 Time zone for GMT support (TODO: specify better). */
+ gchar *if_filter; /* NULL if not available, opt 11 The filter (e.g. "capture only TCP traffic") used to capture traffic.
+ * The first byte of the Option Data keeps a code of the filter used (e.g. if this is a libpcap string, or BPF bytecode, and more).
+ */
+ gchar *if_os; /* NULL if not available, 12 A UTF-8 string containing the name of the operating system of the machine in which this interface is installed. */
+ gint8 if_fcslen; /* -1 if unknown or changes between packets, opt 13 An integer value that specified the length of the Frame Check Sequence (in bits) for this interface. */
+ /* XXX: guint64 if_tsoffset; opt 14 A 64 bits integer value that specifies an offset (in seconds)...*/
} wtapng_if_descr_t;
+#endif
/* Packets */
typedef struct wtapng_packet_s {
/* mandatory */
guint32 ts_high; /* seconds since 1.1.1970 */
- guint32 ts_low; /* fraction of seconds, depends on if_tsaccur */
+ guint32 ts_low; /* fraction of seconds, depends on if_tsresol */
guint32 cap_len; /* data length in the file */
guint32 packet_len; /* data length on the wire */
+ guint32 interface_id; /* identifier of the interface. */
+ guint16 drops_count; /* drops count, only valid for packet block */
+ /* 0xffff if information no available */
/* options */
gchar *opt_comment; /* NULL if not available */
- guint64 drop_count; /* 0xFFFFFFFF if unknown */
- guint32 pack_flags; /* XXX - 0 for now (any value for "we don't have it"?) */
+ guint64 drop_count;
+ guint32 pack_flags; /* XXX - 0 for now (any value for "we don't have it"?) */
/* pack_hash */
+ guint32 pseudo_header_len;
+ int wtap_encap;
/* XXX - put the packet data / pseudo_header here as well? */
} wtapng_packet_t;
/* mandatory */
guint32 cap_len; /* data length in the file */
guint32 packet_len; /* data length on the wire */
+ guint32 pseudo_header_len;
+ int wtap_encap;
/* XXX - put the packet data / pseudo_header here as well? */
} wtapng_simple_packet_t;
/* Interface Statistics */
typedef struct wtapng_if_stats_s {
/* mandatory */
+ guint64 interface_id;
guint32 ts_high;
guint32 ts_low;
/* options */
gchar *opt_comment; /* NULL if not available */
/* XXX */
- /*guint32 isb_starttime_high;*/
- /*guint32 isb_starttime_low;*/
- /*guint32 isb_endtime_high;*/
- /*guint32 isb_endtime_low;*/
- /*guint64 isb_ifrecv;*/
- /*guint64 isb_ifdrop;*/
- /*guint64 isb_filteraccept;*/
- /*guint64 isb_osdrop;*/
- /*guint64 isb_usrdeliv;*/
+ /*guint32 isb_starttime_high;*/
+ /*guint32 isb_starttime_low;*/
+ /*guint32 isb_endtime_high;*/
+ /*guint32 isb_endtime_low;*/
+ guint64 isb_ifrecv;
+ guint64 isb_ifdrop;
+ /*guint64 isb_filteraccept;*/
+ /*guint64 isb_osdrop;*/
+ /*guint64 isb_usrdeliv;*/
} wtapng_if_stats_t;
typedef struct wtapng_block_s {
guint32 type; /* block_type as defined by pcapng */
union {
- wtapng_section_t section;
- wtapng_if_descr_t if_descr;
- wtapng_packet_t packet;
- wtapng_simple_packet_t simple_packet;
- wtapng_name_res_t name_res;
- wtapng_if_stats_t if_stats;
+ wtapng_section_t section;
+ wtapng_if_descr_t if_descr;
+ wtapng_packet_t packet;
+ wtapng_simple_packet_t simple_packet;
+ wtapng_name_res_t name_res;
+ wtapng_if_stats_t if_stats;
} data;
- /* XXX - currently don't know how to handle these! */
+ /*
+ * XXX - currently don't know how to handle these!
+ *
+ * For one thing, when we're reading a block, they must be
+ * writable, i.e. not const, so that we can read into them,
+ * but, when we're writing a block, they can be const, and,
+ * in fact, they sometimes point to const values.
+ */
const union wtap_pseudo_header *pseudo_header;
- const guchar *frame_buffer;
+ struct wtap_pkthdr *packet_header;
+ const guint8 *frame_buffer;
+ int *file_encap;
} wtapng_block_t;
+/* Interface data in private struct */
+typedef struct interface_data_s {
+ int wtap_encap;
+ guint64 time_units_per_second;
+} interface_data_t;
+
+typedef struct {
+ gboolean shb_read; /**< Set when fisrt SHB read, second read will fail */
+ gboolean read_idbs; /**< Idicates that it is the first read after a SHB, atl east one IDB is expected */
+ gboolean byte_swapped;
+ guint16 version_major;
+ guint16 version_minor;
+ GArray *interface_data;
+ guint number_of_interfaces;
+ gint8 if_fcslen;
+ wtap_new_ipv4_callback_t add_new_ipv4;
+ wtap_new_ipv6_callback_t add_new_ipv6;
+} pcapng_t;
static int
-pcapng_read_option(FILE_T fh, pcapng_t *pn, pcapng_option_header_t *oh, char *content, int len, int *err, gchar **err_info _U_)
+pcapng_get_encap(gint id, pcapng_t *pn)
+{
+ interface_data_t int_data;
+
+
+ if ((id >= 0) && ((guint)id < pn->number_of_interfaces)) {
+ int_data = g_array_index(pn->interface_data, interface_data_t, id);
+ pcapng_debug2("pcapng_get_encap: id %i, wtap_encap %i",id, int_data.wtap_encap);
+ return int_data.wtap_encap;
+ } else {
+ pcapng_debug2("pcapng_get_encap: id %i number_of_interfaces %u, wtap_encap = WTAP_ERR_UNSUPPORTED_ENCAP",id,pn->number_of_interfaces);
+ return WTAP_ERR_UNSUPPORTED_ENCAP;
+ }
+}
+
+static int
+pcapng_read_option(FILE_T fh, pcapng_t *pn, pcapng_option_header_t *oh,
+ char *content, int len, int *err, gchar **err_info)
{
int bytes_read;
int block_read;
guint64 file_offset64;
- /* read option header */
- errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(oh, 1, sizeof oh, fh);
- if (bytes_read != sizeof oh) {
- g_warning("pcapng_read_option: failed to read option");
- *err = file_error(fh);
- if (*err != 0)
- return -1;
- return 0;
- }
- block_read = sizeof oh;
- if(pn->byte_swapped) {
- oh->option_code = BSWAP16(oh->option_code);
- oh->option_length = BSWAP32(oh->option_length);
- }
-
- /* sanity check: option length */
- if (oh->option_length > len) {
- g_warning("pcapng_read_option: option_length %u larger than buffer (%u)",
- oh->option_length, len);
- return 0;
- }
-
- /* read option content */
- errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(content, 1, oh->option_length, fh);
- if (bytes_read != oh->option_length) {
- g_warning("pcapng_read_if_descr_block: failed to read content of option %u", oh->option_code);
- *err = file_error(fh);
+ /* read option header */
+ errno = WTAP_ERR_CANT_READ;
+ bytes_read = file_read(oh, sizeof (*oh), fh);
+ if (bytes_read != sizeof (*oh)) {
+ pcapng_debug0("pcapng_read_option: failed to read option");
+ *err = file_error(fh, err_info);
if (*err != 0)
return -1;
return 0;
- }
- block_read += oh->option_length;
-
- /* jump over potential padding bytes at end of option */
- if( (oh->option_length % 4) != 0) {
- file_offset64 = file_seek(fh, 4 - (oh->option_length % 4), SEEK_CUR, err);
- if (file_offset64 <= 0) {
- if (*err != 0)
- return -1;
- return 0;
- }
- block_read += 4 - (oh->option_length % 4);
- }
+ }
+ block_read = sizeof (*oh);
+ if(pn->byte_swapped) {
+ oh->option_code = BSWAP16(oh->option_code);
+ oh->option_length = BSWAP16(oh->option_length);
+ }
- return block_read;
+ /* sanity check: option length */
+ if (oh->option_length > len) {
+ pcapng_debug2("pcapng_read_option: option_length %u larger than buffer (%u)",
+ oh->option_length, len);
+ return 0;
+ }
+
+ /* read option content */
+ errno = WTAP_ERR_CANT_READ;
+ bytes_read = file_read(content, oh->option_length, fh);
+ if (bytes_read != oh->option_length) {
+ pcapng_debug1("pcapng_read_option: failed to read content of option %u", oh->option_code);
+ *err = file_error(fh, err_info);
+ if (*err != 0)
+ return -1;
+ return 0;
+ }
+ block_read += oh->option_length;
+
+ /* jump over potential padding bytes at end of option */
+ if( (oh->option_length % 4) != 0) {
+ file_offset64 = file_seek(fh, 4 - (oh->option_length % 4), SEEK_CUR, err);
+ if (file_offset64 <= 0) {
+ if (*err != 0)
+ return -1;
+ return 0;
+ }
+ block_read += 4 - (oh->option_length % 4);
+ }
+
+ return block_read;
}
static int
-pcapng_read_section_header_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, wtapng_block_t *wblock, int *err, gchar **err_info _U_)
+pcapng_read_section_header_block(FILE_T fh, gboolean first_block,
+ pcapng_block_header_t *bh, pcapng_t *pn,
+ wtapng_block_t *wblock, int *err,
+ gchar **err_info)
{
int bytes_read;
int block_read;
- int to_read;
+ int to_read, opt_cont_buf_len;
pcapng_section_header_block_t shb;
- pcapng_option_header_t oh;
- char option_content[100]; /* XXX - size might need to be increased, if we see longer options */
+ pcapng_option_header_t oh;
+ char *option_content = NULL; /* Allocate as large as the options block */
/* read block content */
errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(&shb, 1, sizeof shb, fh);
+ bytes_read = file_read(&shb, sizeof shb, fh);
if (bytes_read != sizeof shb) {
- *err = file_error(fh);
- if (*err != 0)
- return -1;
- return 0;
+ *err = file_error(fh, err_info);
+ if (*err == 0) {
+ if (first_block) {
+ /*
+ * We're reading this as part of an open,
+ * and this block is too short to be
+ * an SHB, so the file is too short
+ * to be a pcap-ng file.
+ */
+ return 0;
+ }
+
+ /*
+ * Otherwise, just report this as an error.
+ */
+ *err = WTAP_ERR_SHORT_READ;
+ }
+ return -1;
}
- block_read = bytes_read;
+ block_read = bytes_read;
/* is the magic number one we expect? */
switch(shb.magic) {
- case(0x1A2B3C4D):
- /* this seems pcapng with correct byte order */
- pn->byte_swapped = FALSE;
- pn->version_major = shb.version_major;
- pn->version_minor = shb.version_minor;
+ case(0x1A2B3C4D):
+ /* this seems pcapng with correct byte order */
+ pn->byte_swapped = FALSE;
+ pn->version_major = shb.version_major;
+ pn->version_minor = shb.version_minor;
- g_warning("pcapng_read_section_header_block: SHB (little endian) V%u.%u, len %u",
+ pcapng_debug3("pcapng_read_section_header_block: SHB (little endian) V%u.%u, len %u",
pn->version_major, pn->version_minor, bh->block_total_length);
break;
- case(0x4D3C2B1A):
- /* this seems pcapng with swapped byte order */
- pn->byte_swapped = TRUE;
- pn->version_major = BSWAP16(shb.version_major);
- pn->version_minor = BSWAP16(shb.version_minor);
-
- /* tweak the block length to meet current swapping that we know now */
- bh->block_total_length = BSWAP32(bh->block_total_length);
-
- g_warning("pcapng_read_section_header_block: SHB (big endian) V%u.%u, len %u",
+ case(0x4D3C2B1A):
+ /* this seems pcapng with swapped byte order */
+ pn->byte_swapped = TRUE;
+ pn->version_major = BSWAP16(shb.version_major);
+ pn->version_minor = BSWAP16(shb.version_minor);
+
+ /* tweak the block length to meet current swapping that we know now */
+ bh->block_total_length = BSWAP32(bh->block_total_length);
+
+ pcapng_debug3("pcapng_read_section_header_block: SHB (big endian) V%u.%u, len %u",
pn->version_major, pn->version_minor, bh->block_total_length);
- break;
- default:
- /* Not a "pcapng" magic number we know about. */
- g_warning("pcapng_read_section_header_block: unknown magic number %u (probably not an pcapng file)", shb.magic);
+ break;
+ default:
+ /* Not a "pcapng" magic number we know about. */
+ if (first_block) {
+ /* Not a pcap-ng file. */
return 0;
+ }
+
+ /* A bad block */
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup_printf("pcapng_read_section_header_block: unknown byte-order magic number 0x%08x", shb.magic);
+ return 0;
}
- /* we currently only understand SHB V1.0 */
- if(pn->version_major != 1 || pn->version_minor != 0) {
- g_warning("pcapng_read_section_header_block: unknown SHB version %u.%u",
- pn->version_major, pn->version_minor);
+ /* OK, at this point we assume it's a pcap-ng file. */
+ /* We currently only suport one SHB */
+ if (pn->shb_read == TRUE) {
+ *err = WTAP_ERR_UNSUPPORTED;
+ *err_info = g_strdup_printf("pcapng: multiple section header blocks not supported.");
return 0;
}
- /* XXX - no proper way to read/swap 64 bit values -> so ignore the 64bit section_length for now! */
- wblock->data.section.section_length = -1; /* shb.section_length */
+ /* we currently only understand SHB V1.0 */
+ if (pn->version_major != 1 || pn->version_minor > 0) {
+ *err = WTAP_ERR_UNSUPPORTED;
+ *err_info = g_strdup_printf("pcapng_read_section_header_block: unknown SHB version %u.%u",
+ pn->version_major, pn->version_minor);
+ return -1;
+ }
+
+
+ /* 64bit section_length (currently unused) */
+ if (pn->byte_swapped) {
+ wblock->data.section.section_length = BSWAP64(shb.section_length);
+ } else {
+ wblock->data.section.section_length = shb.section_length;
+ }
/* Option defaults */
wblock->data.section.opt_comment = NULL;
/* Options */
errno = WTAP_ERR_CANT_READ;
- to_read = bh->block_total_length
- - sizeof(pcapng_block_header_t)
- - sizeof (pcapng_section_header_block_t)
- - sizeof(bh->block_total_length);
- while(to_read > 0) {
- /* read option */
- bytes_read = pcapng_read_option(fh, pn, &oh, option_content, sizeof(option_content), err, err_info);
- if (bytes_read <= 0) {
- g_warning("pcapng_read_section_header_block: failed to read option");
- return bytes_read;
- }
- block_read += bytes_read;
- to_read -= bytes_read;
-
- /* handle option content */
- switch(oh.option_code) {
- case(0): /* opt_endofopt */
- if(to_read != 0) {
- g_warning("pcapng_read_section_header_block: %u bytes after opt_endofopt", to_read);
- }
- /* padding should be ok here, just get out of this */
- to_read = 0;
- break;
- case(1): /* opt_comment */
- if(oh.option_length > 0 && oh.option_length < sizeof(option_content)) {
- wblock->data.section.opt_comment = g_strndup(option_content, sizeof(option_content));
- g_warning("pcapng_read_section_header_block: opt_comment %s", wblock->data.section.opt_comment);
- } else {
- g_warning("pcapng_read_section_header_block: opt_comment length %u seems strange", oh.option_length);
- }
- break;
- case(2): /* shb_hardware */
- if(oh.option_length > 0 && oh.option_length < sizeof(option_content)) {
- wblock->data.section.shb_hardware = g_strndup(option_content, sizeof(option_content));
- g_warning("pcapng_read_section_header_block: shb_hardware %s", wblock->data.section.shb_hardware);
- } else {
- g_warning("pcapng_read_section_header_block: shb_hardware length %u seems strange", oh.option_length);
- }
- break;
- case(3): /* shb_os */
- if(oh.option_length > 0 && oh.option_length < sizeof(option_content)) {
- wblock->data.section.shb_os = g_strndup(option_content, sizeof(option_content));
- g_warning("pcapng_read_section_header_block: shb_os %s", wblock->data.section.shb_os);
- } else {
- g_warning("pcapng_read_section_header_block: shb_os length %u seems strange", oh.option_length);
- }
- break;
- case(4): /* shb_userappl */
- if(oh.option_length > 0 && oh.option_length < sizeof(option_content)) {
- wblock->data.section.shb_user_appl = g_strndup(option_content, sizeof(option_content));
- g_warning("pcapng_read_section_header_block: shb_userappl %s", wblock->data.section.shb_user_appl);
- } else {
- g_warning("pcapng_read_section_header_block: shb_userappl length %u seems strange", oh.option_length);
- }
- break;
- default:
- g_warning("pcapng_read_section_header_block: unknown option %u - ignoring %u bytes",
- oh.option_code, oh.option_length);
- }
- }
+ to_read = bh->block_total_length -
+ (int)sizeof(pcapng_block_header_t) -
+ (int)sizeof(pcapng_section_header_block_t) -
+ (int)sizeof(bh->block_total_length);
+ /* Allocate enough memory to hold all options */
+ opt_cont_buf_len = to_read;
+ option_content = g_malloc(opt_cont_buf_len);
+ pcapng_debug1("pcapng_read_section_header_block: Options %u bytes", to_read);
+ while(to_read > 0) {
+ /* read option */
+ pcapng_debug1("pcapng_read_section_header_block: Options %u bytes remaining", to_read);
+ bytes_read = pcapng_read_option(fh, pn, &oh, option_content, opt_cont_buf_len, err, err_info);
+ if (bytes_read <= 0) {
+ pcapng_debug0("pcapng_read_section_header_block: failed to read option");
+ return bytes_read;
+ }
+ block_read += bytes_read;
+ to_read -= bytes_read;
+
+ /* handle option content */
+ switch(oh.option_code) {
+ case(0): /* opt_endofopt */
+ if(to_read != 0) {
+ pcapng_debug1("pcapng_read_section_header_block: %u bytes after opt_endofopt", to_read);
+ }
+ /* padding should be ok here, just get out of this */
+ to_read = 0;
+ break;
+ case(1): /* opt_comment */
+ if(oh.option_length > 0 && oh.option_length < opt_cont_buf_len) {
+ wblock->data.section.opt_comment = g_strndup(option_content, oh.option_length);
+ pcapng_debug1("pcapng_read_section_header_block: opt_comment %s", wblock->data.section.opt_comment);
+ } else {
+ pcapng_debug1("pcapng_read_section_header_block: opt_comment length %u seems strange", oh.option_length);
+ }
+ break;
+ case(2): /* shb_hardware */
+ if(oh.option_length > 0 && oh.option_length < opt_cont_buf_len) {
+ wblock->data.section.shb_hardware = g_strndup(option_content, oh.option_length);
+ pcapng_debug1("pcapng_read_section_header_block: shb_hardware %s", wblock->data.section.shb_hardware);
+ } else {
+ pcapng_debug1("pcapng_read_section_header_block: shb_hardware length %u seems strange", oh.option_length);
+ }
+ break;
+ case(3): /* shb_os */
+ if(oh.option_length > 0 && oh.option_length < opt_cont_buf_len) {
+ wblock->data.section.shb_os = g_strndup(option_content, oh.option_length);
+ pcapng_debug1("pcapng_read_section_header_block: shb_os %s", wblock->data.section.shb_os);
+ } else {
+ pcapng_debug2("pcapng_read_section_header_block: shb_os length %u seems strange, opt buffsize %u", oh.option_length,to_read);
+ }
+ break;
+ case(4): /* shb_user_appl */
+ if(oh.option_length > 0 && oh.option_length < opt_cont_buf_len) {
+ wblock->data.section.shb_user_appl = g_strndup(option_content, oh.option_length);
+ pcapng_debug1("pcapng_read_section_header_block: shb_user_appl %s", wblock->data.section.shb_user_appl);
+ } else {
+ pcapng_debug1("pcapng_read_section_header_block: shb_user_appl length %u seems strange", oh.option_length);
+ }
+ break;
+ default:
+ pcapng_debug2("pcapng_read_section_header_block: unknown option %u - ignoring %u bytes",
+ oh.option_code, oh.option_length);
+ }
+ }
+ g_free(option_content);
return block_read;
}
/* "Interface Description Block" */
static int
-pcapng_read_if_descr_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, wtapng_block_t *wblock, int *err, gchar **err_info _U_)
+pcapng_read_if_descr_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn,
+ wtapng_block_t *wblock, int *err, gchar **err_info)
{
+ guint64 time_units_per_second = 1000000; /* default */
int bytes_read;
int block_read;
- int to_read;
+ int to_read, opt_cont_buf_len;
pcapng_interface_description_block_t idb;
- pcapng_option_header_t oh;
- char option_content[100]; /* XXX - size might need to be increased, if we see longer options */
+ pcapng_option_header_t oh;
+ char *option_content = NULL; /* Allocate as large as the options block */
+
/* read block content */
errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(&idb, 1, sizeof idb, fh);
+ bytes_read = file_read(&idb, sizeof idb, fh);
if (bytes_read != sizeof idb) {
- g_warning("pcapng_read_if_descr_block: failed to read IDB");
- *err = file_error(fh);
+ pcapng_debug0("pcapng_read_if_descr_block: failed to read IDB");
+ *err = file_error(fh, err_info);
if (*err != 0)
return -1;
return 0;
}
- block_read = bytes_read;
+ block_read = bytes_read;
/* mandatory values */
- if(pn->byte_swapped) {
+ if (pn->byte_swapped) {
wblock->data.if_descr.link_type = BSWAP16(idb.linktype);
wblock->data.if_descr.snap_len = BSWAP32(idb.snaplen);
} else {
wblock->data.if_descr.snap_len = idb.snaplen;
}
- g_warning("pcapng_read_if_descr_block: IDB link_type %u, snap %u",
- wblock->data.if_descr.link_type, wblock->data.if_descr.snap_len);
-
- /* XXX - sanity check of snapshot length */
- /* XXX - while a very big snapshot length is valid, it's more likely that it's a bug in the file */
- /* XXX - so do a sanity check for now, it's likely e.g. a byte swap order problem */
- if(wblock->data.if_descr.snap_len > 65535) {
- g_warning("pcapng_read_if_descr_block: snapshot length %u unrealistic",
- wblock->data.if_descr.snap_len);
- /*wblock->data.if_descr.snap_len = 65535;*/
- return 0;
+ wblock->data.if_descr.wtap_encap = wtap_pcap_encap_to_wtap_encap(wblock->data.if_descr.link_type);
+ wblock->data.if_descr.time_units_per_second = time_units_per_second;
+
+ pcapng_debug3("pcapng_read_if_descr_block: IDB link_type %u (%s), snap %u",
+ wblock->data.if_descr.link_type,
+ wtap_encap_string(wblock->data.if_descr.wtap_encap),
+ wblock->data.if_descr.snap_len);
+
+ if (wblock->data.if_descr.snap_len > WTAP_MAX_PACKET_SIZE) {
+ /* This is unrealisitic, but text2pcap currently uses 102400.
+ * We do not use this value, maybe we should check the
+ * snap_len of the packets against it. For now, only warn.
+ */
+ pcapng_debug1("pcapng_read_if_descr_block: snapshot length %u unrealistic.",
+ wblock->data.if_descr.snap_len);
+ /*wblock->data.if_descr.snap_len = WTAP_MAX_PACKET_SIZE;*/
}
/* Option defaults */
/* XXX: if_IPv6addr */
/* XXX: if_MACaddr */
/* XXX: if_EUIaddr */
- wblock->data.if_descr.if_speed = 0xFFFFFFFF; /* "unknown" */
- wblock->data.if_descr.if_tsaccur = 6; /* default is 6 for microsecond resolution */
- /* XXX: if_filter */
+ wblock->data.if_descr.if_speed = 0; /* "unknown" */
+ wblock->data.if_descr.if_tsresol = 6; /* default is 6 for microsecond resolution */
+ wblock->data.if_descr.if_filter = NULL;
wblock->data.if_descr.if_os = NULL;
- wblock->data.if_descr.if_fcslen = (gchar) -1; /* unknown or changes between packets */
+ wblock->data.if_descr.if_fcslen = -1; /* unknown or changes between packets */
/* XXX: guint64 if_tsoffset; */
/* Options */
errno = WTAP_ERR_CANT_READ;
- to_read = bh->block_total_length
- - sizeof(pcapng_block_header_t)
- - sizeof (pcapng_interface_description_block_t)
- - sizeof(bh->block_total_length);
- while(to_read > 0) {
- /* read option */
- bytes_read = pcapng_read_option(fh, pn, &oh, option_content, sizeof(option_content), err, err_info);
- if (bytes_read <= 0) {
- g_warning("pcapng_read_if_descr_block: failed to read option");
- return bytes_read;
- }
- block_read += bytes_read;
- to_read -= bytes_read;
-
- /* handle option content */
- switch(oh.option_code) {
- case(0): /* opt_endofopt */
- if(to_read != 0) {
- g_warning("pcapng_read_if_descr_block: %u bytes after opt_endofopt", to_read);
- }
- /* padding should be ok here, just get out of this */
- to_read = 0;
- break;
- case(1): /* opt_comment */
- if(oh.option_length > 0 && oh.option_length < sizeof(option_content)) {
- wblock->data.section.opt_comment = g_strndup(option_content, sizeof(option_content));
- g_warning("pcapng_read_if_descr_block: opt_comment %s", wblock->data.section.opt_comment);
- } else {
- g_warning("pcapng_read_if_descr_block: opt_comment length %u seems strange", oh.option_length);
- }
- break;
- case(2): /* if_name */
- if(oh.option_length > 0 && oh.option_length < sizeof(option_content)) {
- wblock->data.if_descr.if_name = g_strndup(option_content, sizeof(option_content));
- g_warning("pcapng_read_if_descr_block: if_name %s", wblock->data.if_descr.if_name);
- } else {
- g_warning("pcapng_read_if_descr_block: if_name length %u seems strange", oh.option_length);
- }
- break;
- case(3): /* if_description */
- if(oh.option_length > 0 && oh.option_length < sizeof(option_content)) {
- wblock->data.if_descr.if_description = g_strndup(option_content, sizeof(option_content));
- g_warning("pcapng_read_if_descr_block: if_description %s", wblock->data.if_descr.if_description);
- } else {
- g_warning("pcapng_read_if_descr_block: if_description length %u seems strange", oh.option_length);
- }
- break;
- case(8): /* if_speed */
- if(oh.option_length == 8) {
- wblock->data.if_descr.if_speed = *((guint64 *)option_content);
- /* XXX - need 64 bit byte swap */
- /*if(pn->byte_swapped)
- wblock->data.if_descr.if_speed = BSWAP64(wblock->data.if_descr.if_speed);*/
-
- g_warning("pcapng_read_if_descr_block: if_speed %" G_GINT64_MODIFIER "u (bps)", wblock->data.if_descr.if_speed);
- } else {
- g_warning("pcapng_read_if_descr_block: if_speed length %u not 8 as expected", oh.option_length);
- }
- break;
- case(9): /* if_tsaccur */
- if(oh.option_length == 1) {
- wblock->data.if_descr.if_tsaccur = option_content[0];
- g_warning("pcapng_read_if_descr_block: if_tsaccur %u", wblock->data.if_descr.if_tsaccur);
- } else {
- g_warning("pcapng_read_if_descr_block: if_tsaccur length %u not 1 as expected", oh.option_length);
- }
- break;
- case(13): /* if_fcslen */
- if(oh.option_length == 1) {
- wblock->data.if_descr.if_fcslen = option_content[0];
- pn->if_fcslen = wblock->data.if_descr.if_fcslen;
- g_warning("pcapng_read_if_descr_block: if_fcslen %u", wblock->data.if_descr.if_fcslen);
- /* XXX - add sanity check */
- } else {
- g_warning("pcapng_read_if_descr_block: if_fcslen length %u not 1 as expected", oh.option_length);
- }
- break;
- default:
- g_warning("pcapng_read_if_descr_block: unknown option %u - ignoring %u bytes",
- oh.option_code, oh.option_length);
- }
- }
+ to_read = bh->block_total_length -
+ (int)sizeof(pcapng_block_header_t) -
+ (int)sizeof (pcapng_interface_description_block_t) -
+ (int)sizeof(bh->block_total_length);
+
+ /* Allocate enough memory to hold all options */
+ opt_cont_buf_len = to_read;
+ option_content = g_malloc(opt_cont_buf_len);
+
+ while (to_read > 0) {
+ /* read option */
+ bytes_read = pcapng_read_option(fh, pn, &oh, option_content, opt_cont_buf_len, err, err_info);
+ if (bytes_read <= 0) {
+ pcapng_debug0("pcapng_read_if_descr_block: failed to read option");
+ return bytes_read;
+ }
+ block_read += bytes_read;
+ to_read -= bytes_read;
+
+ /* handle option content */
+ switch(oh.option_code) {
+ case(0): /* opt_endofopt */
+ if(to_read != 0) {
+ pcapng_debug1("pcapng_read_if_descr_block: %u bytes after opt_endofopt", to_read);
+ }
+ /* padding should be ok here, just get out of this */
+ to_read = 0;
+ break;
+ case(1): /* opt_comment */
+ if(oh.option_length > 0 && oh.option_length < opt_cont_buf_len) {
+ wblock->data.if_descr.opt_comment = g_strndup(option_content, oh.option_length);
+ pcapng_debug1("pcapng_read_if_descr_block: opt_comment %s", wblock->data.if_descr.opt_comment);
+ } else {
+ pcapng_debug1("pcapng_read_if_descr_block: opt_comment length %u seems strange", oh.option_length);
+ }
+ break;
+ case(2): /* if_name */
+ if(oh.option_length > 0 && oh.option_length < opt_cont_buf_len) {
+ wblock->data.if_descr.if_name = g_strndup(option_content, oh.option_length);
+ pcapng_debug1("pcapng_read_if_descr_block: if_name %s", wblock->data.if_descr.if_name);
+ } else {
+ pcapng_debug1("pcapng_read_if_descr_block: if_name length %u seems strange", oh.option_length);
+ }
+ break;
+ case(3): /* if_description */
+ if(oh.option_length > 0 && oh.option_length < opt_cont_buf_len) {
+ wblock->data.if_descr.if_description = g_strndup(option_content, oh.option_length);
+ pcapng_debug1("pcapng_read_if_descr_block: if_description %s", wblock->data.if_descr.if_description);
+ } else {
+ pcapng_debug1("pcapng_read_if_descr_block: if_description length %u seems strange", oh.option_length);
+ }
+ break;
+ /*
+ * if_IPv4addr 4 Interface network address and netmask. This option can be repeated multiple times within the same Interface Description Block when multiple IPv4 addresses are assigned to the interface. 192 168 1 1 255 255 255 0
+ * if_IPv6addr 5 Interface network address and prefix length (stored in the last byte). This option can be repeated multiple times within the same Interface Description Block when multiple IPv6 addresses are assigned to the interface. 2001:0db8:85a3:08d3:1319:8a2e:0370:7344/64 is written (in hex) as "20 01 0d b8 85 a3 08 d3 13 19 8a 2e 03 70 73 44 40"
+ * if_MACaddr 6 Interface Hardware MAC address (48 bits). 00 01 02 03 04 05
+ * if_EUIaddr 7 Interface Hardware EUI address (64 bits), if available. TODO: give a good example
+ */
+ case(8): /* if_speed */
+ if(oh.option_length == 8) {
+ /* Don't cast a char[] into a guint64--the
+ * char[] may not be aligned correctly.
+ */
+ memcpy(&wblock->data.if_descr.if_speed, option_content, sizeof(guint64));
+ if(pn->byte_swapped)
+ wblock->data.if_descr.if_speed = BSWAP64(wblock->data.if_descr.if_speed);
+ pcapng_debug1("pcapng_read_if_descr_block: if_speed %" G_GINT64_MODIFIER "u (bps)", wblock->data.if_descr.if_speed);
+ } else {
+ pcapng_debug1("pcapng_read_if_descr_block: if_speed length %u not 8 as expected", oh.option_length);
+ }
+ break;
+ case(9): /* if_tsresol */
+ if (oh.option_length == 1) {
+ guint64 base;
+ guint64 result;
+ guint8 i, exponent, if_tsresol;
+
+ if_tsresol = option_content[0];
+ if (if_tsresol & 0x80) {
+ base = 2;
+ } else {
+ base = 10;
+ }
+ exponent = (guint8)(if_tsresol & 0x7f);
+ if (((base == 2) && (exponent < 64)) || ((base == 10) && (exponent < 20))) {
+ result = 1;
+ for (i = 0; i < exponent; i++) {
+ result *= base;
+ }
+ time_units_per_second = result;
+ } else {
+ time_units_per_second = G_MAXUINT64;
+ }
+ if (time_units_per_second > (((guint64)1) << 32)) {
+ pcapng_debug0("pcapng_open: time conversion might be inaccurate");
+ }
+ pcapng_debug1("pcapng_read_if_descr_block: if_tsresol %u", wblock->data.if_descr.if_tsresol);
+ wblock->data.if_descr.time_units_per_second = time_units_per_second;
+ wblock->data.if_descr.if_tsresol = if_tsresol;
+ } else {
+ pcapng_debug1("pcapng_read_if_descr_block: if_tsresol length %u not 1 as expected", oh.option_length);
+ }
+ break;
+ /*
+ * if_tzone 10 Time zone for GMT support (TODO: specify better). TODO: give a good example
+ */
+ case(11): /* if_filter */
+ if(oh.option_length > 0 && oh.option_length < opt_cont_buf_len) {
+ wblock->data.if_descr.if_filter = g_strndup(option_content, oh.option_length);
+ pcapng_debug1("pcapng_read_if_descr_block: if_filter %s", wblock->data.if_descr.if_filter);
+ } else {
+ pcapng_debug1("pcapng_read_if_descr_block: if_filter length %u seems strange", oh.option_length);
+ }
+ break;
+ case(12): /* if_os */
+ /*
+ * if_os 12 A UTF-8 string containing the name of the operating system of the machine in which this interface is installed.
+ * This can be different from the same information that can be contained by the Section Header Block (Section 3.1 (Section Header Block (mandatory)))
+ * because the capture can have been done on a remote machine. "Windows XP SP2" / "openSUSE 10.2" / ...
+ */
+ if(oh.option_length > 0 && oh.option_length < opt_cont_buf_len) {
+ wblock->data.if_descr.if_os = g_strndup(option_content, oh.option_length);
+ pcapng_debug1("pcapng_read_if_descr_block: if_os %s", wblock->data.if_descr.if_os);
+ } else {
+ pcapng_debug1("pcapng_read_if_descr_block: if_os length %u seems strange", oh.option_length);
+ }
+ break;
+ case(13): /* if_fcslen */
+ if(oh.option_length == 1) {
+ wblock->data.if_descr.if_fcslen = option_content[0];
+ pn->if_fcslen = wblock->data.if_descr.if_fcslen;
+ pcapng_debug1("pcapng_read_if_descr_block: if_fcslen %u", wblock->data.if_descr.if_fcslen);
+ /* XXX - add sanity check */
+ } else {
+ pcapng_debug1("pcapng_read_if_descr_block: if_fcslen length %u not 1 as expected", oh.option_length);
+ }
+ break;
+ /*
+ * if_tsoffset 14 A 64 bits integer value that specifies an offset (in seconds) that must be added to the timestamp of each packet
+ * to obtain the absolute timestamp of a packet. If the option is missing, the timestamps stored in the packet must be considered absolute timestamps.
+ * The time zone of the offset can be specified with the option if_tzone.
+ * TODO: won't a if_tsoffset_low for fractional second offsets be useful for highly syncronized capture systems? 1234
+ */
+ default:
+ pcapng_debug2("pcapng_read_if_descr_block: unknown option %u - ignoring %u bytes",
+ oh.option_code, oh.option_length);
+ }
+ }
+
+ g_free(option_content);
+
+ if (*wblock->file_encap == WTAP_ENCAP_UNKNOWN) {
+ *wblock->file_encap = wblock->data.if_descr.wtap_encap;
+ } else {
+ if (*wblock->file_encap != wblock->data.if_descr.wtap_encap) {
+ *wblock->file_encap = WTAP_ENCAP_PER_PACKET;
+ }
+ }
return block_read;
}
-static int
-pcapng_read_packet_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, wtapng_block_t *wblock,int *err, gchar **err_info _U_)
+static int
+pcapng_read_packet_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, wtapng_block_t *wblock, int *err, gchar **err_info, gboolean enhanced)
{
int bytes_read;
int block_read;
- int to_read;
+ int to_read, opt_cont_buf_len;
guint64 file_offset64;
pcapng_enhanced_packet_block_t epb;
+ pcapng_packet_block_t pb;
guint32 block_total_length;
- pcapng_option_header_t oh;
- char option_content[100]; /* XXX - size might need to be increased, if we see longer options */
-
+ pcapng_option_header_t oh;
+ gint wtap_encap;
+ int pseudo_header_len;
+ char *option_content = NULL; /* Allocate as large as the options block */
+ int fcslen;
/* "(Enhanced) Packet Block" read fixed part */
errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(&epb, 1, sizeof epb, fh);
- if (bytes_read != sizeof epb) {
- g_warning("pcapng_read_packet_block: failed to read packet data");
- *err = file_error(fh);
- return 0;
- }
- block_read = bytes_read;
-
- /* XXX - as we currently ignore the interface id, both packet blocks are the same for us */
- if(pn->byte_swapped) {
- wblock->data.packet.ts_high = BSWAP32(epb.timestamp_high);
- wblock->data.packet.ts_low = BSWAP32(epb.timestamp_low);
- wblock->data.packet.cap_len = BSWAP32(epb.captured_len);
- wblock->data.packet.packet_len = BSWAP32(epb.packet_len);
+ if (enhanced) {
+ bytes_read = file_read(&epb, sizeof epb, fh);
+ if (bytes_read != sizeof epb) {
+ pcapng_debug0("pcapng_read_packet_block: failed to read packet data");
+ *err = file_error(fh, err_info);
+ return 0;
+ }
+ block_read = bytes_read;
+
+ if (pn->byte_swapped) {
+ wblock->data.packet.interface_id = BSWAP32(epb.interface_id);
+ wblock->data.packet.drops_count = -1; /* invalid */
+ wblock->data.packet.ts_high = BSWAP32(epb.timestamp_high);
+ wblock->data.packet.ts_low = BSWAP32(epb.timestamp_low);
+ wblock->data.packet.cap_len = BSWAP32(epb.captured_len);
+ wblock->data.packet.packet_len = BSWAP32(epb.packet_len);
+ } else {
+ wblock->data.packet.interface_id = epb.interface_id;
+ wblock->data.packet.drops_count = -1; /* invalid */
+ wblock->data.packet.ts_high = epb.timestamp_high;
+ wblock->data.packet.ts_low = epb.timestamp_low;
+ wblock->data.packet.cap_len = epb.captured_len;
+ wblock->data.packet.packet_len = epb.packet_len;
+ }
} else {
- wblock->data.packet.ts_high = epb.timestamp_high;
- wblock->data.packet.ts_low = epb.timestamp_low;
- wblock->data.packet.cap_len = epb.captured_len;
- wblock->data.packet.packet_len = epb.packet_len;
+ bytes_read = file_read(&pb, sizeof pb, fh);
+ if (bytes_read != sizeof pb) {
+ pcapng_debug0("pcapng_read_packet_block: failed to read packet data");
+ *err = file_error(fh, err_info);
+ return 0;
+ }
+ block_read = bytes_read;
+
+ if (pn->byte_swapped) {
+ wblock->data.packet.interface_id = BSWAP16(pb.interface_id);
+ wblock->data.packet.drops_count = BSWAP16(pb.drops_count);
+ wblock->data.packet.ts_high = BSWAP32(pb.timestamp_high);
+ wblock->data.packet.ts_low = BSWAP32(pb.timestamp_low);
+ wblock->data.packet.cap_len = BSWAP32(pb.captured_len);
+ wblock->data.packet.packet_len = BSWAP32(pb.packet_len);
+ } else {
+ wblock->data.packet.interface_id = pb.interface_id;
+ wblock->data.packet.drops_count = pb.drops_count;
+ wblock->data.packet.ts_high = pb.timestamp_high;
+ wblock->data.packet.ts_low = pb.timestamp_low;
+ wblock->data.packet.cap_len = pb.captured_len;
+ wblock->data.packet.packet_len = pb.packet_len;
+ }
}
- /*g_warning("pcapng_read_packet_block: packet data: packet_len %u captured_len %u",
- wblock->data.packet.packet_len, wblock->data.packet.cap_len);*/
-
- /* xxx - convert timestamps if we have an odd if_tsaccur */
-
- /* XXX - implement other linktypes then Ethernet */
- /* (or even better share the code with libpcap.c) */
-
- /* Ethernet FCS length, might be overwritten by "per packet" options */
- ((union wtap_pseudo_header *) wblock->pseudo_header)->eth.fcs_len = pn->if_fcslen;
+ if (wblock->data.packet.cap_len > wblock->data.packet.packet_len) {
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup_printf("pcapng_read_packet_block: cap_len %u is larger than packet_len %u.",
+ wblock->data.packet.cap_len, wblock->data.packet.packet_len);
+ return 0;
+ }
+ if (wblock->data.packet.cap_len > WTAP_MAX_PACKET_SIZE) {
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup_printf("pcapng_read_packet_block: cap_len %u is larger than WTAP_MAX_PACKET_SIZE %u.",
+ wblock->data.packet.cap_len, WTAP_MAX_PACKET_SIZE);
+ return 0;
+ }
+ pcapng_debug3("pcapng_read_packet_block: packet data: packet_len %u captured_len %u interface_id %u",
+ wblock->data.packet.packet_len,
+ wblock->data.packet.cap_len,
+ wblock->data.packet.interface_id);
+
+ wtap_encap = pcapng_get_encap(wblock->data.packet.interface_id, pn);
+ pcapng_debug3("pcapng_read_packet_block: encapsulation = %d (%s), pseudo header size = %d.",
+ wtap_encap,
+ wtap_encap_string(wtap_encap),
+ pcap_get_phdr_size(wtap_encap, wblock->pseudo_header));
+
+ memset((void *)wblock->pseudo_header, 0, sizeof(union wtap_pseudo_header));
+ pseudo_header_len = pcap_process_pseudo_header(fh,
+ WTAP_FILE_PCAPNG,
+ wtap_encap,
+ wblock->data.packet.cap_len,
+ TRUE,
+ wblock->packet_header,
+ (union wtap_pseudo_header *)wblock->pseudo_header,
+ err,
+ err_info);
+ if (pseudo_header_len < 0) {
+ return 0;
+ }
+ wblock->data.packet.pseudo_header_len = (guint32)pseudo_header_len;
+ block_read += pseudo_header_len;
+ if (pseudo_header_len != pcap_get_phdr_size(wtap_encap, wblock->pseudo_header)) {
+ pcapng_debug1("pcapng_read_packet_block: Could only read %d bytes for pseudo header.",
+ pseudo_header_len);
+ }
/* "(Enhanced) Packet Block" read capture data */
errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read((guchar *) (wblock->frame_buffer), 1, wblock->data.packet.cap_len, fh);
- if (bytes_read != (int) wblock->data.packet.cap_len) {
- *err = file_error(fh);
- g_warning("pcapng_read_packet_block: couldn't read %u bytes of captured data",
- wblock->data.packet.cap_len);
+ bytes_read = file_read((guint8 *) (wblock->frame_buffer), wblock->data.packet.cap_len - pseudo_header_len, fh);
+ if (bytes_read != (int) (wblock->data.packet.cap_len - pseudo_header_len)) {
+ *err = file_error(fh, err_info);
+ pcapng_debug1("pcapng_read_packet_block: couldn't read %u bytes of captured data",
+ wblock->data.packet.cap_len - pseudo_header_len);
if (*err == 0)
*err = WTAP_ERR_SHORT_READ;
- return FALSE;
+ return 0;
}
block_read += bytes_read;
- /* jump over potential padding bytes at end of the packet data */
- if( (wblock->data.packet.cap_len % 4) != 0) {
- file_offset64 = file_seek(fh, 4 - (wblock->data.packet.cap_len % 4), SEEK_CUR, err);
- if (file_offset64 <= 0) {
- if (*err != 0)
- return -1;
- return 0;
- }
- block_read += 4 - (wblock->data.packet.cap_len % 4);
- }
-
- /* add padding bytes to "block total length" */
+ /* jump over potential padding bytes at end of the packet data */
+ if( (wblock->data.packet.cap_len % 4) != 0) {
+ file_offset64 = file_seek(fh, 4 - (wblock->data.packet.cap_len % 4), SEEK_CUR, err);
+ if (file_offset64 <= 0) {
+ if (*err != 0)
+ return -1;
+ return 0;
+ }
+ block_read += 4 - (wblock->data.packet.cap_len % 4);
+ }
+
+ /* add padding bytes to "block total length" */
/* (the "block total length" of some example files don't contain the packet data padding bytes!) */
- if(bh->block_total_length % 4) {
+ if (bh->block_total_length % 4) {
block_total_length = bh->block_total_length + 4 - (bh->block_total_length % 4);
} else {
block_total_length = bh->block_total_length;
}
/* Option defaults */
- wblock->data.packet.opt_comment = NULL;
- wblock->data.packet.drop_count = -1;
- wblock->data.packet.pack_flags = 0; /* XXX - is 0 ok to signal "not used"? */
-
- /* Options */
+ wblock->data.packet.opt_comment = NULL;
+ wblock->data.packet.drop_count = -1;
+ wblock->data.packet.pack_flags = 0; /* XXX - is 0 ok to signal "not used"? */
+
+ /* FCS length default */
+ fcslen = pn->if_fcslen;
+
+ /* Options
+ * opt_comment 1
+ * epb_flags 2
+ * epb_hash 3
+ * epb_dropcount 4
+ */
errno = WTAP_ERR_CANT_READ;
- to_read = block_total_length
- - sizeof(pcapng_block_header_t)
- - block_read /* fixed and variable part, including padding */
- - sizeof(bh->block_total_length);
- while(to_read > 0) {
- /* read option */
- bytes_read = pcapng_read_option(fh, pn, &oh, option_content, sizeof(option_content), err, err_info);
- if (bytes_read <= 0) {
- g_warning("pcapng_read_packet_block: failed to read option");
- return bytes_read;
- }
- block_read += bytes_read;
- to_read -= bytes_read;
-
- /* handle option content */
- switch(oh.option_code) {
- case(0): /* opt_endofopt */
- if(to_read != 0) {
- g_warning("pcapng_read_packet_block: %u bytes after opt_endofopt", to_read);
- }
- /* padding should be ok here, just get out of this */
- to_read = 0;
- break;
- case(1): /* opt_comment */
- if(oh.option_length > 0 && oh.option_length < sizeof(option_content)) {
- wblock->data.section.opt_comment = g_strndup(option_content, sizeof(option_content));
- g_warning("pcapng_read_packet_block: opt_comment %s", wblock->data.section.opt_comment);
- } else {
- g_warning("pcapng_read_packet_block: opt_comment length %u seems strange", oh.option_length);
- }
- break;
- case(2): /* pack_flags / epb_flags */
- if(oh.option_length == 4) {
- wblock->data.packet.pack_flags = *((guint32 *)option_content);
- if(pn->byte_swapped)
- wblock->data.packet.pack_flags = BSWAP32(wblock->data.packet.pack_flags);
- g_warning("pcapng_read_if_descr_block: pack_flags %u (ignored)", wblock->data.packet.pack_flags);
- } else {
- g_warning("pcapng_read_if_descr_block: pack_flags length %u not 4 as expected", oh.option_length);
- }
- break;
- default:
- g_warning("pcapng_read_packet_block: unknown option %u - ignoring %u bytes",
- oh.option_code, oh.option_length);
- }
- }
+ to_read = block_total_length -
+ (int)sizeof(pcapng_block_header_t) -
+ block_read - /* fixed and variable part, including padding */
+ (int)sizeof(bh->block_total_length);
+
+ /* Allocate enough memory to hold all options */
+ opt_cont_buf_len = to_read;
+ option_content = g_malloc(opt_cont_buf_len);
+
+ while(to_read > 0) {
+ /* read option */
+ bytes_read = pcapng_read_option(fh, pn, &oh, option_content, opt_cont_buf_len, err, err_info);
+ if (bytes_read <= 0) {
+ pcapng_debug0("pcapng_read_packet_block: failed to read option");
+ return bytes_read;
+ }
+ block_read += bytes_read;
+ to_read -= bytes_read;
+
+ /* handle option content */
+ switch(oh.option_code) {
+ case(0): /* opt_endofopt */
+ if(to_read != 0) {
+ pcapng_debug1("pcapng_read_packet_block: %u bytes after opt_endofopt", to_read);
+ }
+ /* padding should be ok here, just get out of this */
+ to_read = 0;
+ break;
+ case(1): /* opt_comment */
+ if(oh.option_length > 0 && oh.option_length < opt_cont_buf_len) {
+ wblock->data.packet.opt_comment = g_strndup(option_content, oh.option_length);
+ pcapng_debug2("pcapng_read_packet_block: length %u opt_comment '%s'", oh.option_length, wblock->data.packet.opt_comment);
+ } else {
+ pcapng_debug1("pcapng_read_packet_block: opt_comment length %u seems strange", oh.option_length);
+ }
+ break;
+ case(2): /* pack_flags / epb_flags */
+ if(oh.option_length == 4) {
+ /* Don't cast a char[] into a guint32--the
+ * char[] may not be aligned correctly.
+ */
+ memcpy(&wblock->data.packet.pack_flags, option_content, sizeof(guint32));
+ if(pn->byte_swapped)
+ wblock->data.packet.pack_flags = BSWAP32(wblock->data.packet.pack_flags);
+ if (wblock->data.packet.pack_flags & 0x000001E0) {
+ /* The FCS length is present */
+ fcslen = (wblock->data.packet.pack_flags & 0x000001E0) >> 5;
+ }
+ pcapng_debug1("pcapng_read_packet_block: pack_flags %u (ignored)", wblock->data.packet.pack_flags);
+ } else {
+ pcapng_debug1("pcapng_read_packet_block: pack_flags length %u not 4 as expected", oh.option_length);
+ }
+ break;
+ case(3): /* epb_hash */
+ pcapng_debug2("pcapng_read_packet_block: epb_hash %u currently not handled - ignoring %u bytes",
+ oh.option_code, oh.option_length);
+ break;
+ case(4): /* epb_dropcount */
+ if(oh.option_length == 8) {
+ /* Don't cast a char[] into a guint32--the
+ * char[] may not be aligned correctly.
+ */
+ memcpy(&wblock->data.packet.drop_count, option_content, sizeof(guint64));
+ if(pn->byte_swapped)
+ wblock->data.packet.drop_count = BSWAP64(wblock->data.packet.drop_count);
+
+ pcapng_debug1("pcapng_read_packet_block: drop_count %" G_GINT64_MODIFIER "u", wblock->data.packet.drop_count);
+ } else {
+ pcapng_debug1("pcapng_read_packet_block: drop_count length %u not 8 as expected", oh.option_length);
+ }
+ break;
+ default:
+ pcapng_debug2("pcapng_read_packet_block: unknown option %u - ignoring %u bytes",
+ oh.option_code, oh.option_length);
+ }
+ }
+ g_free(option_content);
+
+ pcap_read_post_process(WTAP_FILE_PCAPNG, wtap_encap,
+ (union wtap_pseudo_header *)wblock->pseudo_header,
+ (guint8 *) (wblock->frame_buffer),
+ (int) (wblock->data.packet.cap_len - pseudo_header_len),
+ pn->byte_swapped, fcslen);
return block_read;
}
-static int
-pcapng_read_simple_packet_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, wtapng_block_t *wblock,int *err, gchar **err_info _U_)
+static int
+pcapng_read_simple_packet_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, wtapng_block_t *wblock, int *err, gchar **err_info)
{
int bytes_read;
int block_read;
guint64 file_offset64;
+ gint encap;
+ int pseudo_header_len;
pcapng_simple_packet_block_t spb;
/* "Simple Packet Block" read fixed part */
errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(&spb, 1, sizeof spb, fh);
+ bytes_read = file_read(&spb, sizeof spb, fh);
if (bytes_read != sizeof spb) {
- g_warning("pcapng_read_simple_packet_block: failed to read packet data");
- *err = file_error(fh);
+ pcapng_debug0("pcapng_read_simple_packet_block: failed to read packet data");
+ *err = file_error(fh, err_info);
return 0;
}
block_read = bytes_read;
- if(pn->byte_swapped) {
- wblock->data.simple_packet.packet_len = BSWAP32(spb.packet_len);
+ if (pn->byte_swapped) {
+ wblock->data.simple_packet.packet_len = BSWAP32(spb.packet_len);
} else {
wblock->data.simple_packet.packet_len = spb.packet_len;
}
- wblock->data.simple_packet.cap_len = bh->block_total_length
- - sizeof(pcapng_simple_packet_block_t)
- - sizeof(bh->block_total_length);
-
- /*g_warning("pcapng_read_simple_packet_block: packet data: packet_len %u",
- wblock->data.simple_packet.packet_len);*/
+ wblock->data.simple_packet.cap_len = bh->block_total_length
+ - (guint32)sizeof(pcapng_simple_packet_block_t)
+ - (guint32)sizeof(bh->block_total_length);
- /* XXX - implement other linktypes then Ethernet */
- /* (or even better share the code with libpcap.c) */
+ if (wblock->data.simple_packet.cap_len > WTAP_MAX_PACKET_SIZE) {
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup_printf("pcapng_read_simple_packet_block: cap_len %u is larger than WTAP_MAX_PACKET_SIZE %u.",
+ wblock->data.simple_packet.cap_len, WTAP_MAX_PACKET_SIZE);
+ return 0;
+ }
+ pcapng_debug1("pcapng_read_simple_packet_block: packet data: packet_len %u",
+ wblock->data.simple_packet.packet_len);
+
+ encap = pcapng_get_encap(0, pn);
+ pcapng_debug1("pcapng_read_simple_packet_block: Need to read pseudo header of size %d",
+ pcap_get_phdr_size(encap, wblock->pseudo_header));
+
+ memset((void *)wblock->pseudo_header, 0, sizeof(union wtap_pseudo_header));
+ pseudo_header_len = pcap_process_pseudo_header(fh,
+ WTAP_FILE_PCAPNG,
+ encap,
+ wblock->data.simple_packet.cap_len,
+ TRUE,
+ wblock->packet_header,
+ (union wtap_pseudo_header *)wblock->pseudo_header,
+ err,
+ err_info);
+ if (pseudo_header_len < 0) {
+ return 0;
+ }
+ wblock->data.simple_packet.pseudo_header_len = (guint32)pseudo_header_len;
+ block_read += pseudo_header_len;
+ if (pseudo_header_len != pcap_get_phdr_size(encap, wblock->pseudo_header)) {
+ pcapng_debug1("pcapng_read_simple_packet_block: Could only read %d bytes for pseudo header.",
+ pseudo_header_len);
+ }
- /* Ethernet FCS length, might be overwritten by "per packet" options */
- ((union wtap_pseudo_header *) wblock->pseudo_header)->eth.fcs_len = pn->if_fcslen;
+ memset((void *)wblock->pseudo_header, 0, sizeof(union wtap_pseudo_header));
/* "Simple Packet Block" read capture data */
errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read((guchar *) (wblock->frame_buffer), 1, wblock->data.simple_packet.cap_len, fh);
+ bytes_read = file_read((guint8 *) (wblock->frame_buffer), wblock->data.simple_packet.cap_len, fh);
if (bytes_read != (int) wblock->data.simple_packet.cap_len) {
- *err = file_error(fh);
- g_warning("pcapng_read_simple_packet_block: couldn't read %u bytes of captured data",
- wblock->data.simple_packet.cap_len);
+ *err = file_error(fh, err_info);
+ pcapng_debug1("pcapng_read_simple_packet_block: couldn't read %u bytes of captured data",
+ wblock->data.simple_packet.cap_len);
if (*err == 0)
*err = WTAP_ERR_SHORT_READ;
- return FALSE;
+ return 0;
}
block_read += bytes_read;
- /* jump over potential padding bytes at end of the packet data */
- if( (wblock->data.simple_packet.cap_len % 4) != 0) {
- file_offset64 = file_seek(fh, 4 - (wblock->data.simple_packet.cap_len % 4), SEEK_CUR, err);
- if (file_offset64 <= 0) {
- if (*err != 0)
- return -1;
- return 0;
- }
- block_read += 4 - (wblock->data.simple_packet.cap_len % 4);
- }
+ /* jump over potential padding bytes at end of the packet data */
+ if ((wblock->data.simple_packet.cap_len % 4) != 0) {
+ file_offset64 = file_seek(fh, 4 - (wblock->data.simple_packet.cap_len % 4), SEEK_CUR, err);
+ if (file_offset64 <= 0) {
+ if (*err != 0)
+ return -1;
+ return 0;
+ }
+ block_read += 4 - (wblock->data.simple_packet.cap_len % 4);
+ }
+ pcap_read_post_process(WTAP_FILE_PCAPNG, encap,
+ (union wtap_pseudo_header *)wblock->pseudo_header,
+ (guint8 *) (wblock->frame_buffer),
+ (int) wblock->data.simple_packet.cap_len,
+ pn->byte_swapped, pn->if_fcslen);
return block_read;
}
+#define NRES_ENDOFRECORD 0
+#define NRES_IP4RECORD 1
+#define NRES_IP6RECORD 2
+#define PADDING4(x) ((((x + 3) >> 2) << 2) - x)
+/* IPv6 + MAXNAMELEN */
+#define MAX_NRB_REC_SIZE (16 + 64)
+static int
+pcapng_read_name_resolution_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, wtapng_block_t *wblock _U_,int *err, gchar **err_info)
+{
+ int bytes_read = 0;
+ int block_read = 0;
+ int to_read;
+ guint64 file_offset64;
+ pcapng_name_resolution_block_t nrb;
+ guint8 nrb_rec[MAX_NRB_REC_SIZE];
+ guint32 v4_addr;
-static int
+ errno = WTAP_ERR_CANT_READ;
+ to_read = bh->block_total_length
+ - sizeof(pcapng_block_header_t)
+ - sizeof(bh->block_total_length);
+
+ while (block_read < to_read) {
+ bytes_read = file_read(&nrb, sizeof nrb, fh);
+ if (bytes_read != sizeof nrb) {
+ pcapng_debug0("pcapng_read_name_resolution_block: failed to read record header");
+ *err = file_error(fh, err_info);
+ return 0;
+ }
+ block_read += bytes_read;
+
+ if (pn->byte_swapped) {
+ nrb.record_type = BSWAP16(nrb.record_type);
+ nrb.record_len = BSWAP16(nrb.record_len);
+ }
+
+ switch(nrb.record_type) {
+ case NRES_ENDOFRECORD:
+ /* There shouldn't be any more data */
+ to_read = 0;
+ break;
+ case NRES_IP4RECORD:
+ if (nrb.record_len < 6 || nrb.record_len > MAX_NRB_REC_SIZE || to_read < nrb.record_len) {
+ pcapng_debug0("pcapng_read_name_resolution_block: bad length or insufficient data for IPv4 record");
+ return 0;
+ }
+ bytes_read = file_read(nrb_rec, nrb.record_len, fh);
+ if (bytes_read != nrb.record_len) {
+ pcapng_debug0("pcapng_read_name_resolution_block: failed to read IPv4 record data");
+ *err = file_error(fh, err_info);
+ return 0;
+ }
+ block_read += bytes_read;
+
+ if (pn->add_new_ipv4) {
+ memcpy(&v4_addr, nrb_rec, 4);
+ if (pn->byte_swapped)
+ v4_addr = BSWAP32(v4_addr);
+ pn->add_new_ipv4(v4_addr, nrb_rec + 4);
+ }
+
+ file_offset64 = file_seek(fh, PADDING4(nrb.record_len), SEEK_CUR, err);
+ if (file_offset64 <= 0) {
+ if (*err != 0)
+ return -1;
+ return 0;
+ }
+ block_read += PADDING4(nrb.record_len);
+ break;
+ case NRES_IP6RECORD:
+ if (nrb.record_len < 18 || nrb.record_len > MAX_NRB_REC_SIZE || to_read < nrb.record_len) {
+ pcapng_debug0("pcapng_read_name_resolution_block: bad length or insufficient data for IPv6 record");
+ return 0;
+ }
+ bytes_read = file_read(nrb_rec, nrb.record_len, fh);
+ if (bytes_read != nrb.record_len) {
+ pcapng_debug0("pcapng_read_name_resolution_block: failed to read IPv6 record data");
+ *err = file_error(fh, err_info);
+ return 0;
+ }
+ block_read += bytes_read;
+
+ if (pn->add_new_ipv6) {
+ pn->add_new_ipv6(nrb_rec, nrb_rec + 16);
+ }
+
+ file_offset64 = file_seek(fh, PADDING4(nrb.record_len), SEEK_CUR, err);
+ if (file_offset64 <= 0) {
+ if (*err != 0)
+ return -1;
+ return 0;
+ }
+ block_read += PADDING4(nrb.record_len);
+ break;
+ default:
+ pcapng_debug1("pcapng_read_name_resolution_block: unknown record type 0x%x", nrb.record_type);
+ file_offset64 = file_seek(fh, nrb.record_len + PADDING4(nrb.record_len), SEEK_CUR, err);
+ if (file_offset64 <= 0) {
+ if (*err != 0)
+ return -1;
+ return 0;
+ }
+ block_read += nrb.record_len + PADDING4(nrb.record_len);
+ break;
+ }
+ }
+
+ return block_read;
+}
+
+static int
+pcapng_read_interface_statistics_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, wtapng_block_t *wblock,int *err, gchar **err_info)
+{
+ int bytes_read;
+ int block_read;
+ int to_read, opt_cont_buf_len;
+ pcapng_interface_statistics_block_t isb;
+ pcapng_option_header_t oh;
+ char *option_content = NULL; /* Allocate as large as the options block */
+
+
+ /* "Interface Statistics Block" read fixed part */
+ errno = WTAP_ERR_CANT_READ;
+ bytes_read = file_read(&isb, sizeof isb, fh);
+ if (bytes_read != sizeof isb) {
+ pcapng_debug0("pcapng_read_interface_statistics_block: failed to read packet data");
+ *err = file_error(fh, err_info);
+ return 0;
+ }
+ block_read = bytes_read;
+
+ if(pn->byte_swapped) {
+ wblock->data.if_stats.interface_id = BSWAP64(isb.interface_id);
+ wblock->data.if_stats.ts_high = BSWAP32(isb.timestamp_high);
+ wblock->data.if_stats.ts_low = BSWAP32(isb.timestamp_low);
+ } else {
+ wblock->data.if_stats.interface_id = isb.interface_id;
+ wblock->data.if_stats.ts_high = isb.timestamp_high;
+ wblock->data.if_stats.ts_low = isb.timestamp_low;
+ }
+ pcapng_debug1("pcapng_read_interface_statistics_block: interface_id %" G_GINT64_MODIFIER "u", wblock->data.if_stats.interface_id);
+
+ /* Option defaults */
+ wblock->data.if_stats.opt_comment = NULL;
+ wblock->data.if_stats.isb_ifrecv = -1;
+ wblock->data.if_stats.isb_ifdrop = -1;
+
+ /* Options */
+ errno = WTAP_ERR_CANT_READ;
+ to_read = bh->block_total_length -
+ sizeof(pcapng_block_header_t) -
+ block_read - /* fixed and variable part, including padding */
+ sizeof(bh->block_total_length);
+
+ /* Allocate enough memory to hold all options */
+ opt_cont_buf_len = to_read;
+ option_content = g_malloc(opt_cont_buf_len);
+
+ while(to_read > 0) {
+ /* read option */
+ bytes_read = pcapng_read_option(fh, pn, &oh, option_content, opt_cont_buf_len, err, err_info);
+ if (bytes_read <= 0) {
+ pcapng_debug0("pcapng_read_interface_statistics_block: failed to read option");
+ return bytes_read;
+ }
+ block_read += bytes_read;
+ to_read -= bytes_read;
+
+ /* handle option content */
+ switch(oh.option_code) {
+ case(0): /* opt_endofopt */
+ if(to_read != 0) {
+ pcapng_debug1("pcapng_read_interface_statistics_block: %u bytes after opt_endofopt", to_read);
+ }
+ /* padding should be ok here, just get out of this */
+ to_read = 0;
+ break;
+ case(1): /* opt_comment */
+ if(oh.option_length > 0 && oh.option_length < opt_cont_buf_len) {
+ wblock->data.if_stats.opt_comment = g_strndup(option_content, oh.option_length);
+ pcapng_debug1("pcapng_read_interface_statistics_block: opt_comment %s", wblock->data.if_stats.opt_comment);
+ } else {
+ pcapng_debug1("pcapng_read_interface_statistics_block: opt_comment length %u seems strange", oh.option_length);
+ }
+ break;
+ case(4): /* isb_ifrecv */
+ if(oh.option_length == 8) {
+ /* Don't cast a char[] into a guint32--the
+ * char[] may not be aligned correctly.
+ */
+ memcpy(&wblock->data.if_stats.isb_ifrecv, option_content, sizeof(guint64));
+ if(pn->byte_swapped)
+ wblock->data.if_stats.isb_ifrecv = BSWAP64(wblock->data.if_stats.isb_ifrecv);
+ pcapng_debug1("pcapng_read_interface_statistics_block: isb_ifrecv %" G_GINT64_MODIFIER "u", wblock->data.if_stats.isb_ifrecv);
+ } else {
+ pcapng_debug1("pcapng_read_interface_statistics_block: isb_ifrecv length %u not 8 as expected", oh.option_length);
+ }
+ break;
+ case(5): /* isb_ifdrop */
+ if(oh.option_length == 8) {
+ /* Don't cast a char[] into a guint32--the
+ * char[] may not be aligned correctly.
+ */
+ memcpy(&wblock->data.if_stats.isb_ifdrop, option_content, sizeof(guint64));
+ if(pn->byte_swapped)
+ wblock->data.if_stats.isb_ifdrop = BSWAP64(wblock->data.if_stats.isb_ifdrop);
+ pcapng_debug1("pcapng_read_interface_statistics_block: isb_ifdrop %" G_GINT64_MODIFIER "u", wblock->data.if_stats.isb_ifdrop);
+ } else {
+ pcapng_debug1("pcapng_read_interface_statistics_block: isb_ifdrop length %u not 8 as expected", oh.option_length);
+ }
+ break;
+ default:
+ pcapng_debug2("pcapng_read_interface_statistics_block: unknown option %u - ignoring %u bytes",
+ oh.option_code, oh.option_length);
+ }
+ }
+
+ g_free(option_content);
+
+ return block_read;
+}
+
+
+static int
pcapng_read_unknown_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn _U_, wtapng_block_t *wblock _U_,int *err, gchar **err_info _U_)
{
int block_read;
guint32 block_total_length;
- /* add padding bytes to "block total length" */
+ /* add padding bytes to "block total length" */
/* (the "block total length" of some example files don't contain any padding bytes!) */
- if(bh->block_total_length % 4) {
+ if (bh->block_total_length % 4) {
block_total_length = bh->block_total_length + 4 - (bh->block_total_length % 4);
} else {
block_total_length = bh->block_total_length;
}
- block_read = block_total_length - sizeof(bh->block_total_length);
+ block_read = block_total_length - (guint32)sizeof(pcapng_block_header_t) - (guint32)sizeof(bh->block_total_length);
- /* jump over this unknown block */
- file_offset64 = file_seek(fh, block_read, SEEK_CUR, err);
- if (file_offset64 <= 0) {
- if (*err != 0)
- return -1;
- return 0;
- }
+ /* jump over this unknown block */
+ file_offset64 = file_seek(fh, block_read, SEEK_CUR, err);
+ if (file_offset64 <= 0) {
+ if (*err != 0)
+ return -1;
+ return 0;
+ }
return block_read;
}
-static int
-pcapng_read_block(FILE_T fh, pcapng_t *pn, wtapng_block_t *wblock, int *err, gchar **err_info)
+static int
+pcapng_read_block(FILE_T fh, gboolean first_block, pcapng_t *pn, wtapng_block_t *wblock, int *err, gchar **err_info)
{
- int block_read;
- int bytes_read;
+ int block_read;
+ int bytes_read;
pcapng_block_header_t bh;
guint32 block_total_length;
/* Try to read the (next) block header */
errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(&bh, 1, sizeof bh, fh);
+ bytes_read = file_read(&bh, sizeof bh, fh);
if (bytes_read != sizeof bh) {
- g_warning("pcapng_read_block: end of file");
- *err = file_error(fh);
+ *err = file_error(fh, err_info);
+ pcapng_debug3("pcapng_read_block: file_read() returned %d instead of %u, err = %d.", bytes_read, (unsigned int)sizeof bh, *err);
if (*err != 0)
return -1;
return 0;
}
- block_read = bytes_read;
- if(pn->byte_swapped) {
- bh.block_type = BSWAP32(bh.block_type);
- bh.block_total_length = BSWAP32(bh.block_total_length);
+
+ block_read = bytes_read;
+ if (pn->byte_swapped) {
+ bh.block_type = BSWAP32(bh.block_type);
+ bh.block_total_length = BSWAP32(bh.block_total_length);
}
wblock->type = bh.block_type;
- /*g_warning("pcapng_read_block: block_type 0x%x", bh.block_type);*/
+ pcapng_debug1("pcapng_read_block: block_type 0x%x", bh.block_type);
+
+ if (first_block) {
+ /*
+ * This is being read in by pcapng_open(), so this block
+ * must be an SHB. If it's not, this is not a pcap-ng
+ * file.
+ *
+ * XXX - check for various forms of Windows <-> UN*X
+ * mangling, and suggest that the file might be a
+ * pcap-ng file that was damaged in transit?
+ */
+ if (bh.block_type != BLOCK_TYPE_SHB)
+ return 0; /* not a pcap-ng file */
+ }
switch(bh.block_type) {
case(BLOCK_TYPE_SHB):
- bytes_read = pcapng_read_section_header_block(fh, &bh, pn, wblock, err, err_info);
+ bytes_read = pcapng_read_section_header_block(fh, first_block, &bh, pn, wblock, err, err_info);
break;
case(BLOCK_TYPE_IDB):
bytes_read = pcapng_read_if_descr_block(fh, &bh, pn, wblock, err, err_info);
break;
case(BLOCK_TYPE_PB):
- bytes_read = pcapng_read_packet_block(fh, &bh, pn, wblock, err, err_info);
+ bytes_read = pcapng_read_packet_block(fh, &bh, pn, wblock, err, err_info, FALSE);
break;
case(BLOCK_TYPE_SPB):
bytes_read = pcapng_read_simple_packet_block(fh, &bh, pn, wblock, err, err_info);
break;
case(BLOCK_TYPE_EPB):
- bytes_read = pcapng_read_packet_block(fh, &bh, pn, wblock, err, err_info);
+ bytes_read = pcapng_read_packet_block(fh, &bh, pn, wblock, err, err_info, TRUE);
+ break;
+ case(BLOCK_TYPE_NRB):
+ bytes_read = pcapng_read_name_resolution_block(fh, &bh, pn, wblock, err, err_info);
+ break;
+ case(BLOCK_TYPE_ISB):
+ bytes_read = pcapng_read_interface_statistics_block(fh, &bh, pn, wblock, err, err_info);
break;
default:
- g_warning("pcapng_read_block: Unknown block_type: 0x%x (block ignored)", bh.block_type);
+ pcapng_debug2("pcapng_read_block: Unknown block_type: 0x%x (block ignored), block total length %d", bh.block_type, bh.block_total_length);
bytes_read = pcapng_read_unknown_block(fh, &bh, pn, wblock, err, err_info);
}
- if(bytes_read <= 0) {
- return bytes_read;
- }
- block_read += bytes_read;
+
+ if (bytes_read <= 0) {
+ return bytes_read;
+ }
+ block_read += bytes_read;
/* sanity check: first and second block lengths must match */
errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(&block_total_length, 1, sizeof block_total_length, fh);
+ bytes_read = file_read(&block_total_length, sizeof block_total_length, fh);
if (bytes_read != sizeof block_total_length) {
- g_warning("pcapng_read_block: couldn't read second block length");
- *err = file_error(fh);
- return 0;
+ pcapng_debug0("pcapng_read_block: couldn't read second block length");
+ *err = file_error(fh, err_info);
+ if (*err == 0)
+ *err = WTAP_ERR_SHORT_READ;
+ return -1;
}
- block_read += bytes_read;
+ block_read += bytes_read;
- if(pn->byte_swapped)
- block_total_length = BSWAP32(block_total_length);
+ if (pn->byte_swapped)
+ block_total_length = BSWAP32(block_total_length);
- if( !(block_total_length == bh.block_total_length) ) {
- g_warning("pcapng_read_block: total block lengths (first %u and second %u) don't match",
- bh.block_total_length, block_total_length);
- return 0;
+ if (!(block_total_length == bh.block_total_length)) {
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup_printf("pcapng_read_block: total block lengths (first %u and second %u) don't match",
+ bh.block_total_length, block_total_length);
+ return -1;
}
return block_read;
/* classic wtap: open capture file */
-int
+int
pcapng_open(wtap *wth, int *err, gchar **err_info)
{
int bytes_read;
pcapng_t pn;
wtapng_block_t wblock;
+ pcapng_t *pcapng;
+ wtapng_if_descr_t int_data;
+ interface_data_t interface_data;
+ pcapng_block_header_t bh;
+ pn.shb_read = FALSE;
+ pn.read_idbs = TRUE; /* IDB expected after SHB */
/* we don't know the byte swapping of the file yet */
pn.byte_swapped = FALSE;
- pn.if_fcslen = -1;
- pn.version_major = -1;
- pn.version_minor = -1;
+ pn.if_fcslen = -1;
+ pn.version_major = -1;
+ pn.version_minor = -1;
+ pn.interface_data = g_array_new(FALSE, FALSE, sizeof(interface_data_t));
+ pn.number_of_interfaces = 0;
+
/* we don't expect any packet blocks yet */
wblock.frame_buffer = NULL;
wblock.pseudo_header = NULL;
+ wblock.packet_header = NULL;
+ wblock.file_encap = &wth->file_encap;
-
+ pcapng_debug0("pcapng_open: opening file");
/* read first block */
- bytes_read = pcapng_read_block(wth->fh, &pn, &wblock, err, err_info);
+ bytes_read = pcapng_read_block(wth->fh, TRUE, &pn, &wblock, err, err_info);
if (bytes_read <= 0) {
- *err = file_error(wth->fh);
- g_warning("pcapng_open_new: couldn't read first SHB");
+ pcapng_debug0("pcapng_open: couldn't read first SHB");
+ *err = file_error(wth->fh, err_info);
if (*err != 0)
return -1;
return 0;
}
-
wth->data_offset += bytes_read;
/* first block must be a "Section Header Block" */
- if(wblock.type != BLOCK_TYPE_SHB) {
- g_warning("pcapng_open_new: first block type %u not SHB", wblock.type);
+ if (wblock.type != BLOCK_TYPE_SHB) {
+ /*
+ * XXX - check for damage from transferring a file
+ * between Windows and UN*X as text rather than
+ * binary data?
+ */
+ pcapng_debug1("pcapng_open: first block type %u not SHB", wblock.type);
return 0;
}
-
-
- /* read second block */
- bytes_read = pcapng_read_block(wth->fh, &pn, &wblock, err, err_info);
- if (bytes_read <= 0) {
- *err = file_error(wth->fh);
- g_warning("pcapng_open_new: couldn't read IDB");
- if (*err != 0)
+ pn.shb_read = TRUE;
+
+ /*
+ * At this point, we've decided this is a pcap-NG file, not
+ * some other type of file, so we can't return 0, as that
+ * means "this isn't a pcap-NG file, try some other file
+ * type".
+ */
+ wth->shb_hdr.opt_comment = wblock.data.section.opt_comment;
+ wth->shb_hdr.shb_hardware = wblock.data.section.shb_hardware;
+ wth->shb_hdr.shb_os = wblock.data.section.shb_os;
+ wth->shb_hdr.shb_user_appl = wblock.data.section.shb_user_appl;
+
+ wth->file_encap = WTAP_ENCAP_UNKNOWN;
+ wth->snapshot_length = 0;
+ wth->tsprecision = WTAP_FILE_TSPREC_NSEC;
+ pcapng = (pcapng_t *)g_malloc(sizeof(pcapng_t));
+ wth->priv = (void *)pcapng;
+ *pcapng = pn;
+
+ wth->subtype_read = pcapng_read;
+ wth->subtype_seek_read = pcapng_seek_read;
+ wth->subtype_close = pcapng_close;
+ wth->file_type = WTAP_FILE_PCAPNG;
+
+ /* Read IDBs */
+ wth->interface_data = g_array_new(FALSE, FALSE, sizeof(wtapng_if_descr_t));
+ wth->number_of_interfaces = 0;
+
+ /* Loop ower all IDB:s that appear before any packets */
+ while(1){
+ bytes_read = pcapng_read_block(wth->fh, FALSE, &pn, &wblock, err, err_info);
+ wth->data_offset += bytes_read;
+ if (bytes_read <= 0) {
+ pcapng_debug0("pcapng_open: couldn't read IDB");
+ *err = file_error(wth->fh, err_info);
+ if (*err == 0)
+ *err = WTAP_ERR_SHORT_READ;
return -1;
- return 0;
- }
-
- wth->data_offset += bytes_read;
+ }
- /* second block must be an "Interface Description Block" */
- if(wblock.type != 1) {
- g_warning("pcapng_open_new: second block type %u not IDB", wblock.type);
- return 0;
- }
+ int_data.wtap_encap = wblock.data.if_descr.wtap_encap;
+ int_data.time_units_per_second = wblock.data.if_descr.time_units_per_second;
+ int_data.link_type = wblock.data.if_descr.link_type;
+ int_data.snap_len = wblock.data.if_descr.snap_len;
+ /* Options */
+ int_data.opt_comment = wblock.data.if_descr.opt_comment;
+ int_data.if_name = wblock.data.if_descr.if_name;
+ int_data.if_description = wblock.data.if_descr.if_description;
+ /* XXX: if_IPv4addr opt 4 Interface network address and netmask.*/
+ /* XXX: if_IPv6addr opt 5 Interface network address and prefix length (stored in the last byte).*/
+ /* XXX: if_MACaddr opt 6 Interface Hardware MAC address (48 bits).*/
+ /* XXX: if_EUIaddr opt 7 Interface Hardware EUI address (64 bits)*/
+ int_data.if_speed = wblock.data.if_descr.if_speed;
+ int_data.if_tsresol = wblock.data.if_descr.if_tsresol;
+ /* XXX: if_tzone 10 Time zone for GMT support (TODO: specify better). */
+ int_data.if_filter = wblock.data.if_descr.if_filter;
+ int_data.if_os = wblock.data.if_descr.if_os;
+ int_data.if_fcslen = wblock.data.if_descr.if_fcslen;
+ /* XXX if_tsoffset; opt 14 A 64 bits integer value that specifies an offset (in seconds)...*/
+
+ g_array_append_val(wth->interface_data, int_data);
+ wth->number_of_interfaces++;
+
+ interface_data.wtap_encap = wblock.data.if_descr.wtap_encap;
+ interface_data.time_units_per_second = 1000000; /* default */
+
+ g_array_append_val(pcapng->interface_data, interface_data);
+ pcapng->number_of_interfaces++;
+
+ pcapng_debug2("pcapng_open: Read IDB number_of_interfaces %u, wtap_encap %i", wth->number_of_interfaces, int_data.wtap_encap);
+
+ /* peek at next block */
+ /* Try to read the (next) block header */
+ errno = WTAP_ERR_CANT_READ;
+ bytes_read = file_read(&bh, sizeof bh, wth->fh);
+ if (bytes_read == 0) {
+ pcapng_debug0("No more IDBs available...");
+ break;
+ }
+ if (bytes_read != sizeof bh) {
+ *err = file_error(wth->fh, err_info);
+ pcapng_debug3("pcapng_open: Check for more IDB:s, file_read() returned %d instead of %u, err = %d.", bytes_read, (unsigned int)sizeof bh, *err);
+ if (*err == 0)
+ *err = WTAP_ERR_SHORT_READ;
+ return -1;
+ }
- /* read "Interface Description Block" specific settings */
- wth->file_encap = wblock.data.if_descr.link_type;
- wth->snapshot_length = wblock.data.if_descr.snap_len;
+ /* go back to where we were */
+ file_seek(wth->fh, wth->data_offset, SEEK_SET, err);
+ if (pn.byte_swapped) {
+ bh.block_type = BSWAP32(bh.block_type);
+ }
- /* Seems, this is a pcapng file */
- wth->capture.pcapng = g_malloc(sizeof(pcapng_t));
- *wth->capture.pcapng = pn;
+ pcapng_debug1("pcapng_open: Check for more IDB:s block_type 0x%x", bh.block_type);
- wth->subtype_read = pcapng_read;
- wth->subtype_seek_read = pcapng_seek_read;
- wth->subtype_close = pcapng_close;
+ if (bh.block_type != BLOCK_TYPE_IDB){
+ break; /* No more IDB:s */
+ }
+ }
- wth->file_type = WTAP_FILE_PCAPNG;
- switch(wblock.data.if_descr.if_tsaccur) {
- case(6):
- wth->tsprecision = WTAP_FILE_TSPREC_USEC; /* usec is the default (without the if_tsaccur option) */
- break;
- case(9):
- wth->tsprecision = WTAP_FILE_TSPREC_NSEC;
- break;
- default:
- g_warning("pcapng_open: if_tsaccur %u not implemented, timestamp conversion omitted",
- wblock.data.if_descr.if_tsaccur);
- }
+ pcapng->read_idbs = FALSE;
return 1;
}
/* classic wtap: read packet */
-static gboolean
-pcapng_read(wtap *wth, int *err, gchar **err_info,
- gint64 *data_offset)
+static gboolean
+pcapng_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
{
+ pcapng_t *pcapng = (pcapng_t *)wth->priv;
int bytes_read;
+ guint64 ts;
wtapng_block_t wblock;
-
+ pcapng_debug1("pcapng_read: wth->data_offset is initially %" G_GINT64_MODIFIER "u", wth->data_offset);
*data_offset = wth->data_offset;
+ pcapng_debug1("pcapng_read: *data_offset is initially set to %" G_GINT64_MODIFIER "u", *data_offset);
- /* XXX - this probably won't work well with unlimited / per packet snapshot length */
- buffer_assure_space(wth->frame_buffer, wth->snapshot_length);
+ /* XXX - This should be done in the packet block reading function and
+ * should make use of the caplen of the packet.
+ */
+ if (wth->snapshot_length > 0) {
+ buffer_assure_space(wth->frame_buffer, wth->snapshot_length);
+ } else {
+ buffer_assure_space(wth->frame_buffer, WTAP_MAX_PACKET_SIZE);
+ }
- wblock.frame_buffer = buffer_start_ptr(wth->frame_buffer);
+ wblock.frame_buffer = buffer_start_ptr(wth->frame_buffer);
wblock.pseudo_header = &wth->pseudo_header;
+ wblock.packet_header = &wth->phdr;
+ wblock.file_encap = &wth->file_encap;
+
+ pcapng->add_new_ipv4 = wth->add_new_ipv4;
+ pcapng->add_new_ipv6 = wth->add_new_ipv6;
/* read next block */
- while(1) {
- bytes_read = pcapng_read_block(wth->fh, wth->capture.pcapng, &wblock, err, err_info);
- if (bytes_read <= 0) {
- *err = file_error(wth->fh);
- /*g_warning("pcapng_read: couldn't read packet block");*/
- if (*err != 0)
- return -1;
- return 0;
- }
-
- /* block must be a "Packet Block" or an "Enhanced Packet Block" -> otherwise continue */
- if(wblock.type == BLOCK_TYPE_PB || wblock.type == BLOCK_TYPE_EPB) {
- break;
- }
-
- /* XXX - improve handling of "unknown" blocks */
- g_warning("pcapng_read: block type 0x%x not PB/EPB", wblock.type);
- }
-
- wth->phdr.caplen = wblock.data.packet.cap_len;
- wth->phdr.len = wblock.data.packet.packet_len;
- wth->phdr.ts.secs = wblock.data.packet.ts_high;
- wth->phdr.ts.nsecs = wblock.data.packet.ts_low;
-
- /*g_warning("Read length: %u Packet length: %u", bytes_read, wth->phdr.caplen);*/
- wth->data_offset += bytes_read;
+ while (1) {
+ bytes_read = pcapng_read_block(wth->fh, FALSE, pcapng, &wblock, err, err_info);
+ if (bytes_read <= 0) {
+ wth->data_offset = *data_offset;
+ pcapng_debug1("pcapng_read: wth->data_offset is finally %" G_GINT64_MODIFIER "u", wth->data_offset);
+ pcapng_debug0("pcapng_read: couldn't read packet block");
+ return FALSE;
+ }
+
+ /* block must be a "Packet Block" or an "Enhanced Packet Block" -> otherwise continue */
+ if (wblock.type == BLOCK_TYPE_PB || wblock.type == BLOCK_TYPE_EPB) {
+ break;
+ }
+
+ /* XXX - improve handling of "unknown" blocks */
+ pcapng_debug1("pcapng_read: block type 0x%x not PB/EPB", wblock.type);
+ *data_offset += bytes_read;
+ pcapng_debug1("pcapng_read: *data_offset is updated to %" G_GINT64_MODIFIER "u", *data_offset);
+ }
+
+ /* Combine the two 32-bit pieces of the timestamp into one 64-bit value */
+ ts = (((guint64)wblock.data.packet.ts_high) << 32) | ((guint64)wblock.data.packet.ts_low);
+
+ wth->phdr.caplen = wblock.data.packet.cap_len - wblock.data.packet.pseudo_header_len;
+ wth->phdr.len = wblock.data.packet.packet_len - wblock.data.packet.pseudo_header_len;
+ if (wblock.data.packet.interface_id < pcapng->number_of_interfaces) {
+ interface_data_t int_data;
+ guint64 time_units_per_second;
+ gint id;
+
+ id = (gint)wblock.data.packet.interface_id;
+ int_data = g_array_index(pcapng->interface_data, interface_data_t, id);
+ time_units_per_second = int_data.time_units_per_second;
+ wth->phdr.pkt_encap = int_data.wtap_encap;
+ wth->phdr.ts.secs = (time_t)(ts / time_units_per_second);
+ wth->phdr.ts.nsecs = (int)(((ts % time_units_per_second) * 1000000000) / time_units_per_second);
+
+ wth->phdr.interface_id = wblock.data.packet.interface_id;
+ wth->phdr.opt_comment = wblock.data.packet.opt_comment;
+ wth->phdr.drop_count = wblock.data.packet.drop_count;
+ wth->phdr.pack_flags = wblock.data.packet.pack_flags;
+ } else {
+ wth->phdr.pkt_encap = WTAP_ENCAP_UNKNOWN;
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup_printf("pcapng: interface index %u is not less than interface count %u.",
+ wblock.data.packet.interface_id, pcapng->number_of_interfaces);
+ wth->data_offset = *data_offset + bytes_read;
+ pcapng_debug1("pcapng_read: wth->data_offset is finally %" G_GINT64_MODIFIER "u", wth->data_offset);
+ return FALSE;
+ }
+
+ /*pcapng_debug2("Read length: %u Packet length: %u", bytes_read, wth->phdr.caplen);*/
+ wth->data_offset = *data_offset + bytes_read;
+ pcapng_debug1("pcapng_read: wth->data_offset is finally %" G_GINT64_MODIFIER "u", wth->data_offset);
- return TRUE;
+ return TRUE;
}
/* classic wtap: seek to file position and read packet */
static gboolean
pcapng_seek_read(wtap *wth, gint64 seek_off,
- union wtap_pseudo_header *pseudo_header, guchar *pd, int length _U_,
+ union wtap_pseudo_header *pseudo_header, guint8 *pd, int length _U_,
int *err, gchar **err_info)
{
+ pcapng_t *pcapng = (pcapng_t *)wth->priv;
guint64 bytes_read64;
int bytes_read;
wtapng_block_t wblock;
if (bytes_read64 <= 0) {
return FALSE; /* Seek error */
}
+ pcapng_debug1("pcapng_seek_read: reading at offset %" G_GINT64_MODIFIER "u", seek_off);
wblock.frame_buffer = pd;
wblock.pseudo_header = pseudo_header;
+ wblock.packet_header = &wth->phdr;
+ wblock.file_encap = &wth->file_encap;
/* read the block */
- bytes_read = pcapng_read_block(wth->random_fh, wth->capture.pcapng, &wblock, err, err_info);
+ bytes_read = pcapng_read_block(wth->random_fh, FALSE, pcapng, &wblock, err, err_info);
if (bytes_read <= 0) {
- *err = file_error(wth->fh);
- g_warning("pcapng_seek_read: couldn't read packet block");
+ *err = file_error(wth->random_fh, err_info);
+ pcapng_debug3("pcapng_seek_read: couldn't read packet block (err=%d, errno=%d, bytes_read=%d).",
+ *err, errno, bytes_read);
return FALSE;
}
/* block must be a "Packet Block" or an "Enhanced Packet Block" */
- if(wblock.type != BLOCK_TYPE_PB && wblock.type != BLOCK_TYPE_EPB) {
- g_warning("pcapng_seek_read: block type %u not PB/EPB", wblock.type);
+ if (wblock.type != BLOCK_TYPE_PB && wblock.type != BLOCK_TYPE_EPB) {
+ pcapng_debug1("pcapng_seek_read: block type %u not PB/EPB", wblock.type);
return FALSE;
}
static void
pcapng_close(wtap *wth)
{
- g_free(wth->capture.pcapng);
+ pcapng_t *pcapng = (pcapng_t *)wth->priv;
+
+ pcapng_debug0("pcapng_close: closing file");
+ if (pcapng->interface_data != NULL) {
+ g_array_free(pcapng->interface_data, TRUE);
+ }
}
+typedef struct {
+ GArray *interface_data;
+ guint number_of_interfaces;
+ struct addrinfo *addrinfo_list_last;
+} pcapng_dump_t;
+
static gboolean
pcapng_write_section_header_block(wtap_dumper *wdh, wtapng_block_t *wblock, int *err)
{
pcapng_block_header_t bh;
pcapng_section_header_block_t shb;
- size_t nwritten;
+ const guint32 zero_pad = 0;
+ gboolean have_options = FALSE;
+ struct option option_hdr; /* guint16 type, guint16 value_length; */
+ guint32 options_total_length = 0;
+ guint32 comment_len = 0, shb_hardware_len = 0, shb_os_len = 0, shb_user_appl_len = 0;
+ guint32 comment_pad_len = 0, shb_hardware_pad_len = 0, shb_os_pad_len = 0, shb_user_appl_pad_len = 0;
+
+ if(wdh->shb_hdr){
+ pcapng_debug0("pcapng_write_section_header_block: Have shb_hdr");
+ /* Check if we should write comment option */
+ if(wdh->shb_hdr->opt_comment){
+ have_options = TRUE;
+ comment_len = (guint32)strlen(wdh->shb_hdr->opt_comment) & 0xffff;
+ if((comment_len % 4)){
+ comment_pad_len = 4 - (comment_len % 4);
+ }else{
+ comment_pad_len = 0;
+ }
+ options_total_length = options_total_length + comment_len + comment_pad_len + 4 /* comment options tag */ ;
+ }
+
+ /* Check if we should write shb_hardware option */
+ if(wdh->shb_hdr->shb_hardware){
+ have_options = TRUE;
+ shb_hardware_len = (guint32)strlen(wdh->shb_hdr->shb_hardware) & 0xffff;
+ if((shb_hardware_len % 4)){
+ shb_hardware_pad_len = 4 - (shb_hardware_len % 4);
+ }else{
+ shb_hardware_pad_len = 0;
+ }
+ options_total_length = options_total_length + shb_hardware_len + shb_hardware_pad_len + 4 /* options tag */ ;
+ }
+ /* Check if we should write shb_os option */
+ if(wdh->shb_hdr->shb_os){
+ have_options = TRUE;
+ shb_os_len = (guint32)strlen(wdh->shb_hdr->shb_os) & 0xffff;
+ if((shb_os_len % 4)){
+ shb_os_pad_len = 4 - (shb_os_len % 4);
+ }else{
+ shb_os_pad_len = 0;
+ }
+ options_total_length = options_total_length + shb_os_len + shb_os_pad_len + 4 /* options tag */ ;
+ }
+
+ /* Check if we should write shb_user_appl option */
+ if(wdh->shb_hdr->shb_user_appl){
+ have_options = TRUE;
+ shb_user_appl_len = (guint32)strlen(wdh->shb_hdr->shb_user_appl) & 0xffff;
+ if((shb_user_appl_len % 4)){
+ shb_user_appl_pad_len = 4 - (shb_user_appl_len % 4);
+ }else{
+ shb_user_appl_pad_len = 0;
+ }
+ options_total_length = options_total_length + shb_user_appl_len + shb_user_appl_pad_len + 4 /* options tag */ ;
+ }
+ if(have_options){
+ /* End-of-optios tag */
+ options_total_length += 4;
+ }
+ }
/* write block header */
bh.block_type = wblock->type;
- bh.block_total_length = sizeof(bh) + sizeof(shb) /* + options */ + 4;
-
- nwritten = wtap_dump_file_write(wdh, &bh, sizeof bh);
- if (nwritten != sizeof bh) {
- if (nwritten == 0 && wtap_dump_file_ferror(wdh))
- *err = wtap_dump_file_ferror(wdh);
- else
- *err = WTAP_ERR_SHORT_WRITE;
+ bh.block_total_length = sizeof(bh) + sizeof(shb) + options_total_length + 4;
+ pcapng_debug2("pcapng_write_section_header_block: Total len %u, Options total len %u",bh.block_total_length, options_total_length);
+
+ if (!wtap_dump_file_write(wdh, &bh, sizeof bh, err))
return FALSE;
- }
wdh->bytes_dumped += sizeof bh;
/* write block fixed content */
shb.version_minor = 0;
shb.section_length = -1;
- nwritten = wtap_dump_file_write(wdh, &shb, sizeof shb);
- if (nwritten != sizeof shb) {
- if (nwritten == 0 && wtap_dump_file_ferror(wdh))
- *err = wtap_dump_file_ferror(wdh);
- else
- *err = WTAP_ERR_SHORT_WRITE;
+ if (!wtap_dump_file_write(wdh, &shb, sizeof shb, err))
return FALSE;
- }
wdh->bytes_dumped += sizeof shb;
- /* XXX - write (optional) block options */
+ /* XXX - write (optional) block options
+ * opt_comment 1
+ * shb_hardware 2
+ * shb_os 3
+ * shb_user_appl 4
+ */
+
+ if(comment_len){
+ option_hdr.type = OPT_COMMENT;
+ option_hdr.value_length = comment_len;
+ if (!wtap_dump_file_write(wdh, &option_hdr, 4, err))
+ return FALSE;
+ wdh->bytes_dumped += 4;
+
+ /* Write the comments string */
+ pcapng_debug3("pcapng_write_section_header_block, comment:'%s' comment_len %u comment_pad_len %u" , wdh->shb_hdr->opt_comment, comment_len, comment_pad_len);
+ if (!wtap_dump_file_write(wdh, wdh->shb_hdr->opt_comment, comment_len, err))
+ return FALSE;
+ wdh->bytes_dumped += comment_len;
+
+ /* write padding (if any) */
+ if (comment_pad_len != 0) {
+ if (!wtap_dump_file_write(wdh, &zero_pad, comment_pad_len, err))
+ return FALSE;
+ wdh->bytes_dumped += comment_pad_len;
+ }
+ }
+
+ if(shb_hardware_len){
+ option_hdr.type = OPT_SHB_HARDWARE;
+ option_hdr.value_length = shb_hardware_len;
+ if (!wtap_dump_file_write(wdh, &option_hdr, 4, err))
+ return FALSE;
+ wdh->bytes_dumped += 4;
+
+ /* Write the string */
+ pcapng_debug3("pcapng_write_section_header_block, shb_hardware:'%s' shb_hardware_len %u shb_hardware_pad_len %u" , wdh->shb_hdr->shb_hardware, shb_hardware_len, shb_hardware_pad_len);
+ if (!wtap_dump_file_write(wdh, wdh->shb_hdr->shb_hardware, shb_hardware_len, err))
+ return FALSE;
+ wdh->bytes_dumped += shb_hardware_len;
+
+ /* write padding (if any) */
+ if (shb_hardware_pad_len != 0) {
+ if (!wtap_dump_file_write(wdh, &zero_pad, shb_hardware_pad_len, err))
+ return FALSE;
+ wdh->bytes_dumped += shb_hardware_pad_len;
+ }
+ }
+
+ if(shb_os_len){
+ option_hdr.type = OPT_SHB_OS;
+ option_hdr.value_length = shb_os_len;
+ if (!wtap_dump_file_write(wdh, &option_hdr, 4, err))
+ return FALSE;
+ wdh->bytes_dumped += 4;
+
+ /* Write the string */
+ pcapng_debug3("pcapng_write_section_header_block, shb_os:'%s' shb_os_len %u shb_os_pad_len %u" , wdh->shb_hdr->shb_os, shb_os_len, shb_os_pad_len);
+ if (!wtap_dump_file_write(wdh, wdh->shb_hdr->shb_os, shb_os_len, err))
+ return FALSE;
+ wdh->bytes_dumped += shb_os_len;
+
+ /* write padding (if any) */
+ if (shb_os_pad_len != 0) {
+ if (!wtap_dump_file_write(wdh, &zero_pad, shb_os_pad_len, err))
+ return FALSE;
+ wdh->bytes_dumped += shb_os_pad_len;
+ }
+ }
+
+ if(shb_user_appl_len){
+ option_hdr.type = OPT_SHB_USERAPPL;
+ option_hdr.value_length = shb_user_appl_len;
+ if (!wtap_dump_file_write(wdh, &option_hdr, 4, err))
+ return FALSE;
+ wdh->bytes_dumped += 4;
+
+ /* Write the comments string */
+ pcapng_debug3("pcapng_write_section_header_block, shb_user_appl:'%s' shb_user_appl_len %u shb_user_appl_pad_len %u" , wdh->shb_hdr->shb_user_appl, shb_user_appl_len, shb_user_appl_pad_len);
+ if (!wtap_dump_file_write(wdh, wdh->shb_hdr->shb_user_appl, shb_user_appl_len, err))
+ return FALSE;
+ wdh->bytes_dumped += shb_user_appl_len;
+
+ /* write padding (if any) */
+ if (shb_user_appl_pad_len != 0) {
+ if (!wtap_dump_file_write(wdh, &zero_pad, shb_user_appl_pad_len, err))
+ return FALSE;
+ wdh->bytes_dumped += shb_user_appl_pad_len;
+ }
+ }
+
+ /* Write end of options if we have otions */
+ if(have_options){
+ if (!wtap_dump_file_write(wdh, &zero_pad, 4, err))
+ return FALSE;
+ wdh->bytes_dumped += 4;
+ }
/* write block footer */
- nwritten = wtap_dump_file_write(wdh, &bh.block_total_length, sizeof bh.block_total_length);
- if (nwritten != sizeof bh.block_total_length) {
- if (nwritten == 0 && wtap_dump_file_ferror(wdh))
- *err = wtap_dump_file_ferror(wdh);
- else
- *err = WTAP_ERR_SHORT_WRITE;
+ if (!wtap_dump_file_write(wdh, &bh.block_total_length,
+ sizeof bh.block_total_length, err))
return FALSE;
- }
wdh->bytes_dumped += sizeof bh.block_total_length;
return TRUE;
}
-
+#define IDB_OPT_IF_NAME 2
+#define IDB_OPT_IF_DESCR 3
+#define IDB_OPT_IF_SPEED 8
+#define IDB_OPT_IF_TSRESOL 9
+#define IDB_OPT_IF_FILTER 11
+#define IDB_OPT_IF_OS 12
static gboolean
pcapng_write_if_descr_block(wtap_dumper *wdh, wtapng_block_t *wblock, int *err)
{
pcapng_block_header_t bh;
pcapng_interface_description_block_t idb;
- size_t nwritten;
+ const guint32 zero_pad = 0;
+ gboolean have_options = FALSE;
+ struct option option_hdr; /* guint16 type, guint16 value_length; */
+ guint32 options_total_length = 0;
+ guint32 comment_len = 0, if_name_len = 0, if_description_len = 0 , if_os_len = 0;
+ guint32 comment_pad_len = 0, if_name_pad_len = 0, if_description_pad_len = 0, if_os_pad_len = 0;
+
+
+ pcapng_debug3("pcapng_write_if_descr_block: encap = %d (%s), snaplen = %d",
+ wblock->data.if_descr.link_type,
+ wtap_encap_string(wtap_pcap_encap_to_wtap_encap(wblock->data.if_descr.link_type)),
+ wblock->data.if_descr.snap_len);
+ if (wblock->data.if_descr.link_type == (guint16)-1) {
+ *err = WTAP_ERR_UNSUPPORTED_ENCAP;
+ return FALSE;
+ }
+
+ /* Calculate options length */
+ if(wblock->data.if_descr.opt_comment){
+ have_options = TRUE;
+ comment_len = (guint32)strlen(wblock->data.if_descr.opt_comment) & 0xffff;
+ if((comment_len % 4)){
+ comment_pad_len = 4 - (comment_len % 4);
+ }else{
+ comment_pad_len = 0;
+ }
+ options_total_length = options_total_length + comment_len + comment_pad_len + 4 /* comment options tag */ ;
+ }
+
+ /*
+ * if_name 2 A UTF-8 string containing the name of the device used to capture data.
+ */
+ if(wblock->data.if_descr.if_name){
+ have_options = TRUE;
+ if_name_len = (guint32)strlen(wblock->data.if_descr.if_name) & 0xffff;
+ if((if_name_len % 4)){
+ if_name_pad_len = 4 - (if_name_len % 4);
+ }else{
+ if_name_pad_len = 0;
+ }
+ options_total_length = options_total_length + if_name_len + if_name_pad_len + 4 /* comment options tag */ ;
+ }
+
+ /*
+ * if_description 3 A UTF-8 string containing the description of the device used to capture data.
+ */
+ if(wblock->data.if_descr.if_description){
+ have_options = TRUE;
+ if_name_len = (guint32)strlen(wblock->data.if_descr.if_description) & 0xffff;
+ if((if_description_len % 4)){
+ if_description_pad_len = 4 - (if_description_len % 4);
+ }else{
+ if_description_pad_len = 0;
+ }
+ options_total_length = options_total_length + if_description_len + if_description_pad_len + 4 /* comment options tag */ ;
+ }
+ /* Currently not handled
+ * if_IPv4addr 4 Interface network address and netmask.
+ * if_IPv6addr 5 Interface network address and prefix length (stored in the last byte).
+ * if_MACaddr 6 Interface Hardware MAC address (48 bits). 00 01 02 03 04 05
+ * if_EUIaddr 7 Interface Hardware EUI address (64 bits), if available. TODO: give a good example
+ */
+ /*
+ * if_speed 8 Interface speed (in bps). 100000000 for 100Mbps
+ */
+ if(wblock->data.if_descr.if_speed != 0){
+ have_options = TRUE;
+ options_total_length = options_total_length + 8 + 4;
+ }
+ /*
+ * if_tsresol 9 Resolution of timestamps.
+ */
+ if(wblock->data.if_descr.if_tsresol != 0){
+ have_options = TRUE;
+ options_total_length = options_total_length + 4 + 4;
+ }
+ /* Not used
+ * if_tzone 10 Time zone for GMT support (TODO: specify better). TODO: give a good example
+ */
+ /*
+ * if_filter 11 The filter (e.g. "capture only TCP traffic") used to capture traffic.
+ */
+ if(wblock->data.if_descr.if_filter){
+ }
+ /*
+ * if_os 12 A UTF-8 string containing the name of the operating system of the machine in which this interface is installed.
+ */
+ if(wblock->data.if_descr.if_os){
+ have_options = TRUE;
+ if_name_len = (guint32)strlen(wblock->data.if_descr.if_os) & 0xffff;
+ if((if_os_len % 4)){
+ if_os_pad_len = 4 - (if_os_len % 4);
+ }else{
+ if_os_pad_len = 0;
+ }
+ options_total_length = options_total_length + if_os_len + if_os_pad_len + 4 /* comment options tag */ ;
+ }
+ /*
+ * if_fcslen 13 An integer value that specified the length of the Frame Check Sequence (in bits) for this interface.
+ */
+ if(wblock->data.if_descr.opt_comment){
+ }
+ /* Not used
+ * if_tsoffset 14 A 64 bits integer value that specifies an offset (in seconds) that must be added to the timestamp of each packet
+ * to obtain the absolute timestamp of a packet. If the option is missing, the timestamps stored in the packet must be considered absolute timestamps.
+ */
+
+ if(have_options){
+ /* End-of-optios tag */
+ options_total_length += 4;
+ }
/* write block header */
bh.block_type = wblock->type;
- bh.block_total_length = sizeof(bh) + sizeof(idb) /* + options */ + 4;
-
- nwritten = wtap_dump_file_write(wdh, &bh, sizeof bh);
- if (nwritten != sizeof bh) {
- if (nwritten == 0 && wtap_dump_file_ferror(wdh))
- *err = wtap_dump_file_ferror(wdh);
- else
- *err = WTAP_ERR_SHORT_WRITE;
+ bh.block_total_length = sizeof(bh) + sizeof(idb) + options_total_length + 4;
+
+ if (!wtap_dump_file_write(wdh, &bh, sizeof bh, err))
return FALSE;
- }
wdh->bytes_dumped += sizeof bh;
/* write block fixed content */
idb.linktype = wblock->data.if_descr.link_type;
idb.reserved = 0;
- idb.snaplen = wblock->data.if_descr.snap_len;
-
- nwritten = wtap_dump_file_write(wdh, &idb, sizeof idb);
- if (nwritten != sizeof idb) {
- if (nwritten == 0 && wtap_dump_file_ferror(wdh))
- *err = wtap_dump_file_ferror(wdh);
- else
- *err = WTAP_ERR_SHORT_WRITE;
+ idb.snaplen = wblock->data.if_descr.snap_len;
+
+ if (!wtap_dump_file_write(wdh, &idb, sizeof idb, err))
return FALSE;
- }
wdh->bytes_dumped += sizeof idb;
/* XXX - write (optional) block options */
+ if(comment_len){
+ option_hdr.type = OPT_COMMENT;
+ option_hdr.value_length = comment_len;
+ if (!wtap_dump_file_write(wdh, &option_hdr, 4, err))
+ return FALSE;
+ wdh->bytes_dumped += 4;
+
+ /* Write the comments string */
+ pcapng_debug3("pcapng_write_if_descr_block, comment:'%s' comment_len %u comment_pad_len %u" , wblock->data.if_descr.opt_comment, comment_len, comment_pad_len);
+ if (!wtap_dump_file_write(wdh, wblock->data.if_descr.opt_comment, comment_len, err))
+ return FALSE;
+ wdh->bytes_dumped += comment_len;
+
+ /* write padding (if any) */
+ if (comment_pad_len != 0) {
+ if (!wtap_dump_file_write(wdh, &zero_pad, comment_pad_len, err))
+ return FALSE;
+ wdh->bytes_dumped += comment_pad_len;
+ }
+ }
+ /*
+ * if_name 2 A UTF-8 string containing the name of the device used to capture data.
+ */
+ if(if_name_len){
+ option_hdr.type = IDB_OPT_IF_NAME;
+ option_hdr.value_length = if_name_len;
+ if (!wtap_dump_file_write(wdh, &option_hdr, 4, err))
+ return FALSE;
+ wdh->bytes_dumped += 4;
+
+ /* Write the comments string */
+ pcapng_debug3("pcapng_write_if_descr_block, if_name:'%s' if_name_len %u if_name_pad_len %u" , wblock->data.if_descr.if_name, if_name_len, if_name_pad_len);
+ if (!wtap_dump_file_write(wdh, wblock->data.if_descr.if_name, if_name_len, err))
+ return FALSE;
+ wdh->bytes_dumped += comment_len;
+
+ /* write padding (if any) */
+ if (if_name_pad_len != 0) {
+ if (!wtap_dump_file_write(wdh, &zero_pad, if_name_pad_len, err))
+ return FALSE;
+ wdh->bytes_dumped += if_name_pad_len;
+ }
+ }
+ /*
+ * if_description 3 A UTF-8 string containing the description of the device used to capture data.
+ */
+ if(if_description_len){
+ option_hdr.type = IDB_OPT_IF_NAME;
+ option_hdr.value_length = if_description_len;
+ if (!wtap_dump_file_write(wdh, &option_hdr, 4, err))
+ return FALSE;
+ wdh->bytes_dumped += 4;
+
+ /* Write the comments string */
+ pcapng_debug3("pcapng_write_if_descr_block, if_description:'%s' if_description_len %u if_description_pad_len %u" , wblock->data.if_descr.if_description, if_description_len, if_description_pad_len);
+ if (!wtap_dump_file_write(wdh, wblock->data.if_descr.if_description, if_description_len, err))
+ return FALSE;
+ wdh->bytes_dumped += comment_len;
+
+ /* write padding (if any) */
+ if (if_description_pad_len != 0) {
+ if (!wtap_dump_file_write(wdh, &zero_pad, if_description_pad_len, err))
+ return FALSE;
+ wdh->bytes_dumped += if_description_pad_len;
+ }
+ }
+ /* Currently not handled
+ * if_IPv4addr 4 Interface network address and netmask.
+ * if_IPv6addr 5 Interface network address and prefix length (stored in the last byte).
+ * if_MACaddr 6 Interface Hardware MAC address (48 bits). 00 01 02 03 04 05
+ * if_EUIaddr 7 Interface Hardware EUI address (64 bits), if available. TODO: give a good example
+ */
+ /*
+ * if_speed 8 Interface speed (in bps). 100000000 for 100Mbps
+ */
+ if(wblock->data.if_descr.if_speed != 0){
+ option_hdr.type = IDB_OPT_IF_SPEED;
+ option_hdr.value_length = 8;
+ if (!wtap_dump_file_write(wdh, &option_hdr, 4, err))
+ return FALSE;
+ wdh->bytes_dumped += 4;
+
+ /* Write the comments string */
+ pcapng_debug1("pcapng_write_if_descr_block: if_speed %" G_GINT64_MODIFIER "u (bps)", wblock->data.if_descr.if_speed);
+ if (!wtap_dump_file_write(wdh, &wblock->data.if_descr.if_speed, sizeof(guint64), err))
+ return FALSE;
+ wdh->bytes_dumped += 8;
+ }
+ /*
+ * if_tsresol 9 Resolution of timestamps.
+ */
+ if(wblock->data.if_descr.if_tsresol != 0){
+ option_hdr.type = IDB_OPT_IF_TSRESOL;
+ option_hdr.value_length = 1;
+ if (!wtap_dump_file_write(wdh, &option_hdr, 4, err))
+ return FALSE;
+ wdh->bytes_dumped += 4;
+
+ /* Write the comments string */
+ pcapng_debug1("pcapng_write_if_descr_block: if_tsresol %u", wblock->data.if_descr.if_tsresol);
+ if (!wtap_dump_file_write(wdh, &wblock->data.if_descr.if_tsresol, 1, err))
+ return FALSE;
+ wdh->bytes_dumped += 1;
+ if (!wtap_dump_file_write(wdh, &zero_pad, 3, err))
+ return FALSE;
+ wdh->bytes_dumped += 3;
+ }
+ /* not used
+ * if_tzone 10 Time zone for GMT support (TODO: specify better). TODO: give a good example
+ */
+ /*
+ * if_filter 11 The filter (e.g. "capture only TCP traffic") used to capture traffic.
+ */
+ /*
+ * if_os 12 A UTF-8 string containing the name of the operating system of the machine in which this interface is installed.
+ */
+ if(if_os_len){
+ option_hdr.type = IDB_OPT_IF_OS;
+ option_hdr.value_length = if_os_len;
+ if (!wtap_dump_file_write(wdh, &option_hdr, 4, err))
+ return FALSE;
+ wdh->bytes_dumped += 4;
+
+ /* Write the comments string */
+ pcapng_debug3("pcapng_write_if_descr_block, if_os:'%s' if_os_len %u if_os_pad_len %u" , wblock->data.if_descr.if_os, if_os_len, if_os_pad_len);
+ if (!wtap_dump_file_write(wdh, wblock->data.if_descr.if_os, if_os_len, err))
+ return FALSE;
+ wdh->bytes_dumped += comment_len;
+
+ /* write padding (if any) */
+ if (if_os_pad_len != 0) {
+ if (!wtap_dump_file_write(wdh, &zero_pad, if_os_pad_len, err))
+ return FALSE;
+ wdh->bytes_dumped += if_os_pad_len;
+ }
+ }
+
+ /*
+ * if_fcslen 13 An integer value that specified the length of the Frame Check Sequence (in bits) for this interface.
+ */
+ /*
+ * if_tsoffset 14 A 64 bits integer value that specifies an offset (in seconds) that must be added to the timestamp of each packet
+ * to obtain the absolute timestamp of a packet. If the option is missing, the timestamps stored in the packet must be considered absolute timestamps.
+ */
/* write block footer */
- nwritten = wtap_dump_file_write(wdh, &bh.block_total_length, sizeof bh.block_total_length);
- if (nwritten != sizeof bh.block_total_length) {
- if (nwritten == 0 && wtap_dump_file_ferror(wdh))
- *err = wtap_dump_file_ferror(wdh);
- else
- *err = WTAP_ERR_SHORT_WRITE;
+ if (!wtap_dump_file_write(wdh, &bh.block_total_length,
+ sizeof bh.block_total_length, err))
return FALSE;
- }
wdh->bytes_dumped += sizeof bh.block_total_length;
return TRUE;
{
pcapng_block_header_t bh;
pcapng_enhanced_packet_block_t epb;
- size_t nwritten;
- guint32 zero_pad = 0;
+ const guint32 zero_pad = 0;
+ guint32 pad_len;
+ guint32 phdr_len;
+ gboolean have_options = FALSE;
+ guint32 options_total_length = 0;
+ guint32 options_hdr = 0;
+ guint32 comment_len = 0, comment_pad_len = 0;
+
+ phdr_len = (guint32)pcap_get_phdr_size(wblock->data.packet.wtap_encap, wblock->pseudo_header);
+ if ((phdr_len + wblock->data.packet.cap_len) % 4) {
+ pad_len = 4 - ((phdr_len + wblock->data.packet.cap_len) % 4);
+ } else {
+ pad_len = 0;
+ }
+
+ /* Check if we should write comment option */
+ if(wblock->data.packet.opt_comment){
+ have_options = TRUE;
+ comment_len = (guint32)strlen(wblock->data.packet.opt_comment) & 0xffff;
+ if((comment_len % 4)){
+ comment_pad_len = 4 - (comment_len % 4);
+ }else{
+ comment_pad_len = 0;
+ }
+ options_total_length = options_total_length + comment_len + comment_pad_len + 4 /* comment options tag */ ;
+ }
+ if(have_options){
+ /* End-of optios tag */
+ options_total_length += 4;
+ }
- guint32 cap_pad_len = 0;
- if (wblock->data.packet.cap_len % 4) {
- cap_pad_len += 4 - (wblock->data.packet.cap_len % 4);
- }
/* write (enhanced) packet block header */
bh.block_type = wblock->type;
- bh.block_total_length = sizeof(bh) + sizeof(epb) /* + pseudo header */ + wblock->data.packet.cap_len + cap_pad_len /* + options */ + 4;
-
- nwritten = wtap_dump_file_write(wdh, &bh, sizeof bh);
- if (nwritten != sizeof bh) {
- if (nwritten == 0 && wtap_dump_file_ferror(wdh))
- *err = wtap_dump_file_ferror(wdh);
- else
- *err = WTAP_ERR_SHORT_WRITE;
+ bh.block_total_length = (guint32)sizeof(bh) + (guint32)sizeof(epb) + phdr_len + wblock->data.packet.cap_len + pad_len + options_total_length + 4;
+
+ if (!wtap_dump_file_write(wdh, &bh, sizeof bh, err))
return FALSE;
- }
wdh->bytes_dumped += sizeof bh;
/* write block fixed content */
- epb.interface_id = 1; /* XXX */
+ epb.interface_id = wblock->data.packet.interface_id;
epb.timestamp_high = wblock->data.packet.ts_high;
epb.timestamp_low = wblock->data.packet.ts_low;
- epb.captured_len = wblock->data.packet.cap_len;
- epb.packet_len = wblock->data.packet.packet_len;
-
- nwritten = wtap_dump_file_write(wdh, &epb, sizeof epb);
- if (nwritten != sizeof epb) {
- if (nwritten == 0 && wtap_dump_file_ferror(wdh))
- *err = wtap_dump_file_ferror(wdh);
- else
- *err = WTAP_ERR_SHORT_WRITE;
+ epb.captured_len = wblock->data.packet.cap_len + phdr_len;
+ epb.packet_len = wblock->data.packet.packet_len + phdr_len;
+
+ if (!wtap_dump_file_write(wdh, &epb, sizeof epb, err))
return FALSE;
- }
wdh->bytes_dumped += sizeof epb;
- /* XXX - write pseudo header */
+ /* write pseudo header */
+ if (!pcap_write_phdr(wdh, wblock->data.packet.wtap_encap, wblock->pseudo_header, err)) {
+ return FALSE;
+ }
+ wdh->bytes_dumped += phdr_len;
/* write packet data */
- nwritten = wtap_dump_file_write(wdh, wblock->frame_buffer, wblock->data.packet.cap_len);
- if (nwritten != wblock->data.packet.cap_len) {
- if (nwritten == 0 && wtap_dump_file_ferror(wdh))
- *err = wtap_dump_file_ferror(wdh);
- else
- *err = WTAP_ERR_SHORT_WRITE;
+ if (!wtap_dump_file_write(wdh, wblock->frame_buffer,
+ wblock->data.packet.cap_len, err))
return FALSE;
- }
wdh->bytes_dumped += wblock->data.packet.cap_len;
/* write padding (if any) */
- if(cap_pad_len != 0) {
- nwritten = wtap_dump_file_write(wdh, &zero_pad, cap_pad_len);
- if (nwritten != cap_pad_len) {
- if (nwritten == 0 && wtap_dump_file_ferror(wdh))
- *err = wtap_dump_file_ferror(wdh);
- else
- *err = WTAP_ERR_SHORT_WRITE;
+ if (pad_len != 0) {
+ if (!wtap_dump_file_write(wdh, &zero_pad, pad_len, err))
return FALSE;
- }
- wdh->bytes_dumped += cap_pad_len;
+ wdh->bytes_dumped += pad_len;
}
/* XXX - write (optional) block options */
+ /* options defined in Section 2.5 (Options)
+ * Name Code Length Description
+ * opt_comment 1 variable A UTF-8 string containing a comment that is associated to the current block.
+ *
+ * Enhanced Packet Block options
+ * epb_flags 2 4 A flags word containing link-layer information. A complete specification of
+ * the allowed flags can be found in Appendix A (Packet Block Flags Word).
+ * epb_hash 3 variable This option contains a hash of the packet. The first byte specifies the hashing algorithm,
+ * while the following bytes contain the actual hash, whose size depends on the hashing algorithm,
+ * and hence from the value in the first bit. The hashing algorithm can be: 2s complement
+ * (algorithm byte = 0, size=XXX), XOR (algorithm byte = 1, size=XXX), CRC32 (algorithm byte = 2, size = 4),
+ * MD-5 (algorithm byte = 3, size=XXX), SHA-1 (algorithm byte = 4, size=XXX).
+ * The hash covers only the packet, not the header added by the capture driver:
+ * this gives the possibility to calculate it inside the network card.
+ * The hash allows easier comparison/merging of different capture files, and reliable data transfer between the
+ * data acquisition system and the capture library.
+ * epb_dropcount 4 8 A 64bit integer value specifying the number of packets lost (by the interface and the operating system)
+ * between this packet and the preceding one.
+ * opt_endofopt 0 0 It delimits the end of the optional fields. This block cannot be repeated within a given list of options.
+ */
+ if(wblock->data.packet.opt_comment){
+ options_hdr = comment_len;
+ options_hdr = options_hdr << 16;
+ /* Option 1 */
+ options_hdr += 1;
+ if (!wtap_dump_file_write(wdh, &options_hdr, 4, err))
+ return FALSE;
+ wdh->bytes_dumped += 4;
+
+ /* Write the comments string */
+ pcapng_debug3("pcapng_write_packet_block, comment:'%s' comment_len %u comment_pad_len %u" , wblock->data.packet.opt_comment, comment_len, comment_pad_len);
+ if (!wtap_dump_file_write(wdh, wblock->data.packet.opt_comment, comment_len, err))
+ return FALSE;
+ wdh->bytes_dumped += comment_len;
+
+ /* write padding (if any) */
+ if (comment_pad_len != 0) {
+ if (!wtap_dump_file_write(wdh, &zero_pad, comment_pad_len, err))
+ return FALSE;
+ wdh->bytes_dumped += comment_pad_len;
+ }
+
+ pcapng_debug2("pcapng_write_packet_block: Wrote Options comments: comment_len %u, comment_pad_len %u",
+ comment_len,
+ comment_pad_len);
+ }
+
+ /* Write end of options if we have otions */
+ if(have_options){
+ if (!wtap_dump_file_write(wdh, &zero_pad, 4, err))
+ return FALSE;
+ wdh->bytes_dumped += 4;
+ }
/* write block footer */
- nwritten = wtap_dump_file_write(wdh, &bh.block_total_length, sizeof bh.block_total_length);
- if (nwritten != sizeof bh.block_total_length) {
- if (nwritten == 0 && wtap_dump_file_ferror(wdh))
- *err = wtap_dump_file_ferror(wdh);
- else
- *err = WTAP_ERR_SHORT_WRITE;
+ if (!wtap_dump_file_write(wdh, &bh.block_total_length,
+ sizeof bh.block_total_length, err))
return FALSE;
- }
wdh->bytes_dumped += sizeof bh.block_total_length;
return TRUE;
}
+/* Arbitrary. */
+#define NRES_REC_MAX_SIZE ((WTAP_MAX_PACKET_SIZE * 4) + 16)
+static gboolean
+pcapng_write_name_resolution_block(wtap_dumper *wdh, pcapng_dump_t *pcapng, int *err)
+{
+ pcapng_block_header_t bh;
+ pcapng_name_resolution_block_t nrb;
+ struct addrinfo *ai;
+ struct sockaddr_in *sa4;
+ struct sockaddr_in6 *sa6;
+ guint8 *rec_data;
+ gint rec_off, namelen, tot_rec_len;
+
+ if (! pcapng->addrinfo_list_last || ! pcapng->addrinfo_list_last->ai_next) {
+ return TRUE;
+ }
+
+ rec_off = 8; /* block type + block total length */
+ bh.block_type = BLOCK_TYPE_NRB;
+ bh.block_total_length = rec_off + 8; /* end-of-record + block total length */
+ rec_data = g_malloc(NRES_REC_MAX_SIZE);
+
+ for (; pcapng->addrinfo_list_last && pcapng->addrinfo_list_last->ai_next; pcapng->addrinfo_list_last = pcapng->addrinfo_list_last->ai_next ) {
+ ai = pcapng->addrinfo_list_last->ai_next; /* Skips over the first (dummy) entry */
+ namelen = (gint)strlen(ai->ai_canonname) + 1;
+ if (ai->ai_family == AF_INET) {
+ nrb.record_type = NRES_IP4RECORD;
+ nrb.record_len = 4 + namelen;
+ tot_rec_len = 4 + nrb.record_len + PADDING4(nrb.record_len);
+ bh.block_total_length += tot_rec_len;
+
+ if (rec_off + tot_rec_len > NRES_REC_MAX_SIZE)
+ break;
+
+ /*
+ * The joys of BSD sockaddrs. In practice, this
+ * cast is alignment-safe.
+ */
+ sa4 = (struct sockaddr_in *)(void *)ai->ai_addr;
+ memcpy(rec_data + rec_off, &nrb, sizeof(nrb));
+ rec_off += 4;
+
+ memcpy(rec_data + rec_off, &(sa4->sin_addr.s_addr), 4);
+ rec_off += 4;
+
+ memcpy(rec_data + rec_off, ai->ai_canonname, namelen);
+ rec_off += namelen;
+
+ memset(rec_data + rec_off, 0, PADDING4(namelen));
+ rec_off += PADDING4(namelen);
+ pcapng_debug1("NRB: added IPv4 record for %s", ai->ai_canonname);
+ } else if (ai->ai_family == AF_INET6) {
+ nrb.record_type = NRES_IP6RECORD;
+ nrb.record_len = 16 + namelen;
+ tot_rec_len = 4 + nrb.record_len + PADDING4(nrb.record_len);
+ bh.block_total_length += tot_rec_len;
+
+ if (rec_off + tot_rec_len > NRES_REC_MAX_SIZE)
+ break;
+
+ /*
+ * The joys of BSD sockaddrs. In practice, this
+ * cast is alignment-safe.
+ */
+ sa6 = (struct sockaddr_in6 *)(void *)ai->ai_addr;
+ memcpy(rec_data + rec_off, &nrb, sizeof(nrb));
+ rec_off += 4;
+
+ memcpy(rec_data + rec_off, sa6->sin6_addr.s6_addr, 16);
+ rec_off += 16;
+
+ memcpy(rec_data + rec_off, ai->ai_canonname, namelen);
+ rec_off += namelen;
+
+ memset(rec_data + rec_off, 0, PADDING4(namelen));
+ rec_off += PADDING4(namelen);
+ pcapng_debug1("NRB: added IPv6 record for %s", ai->ai_canonname);
+ }
+ }
+
+ /* We know the total length now; copy the block header. */
+ memcpy(rec_data, &bh, sizeof(bh));
+
+ /* End of record */
+ memset(rec_data + rec_off, 0, 4);
+ rec_off += 4;
+
+ memcpy(rec_data + rec_off, &bh.block_total_length, sizeof(bh.block_total_length));
+
+ if (!wtap_dump_file_write(wdh, rec_data, bh.block_total_length, err)) {
+ g_free(rec_data);
+ return FALSE;
+ }
+
+ g_free(rec_data);
+ wdh->bytes_dumped += bh.block_total_length;
+ return TRUE;
+}
+
static gboolean
pcapng_write_block(wtap_dumper *wdh, /*pcapng_t *pn, */wtapng_block_t *wblock, int *err)
{
switch(wblock->type) {
- case(BLOCK_TYPE_SHB):
- return pcapng_write_section_header_block(wdh, wblock, err);
- break;
- case(BLOCK_TYPE_IDB):
- return pcapng_write_if_descr_block(wdh, wblock, err);
- break;
- case(BLOCK_TYPE_PB):
- /* Packet Block is obsolete */
- return FALSE;
- break;
- case(BLOCK_TYPE_EPB):
- return pcapng_write_packet_block(wdh, wblock, err);
- break;
- default:
- g_warning("Unknown block_type: 0x%x", wblock->type);
- return FALSE;
+ case(BLOCK_TYPE_SHB):
+ return pcapng_write_section_header_block(wdh, wblock, err);
+ case(BLOCK_TYPE_IDB):
+ return pcapng_write_if_descr_block(wdh, wblock, err);
+ case(BLOCK_TYPE_PB):
+ /* Packet Block is obsolete */
+ return FALSE;
+ case(BLOCK_TYPE_EPB):
+ return pcapng_write_packet_block(wdh, wblock, err);
+ default:
+ pcapng_debug1("Unknown block_type: 0x%x", wblock->type);
+ return FALSE;
}
}
+#if 0
+static guint32
+pcapng_lookup_interface_id_by_encap(int wtap_encap, wtap_dumper *wdh)
+{
+ gint i;
+ interface_data_t int_data;
+ pcapng_dump_t *pcapng = (pcapng_dump_t *)wdh->priv;
+
+ for(i = 0; i < (gint)pcapng->number_of_interfaces; i++) {
+ int_data = g_array_index(pcapng->interface_data, interface_data_t, i);
+ if (wtap_encap == int_data.wtap_encap) {
+ return (guint32)i;
+ }
+ }
+ return G_MAXUINT32;
+}
+#endif
static gboolean pcapng_dump(wtap_dumper *wdh,
const struct wtap_pkthdr *phdr,
- const union wtap_pseudo_header *pseudo_header _U_,
- const guchar *pd, int *err)
+ const union wtap_pseudo_header *pseudo_header,
+ const guint8 *pd, int *err)
{
wtapng_block_t wblock;
+ /*interface_data_t int_data;*/
+ guint32 interface_id = 0;
+ guint64 ts;
+ pcapng_dump_t *pcapng = (pcapng_dump_t *)wdh->priv;
+ /*int pcap_encap;*/
+
+ pcapng_debug2("pcapng_dump: encap = %d (%s)",
+ phdr->pkt_encap,
+ wtap_encap_string(phdr->pkt_encap));
+
+ if (!pcapng->addrinfo_list_last)
+ pcapng->addrinfo_list_last = wdh->addrinfo_list;
+ /* Flush any hostname resolution info we may have */
+ while (pcapng->addrinfo_list_last && pcapng->addrinfo_list_last->ai_next) {
+ pcapng_write_name_resolution_block(wdh, pcapng, err);
+ }
- wblock.frame_buffer = pd;
+ wblock.frame_buffer = pd;
wblock.pseudo_header = pseudo_header;
+ wblock.packet_header = NULL;
+ wblock.file_encap = NULL;
/* write the (enhanced) packet block */
wblock.type = BLOCK_TYPE_EPB;
- wblock.data.packet.ts_high = (guint32) phdr->ts.secs;
- wblock.data.packet.ts_low = phdr->ts.nsecs; /* XXX - convert */
- wblock.data.packet.cap_len = phdr->caplen;
- wblock.data.packet.packet_len = phdr->len;
+ /* default is to write out in microsecond resolution */
+ ts = (((guint64)phdr->ts.secs) * 1000000) + (phdr->ts.nsecs / 1000);
+
+ /* Split the 64-bit timestamp into two 32-bit pieces */
+ wblock.data.packet.ts_high = (guint32)(ts >> 32);
+ wblock.data.packet.ts_low = (guint32)ts;
+
+ wblock.data.packet.cap_len = phdr->caplen;
+ wblock.data.packet.packet_len = phdr->len;
+ wblock.data.packet.interface_id = interface_id;
+ wblock.data.packet.wtap_encap = phdr->pkt_encap;
/* currently unused */
- wblock.data.packet.drop_count = -1;
- wblock.data.packet.opt_comment = NULL;
+ wblock.data.packet.drop_count = phdr->drop_count;
+ wblock.data.packet.opt_comment = phdr->opt_comment;
+ pcapng_debug1("pcapng_dump: Comment %s",phdr->opt_comment);
if (!pcapng_write_block(wdh, &wblock, err)) {
return FALSE;
}
+/* Finish writing to a dump file.
+ Returns TRUE on success, FALSE on failure. */
+static gboolean pcapng_dump_close(wtap_dumper *wdh, int *err _U_)
+{
+ pcapng_dump_t *pcapng = (pcapng_dump_t *)wdh->priv;
+
+ pcapng_debug0("pcapng_dump_close");
+ g_array_free(pcapng->interface_data, TRUE);
+ pcapng->number_of_interfaces = 0;
+ return TRUE;
+}
+
+
/* Returns TRUE on success, FALSE on failure; sets "*err" to an error code on
failure */
-gboolean
-pcapng_dump_open(wtap_dumper *wdh, gboolean cant_seek _U_, int *err)
+gboolean
+pcapng_dump_open(wtap_dumper *wdh, int *err)
{
wtapng_block_t wblock;
-
- wblock.frame_buffer = NULL;
+ pcapng_dump_t *pcapng;
+ int i;
+ interface_data_t interface_data;
+
+ wblock.frame_buffer = NULL;
wblock.pseudo_header = NULL;
+ wblock.packet_header = NULL;
+ wblock.file_encap = NULL;
-
+ pcapng_debug0("pcapng_dump_open");
/* This is a pcapng file */
wdh->subtype_write = pcapng_dump;
- wdh->subtype_close = NULL;
+ wdh->subtype_close = pcapng_dump_close;
+ pcapng = (pcapng_dump_t *)g_malloc0(sizeof(pcapng_dump_t));
+ wdh->priv = (void *)pcapng;
+ pcapng->interface_data = g_array_new(FALSE, FALSE, sizeof(wtapng_if_descr_t));
+
+ if ((wdh->number_of_interfaces == 0) || (wdh->interface_data == NULL)) {
+ pcapng_debug0("There are no interfaces. Can't handle that...");
+ *err = WTAP_ERR_INTERNAL;
+ return FALSE;
+ }
/* write the section header block */
wblock.type = BLOCK_TYPE_SHB;
wblock.data.section.section_length = -1;
- /* XXX - options unused */
- wblock.data.section.opt_comment = NULL;
- wblock.data.section.shb_hardware = NULL;
- wblock.data.section.shb_os = NULL;
- wblock.data.section.shb_user_appl = NULL;
+ /* Options */
+ if (wdh->shb_hdr) {
+ wblock.data.section.opt_comment = wdh->shb_hdr->opt_comment;
+ wblock.data.section.shb_hardware = wdh->shb_hdr->shb_hardware;
+ wblock.data.section.shb_os = wdh->shb_hdr->shb_os;
+ wblock.data.section.shb_user_appl = wdh->shb_hdr->shb_user_appl;
+ } else {
+ wblock.data.section.opt_comment = NULL;
+ wblock.data.section.shb_hardware = NULL;
+ wblock.data.section.shb_os = NULL;
+ wblock.data.section.shb_user_appl = NULL;
+ }
if (!pcapng_write_block(wdh, &wblock, err)) {
return FALSE;
}
+ pcapng_debug0("pcapng_dump_open: wrote section header block.");
+
+ /* Write the Interface description blocks */
+ pcapng_debug1("pcapng_dump_open: Number of IDB:s to write (number of interfaces) %u", wdh->number_of_interfaces);
+
+ for (i = 0; i < (int)wdh->number_of_interfaces; i++) {
+
+ /* Get the interface description */
+ wtapng_if_descr_t int_data;
+
+ int_data = g_array_index(wdh->interface_data, wtapng_if_descr_t, i);
+
+ /* write the interface description block */
+ wblock.data.if_descr.link_type = int_data.link_type;
+ wblock.data.if_descr.wtap_encap = int_data.wtap_encap;
+ wblock.data.if_descr.snap_len = int_data.snap_len;
+ /* options */
+ /* NULL if not available */
+ wblock.data.if_descr.opt_comment = int_data.opt_comment;
+ /* NULL if not available, opt 2 A UTF-8 string containing the name of the device used to capture data. */
+ wblock.data.if_descr.if_name = int_data.if_name;
+ /* NULL if not available, opt 3 A UTF-8 string containing the description of the device used to capture data. */
+ wblock.data.if_descr.if_description = int_data.if_description;
+ /* XXX: if_IPv4addr opt 4 Interface network address and netmask.*/
+ /* XXX: if_IPv6addr opt 5 Interface network address and prefix length (stored in the last byte).*/
+ /* XXX: if_MACaddr opt 6 Interface Hardware MAC address (48 bits).*/
+ /* XXX: if_EUIaddr opt 7 Interface Hardware EUI address (64 bits)*/
+ /* 0xFFFFFFFF if unknown, opt 8 Interface speed (in bps). 100000000 for 100Mbps */
+ wblock.data.if_descr.if_speed = int_data.if_speed;
+ /* default is 6 for microsecond resolution, opt 9 Resolution of timestamps.
+ * If the Most Significant Bit is equal to zero, the remaining bits indicates
+ * the resolution of the timestamp as as a negative power of 10
+ */
+ wblock.data.if_descr.if_tsresol = int_data.if_tsresol;
+ /* XXX: if_tzone 10 Time zone for GMT support (TODO: specify better). */
+ /* NULL if not available, opt 11 The filter (e.g. "capture only TCP traffic") used to capture traffic.
+ * The first byte of the Option Data keeps a code of the filter used (e.g. if this is a libpcap string, or BPF bytecode, and more).
+ */
+ wblock.data.if_descr.if_filter = int_data.if_filter;
+ /* NULL if not available, 12 A UTF-8 string containing the name of the operating system of the machine in which this interface is installed. */
+ wblock.data.if_descr.if_os = int_data.if_os;
+ /* -1 if unknown or changes between packets, opt 13 An integer value that specified the length of the Frame Check Sequence (in bits) for this interface. */
+ wblock.data.if_descr.if_fcslen = int_data.if_fcslen;
+ /* XXX: guint64 if_tsoffset; opt 14 A 64 bits integer value that specifies an offset (in seconds)...*/
+
+ wblock.frame_buffer = NULL;
+ wblock.pseudo_header = NULL;
+ wblock.packet_header = NULL;
+ wblock.file_encap = NULL;
+ wblock.type = BLOCK_TYPE_IDB;
+
+ interface_data.wtap_encap = int_data.wtap_encap;;
+ interface_data.time_units_per_second = int_data.time_units_per_second;
+
+ g_array_append_val(pcapng->interface_data, interface_data);
+ pcapng->number_of_interfaces++;
+
+ if (!pcapng_write_block(wdh, &wblock, err)) {
+ return FALSE;
+ }
- /* write the interface description block */
- wblock.type = BLOCK_TYPE_IDB;
- wblock.data.if_descr.link_type = wdh->encap;
- wblock.data.if_descr.snap_len = wdh->snaplen;
+ }
+#if 0
+ interface_id = pcapng_lookup_interface_id_by_encap(phdr->pkt_encap, wdh);
+ if (interface_id == G_MAXUINT32) {
+ /*
+ * We haven't yet written out an interface description
+ * block for an interface with this encapsulation.
+ *
+ * Is this encapsulation even supported in pcap-ng?
+ */
+ pcap_encap = wtap_wtap_encap_to_pcap_encap(phdr->pkt_encap);
+ if (pcap_encap == -1) {
+ /*
+ * No. Fail.
+ */
+ *err = WTAP_ERR_UNSUPPORTED_ENCAP;
+ return FALSE;
+ }
- /* XXX - options unused */
- wblock.data.if_descr.if_speed = -1;
- wblock.data.if_descr.if_tsaccur = 6; /* default: usec */
- wblock.data.if_descr.if_os = NULL;
- wblock.data.if_descr.if_fcslen = -1;
+ /* write the interface description block */
+ wblock.frame_buffer = NULL;
+ wblock.pseudo_header = NULL;
+ wblock.packet_header = NULL;
+ wblock.file_encap = NULL;
+ wblock.type = BLOCK_TYPE_IDB;
+ wblock.data.if_descr.link_type = pcap_encap;
+ wblock.data.if_descr.snap_len = (wdh->snaplen != 0) ? wdh->snaplen :
+ WTAP_MAX_PACKET_SIZE; /* XXX */
+
+ /* XXX - options unused */
+ wblock.data.if_descr.if_speed = -1;
+ /*wblock.data.if_descr.if_tsresol = 6;*/ /* default: usec */
+ wblock.data.if_descr.if_os = NULL;
+ wblock.data.if_descr.if_fcslen = -1;
+
+ if (!pcapng_write_block(wdh, &wblock, err)) {
+ return FALSE;
+ }
- if (!pcapng_write_block(wdh, &wblock, err)) {
- return FALSE;
+ interface_id = pcapng->number_of_interfaces;
+ int_data.wtap_encap = phdr->pkt_encap;
+ int_data.time_units_per_second = 0;
+ g_array_append_val(pcapng->interface_data, int_data);
+ pcapng->number_of_interfaces++;
+
+ pcapng_debug3("pcapng_dump: added interface description block with index %u for encap = %d (%s).",
+ interface_id,
+ phdr->pkt_encap,
+ wtap_encap_string(phdr->pkt_encap));
}
+#endif
return TRUE;
}
/* Returns 0 if we could write the specified encapsulation type,
an error indication otherwise. */
-int pcapng_dump_can_write_encap(int encap)
+int pcapng_dump_can_write_encap(int wtap_encap)
{
- /* Per-packet encapsulations aren't supported. */
- if (encap == WTAP_ENCAP_PER_PACKET)
- return WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED;
+ pcapng_debug2("pcapng_dump_can_write_encap: encap = %d (%s)",
+ wtap_encap,
+ wtap_encap_string(wtap_encap));
- /* XXX - for now we only support Ethernet */
- if (encap != WTAP_ENCAP_ETHERNET)
+ /* Per-packet encapsulations is supported. */
+ if (wtap_encap == WTAP_ENCAP_PER_PACKET)
+ return 0;
+
+ /* Make sure we can figure out this DLT type */
+ if (wtap_wtap_encap_to_pcap_encap(wtap_encap) == -1)
return WTAP_ERR_UNSUPPORTED_ENCAP;
return 0;
}
-
git.samba.org / obnox / wireshark / wip.git / blobdiff