#include <string.h>
#include <errno.h>
-#include "wftap-int.h"
#include "wtap-int.h"
-#include "wtap.h"
#include "file_wrappers.h"
-#include "buffer.h"
#include "k12.h"
#include <wsutil/str_util.h>
/* #define DEBUG_K12 */
#ifdef DEBUG_K12
#include <stdio.h>
-#include <ctype.h>
#include <stdarg.h>
#include <wsutil/file_util.h>
#define CAT(a,b) a##b
#define K12_DBG(level,args) do { if (level <= debug_level) { \
- fprintf(dbg_out,"%s:%d: ",CAT(__FI,LE__),CAT(__LI,NE__)); \
- k12_fprintf args ; \
- fprintf(dbg_out,"\n"); \
+ fprintf(dbg_out,"%s:%d: ",CAT(__FI,LE__),CAT(__LI,NE__)); \
+ k12_fprintf args ; \
+ fprintf(dbg_out,"\n"); \
} } while(0)
void k12_hex_ascii_dump(guint level, gint64 offset, const char* label, const unsigned char* b, unsigned int len) {
if (debug_level < level) return;
for (i = buf_offset; i < len; i++) {
- if (isprint(buf[i]) || buf[i] == '\n' || buf[i] == '\t')
+ if (g_ascii_isprint(buf[i]) || buf[i] == '\n' || buf[i] == '\t')
putc(buf[i], dbg_out);
else if (buf[i] == '\0')
fprintf(dbg_out, "(NUL)\n");
/*
- * the 32 bits .rf5 file contains:
- * an 8 byte magic number
- * 32bit length
- * 32bit number of records
- * other 0x200 bytes bytes of uncharted territory
- * 1 or more copies of the num_of_records in there
- * the records whose first 32bits word is the length
- * they are stuffed by one to four words every 0x2000 bytes
- * and a 2 byte terminator FFFF
+ * A 32-bit .rf5 file begins with a 512-byte file header, containing:
+ *
+ * a 32-bit big-endian file header length, in bytes - always 512 in
+ * the files we've seen;
+ *
+ * 4 unknown bytes, always 0x12 0x05 0x00 0x10;
+ *
+ * a 32-bit big-endian file length, giving the total length of the file,
+ * in bytes;
+ *
+ * a 32-bit big-endian number giving the "page size" of the file, in
+ * bytes, which is normally 8192;
+ *
+ * 20 unknown bytes;
+ *
+ * a 32-bit count of the number of records in the file;
+ *
+ * 4 unknown bytes;
+ *
+ * a 32-bit count of the number of records in the file;
+ *
+ * 464 unknown bytes;
+ *
+ * followed by a sequence of records containing:
+ *
+ * a 32-bit big-endian record length;
+ *
+ * a 32-bit big-endian record type;
+ *
+ * a 32-bit big-endian frame length;
+ *
+ * a 32-bit big-endian source ID.
+ *
+ * Every 8192 bytes, starting immediately after the 512-byte header,
+ * there's a 16-byte blob; it's not part of the record data.
+ * There's no obvious pattern to the data; it might be junk left
+ * in memory as the file was being written.
+ *
+ * There's a 16-bit terminator FFFF at the end.
+ *
+ * Older versions of the Wireshark .rf5 writing code incorrectly wrote
+ * the header - they put 512 in the file length field (counting only the
+ * header), put a count of records into the "page size" field, and wrote
+ * out zeroes in the rest of the header. We detect those files by
+ * checking whether the rest of the header is zero.
*/
+/*
+ * We use the first 8 bytes of the file header as a magic number.
+ */
static const guint8 k12_file_magic[] = { 0x00, 0x00, 0x02, 0x00 ,0x12, 0x05, 0x00, 0x10 };
+#define K12_FILE_HDR_LEN 512
+
+/*
+ * Offsets in the file header.
+ */
+#define K12_FILE_HDR_MAGIC_NUMBER 0x00
+#define K12_FILE_HDR_FILE_SIZE 0x08
+#define K12_FILE_HDR_PAGE_SIZE 0x0C
+#define K12_FILE_HDR_RECORD_COUNT_1 0x24
+#define K12_FILE_HDR_RECORD_COUNT_2 0x2C
+
+#define K12_FILE_BLOB_LEN 16
+
typedef struct {
guint32 file_len;
guint32 num_of_records; /* XXX: not sure about this */
* with the "group" code followe by the "type" code. The "group" values
* are:
*
- * 0x0001 - "data event"
- * 0x0002 - "text or L1 event"
- * 0x0007 - "configuration event"
+ * 0x0001 - "data event"
+ * 0x0002 - "text or L1 event"
+ * 0x0007 - "configuration event"
*
* and the "type" values are:
*
* data events:
- * 0x0020 - "frame" (i.e., "an actual packet")
- * 0x0021 - "transparent frame"
- * 0x0022 - "bit data (TRAU frame)"
- * 0x0024 - "used to mark the frame which is a fragment"
- * 0x0026 - "used to mark the frame which is a fragment"
- * 0x0028 - "used to mark the frame which is generated by the LSA"
- * 0x002A - "used to mark the frame which is generated by the LSA"
+ * 0x0020 - "frame" (i.e., "an actual packet")
+ * 0x0021 - "transparent frame"
+ * 0x0022 - "bit data (TRAU frame)"
+ * 0x0024 - "used to mark the frame which is a fragment"
+ * 0x0026 - "used to mark the frame which is a fragment"
+ * 0x0028 - "used to mark the frame which is generated by the LSA"
+ * 0x002A - "used to mark the frame which is generated by the LSA"
*
* text or L1 events:
- * 0x0030 - "text event"
- * 0x0031 - "L1 event"
- * 0x0032 - "L1 event (BAI)"
- * 0x0033 - "L1 event (VX)"
+ * 0x0030 - "text event"
+ * 0x0031 - "L1 event"
+ * 0x0032 - "L1 event (BAI)"
+ * 0x0033 - "L1 event (VX)"
*
* configuration events:
- * 0x0040 - Logical Data Source configuration event
- * 0x0041 - Logical Link configuration event
+ * 0x0040 - Logical Data Source configuration event
+ * 0x0041 - Logical Link configuration event
*/
/* so far we've seen these types of records */
#define K12_REC_PACKET 0x00010020 /* an actual packet */
#define K12_SRCDESC_COLOR_FOREGROUND 0x12 /* 1 byte */
#define K12_SRCDESC_COLOR_BACKGROUND 0x13 /* 1 byte */
-#define K12_SRCDESC_PORT_TYPE 0x1a /* 1 byte */
-#define K12_SRCDESC_EXTRALEN 0x1e /* uint16, big endian */
-#define K12_SRCDESC_NAMELEN 0x20 /* uint16, big endian */
-#define K12_SRCDESC_STACKLEN 0x22 /* uint16, big endian */
+#define K12_SRCDESC_PORT_TYPE 0x1a /* 1 byte */
+#define K12_SRCDESC_HWPARTLEN 0x1e /* uint16, big endian */
+#define K12_SRCDESC_NAMELEN 0x20 /* uint16, big endian */
+#define K12_SRCDESC_STACKLEN 0x22 /* uint16, big endian */
+
+/* Hardware part of the record */
+#define K12_SRCDESC_HWPART 0x24 /* offset of the hardware part */
-#define K12_SRCDESC_EXTRATYPE 0x24 /* uint32, big endian */
+/* Offsets relative to the beginning of the hardware part */
+#define K12_SRCDESC_HWPARTTYPE 0 /* uint32, big endian */
-#define K12_SRCDESC_ATM_VPI 0x38 /* uint16, big endian */
-#define K12_SRCDESC_ATM_VCI 0x3a /* uint16, big endian */
-#define K12_SRCDESC_ATM_AAL 0x3c /* 1 byte */
+#define K12_SRCDESC_DS0_MASK 24 /* variable-length */
-#define K12_SRCDESC_DS0_MASK 0x3c /* 32 bytes */
+#define K12_SRCDESC_ATM_VPI 20 /* uint16, big endian */
+#define K12_SRCDESC_ATM_VCI 22 /* uint16, big endian */
+#define K12_SRCDESC_ATM_AAL 24 /* 1 byte */
/*
* A "stack file", as appears in a K12_REC_STK_FILE record, is a text
/*
* get_record: Get the next record into a buffer
- * Every about 0x2000 bytes 0x10 bytes are inserted in the file,
+ * Every 8192 bytes 16 bytes are inserted in the file,
* even in the middle of a record.
- * This reads the next record without the eventual 0x10 bytes.
+ * This reads the next record without the eventual 16 bytes.
* returns the length of the record + the stuffing (if any)
*
* Returns number of bytes read on success, 0 on EOF, -1 on error;
* errors where that's appropriate, *err_info is set to an additional
* error string.
*
- * XXX: works at most with 0x1FFF bytes per record
+ * XXX: works at most with 8191 bytes per record
*/
static gint get_record(k12_t *file_data, FILE_T fh, gint64 file_offset,
gboolean is_random, int *err, gchar **err_info) {
guint8 *buffer = is_random ? file_data->rand_read_buff : file_data->seq_read_buff;
guint buffer_len = is_random ? file_data->rand_read_buff_len : file_data->seq_read_buff_len;
- guint bytes_read;
- guint last_read;
+ guint total_read = 0;
guint left;
- guint8 junk[0x14];
guint8* writep;
#ifdef DEBUG_K12
guint actual_len;
#endif
- /* where the next unknown 0x10 bytes are stuffed to the file */
- guint junky_offset = 0x2000 - (gint) ( (file_offset - 0x200) % 0x2000 );
+ /*
+ * Where the next unknown 16 bytes are stuffed to the file.
+ * Following the file header, they appear every 8192 bytes,
+ * starting right after the file header, so if the file offset
+ * relative to the file header is a multiple of 8192, the
+ * 16-byte blob is there.
+ */
+ guint junky_offset = 8192 - (gint) ( (file_offset - K12_FILE_HDR_LEN) % 8192 );
K12_DBG(6,("get_record: ENTER: junky_offset=%" G_GINT64_MODIFIER "d, file_offset=%" G_GINT64_MODIFIER "d",junky_offset,file_offset));
/* no buffer is given, lets create it */
if (buffer == NULL) {
- buffer = (guint8*)g_malloc(0x2000);
- buffer_len = 0x2000;
+ buffer = (guint8*)g_malloc(8192);
+ buffer_len = 8192;
if (is_random) {
file_data->rand_read_buff = buffer;
file_data->rand_read_buff_len = buffer_len;
}
}
- /* Get the record length. */
- if ( junky_offset == 0x2000 ) {
- /* the length of the record is 0x10 bytes ahead from we are reading */
- bytes_read = file_read(junk,0x14,fh);
-
- if (bytes_read == 2 && junk[0] == 0xff && junk[1] == 0xff) {
- K12_DBG(1,("get_record: EOF"));
- return 0;
- } else if ( bytes_read < 0x14 ){
- K12_DBG(1,("get_record: SHORT READ OR ERROR"));
- *err = file_error(fh, err_info);
- if (*err == 0) {
- *err = WTAP_ERR_SHORT_READ;
- }
- return -1;
- }
-
- memcpy(buffer,&(junk[0x10]),4);
- } else {
- /* the length of the record is right where we are reading */
- bytes_read = file_read(buffer, 0x4, fh);
-
- if (bytes_read == 2 && buffer[0] == 0xff && buffer[1] == 0xff) {
- K12_DBG(1,("get_record: EOF"));
- return 0;
- } else if (bytes_read == 4 && buffer[0] == 0xff && buffer[1] == 0xff
- && buffer[2] == 0x00 && buffer[3] == 0x00) {
- /*
- * In at least one k18 RF5 file, there appears to be a "record"
- * with a length value of 0xffff0000, followed by a bunch of
- * data that doesn't appear to be records, including a long
- * list of numbers.
- *
- * We treat a length value of 0xffff0000 as an end-of-file
- * indication.
- *
- * XXX - is this a length indication, or will it appear
- * at the beginning of an 8KB block, so that we should
- * check for it above?
- */
- K12_DBG(1,("get_record: EOF"));
- return 0;
- } else if ( bytes_read != 0x4 ) {
- K12_DBG(1,("get_record: SHORT READ OR ERROR"));
- *err = file_error(fh, err_info);
- if (*err == 0) {
- *err = WTAP_ERR_SHORT_READ;
- }
+ if ( junky_offset == 8192 ) {
+ /*
+ * We're at the beginning of one of the 16-byte blobs,
+ * so we first need to skip the blob.
+ *
+ * XXX - what if the blob is in the middle of the record
+ * length? If the record length is always a multiple of
+ * 4 bytes, that won't happen.
+ */
+ if ( ! file_skip( fh, K12_FILE_BLOB_LEN, err ) )
return -1;
- }
+ total_read += K12_FILE_BLOB_LEN;
}
+ /*
+ * Read the record length.
+ */
+ if ( !wtap_read_bytes( fh, buffer, 4, err, err_info ) )
+ return -1;
+ total_read += 4;
+
left = pntoh32(buffer + K12_RECORD_LEN);
#ifdef DEBUG_K12
actual_len = left;
#endif
- junky_offset -= 0x4;
+ junky_offset -= 4;
K12_DBG(5,("get_record: GET length=%u",left));
/*
- * Record length must be at least large enough for the length,
- * hence 4 bytes.
+ * Record length must be at least large enough for the length
+ * and type, hence 8 bytes.
*
- * XXX - Is WTAP_MAX_PACKET_SIZE the right check for a maximum
+ * XXX - is WTAP_MAX_PACKET_SIZE the right check for a maximum
* record size? Should we report this error differently?
*/
- if (left < 4 || left > WTAP_MAX_PACKET_SIZE) {
- K12_DBG(1,("get_record: Invalid GET length=%u",left));
+ if (left < 8) {
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup_printf("k12: Record length %u is less than 8 bytes long",left);
+ return -1;
+ }
+ if (left > WTAP_MAX_PACKET_SIZE) {
*err = WTAP_ERR_BAD_FILE;
- *err_info = g_strdup_printf("get_record: Invalid GET length=%u",left);
+ *err_info = g_strdup_printf("k12: Record length %u is greater than the maximum %u",left,WTAP_MAX_PACKET_SIZE);
return -1;
}
* looping.
*/
while (left > buffer_len) {
- buffer = (guint8*)g_realloc(buffer,buffer_len*=2);
+ buffer = (guint8*)g_realloc(buffer,buffer_len*=2);
if (is_random) {
file_data->rand_read_buff = buffer;
file_data->rand_read_buff_len = buffer_len;
K12_DBG(6,("get_record: looping left=%d junky_offset=%" G_GINT64_MODIFIER "d",left,junky_offset));
if (junky_offset > left) {
- bytes_read += last_read = file_read(writep, left, fh);
-
- if ( last_read != left ) {
- K12_DBG(1,("get_record: SHORT READ OR ERROR"));
- *err = file_error(fh, err_info);
- if (*err == 0) {
- *err = WTAP_ERR_SHORT_READ;
- }
+ /*
+ * The next 16-byte blob is past the end of this record.
+ * Just read the rest of the record.
+ */
+ if ( !wtap_read_bytes( fh, writep, left, err, err_info ) )
return -1;
- } else {
- K12_HEX_ASCII_DUMP(5,file_offset, "GOT record", buffer, actual_len);
- return bytes_read;
- }
+ total_read += left;
+ break;
} else {
- bytes_read += last_read = file_read(writep, junky_offset, fh);
-
- if ( last_read != junky_offset ) {
- K12_DBG(1,("get_record: SHORT READ OR ERROR, read=%d expected=%d",last_read, junky_offset));
- *err = file_error(fh, err_info);
- if (*err == 0) {
- *err = WTAP_ERR_SHORT_READ;
- }
+ /*
+ * The next 16-byte blob is part of this record.
+ * Read up to the blob.
+ */
+ if ( !wtap_read_bytes( fh, writep, junky_offset, err, err_info ) )
return -1;
- }
-
- writep += last_read;
- bytes_read += last_read = file_read(junk, 0x10, fh);
+ total_read += junky_offset;
+ writep += junky_offset;
- if ( last_read != 0x10 ) {
- K12_DBG(1,("get_record: SHORT READ OR ERROR"));
- *err = file_error(fh, err_info);
- if (*err == 0) {
- *err = WTAP_ERR_SHORT_READ;
- }
+ /*
+ * Skip the blob.
+ */
+ if ( !file_skip( fh, K12_FILE_BLOB_LEN, err ) )
return -1;
- }
+ total_read += K12_FILE_BLOB_LEN;
left -= junky_offset;
- junky_offset = 0x2000;
+ junky_offset = 8192;
}
} while(left);
K12_HEX_ASCII_DUMP(5,file_offset, "GOT record", buffer, actual_len);
- return bytes_read;
+ return total_read;
+}
+
+static gboolean
+memiszero(const void *ptr, size_t count)
+{
+ const guint8 *p = (const guint8 *)ptr;
+
+ while (count != 0) {
+ if (*p != 0)
+ return FALSE;
+ p++;
+ count--;
+ }
+ return TRUE;
}
static void
guint32 src_id;
k12_src_desc_t* src_desc;
+ phdr->rec_type = REC_TYPE_PACKET;
phdr->presence_flags = WTAP_HAS_TS;
ts = pntoh64(buffer + K12_PACKET_TIMESTAMP);
type = pntoh32(buffer + K12_RECORD_TYPE);
buffer_offset = (type == K12_REC_D0020) ? K12_PACKET_FRAME_D0020 : K12_PACKET_FRAME;
- buffer_assure_space(target, length);
- memcpy(buffer_start_ptr(target), buffer + buffer_offset, length);
+ ws_buffer_assure_space(target, length);
+ memcpy(ws_buffer_start_ptr(target), buffer + buffer_offset, length);
/* extra information need by some protocols */
extra_len = len - buffer_offset - length;
- buffer_assure_space(&(k12->extra_info), extra_len);
- memcpy(buffer_start_ptr(&(k12->extra_info)),
+ ws_buffer_assure_space(&(k12->extra_info), extra_len);
+ memcpy(ws_buffer_start_ptr(&(k12->extra_info)),
buffer + buffer_offset + length, extra_len);
- phdr->pseudo_header.k12.extra_info = (guint8*)buffer_start_ptr(&(k12->extra_info));
+ phdr->pseudo_header.k12.extra_info = (guint8*)ws_buffer_start_ptr(&(k12->extra_info));
phdr->pseudo_header.k12.extra_length = extra_len;
src_id = pntoh32(buffer + K12_RECORD_SRC_ID);
phdr->pseudo_header.k12.stuff = k12;
}
-static gboolean k12_read(wftap *wfth, int *err, gchar **err_info, gint64 *data_offset) {
- k12_t *k12 = (k12_t *)wfth->priv;
- wtap* wth = (wtap*)wfth->tap_specific_data;
+static gboolean k12_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) {
+ k12_t *k12 = (k12_t *)wth->priv;
k12_src_desc_t* src_desc;
guint8* buffer;
gint64 offset;
guint32 type;
guint32 src_id;
- offset = file_tell(wfth->fh);
+ offset = file_tell(wth->fh);
/* ignore the record if it isn't a packet */
do {
+ if ( k12->num_of_records == 0 ) {
+ /* No more records */
+ *err = 0;
+ return FALSE;
+ }
+
K12_DBG(5,("k12_read: offset=%i",offset));
*data_offset = offset;
- len = get_record(k12, wfth->fh, offset, FALSE, err, err_info);
+ len = get_record(k12, wth->fh, offset, FALSE, err, err_info);
if (len < 0) {
/* read error */
return FALSE;
} else if (len == 0) {
/* EOF */
- *err = 0;
+ *err = WTAP_ERR_SHORT_READ;
return FALSE;
} else if (len < K12_RECORD_SRC_ID + 4) {
/* Record not large enough to contain a src ID */
*err_info = g_strdup_printf("data record length %d too short", len);
return FALSE;
}
+ k12->num_of_records--;
buffer = k12->seq_read_buff;
} while ( ((type & K12_MASK_PACKET) != K12_REC_PACKET && (type & K12_MASK_PACKET) != K12_REC_D0020) || !src_id || !src_desc );
- process_packet_data(&wth->phdr, wfth->frame_buffer, buffer, len, k12);
+ process_packet_data(&wth->phdr, wth->frame_buffer, buffer, len, k12);
return TRUE;
}
-static gboolean k12_seek_read(wftap *wfth, gint64 seek_off, void* header, Buffer *buf, int *err, gchar **err_info) {
- struct wtap_pkthdr *phdr = (struct wtap_pkthdr *)header;
- k12_t *k12 = (k12_t *)wfth->priv;
+static gboolean k12_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info) {
+ k12_t *k12 = (k12_t *)wth->priv;
guint8* buffer;
gint len;
K12_DBG(5,("k12_seek_read: ENTER"));
- if ( file_seek(wfth->random_fh, seek_off, SEEK_SET, err) == -1) {
+ if ( file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1) {
K12_DBG(5,("k12_seek_read: SEEK ERROR"));
return FALSE;
}
- len = get_record(k12, wfth->random_fh, seek_off, TRUE, err, err_info);
+ len = get_record(k12, wth->random_fh, seek_off, TRUE, err, err_info);
if (len < 0) {
K12_DBG(5,("k12_seek_read: READ ERROR"));
return FALSE;
fd->rand_read_buff = NULL;
fd->rand_read_buff_len = 0;
- buffer_init(&(fd->extra_info), 100);
+ ws_buffer_init(&(fd->extra_info), 100);
return fd;
}
g_hash_table_destroy(fd->src_by_id);
g_hash_table_foreach_remove(fd->src_by_name,destroy_srcdsc,NULL);
g_hash_table_destroy(fd->src_by_name);
- buffer_free(&(fd->extra_info));
+ ws_buffer_free(&(fd->extra_info));
g_free(fd->seq_read_buff);
g_free(fd->rand_read_buff);
g_free(fd);
}
-static void k12_close(wftap *wfth) {
- k12_t *k12 = (k12_t *)wfth->priv;
+static void k12_close(wtap *wth) {
+ k12_t *k12 = (k12_t *)wth->priv;
destroy_k12_file_data(k12);
- wfth->priv = NULL; /* destroy_k12_file_data freed it */
+ wth->priv = NULL; /* destroy_k12_file_data freed it */
#ifdef DEBUG_K12
K12_DBG(5,("k12_close: CLOSED"));
if (env_file) fclose(dbg_out);
}
-int k12_open(wftap *wfth, int *err, gchar **err_info) {
+wtap_open_return_val k12_open(wtap *wth, int *err, gchar **err_info) {
k12_src_desc_t* rec;
- guint8 header_buffer[0x200];
+ guint8 header_buffer[K12_FILE_HDR_LEN];
guint8* read_buffer;
guint32 type;
long offset;
long len;
+ guint port_type;
guint32 rec_len;
- guint32 extra_len;
+ guint32 hwpart_len;
guint32 name_len;
guint32 stack_len;
guint i;
gchar* env_level = getenv("K12_DEBUG_LEVEL");
env_file = getenv("K12_DEBUG_FILENAME");
if ( env_file ) {
- dbg_out = ws_fopen(env_file,"w");
- if (dbg_out == NULL) {
- dbg_out = stderr;
- K12_DBG(1,("unable to open K12 DEBUG FILENAME for writing! Logging to standard error"));
- }
+ dbg_out = ws_fopen(env_file,"w");
+ if (dbg_out == NULL) {
+ dbg_out = stderr;
+ K12_DBG(1,("unable to open K12 DEBUG FILENAME for writing! Logging to standard error"));
+ }
}
else
- dbg_out = stderr;
+ dbg_out = stderr;
if ( env_level ) debug_level = (unsigned int)strtoul(env_level,NULL,10);
K12_DBG(1,("k12_open: ENTER debug_level=%u",debug_level));
#endif
- if ( file_read(header_buffer,0x200,wfth->fh) != 0x200 ) {
+ if ( !wtap_read_bytes(wth->fh,header_buffer,K12_FILE_HDR_LEN,err,err_info) ) {
K12_DBG(1,("k12_open: FILE HEADER TOO SHORT OR READ ERROR"));
- *err = file_error(wfth->fh, err_info);
- if (*err != 0 && *err != WTAP_ERR_SHORT_READ) {
- return -1;
- }
- return 0;
- } else {
- if ( memcmp(header_buffer,k12_file_magic,8) != 0 ) {
- K12_DBG(1,("k12_open: BAD MAGIC"));
- return 0;
+ if (*err != WTAP_ERR_SHORT_READ) {
+ return WTAP_OPEN_ERROR;
}
+ return WTAP_OPEN_NOT_MINE;
}
- offset = 0x200;
+ if ( memcmp(header_buffer,k12_file_magic,8) != 0 ) {
+ K12_DBG(1,("k12_open: BAD MAGIC"));
+ return WTAP_OPEN_NOT_MINE;
+ }
+
+ offset = K12_FILE_HDR_LEN;
file_data = new_k12_file_data();
file_data->file_len = pntoh32( header_buffer + 0x8);
- file_data->num_of_records = pntoh32( header_buffer + 0xC );
+ if (memiszero(header_buffer + 0x10, K12_FILE_HDR_LEN - 0x10)) {
+ /*
+ * The rest of the file header is all zeroes. That means
+ * this is a file written by the old Wireshark code, and
+ * a count of records in the file is at an offset of 0x0C.
+ */
+ file_data->num_of_records = pntoh32( header_buffer + 0x0C );
+ } else {
+ /*
+ * There's at least one non-zero byte in the rest of the
+ * header. The value 8192 is at 0xC (page size?), and
+ * what appears to be the number of records in the file
+ * is at an offset of 0x24 and at an offset of 0x2c.
+ *
+ * If the two values are not the same, we fail; if that's
+ * the case, we need to see the file to figure out which
+ * of those two values, if any, is the count.
+ */
+ file_data->num_of_records = pntoh32( header_buffer + K12_FILE_HDR_RECORD_COUNT_1 );
+ if ( file_data->num_of_records != pntoh32( header_buffer + K12_FILE_HDR_RECORD_COUNT_2 ) ) {
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup_printf("k12: two different record counts, %u at 0x%02x and %u at 0x%02x",
+ file_data->num_of_records,
+ K12_FILE_HDR_RECORD_COUNT_1,
+ pntoh32( header_buffer + K12_FILE_HDR_RECORD_COUNT_2 ),
+ K12_FILE_HDR_RECORD_COUNT_2 );
+ return WTAP_OPEN_ERROR;
+ }
+ }
K12_DBG(5,("k12_open: FILE_HEADER OK: offset=%x file_len=%i records=%i",
offset,
file_data->num_of_records ));
do {
+ if ( file_data->num_of_records == 0 ) {
+ *err = WTAP_ERR_SHORT_READ;
+ destroy_k12_file_data(file_data);
+ return WTAP_OPEN_ERROR;
+ }
- len = get_record(file_data, wfth->fh, offset, FALSE, err, err_info);
+ len = get_record(file_data, wth->fh, offset, FALSE, err, err_info);
if ( len < 0 ) {
K12_DBG(1,("k12_open: BAD HEADER RECORD",len));
destroy_k12_file_data(file_data);
- return -1;
- }
- if (len == 0) {
- K12_DBG(1,("k12_open: BAD HEADER RECORD",len));
- *err = WTAP_ERR_SHORT_READ;
- destroy_k12_file_data(file_data);
- return -1;
+ return WTAP_OPEN_ERROR;
}
-
- if (len == 0) {
+ if ( len == 0 ) {
K12_DBG(1,("k12_open: BAD HEADER RECORD",len));
*err = WTAP_ERR_SHORT_READ;
destroy_k12_file_data(file_data);
- return -1;
+ return WTAP_OPEN_ERROR;
}
read_buffer = file_data->seq_read_buff;
*err = WTAP_ERR_BAD_FILE;
*err_info = g_strdup_printf("k12_open: record length %u < %u",
rec_len, K12_RECORD_TYPE + 4);
- return -1;
+ return WTAP_OPEN_ERROR;
}
type = pntoh32( read_buffer + K12_RECORD_TYPE );
/*
* we are at the first packet record, rewind and leave.
*/
- if (file_seek(wfth->fh, offset, SEEK_SET, err) == -1) {
+ if (file_seek(wth->fh, offset, SEEK_SET, err) == -1) {
destroy_k12_file_data(file_data);
- return -1;
+ return WTAP_OPEN_ERROR;
}
K12_DBG(5,("k12_open: FIRST PACKET offset=%x",offset));
break;
- } else if (type == K12_REC_SRCDSC || type == K12_REC_SRCDSC2 ) {
+ }
+
+ switch (type) {
+
+ case K12_REC_SRCDSC:
+ case K12_REC_SRCDSC2:
rec = g_new0(k12_src_desc_t,1);
- if (rec_len < K12_SRCDESC_STACKLEN + 2) {
- /* Record isn't long enough to have a stack length field */
+ if (rec_len < K12_SRCDESC_HWPART) {
+ /*
+ * Record isn't long enough to have the fixed-length portion
+ * of the source descriptor field.
+ */
*err = WTAP_ERR_BAD_FILE;
*err_info = g_strdup_printf("k12_open: source descriptor record length %u < %u",
- rec_len, K12_SRCDESC_STACKLEN + 2);
- return -1;
+ rec_len, K12_SRCDESC_HWPART);
+ destroy_k12_file_data(file_data);
+ g_free(rec);
+ return WTAP_OPEN_ERROR;
}
- extra_len = pntoh16( read_buffer + K12_SRCDESC_EXTRALEN );
+ port_type = read_buffer[K12_SRCDESC_PORT_TYPE];
+ hwpart_len = pntoh16( read_buffer + K12_SRCDESC_HWPARTLEN );
name_len = pntoh16( read_buffer + K12_SRCDESC_NAMELEN );
stack_len = pntoh16( read_buffer + K12_SRCDESC_STACKLEN );
K12_DBG(5,("k12_open: INTERFACE RECORD offset=%x interface=%x",offset,rec->input));
- if (name_len == 0 || stack_len == 0
- || 0x20 + extra_len + name_len + stack_len > rec_len ) {
+ if (name_len == 0) {
+ K12_DBG(5,("k12_open: failed (name_len == 0 in source description"));
+ destroy_k12_file_data(file_data);
g_free(rec);
- K12_DBG(5,("k12_open: failed (name_len == 0 || stack_len == 0 "
- "|| 0x20 + extra_len + name_len + stack_len > rec_len) extra_len=%i name_len=%i stack_len=%i"));
+ return WTAP_OPEN_NOT_MINE;
+ }
+ if (stack_len == 0) {
+ K12_DBG(5,("k12_open: failed (stack_len == 0 in source description"));
+ destroy_k12_file_data(file_data);
+ g_free(rec);
+ return WTAP_OPEN_NOT_MINE;
+ }
+ if (rec_len < K12_SRCDESC_HWPART + hwpart_len + name_len + stack_len) {
+ /*
+ * Record isn't long enough to have the full source descriptor
+ * field, including the variable-length parts.
+ */
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup_printf("k12_open: source descriptor record length %u < %u (%u + %u + %u + %u)",
+ rec_len,
+ K12_SRCDESC_HWPART + hwpart_len + name_len + stack_len,
+ K12_SRCDESC_HWPART, hwpart_len, name_len, stack_len);
destroy_k12_file_data(file_data);
- return 0;
+ g_free(rec);
+ return WTAP_OPEN_ERROR;
}
- if (extra_len) {
- if (rec_len < K12_SRCDESC_EXTRATYPE + 4) {
- /* Record isn't long enough to have a source descriptor extra type field */
+ if (hwpart_len) {
+ if (hwpart_len < 4) {
+ /* Hardware part isn't long enough to have a type field */
*err = WTAP_ERR_BAD_FILE;
- *err_info = g_strdup_printf("k12_open: source descriptor record length %u < %u",
- rec_len, K12_SRCDESC_EXTRATYPE + 4);
- return -1;
+ *err_info = g_strdup_printf("k12_open: source descriptor hardware part length %u < 4",
+ hwpart_len);
+ destroy_k12_file_data(file_data);
+ g_free(rec);
+ return WTAP_OPEN_ERROR;
}
- switch(( rec->input_type = pntoh32( read_buffer + K12_SRCDESC_EXTRATYPE ) )) {
+ switch(( rec->input_type = pntoh32( read_buffer + K12_SRCDESC_HWPART + K12_SRCDESC_HWPARTTYPE ) )) {
case K12_PORT_DS0S:
- if (rec_len < K12_SRCDESC_DS0_MASK + 32) {
- /* Record isn't long enough to have a source descriptor extra type field */
- *err = WTAP_ERR_BAD_FILE;
- *err_info = g_strdup_printf("k12_open: source descriptor record length %u < %u",
- rec_len, K12_SRCDESC_DS0_MASK + 12);
- return -1;
- }
-
+ /* This appears to be variable-length */
rec->input_info.ds0mask = 0x00000000;
-
- for (i = 0; i < 32; i++) {
- rec->input_info.ds0mask |= ( *(read_buffer + K12_SRCDESC_DS0_MASK + i) == 0xff ) ? 0x1<<(31-i) : 0x0;
+ if (hwpart_len > K12_SRCDESC_DS0_MASK) {
+ for (i = 0; i < hwpart_len - K12_SRCDESC_DS0_MASK; i++) {
+ rec->input_info.ds0mask |= ( *(read_buffer + K12_SRCDESC_HWPART + K12_SRCDESC_DS0_MASK + i) == 0xff ) ? 1U<<(31-i) : 0x0;
+ }
}
-
break;
case K12_PORT_ATMPVC:
- if (rec_len < K12_SRCDESC_ATM_VCI + 2) {
- /* Record isn't long enough to have a source descriptor extra type field */
+ if (hwpart_len < K12_SRCDESC_ATM_VCI + 2) {
+ /* Hardware part isn't long enough to have ATM information */
*err = WTAP_ERR_BAD_FILE;
- *err_info = g_strdup_printf("k12_open: source descriptor record length %u < %u",
- rec_len, K12_SRCDESC_DS0_MASK + 12);
- return -1;
+ *err_info = g_strdup_printf("k12_open: source descriptor hardware part length %u < %u",
+ hwpart_len,
+ K12_SRCDESC_ATM_VCI + 2);
+ destroy_k12_file_data(file_data);
+ g_free(rec);
+ return WTAP_OPEN_ERROR;
}
- rec->input_info.atm.vp = pntoh16( read_buffer + K12_SRCDESC_ATM_VPI );
- rec->input_info.atm.vc = pntoh16( read_buffer + K12_SRCDESC_ATM_VCI );
+ rec->input_info.atm.vp = pntoh16( read_buffer + K12_SRCDESC_HWPART + K12_SRCDESC_ATM_VPI );
+ rec->input_info.atm.vc = pntoh16( read_buffer + K12_SRCDESC_HWPART + K12_SRCDESC_ATM_VCI );
break;
default:
break;
}
} else {
- /* Record viewer generated files don't have this information */
- if (rec_len < K12_SRCDESC_PORT_TYPE + 1) {
- /* Record isn't long enough to have a source descriptor extra type field */
- *err = WTAP_ERR_BAD_FILE;
- *err_info = g_strdup_printf("k12_open: source descriptor record length %u < %u",
- rec_len, K12_SRCDESC_DS0_MASK + 12);
- return -1;
- }
- if (read_buffer[K12_SRCDESC_PORT_TYPE] >= 0x14
- && read_buffer[K12_SRCDESC_PORT_TYPE] <= 0x17) {
+ /* Record viewer generated files don't have this information */
+ if (port_type >= 0x14
+ && port_type <= 0x17) {
/* For ATM2_E1DS1, ATM2_E3DS3,
ATM2_STM1EL and ATM2_STM1OP */
rec->input_type = K12_PORT_ATMPVC;
}
}
- /* XXX - this is assumed, in a number of places (not just in the
- ascii_strdown_inplace() call below) to be null-terminated;
- is that guaranteed (even with a corrupt file)?
- Obviously not, as a corrupt file could contain anything
- here; the Tektronix document says the strings "must end
- with \0", but a bad file could fail to add the \0. */
- if (rec_len < K12_SRCDESC_EXTRATYPE + extra_len + name_len + stack_len) {
- /* Record isn't long enough to have a source descriptor extra type field */
+ if (read_buffer[K12_SRCDESC_HWPART + hwpart_len + name_len - 1] != '\0') {
*err = WTAP_ERR_BAD_FILE;
- *err_info = g_strdup_printf("k12_open: source descriptor record length %u < %u",
- rec_len, K12_SRCDESC_EXTRATYPE + extra_len + name_len + stack_len);
- return -1;
+ *err_info = g_strdup("k12_open: source descriptor record contains non-null-terminated link-layer name");
+ destroy_k12_file_data(file_data);
+ g_free(rec);
+ return WTAP_OPEN_ERROR;
+ }
+ if (read_buffer[K12_SRCDESC_HWPART + hwpart_len + name_len + stack_len - 1] != '\0') {
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup("k12_open: source descriptor record contains non-null-terminated stack path");
+ destroy_k12_file_data(file_data);
+ g_free(rec);
+ return WTAP_OPEN_ERROR;
}
- rec->input_name = (gchar *)g_memdup(read_buffer + K12_SRCDESC_EXTRATYPE + extra_len, name_len);
- rec->stack_file = (gchar *)g_memdup(read_buffer + K12_SRCDESC_EXTRATYPE + extra_len + name_len, stack_len);
+ rec->input_name = (gchar *)g_memdup(read_buffer + K12_SRCDESC_HWPART + hwpart_len, name_len);
+ rec->stack_file = (gchar *)g_memdup(read_buffer + K12_SRCDESC_HWPART + hwpart_len + name_len, stack_len);
ascii_strdown_inplace (rec->stack_file);
g_hash_table_insert(file_data->src_by_id,GUINT_TO_POINTER(rec->input),rec);
g_hash_table_insert(file_data->src_by_name,rec->stack_file,rec);
+ break;
- offset += len;
- continue;
- } else if (type == K12_REC_STK_FILE) {
+ case K12_REC_STK_FILE:
K12_DBG(1,("k12_open: K12_REC_STK_FILE"));
K12_DBG(1,("Field 1: 0x%08x",pntoh32( read_buffer + 0x08 )));
K12_DBG(1,("Field 2: 0x%08x",pntoh32( read_buffer + 0x0c )));
- K12_ASCII_DUMP(1, read_buffer, rec_len, 0x10);
+ K12_ASCII_DUMP(1, read_buffer, rec_len, 16);
+ break;
- offset += len;
- continue;
- } else {
+ default:
K12_DBG(1,("k12_open: RECORD TYPE 0x%08x",type));
- offset += len;
- continue;
+ break;
}
+ offset += len;
+ file_data->num_of_records--;
} while(1);
- wfth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_K12;
- wfth->file_encap = WTAP_ENCAP_K12;
- wfth->snapshot_length = 0;
- wfth->subtype_read = k12_read;
- wfth->subtype_seek_read = k12_seek_read;
- wfth->subtype_close = k12_close;
- wfth->priv = (void *)file_data;
- wfth->tsprecision = WTAP_FILE_TSPREC_NSEC;
+ wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_K12;
+ wth->file_encap = WTAP_ENCAP_K12;
+ wth->snapshot_length = 0;
+ wth->subtype_read = k12_read;
+ wth->subtype_seek_read = k12_seek_read;
+ wth->subtype_close = k12_close;
+ wth->priv = (void *)file_data;
+ wth->file_tsprec = WTAP_TSPREC_NSEC;
- return 1;
+ return WTAP_OPEN_MINE;
}
typedef struct {
- guint32 file_len;
- guint32 num_of_records;
- guint32 file_offset;
+ guint32 file_len;
+ guint32 num_of_records;
+ guint32 file_offset;
} k12_dump_t;
int k12_dump_can_write_encap(int encap) {
return WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED;
if (encap != WTAP_ENCAP_K12)
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
return 0;
}
static const gchar dumpy_junk[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
-static gboolean k12_dump_record(wftap_dumper *wdh, guint32 len, guint8* buffer, int *err_p) {
+static gboolean k12_dump_record(wtap_dumper *wdh, guint32 len, guint8* buffer, int *err_p) {
k12_dump_t *k12 = (k12_dump_t *)wdh->priv;
- guint32 junky_offset = (0x2000 - ( (k12->file_offset - 0x200) % 0x2000 )) % 0x2000;
+ guint32 junky_offset = (8192 - ( (k12->file_offset - K12_FILE_HDR_LEN) % 8192 )) % 8192;
if (len > junky_offset) {
if (junky_offset) {
- if (! wftap_dump_file_write(wdh, buffer, junky_offset, err_p))
+ if (! wtap_dump_file_write(wdh, buffer, junky_offset, err_p))
return FALSE;
}
- if (! wftap_dump_file_write(wdh, dumpy_junk, 0x10, err_p))
+ if (! wtap_dump_file_write(wdh, dumpy_junk, K12_FILE_BLOB_LEN, err_p))
return FALSE;
- if (! wftap_dump_file_write(wdh, buffer+junky_offset, len - junky_offset, err_p))
+ if (! wtap_dump_file_write(wdh, buffer+junky_offset, len - junky_offset, err_p))
return FALSE;
- k12->file_offset += len + 0x10;
+ k12->file_offset += len + K12_FILE_BLOB_LEN;
+ k12->file_len += len + K12_FILE_BLOB_LEN;
} else {
- if (! wftap_dump_file_write(wdh, buffer, len, err_p))
+ if (! wtap_dump_file_write(wdh, buffer, len, err_p))
return FALSE;
k12->file_offset += len;
+ k12->file_len += len;
}
k12->num_of_records++;
static void k12_dump_src_setting(gpointer k _U_, gpointer v, gpointer p) {
k12_src_desc_t* src_desc = (k12_src_desc_t*)v;
- wftap_dumper *wdh = (wftap_dumper *)p;
+ wtap_dumper *wdh = (wtap_dumper *)p;
guint32 len;
guint offset;
guint i;
int errxxx; /* dummy */
union {
- guint8 buffer[0x2000];
+ guint8 buffer[8192];
struct {
guint32 len;
guint32 unk32_3;
guint32 unk32_4;
guint16 unk16_1;
- guint16 extra_len;
+ guint16 hwpart_len;
guint16 name_len;
guint16 stack_len;
} ds0mask;
struct {
- guint8 unk_data[0x10];
+ guint8 unk_data[16];
guint16 vp;
guint16 vc;
} atm;
switch (src_desc->input_type) {
case K12_PORT_ATMPVC:
- obj.record.extra_len = g_htons(0x18);
+ obj.record.hwpart_len = g_htons(0x18);
obj.record.extra.desc.atm.vp = g_htons(src_desc->input_info.atm.vp);
obj.record.extra.desc.atm.vc = g_htons(src_desc->input_info.atm.vc);
offset = 0x3c;
break;
case K12_PORT_DS0S:
- obj.record.extra_len = g_htons(0x18);
+ obj.record.hwpart_len = g_htons(0x18);
for( i=0; i<32; i++ ) {
obj.record.extra.desc.ds0mask.mask[i] =
(src_desc->input_info.ds0mask & (1 << i)) ? 0xff : 0x00;
offset = 0x3c;
break;
default:
- obj.record.extra_len = g_htons(0x08);
+ obj.record.hwpart_len = g_htons(0x08);
offset = 0x2c;
break;
}
k12_dump_record(wdh,len,obj.buffer, &errxxx); /* fwrite errs ignored: see k12_dump below */
}
-static gboolean k12_dump(wftap_dumper *wdh, const struct wtap_pkthdr *phdr,
- const guint8 *pd, int *err) {
+static gboolean k12_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
+ const guint8 *pd, int *err, gchar **err_info _U_) {
const union wtap_pseudo_header *pseudo_header = &phdr->pseudo_header;
k12_dump_t *k12 = (k12_dump_t *)wdh->priv;
guint32 len;
union {
- guint8 buffer[0x2000];
+ guint8 buffer[8192];
struct {
guint32 len;
guint32 type;
} record;
} obj;
+ /* We can only write packet records. */
+ if (phdr->rec_type != REC_TYPE_PACKET) {
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
+ return FALSE;
+ }
+
if (k12->num_of_records == 0) {
k12_t* file_data = (k12_t*)pseudo_header->k12.stuff;
/* XXX: We'll assume that any fwrite errors in k12_dump_src_setting will */
static const guint8 k12_eof[] = {0xff,0xff};
-static gboolean k12_dump_close(wftap_dumper *wdh, int *err) {
+static gboolean k12_dump_finish(wtap_dumper *wdh, int *err) {
k12_dump_t *k12 = (k12_dump_t *)wdh->priv;
union {
guint8 b[sizeof(guint32)];
guint32 u;
} d;
- if (! wftap_dump_file_write(wdh, k12_eof, 2, err))
+ if (! wtap_dump_file_write(wdh, k12_eof, 2, err))
return FALSE;
+ k12->file_len += 2;
- if (wftap_dump_file_seek(wdh, 8, SEEK_SET, err) == -1)
+ if (wtap_dump_file_seek(wdh, K12_FILE_HDR_FILE_SIZE, SEEK_SET, err) == -1)
return FALSE;
d.u = g_htonl(k12->file_len);
- if (! wftap_dump_file_write(wdh, d.b, 4, err))
+ if (! wtap_dump_file_write(wdh, d.b, 4, err))
+ return FALSE;
+
+ if (wtap_dump_file_seek(wdh, K12_FILE_HDR_PAGE_SIZE, SEEK_SET, err) == -1)
+ return FALSE;
+
+ d.u = g_htonl(8192);
+
+ if (! wtap_dump_file_write(wdh, d.b, 4, err))
+ return FALSE;
+
+ if (wtap_dump_file_seek(wdh, K12_FILE_HDR_RECORD_COUNT_1, SEEK_SET, err) == -1)
return FALSE;
d.u = g_htonl(k12->num_of_records);
- if (! wftap_dump_file_write(wdh, d.b, 4, err))
+ if (! wtap_dump_file_write(wdh, d.b, 4, err))
+ return FALSE;
+
+ if (wtap_dump_file_seek(wdh, K12_FILE_HDR_RECORD_COUNT_2, SEEK_SET, err) == -1)
+ return FALSE;
+
+ d.u = g_htonl(k12->num_of_records);
+
+ if (! wtap_dump_file_write(wdh, d.b, 4, err))
return FALSE;
return TRUE;
}
-gboolean k12_dump_open(wftap_dumper *wdh, int *err) {
+gboolean k12_dump_open(wtap_dumper *wdh, int *err) {
k12_dump_t *k12;
- if ( ! wftap_dump_file_write(wdh, k12_file_magic, 8, err)) {
+ if ( ! wtap_dump_file_write(wdh, k12_file_magic, 8, err)) {
return FALSE;
}
- if (wftap_dump_file_seek(wdh, 0x200, SEEK_SET, err) == -1)
+ if (wtap_dump_file_seek(wdh, K12_FILE_HDR_LEN, SEEK_SET, err) == -1)
return FALSE;
wdh->subtype_write = k12_dump;
- wdh->subtype_close = k12_dump_close;
+ wdh->subtype_finish = k12_dump_finish;
k12 = (k12_dump_t *)g_malloc(sizeof(k12_dump_t));
wdh->priv = (void *)k12;
- k12->file_len = 0x200;
+ k12->file_len = K12_FILE_HDR_LEN;
k12->num_of_records = 0;
- k12->file_offset = 0x200;
+ k12->file_offset = K12_FILE_HDR_LEN;
return TRUE;
}
-
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
git.samba.org / metze / wireshark / wip.git / blobdiff