union wtap_pseudo_header *pseudo_header, guint8 *pd, int length,
int *err, gchar **err_info);
static int read_packet_header(FILE_T fh, union wtap_pseudo_header *pseudo_header,
- packet_entry_header *packet_header, int *err, gchar **err_info);
+ packet_entry_header *packet_header, int *err, gchar **err_info);
static int read_packet_data(FILE_T fh, int offset_to_frame, int current_offset_from_packet_header,
guint8 *pd, int length, int *err, char **err_info);
static gboolean skip_to_next_packet(wtap *wth, int offset_to_next_packet,
*data_offset = wth->data_offset;
/* process the packet header, including TLVs */
- bytes_consumed = read_packet_header(wth->fh, &wth->pseudo_header, &packet_header, err,
+ bytes_consumed = read_packet_header(wth->fh, &wth->pseudo_header, &packet_header, err,
err_info);
if (bytes_consumed <= 0)
return FALSE; /* EOF or error */
/* There is no FCS in the frame */
wth->pseudo_header.eth.fcs_len = 0;
break;
- case WTAP_ENCAP_IEEE_802_11_WITH_RADIO:
- /* Updated in read_packet_header */
- break;
+ case WTAP_ENCAP_IEEE_802_11_WITH_RADIO:
+ /* Updated in read_packet_header */
+ break;
}
/* set-up the packet buffer */
return FALSE;
/* process the packet header, including TLVs */
- offset = read_packet_header(wth->random_fh, pseudo_header, &packet_header, err,
+ offset = read_packet_header(wth->random_fh, pseudo_header, &packet_header, err,
err_info);
if (offset <= 0)
return FALSE; /* EOF or error */
/* There is no FCS in the frame */
pseudo_header->eth.fcs_len = 0;
break;
- case WTAP_ENCAP_IEEE_802_11_WITH_RADIO:
- /* Updated in read_packet_header */
- break;
+ case WTAP_ENCAP_IEEE_802_11_WITH_RADIO:
+ /* Updated in read_packet_header */
+ break;
}
/* read the frame data */
static int
read_packet_header(FILE_T fh, union wtap_pseudo_header *pseudo_header,
- packet_entry_header *packet_header, int *err, gchar **err_info)
+ packet_entry_header *packet_header, int *err, gchar **err_info)
{
int offset;
int bytes_read;
guint i;
tlv_header tlvh;
int seek_increment;
- tlv_wireless_info wireless_header;
+ tlv_wireless_info wireless_header;
offset = 0;
/* process (or skip over) the current TLV */
switch (tlvh.type) {
case INFORMATION_TYPE_WIRELESS:
- bytes_read = file_read(&wireless_header, sizeof wireless_header, fh);
- if (bytes_read != sizeof wireless_header) {
- *err = file_error(fh, err_info);
+ bytes_read = file_read(&wireless_header, sizeof wireless_header, fh);
+ if (bytes_read != sizeof wireless_header) {
+ *err = file_error(fh, err_info);
if(*err == 0)
*err = WTAP_ERR_SHORT_READ;
return -1;
- }
- /* update the pseudo header */
- pseudo_header->ieee_802_11.fcs_len = 0;
- pseudo_header->ieee_802_11.channel = wireless_header.frequency;
- pseudo_header->ieee_802_11.data_rate = wireless_header.rate;
- pseudo_header->ieee_802_11.signal_level = wireless_header.strengthPercent;
- offset += bytes_read;
+ }
+ /* update the pseudo header */
+ pseudo_header->ieee_802_11.fcs_len = 0;
+ pseudo_header->ieee_802_11.channel = wireless_header.frequency;
+ pseudo_header->ieee_802_11.data_rate = wireless_header.rate;
+ pseudo_header->ieee_802_11.signal_level = wireless_header.strengthPercent;
+ offset += bytes_read;
break;
default:
- /* skip the TLV data */
- seek_increment = tlvh.length - (int)sizeof tlvh;
- if (seek_increment > 0) {
- if (file_seek(fh, seek_increment, SEEK_CUR, err) == -1)
- return -1;
- }
- offset += seek_increment;
- }
+ /* skip the TLV data */
+ seek_increment = tlvh.length - (int)sizeof tlvh;
+ if (seek_increment > 0) {
+ if (file_seek(fh, seek_increment, SEEK_CUR, err) == -1)
+ return -1;
+ }
+ offset += seek_increment;
+ }
}
return offset;
*/
typedef struct capture_file_header
{
- char observer_version[31];
- guint8 offset_to_first_packet_high_byte; /* allows to extend the offset to the first packet to 256*0x10000 = 16 MB */
- guint16 offset_to_first_packet;
- char probe_instance;
- guint8 number_of_information_elements; /* number of TLVs in the header */
+ char observer_version[31];
+ guint8 offset_to_first_packet_high_byte; /* allows to extend the offset to the first packet to 256*0x10000 = 16 MB */
+ guint16 offset_to_first_packet;
+ char probe_instance;
+ guint8 number_of_information_elements; /* number of TLVs in the header */
} capture_file_header;
#define CAPTURE_FILE_HEADER_FROM_LE_IN_PLACE(_capture_file_header) \
typedef struct tlv_header
{
- guint16 type;
- guint16 length; /* includes the length of the TLV header */
+ guint16 type;
+ guint16 length; /* includes the length of the TLV header */
} tlv_header;
#define TLV_HEADER_FROM_LE_IN_PLACE(_tlv_header) \
(_tlv_header).length = GUINT16_TO_LE((_tlv_header).length)
typedef struct tlv_time_info {
- guint16 type;
- guint16 length;
- guint32 time_format;
+ guint16 type;
+ guint16 length;
+ guint32 time_format;
} tlv_time_info;
#define TLV_TIME_INFO_FROM_LE_IN_PLACE(_tlv_time_info) \
(_tlv_time_info).type = GUINT16_FROM_LE((_tlv_time_info).type); \
(_tlv_time_info).length = GUINT16_FROM_LE((_tlv_time_info).length); \
- (_tlv_time_info).time_format = GUINT32_FROM_LE((_tlv_time_info).time_format)
+ (_tlv_time_info).time_format = GUINT32_FROM_LE((_tlv_time_info).time_format)
#define TLV_TIME_INFO_TO_LE_IN_PLACE(_tlv_time_info) \
(_tlv_time_info).type = GUINT16_TO_LE((_tlv_time_info).type); \
(_tlv_time_info).length = GUINT16_TO_LE((_tlv_time_info).length); \
- (_tlv_time_info).time_format = GUINT32_FROM_LE((_tlv_time_info).time_format)
+ (_tlv_time_info).time_format = GUINT32_FROM_LE((_tlv_time_info).time_format)
typedef struct tlv_wireless_info {
- guint8 quality;
- guint8 signalStrength;
- guint8 rate;
- guint8 frequency;
- guint8 qualityPercent;
- guint8 strengthPercent;
- guint8 conditions;
- guint8 reserved;
+ guint8 quality;
+ guint8 signalStrength;
+ guint8 rate;
+ guint8 frequency;
+ guint8 qualityPercent;
+ guint8 strengthPercent;
+ guint8 conditions;
+ guint8 reserved;
} tlv_wireless_info;
/*
* TLV type values.
*/
-#define INFORMATION_TYPE_ALIAS_LIST 0x01
-#define INFORMATION_TYPE_COMMENT 0x02 /* ASCII text */
-#define INFORMATION_TYPE_TIME_INFO 0x04
-#define INFORMATION_TYPE_WIRELESS 0x101
+#define INFORMATION_TYPE_ALIAS_LIST 0x01
+#define INFORMATION_TYPE_COMMENT 0x02 /* ASCII text */
+#define INFORMATION_TYPE_TIME_INFO 0x04
+#define INFORMATION_TYPE_WIRELESS 0x101
/*
* TVL TIME_INFO values.
*/
-#define TIME_INFO_LOCAL 0
-#define TIME_INFO_GMT 1
+#define TIME_INFO_LOCAL 0
+#define TIME_INFO_GMT 1
typedef struct packet_entry_header
{
- guint32 packet_magic;
- guint32 network_speed;
- guint16 captured_size;
- guint16 network_size;
- guint16 offset_to_frame;
- guint16 offset_to_next_packet;
- guint8 network_type;
- guint8 flags;
- guint8 number_of_information_elements; /* number of TLVs in the header */
- guint8 packet_type;
- guint16 errors;
- guint16 reserved;
- guint64 packet_number;
- guint64 original_packet_number;
- guint64 nano_seconds_since_2000;
+ guint32 packet_magic;
+ guint32 network_speed;
+ guint16 captured_size;
+ guint16 network_size;
+ guint16 offset_to_frame;
+ guint16 offset_to_next_packet;
+ guint8 network_type;
+ guint8 flags;
+ guint8 number_of_information_elements; /* number of TLVs in the header */
+ guint8 packet_type;
+ guint16 errors;
+ guint16 reserved;
+ guint64 packet_number;
+ guint64 original_packet_number;
+ guint64 nano_seconds_since_2000;
} packet_entry_header;
#define PACKET_ENTRY_HEADER_FROM_LE_IN_PLACE(_packet_entry_header) \
/*
* Packet type values.
*/
-#define PACKET_TYPE_DATA_PACKET 0
-#define PACKET_TYPE_EXPERT_INFORMATION_PACKET 1
+#define PACKET_TYPE_DATA_PACKET 0
+#define PACKET_TYPE_EXPERT_INFORMATION_PACKET 1
/*
* The Observer document indicates that the types of expert information
* packets are:
*
- * Network Load (markers used by Expert Time Interval and What If
- * analysis modes)
+ * Network Load (markers used by Expert Time Interval and What If
+ * analysis modes)
*
- * Start/Stop Packet Capture marker frames (with time stamps when
- * captures start and stop)
+ * Start/Stop Packet Capture marker frames (with time stamps when
+ * captures start and stop)
*
- * Wireless Channel Change (markers showing what channel was being
- * currently listened to)
+ * Wireless Channel Change (markers showing what channel was being
+ * currently listened to)
*
* That information appears to be contained in TLVs.
*/
/*
* TLV type values.
*/
-#define INFORMATION_TYPE_NETWORK_LOAD 0x0100
-#define INFORMATION_TYPE_CAPTURE_START_STOP 0x0104
+#define INFORMATION_TYPE_NETWORK_LOAD 0x0100
+#define INFORMATION_TYPE_CAPTURE_START_STOP 0x0104
/*
* Might some of these be broadcast and multicast packet counts?
*/
typedef struct tlv_network_load
{
- guint32 utilization; /* network utilization, in .1% units */
- guint32 unknown1;
- guint32 unknown2;
- guint32 packets_per_second;
- guint32 unknown3;
- guint32 bytes_per_second;
- guint32 unknown4;
+ guint32 utilization; /* network utilization, in .1% units */
+ guint32 unknown1;
+ guint32 unknown2;
+ guint32 packets_per_second;
+ guint32 unknown3;
+ guint32 bytes_per_second;
+ guint32 unknown4;
} tlv_network_load;
typedef struct tlv_capture_start_stop
{
- guint32 start_stop;
+ guint32 start_stop;
} tlv_capture_start_stop;
-#define START_STOP_TYPE_STOP 0
-#define START_STOP_TYPE_START 1
+#define START_STOP_TYPE_STOP 0
+#define START_STOP_TYPE_START 1
#endif
git.samba.org / metze / wireshark / wip.git / commitdiff