/* lanalyzer.c
- *
- * $Id: lanalyzer.c,v 1.35 2002/07/16 07:15:08 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <stdlib.h>
#include <errno.h>
#include "wtap-int.h"
#include "file_wrappers.h"
-#include "buffer.h"
#include "lanalyzer.h"
+#include "pcapng.h"
/* The LANalyzer format is documented (at least in part) in Novell document
TID022037, which can be found at, among other places:
- http://secinf.net/info/nw/lan/trace.txt
+ http://www.windowsecurity.com/whitepapers/Description_of_the_LANalysers_output_file.html
*/
+/* Record header format */
+
+typedef struct {
+ guint8 record_type[2];
+ guint8 record_length[2];
+} LA_RecordHeader;
+
+#define LA_RecordHeaderSize 4
+
+/* Record type codes: */
+
+#define RT_HeaderRegular 0x1001
+#define RT_HeaderCyclic 0x1007
+#define RT_RxChannelName 0x1006
+#define RT_TxChannelName 0x100b
+#define RT_FilterName 0x1032
+#define RT_RxTemplateName 0x1035
+#define RT_TxTemplateName 0x1036
+#define RT_DisplayOptions 0x100a
+#define RT_Summary 0x1002
+#define RT_SubfileSummary 0x1003
+#define RT_CyclicInformation 0x1009
+#define RT_Index 0x1004
+#define RT_PacketData 0x1005
+
+#define LA_ProFileLimit (1024 * 1024 * 32)
+
+typedef guint8 Eadr[6];
+typedef guint16 TimeStamp[3]; /* 0.5 microseconds since start of trace */
+
+/*
+ * These records have only 2-byte alignment for 4-byte quantities,
+ * so the structures aren't necessarily valid; they're kept as comments
+ * for reference purposes.
+ */
+
+/*
+ * typedef struct {
+ * guint8 day;
+ * guint8 mon;
+ * gint16 year;
+ * } Date;
+ */
+
+/*
+ * typedef struct {
+ * guint8 second;
+ * guint8 minute;
+ * guint8 hour;
+ * guint8 day;
+ * gint16 reserved;
+ * } Time;
+ */
+
+/*
+ * RT_Summary:
+ *
+ * typedef struct {
+ * Date datcre;
+ * Date datclo;
+ * Time timeopn;
+ * Time timeclo;
+ * Eadr statadr;
+ * gint16 mxseqno;
+ * gint16 slcoff;
+ * gint16 mxslc;
+ * gint32 totpktt;
+ * gint32 statrg;
+ * gint32 stptrg;
+ * gint32 mxpkta[36];
+ * gint16 board_type;
+ * gint16 board_version;
+ * gint8 reserved[18];
+ * } Summary;
+ */
+
+#define SummarySize (18+22+(4*36)+6+6+6+4+4)
+
+/*
+ * typedef struct {
+ * gint16 rid;
+ * gint16 rlen;
+ * Summary s;
+ * } LA_SummaryRecord;
+ */
+
+#define LA_SummaryRecordSize (SummarySize + 4)
+
/* LANalyzer board types (which indicate the type of network on which
the capture was done). */
-#define BOARD_325 226 /* LANalyzer 325 (Ethernet) */
-#define BOARD_325TR 227 /* LANalyzer 325TR (Token-ring) */
+#define BOARD_325 226 /* LANalyzer 325 (Ethernet) */
+#define BOARD_325TR 227 /* LANalyzer 325TR (Token-ring) */
+
+
+/*
+ * typedef struct {
+ * gint16 rid;
+ * gint16 rlen;
+ * gint16 seqno;
+ * gint32 totpktf;
+ * } LA_SubfileSummaryRecord;
+ */
+
+#define LA_SubfileSummaryRecordSize 10
+
+
+#define LA_IndexSize 500
+
+/*
+ * typedef struct {
+ * gint16 rid;
+ * gint16 rlen;
+ * gint16 idxsp; = LA_IndexSize
+ * gint16 idxct;
+ * gint8 idxgranu;
+ * gint8 idxvd;
+ * gint32 trcidx[LA_IndexSize + 2]; +2 undocumented but used by La 2.2
+ * } LA_IndexRecord;
+ */
+
+#define LA_IndexRecordSize (10 + 4 * (LA_IndexSize + 2))
+
+
+/*
+ * typedef struct {
+ * guint16 rx_channels;
+ * guint16 rx_errors;
+ * gint16 rx_frm_len;
+ * gint16 rx_frm_sln;
+ * TimeStamp rx_time;
+ * guint32 pktno;
+ * gint16 prvlen;
+ * gint16 offset;
+ * gint16 tx_errs;
+ * gint16 rx_filters;
+ * gint8 unused[2];
+ * gint16 hwcolls;
+ * gint16 hwcollschans;
+ * Packetdata ....;
+ * } LA_PacketRecord;
+ */
+
+#define LA_PacketRecordSize 32
+typedef struct {
+ gboolean init;
+ nstime_t start;
+ guint32 pkts;
+ int encap;
+ int lastlen;
+ } LA_TmpInfo;
-static const gint8 LA_HeaderRegularFake[] = {
+static const guint8 LA_HeaderRegularFake[] = {
0x01,0x10,0x4c,0x00,0x01,0x05,0x54,0x72,0x61,0x63,0x65,0x20,0x44,0x69,0x73,0x70,
0x6c,0x61,0x79,0x20,0x54,0x72,0x61,0x63,0x65,0x20,0x46,0x69,0x6c,0x65,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
};
-static const gint8 LA_RxChannelNameFake[] = {
+static const guint8 LA_RxChannelNameFake[] = {
0x06,0x10,0x80,0x00,0x43,0x68,0x61,0x6e ,0x6e,0x65,0x6c,0x31,0x00,0x43,0x68,0x61,
0x6e,0x6e,0x65,0x6c,0x32,0x00,0x43,0x68 ,0x61,0x6e,0x6e,0x65,0x6c,0x33,0x00,0x43,
0x68,0x61,0x6e,0x6e,0x65,0x6c,0x34,0x00 ,0x43,0x68,0x61,0x6e,0x6e,0x65,0x6c,0x35,
0x00,0x00,0x00,0x00
};
-static const gint8 LA_TxChannelNameFake[] = {
+static const guint8 LA_TxChannelNameFake[] = {
0x0b,0x10,0x36,0x00 ,0x54,0x72,0x61,0x6e,0x73,0x31,0x00,0x00,
0x00,0x54,0x72,0x61,0x6e,0x73,0x32,0x00 ,0x00,0x00,0x54,0x72,0x61,0x6e,0x73,0x33,
0x00,0x00,0x00,0x54,0x72,0x61,0x6e,0x73 ,0x34,0x00,0x00,0x00,0x54,0x72,0x61,0x6e,
0x73,0x35,0x00,0x00,0x00,0x54,0x72,0x61 ,0x6e,0x73,0x36,0x00,0x00,0x00
};
-static const gint8 LA_RxTemplateNameFake[] = {
+static const guint8 LA_RxTemplateNameFake[] = {
0x35,0x10,
0x90,0x00,0x00,0x00,0x00,0x00,0x00,0x00 ,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 ,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00
};
-static const gint8 LA_TxTemplateNameFake[] = {
+static const guint8 LA_TxTemplateNameFake[] = {
0x36,0x10,0x36,0x00,0x00,0x00 ,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 ,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 ,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 ,0x00,0x00,0x00,0x00
};
-static const gint8 LA_DisplayOptionsFake[] = {
+static const guint8 LA_DisplayOptionsFake[] = {
0x0a,0x10,0x0a,0x01,
0x00,0x00,0x01,0x00,0x01,0x02,0x00,0x00 ,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 ,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 ,0x00,0x00
};
-static const gint8 LA_CyclicInformationFake[] = {
+static const guint8 LA_CyclicInformationFake[] = {
0x09,0x10,0x1a,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 ,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
};
-static gboolean lanalyzer_read(wtap *wth, int *err, long *data_offset);
-static void lanalyzer_close(wtap *wth);
-static gboolean lanalyzer_dump_close(wtap_dumper *wdh, int *err);
+static const guint8 z64[64] = {
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+ };
+
+typedef struct {
+ time_t start;
+} lanalyzer_t;
-int lanalyzer_open(wtap *wth, int *err)
+static gboolean lanalyzer_read(wtap *wth, int *err, gchar **err_info,
+ gint64 *data_offset);
+static gboolean lanalyzer_seek_read(wtap *wth, gint64 seek_off,
+ struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info);
+static gboolean lanalyzer_dump_finish(wtap_dumper *wdh, int *err);
+
+wtap_open_return_val lanalyzer_open(wtap *wth, int *err, gchar **err_info)
{
- int bytes_read;
- char LE_record_type[2];
- char LE_record_length[2];
- char summary[210];
- guint16 board_type, mxslc;
- guint16 record_type, record_length;
- guint8 cr_day, cr_month, cr_year;
- struct tm tm;
-
- errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(LE_record_type, 1, 2, wth->fh);
- bytes_read += file_read(LE_record_length, 1, 2, wth->fh);
- if (bytes_read != 4) {
- *err = file_error(wth->fh);
- if (*err != 0)
- return -1;
- return 0;
- }
- wth->data_offset += 4;
- record_type = pletohs(LE_record_type);
- record_length = pletohs(LE_record_length); /* make sure to do this for while() loop */
-
- if (record_type != RT_HeaderRegular && record_type != RT_HeaderCyclic) {
- return 0;
- }
-
- /* If we made it this far, then the file is a LANAlyzer file.
- * Let's get some info from it. Note that we get wth->snapshot_length
- * from a record later in the file. */
- wth->file_type = WTAP_FILE_LANALYZER;
- wth->capture.lanalyzer = g_malloc(sizeof(lanalyzer_t));
- wth->subtype_read = lanalyzer_read;
- wth->subtype_seek_read = wtap_def_seek_read;
- wth->subtype_close = lanalyzer_close;
- wth->snapshot_length = 0;
-
- /* Read records until we find the start of packets */
- while (1) {
- if (file_seek(wth->fh, record_length, SEEK_CUR, err) == -1) {
- g_free(wth->capture.lanalyzer);
- return -1;
- }
- wth->data_offset += record_length;
- errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(LE_record_type, 1, 2, wth->fh);
- bytes_read += file_read(LE_record_length, 1, 2, wth->fh);
- if (bytes_read != 4) {
- *err = file_error(wth->fh);
- if (*err != 0) {
- g_free(wth->capture.lanalyzer);
- return -1;
- }
- g_free(wth->capture.lanalyzer);
- return 0;
- }
- wth->data_offset += 4;
-
- record_type = pletohs(LE_record_type);
- record_length = pletohs(LE_record_length);
-
- /*g_message("Record 0x%04X Length %d", record_type, record_length);*/
- switch (record_type) {
- /* Trace Summary Record */
- case RT_Summary:
- errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(summary, 1, sizeof summary,
- wth->fh);
- if (bytes_read != sizeof summary) {
- *err = file_error(wth->fh);
- if (*err != 0) {
- g_free(wth->capture.lanalyzer);
- return -1;
- }
- g_free(wth->capture.lanalyzer);
- return 0;
- }
- wth->data_offset += sizeof summary;
-
- /* Assume that the date of the creation of the trace file
- * is the same date of the trace. Lanalyzer doesn't
- * store the creation date/time of the trace, but only of
- * the file. Unless you traced at 11:55 PM and saved at 00:05
- * AM, the assumption that trace.date == file.date is true.
- */
- cr_day = summary[0];
- cr_month = summary[1];
- cr_year = pletohs(&summary[2]);
- /*g_message("Day %d Month %d Year %d (%04X)", cr_day, cr_month,
- cr_year, cr_year);*/
-
- /* Get capture start time. I learned how to do
- * this from Guy's code in ngsniffer.c
- */
- /* this strange year offset is not in the
- * lanalyzer file format documentation, but it
- * works. */
- tm.tm_year = cr_year - (1900 - 1792);
- tm.tm_mon = cr_month - 1;
- tm.tm_mday = cr_day;
- tm.tm_hour = 0;
- tm.tm_min = 0;
- tm.tm_sec = 0;
- tm.tm_isdst = -1;
- wth->capture.lanalyzer->start = mktime(&tm);
- /*g_message("Day %d Month %d Year %d", tm.tm_mday,
- tm.tm_mon, tm.tm_year);*/
- mxslc = pletohs(&summary[30]);
- wth->snapshot_length = mxslc;
-
- record_length = 0; /* to fake the next iteration of while() */
- board_type = pletohs(&summary[188]);
- switch (board_type) {
- case BOARD_325:
- wth->file_encap = WTAP_ENCAP_ETHERNET;
- break;
- case BOARD_325TR:
- wth->file_encap = WTAP_ENCAP_TOKEN_RING;
- break;
- default:
- g_message("lanalyzer: board type %u unknown",
- board_type);
- g_free(wth->capture.lanalyzer);
- *err = WTAP_ERR_UNSUPPORTED;
- return -1;
- }
- break;
-
- /* Trace Packet Data Record */
- case RT_PacketData:
- /* Go back header number ob ytes so that lanalyzer_read
- * can read this header */
- if (file_seek(wth->fh, -bytes_read, SEEK_CUR, err) == -1) {
- g_free(wth->capture.lanalyzer);
- return -1;
- }
- wth->data_offset -= bytes_read;
- return 1;
-
- default:
- ; /* no action */
- }
- }
+ LA_RecordHeader rec_header;
+ char header_fixed[2];
+ char *comment;
+ char summary[210];
+ guint16 board_type, mxslc;
+ guint16 record_type, record_length;
+ guint8 cr_day, cr_month;
+ guint16 cr_year;
+ struct tm tm;
+ lanalyzer_t *lanalyzer;
+
+ if (!wtap_read_bytes(wth->fh, &rec_header, LA_RecordHeaderSize,
+ err, err_info)) {
+ if (*err != WTAP_ERR_SHORT_READ)
+ return WTAP_OPEN_ERROR;
+ return WTAP_OPEN_NOT_MINE;
+ }
+ record_type = pletoh16(rec_header.record_type);
+ record_length = pletoh16(rec_header.record_length); /* make sure to do this for while() loop */
+
+ if (record_type != RT_HeaderRegular && record_type != RT_HeaderCyclic) {
+ return WTAP_OPEN_NOT_MINE;
+ }
+
+ /* Read the major and minor version numbers */
+ if (record_length < 2) {
+ /*
+ * Not enough room for the major and minor version numbers.
+ * Just treat that as a "not a LANalyzer file" indication.
+ */
+ return WTAP_OPEN_NOT_MINE;
+ }
+ if (!wtap_read_bytes(wth->fh, &header_fixed, sizeof header_fixed,
+ err, err_info)) {
+ if (*err != WTAP_ERR_SHORT_READ)
+ return WTAP_OPEN_ERROR;
+ return WTAP_OPEN_NOT_MINE;
+ }
+ record_length -= sizeof header_fixed;
+
+ if (record_length != 0) {
+ /* Read the rest of the record as a comment. */
+ comment = (char *)g_malloc(record_length + 1);
+ if (!wtap_read_bytes(wth->fh, comment, record_length,
+ err, err_info)) {
+ if (*err != WTAP_ERR_SHORT_READ) {
+ g_free(comment);
+ return WTAP_OPEN_ERROR;
+ }
+ g_free(comment);
+ return WTAP_OPEN_NOT_MINE;
+ }
+ wtap_optionblock_set_option_string(wth->shb_hdr, OPT_COMMENT, comment, record_length);
+ g_free(comment);
+ }
+
+ /* If we made it this far, then the file is a LANAlyzer file.
+ * Let's get some info from it. Note that we get wth->snapshot_length
+ * from a record later in the file. */
+ wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_LANALYZER;
+ lanalyzer = (lanalyzer_t *)g_malloc(sizeof(lanalyzer_t));
+ wth->priv = (void *)lanalyzer;
+ wth->subtype_read = lanalyzer_read;
+ wth->subtype_seek_read = lanalyzer_seek_read;
+ wth->snapshot_length = 0;
+ wth->file_tsprec = WTAP_TSPREC_NSEC;
+
+ /* Read records until we find the start of packets */
+ while (1) {
+ if (!wtap_read_bytes_or_eof(wth->fh, &rec_header,
+ LA_RecordHeaderSize, err, err_info)) {
+ if (*err == 0) {
+ /*
+ * End of file and no packets;
+ * accept this file.
+ */
+ return WTAP_OPEN_MINE;
+ }
+ return WTAP_OPEN_ERROR;
+ }
+
+ record_type = pletoh16(rec_header.record_type);
+ record_length = pletoh16(rec_header.record_length);
+
+ /*g_message("Record 0x%04X Length %d", record_type, record_length);*/
+ switch (record_type) {
+ /* Trace Summary Record */
+ case RT_Summary:
+ if (!wtap_read_bytes(wth->fh, summary,
+ sizeof summary, err, err_info))
+ return WTAP_OPEN_ERROR;
+
+ /* Assume that the date of the creation of the trace file
+ * is the same date of the trace. Lanalyzer doesn't
+ * store the creation date/time of the trace, but only of
+ * the file. Unless you traced at 11:55 PM and saved at 00:05
+ * AM, the assumption that trace.date == file.date is true.
+ */
+ cr_day = summary[0];
+ cr_month = summary[1];
+ cr_year = pletoh16(&summary[2]);
+ /*g_message("Day %d Month %d Year %d (%04X)", cr_day, cr_month,
+ cr_year, cr_year);*/
+
+ /* Get capture start time. I learned how to do
+ * this from Guy's code in ngsniffer.c
+ */
+ tm.tm_year = cr_year - 1900;
+ tm.tm_mon = cr_month - 1;
+ tm.tm_mday = cr_day;
+ tm.tm_hour = 0;
+ tm.tm_min = 0;
+ tm.tm_sec = 0;
+ tm.tm_isdst = -1;
+ lanalyzer->start = mktime(&tm);
+ /*g_message("Day %d Month %d Year %d", tm.tm_mday,
+ tm.tm_mon, tm.tm_year);*/
+ mxslc = pletoh16(&summary[30]);
+ wth->snapshot_length = mxslc;
+
+ board_type = pletoh16(&summary[188]);
+ switch (board_type) {
+ case BOARD_325:
+ wth->file_encap = WTAP_ENCAP_ETHERNET;
+ break;
+ case BOARD_325TR:
+ wth->file_encap = WTAP_ENCAP_TOKEN_RING;
+ break;
+ default:
+ *err = WTAP_ERR_UNSUPPORTED;
+ *err_info = g_strdup_printf("lanalyzer: board type %u unknown",
+ board_type);
+ return WTAP_OPEN_ERROR;
+ }
+ break;
+
+ /* Trace Packet Data Record */
+ case RT_PacketData:
+ /* Go back header number of bytes so that lanalyzer_read
+ * can read this header */
+ if (file_seek(wth->fh, -LA_RecordHeaderSize, SEEK_CUR, err) == -1) {
+ return WTAP_OPEN_ERROR;
+ }
+ return WTAP_OPEN_MINE;
+
+ default:
+ if (file_seek(wth->fh, record_length, SEEK_CUR, err) == -1) {
+ return WTAP_OPEN_ERROR;
+ }
+ break;
+ }
+ }
}
-#define DESCRIPTOR_LEN 32
+#define DESCRIPTOR_LEN 32
-/* Read the next packet */
-static gboolean lanalyzer_read(wtap *wth, int *err, long *data_offset)
+static gboolean lanalyzer_read_trace_record(wtap *wth, FILE_T fh,
+ struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info)
{
- int packet_size = 0;
- int bytes_read;
- char LE_record_type[2];
- char LE_record_length[2];
- guint16 record_type, record_length;
- gchar descriptor[DESCRIPTOR_LEN];
- guint16 time_low, time_med, time_high, true_size;
- double t;
-
- /* read the record type and length. */
- errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(LE_record_type, 1, 2, wth->fh);
- if (bytes_read != 2) {
- *err = file_error(wth->fh);
- if (*err == 0 && bytes_read != 0) {
- *err = WTAP_ERR_SHORT_READ;
- }
- return FALSE;
- }
- wth->data_offset += 2;
- bytes_read = file_read(LE_record_length, 1, 2, wth->fh);
- if (bytes_read != 2) {
- *err = file_error(wth->fh);
- if (*err == 0)
- *err = WTAP_ERR_SHORT_READ;
- return FALSE;
- }
- wth->data_offset += 2;
-
- record_type = pletohs(LE_record_type);
- record_length = pletohs(LE_record_length);
-
- /* Only Trace Packet Data Records should occur now that we're in
- * the middle of reading packets. If any other record type exists
- * after a Trace Packet Data Record, mark it as an error. */
- if (record_type != RT_PacketData) {
- g_message("lanalyzer: record type %u seen after trace summary record",
- record_type);
- *err = WTAP_ERR_BAD_RECORD;
- return FALSE;
- }
- else {
- packet_size = record_length - DESCRIPTOR_LEN;
- }
-
- /* Read the descriptor data */
- errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(descriptor, 1, DESCRIPTOR_LEN, wth->fh);
- if (bytes_read != DESCRIPTOR_LEN) {
- *err = file_error(wth->fh);
- if (*err == 0)
- *err = WTAP_ERR_SHORT_READ;
- return FALSE;
- }
- wth->data_offset += DESCRIPTOR_LEN;
-
- /* Read the packet data */
- buffer_assure_space(wth->frame_buffer, packet_size);
- *data_offset = wth->data_offset;
- errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(buffer_start_ptr(wth->frame_buffer), 1,
- packet_size, wth->fh);
-
- if (bytes_read != packet_size) {
- *err = file_error(wth->fh);
- if (*err == 0)
- *err = WTAP_ERR_SHORT_READ;
- return FALSE;
- }
- wth->data_offset += packet_size;
-
- true_size = pletohs(&descriptor[4]);
- time_low = pletohs(&descriptor[8]);
- time_med = pletohs(&descriptor[10]);
- time_high = pletohs(&descriptor[12]);
-
- t = (double)time_low+(double)(time_med)*65536.0 +
- (double)time_high*4294967296.0;
- t = t/1000000.0 * 0.5; /* t = # of secs */
- t += wth->capture.lanalyzer->start;
-
- wth->phdr.ts.tv_sec = (long)t;
- wth->phdr.ts.tv_usec = (unsigned long)((t-(double)(wth->phdr.ts.tv_sec))
- *1.0e6);
-
- wth->phdr.len = true_size - 4;
- wth->phdr.caplen = packet_size;
- wth->phdr.pkt_encap = wth->file_encap;
-
- return TRUE;
+ char LE_record_type[2];
+ char LE_record_length[2];
+ guint16 record_type, record_length;
+ int record_data_size;
+ int packet_size;
+ gchar descriptor[DESCRIPTOR_LEN];
+ lanalyzer_t *lanalyzer;
+ guint16 time_low, time_med, time_high, true_size;
+ guint64 t;
+ time_t tsecs;
+
+ /* read the record type and length. */
+ if (!wtap_read_bytes_or_eof(fh, LE_record_type, 2, err, err_info))
+ return FALSE;
+ if (!wtap_read_bytes(fh, LE_record_length, 2, err, err_info))
+ return FALSE;
+
+ record_type = pletoh16(LE_record_type);
+ record_length = pletoh16(LE_record_length);
+
+ /* Only Trace Packet Data Records should occur now that we're in
+ * the middle of reading packets. If any other record type exists
+ * after a Trace Packet Data Record, mark it as an error. */
+ if (record_type != RT_PacketData) {
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup_printf("lanalyzer: record type %u seen after trace summary record",
+ record_type);
+ return FALSE;
+ }
+
+ if (record_length < DESCRIPTOR_LEN) {
+ /*
+ * Uh-oh, the record isn't big enough to even have a
+ * descriptor.
+ */
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup_printf("lanalyzer: file has a %u-byte record, too small to have even a packet descriptor",
+ record_length);
+ return FALSE;
+ }
+ record_data_size = record_length - DESCRIPTOR_LEN;
+
+ /* Read the descriptor data */
+ if (!wtap_read_bytes(fh, descriptor, DESCRIPTOR_LEN, err, err_info))
+ return FALSE;
+
+ true_size = pletoh16(&descriptor[4]);
+ packet_size = pletoh16(&descriptor[6]);
+ /*
+ * The maximum value of packet_size is 65535, which is less than
+ * WTAP_MAX_PACKET_SIZE will ever be, so we don't need to check
+ * it.
+ */
+
+ /*
+ * OK, is the frame data size greater than than what's left of the
+ * record?
+ */
+ if (packet_size > record_data_size) {
+ /*
+ * Yes - treat this as an error.
+ */
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup("lanalyzer: Record length is less than packet size");
+ return FALSE;
+ }
+
+ phdr->rec_type = REC_TYPE_PACKET;
+ phdr->presence_flags = WTAP_HAS_TS|WTAP_HAS_CAP_LEN;
+
+ time_low = pletoh16(&descriptor[8]);
+ time_med = pletoh16(&descriptor[10]);
+ time_high = pletoh16(&descriptor[12]);
+ t = (((guint64)time_low) << 0) + (((guint64)time_med) << 16) +
+ (((guint64)time_high) << 32);
+ tsecs = (time_t) (t/2000000);
+ lanalyzer = (lanalyzer_t *)wth->priv;
+ phdr->ts.secs = tsecs + lanalyzer->start;
+ phdr->ts.nsecs = ((guint32) (t - tsecs*2000000)) * 500;
+
+ if (true_size - 4 >= packet_size) {
+ /*
+ * It appears that the "true size" includes the FCS;
+ * make it reflect the non-FCS size (the "packet size"
+ * appears never to include the FCS, even if no slicing
+ * is done).
+ */
+ true_size -= 4;
+ }
+ phdr->len = true_size;
+ phdr->caplen = packet_size;
+
+ switch (wth->file_encap) {
+
+ case WTAP_ENCAP_ETHERNET:
+ /* We assume there's no FCS in this frame. */
+ phdr->pseudo_header.eth.fcs_len = 0;
+ break;
+ }
+
+ /* Read the packet data */
+ return wtap_read_packet_bytes(fh, buf, packet_size, err, err_info);
}
-static void
-lanalyzer_close(wtap *wth)
+/* Read the next packet */
+static gboolean lanalyzer_read(wtap *wth, int *err, gchar **err_info,
+ gint64 *data_offset)
{
- g_free(wth->capture.lanalyzer);
+ *data_offset = file_tell(wth->fh);
+
+ /* Read the record */
+ return lanalyzer_read_trace_record(wth, wth->fh, &wth->phdr,
+ wth->frame_buffer, err, err_info);
}
-/*---------------------------------------------------
- * Returns 0 or error
- * Write one block with error control
- *---------------------------------------------------*/
-static int swrite(const void* what, guint size, FILE *hd)
+static gboolean lanalyzer_seek_read(wtap *wth, gint64 seek_off,
+ struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info)
{
- size_t nwritten;
-
- nwritten = fwrite(what, 1, size, hd);
- if (nwritten != size) {
- if (nwritten == 0 && ferror(hd))
- return errno;
- else
- return WTAP_ERR_SHORT_WRITE;
- }
- return 0; /* ok */
+ if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
+ return FALSE;
+
+ /* Read the record */
+ if (!lanalyzer_read_trace_record(wth, wth->random_fh, phdr, buf,
+ err, err_info)) {
+ if (*err == 0)
+ *err = WTAP_ERR_SHORT_READ;
+ return FALSE;
+ }
+ return TRUE;
}
/*---------------------------------------------------
- * Returns 0 or error
- * Write one block with error control
+ * Returns TRUE on success, FALSE on error
+ * Write "cnt" bytes of zero with error control
*---------------------------------------------------*/
-static int s0write(guint cnt, FILE *hd)
+static gboolean s0write(wtap_dumper *wdh, size_t cnt, int *err)
{
- static gint8 z64[64];
- size_t nwritten;
- size_t snack;
+ size_t snack;
- while (cnt) {
+ while (cnt) {
snack = cnt > 64 ? 64 : cnt;
- nwritten = fwrite(z64, 1, snack, hd);
- if (nwritten != snack) {
- if (nwritten == 0 && ferror(hd))
- return errno;
- else
- return WTAP_ERR_SHORT_WRITE;
- }
+
+ if (!wtap_dump_file_write(wdh, z64, snack, err))
+ return FALSE;
cnt -= snack;
- }
- return 0; /* ok */
+ }
+ return TRUE; /* ok */
}
/*---------------------------------------------------
- * Returns 0 or error
- * Write one block with error control
+ * Returns TRUE on success, FALSE on error
+ * Write an 8-bit value
*---------------------------------------------------*/
-static int s8write(const guint8 s8, FILE *hd)
+static gboolean s8write(wtap_dumper *wdh, const guint8 s8, int *err)
{
- size_t nwritten;
-
- nwritten = fwrite(&s8, 1, 1, hd);
- if (nwritten != 1) {
- if (nwritten == 0 && ferror(hd))
- return errno;
- else
- return WTAP_ERR_SHORT_WRITE;
- }
- return 0; /* ok */
+ return wtap_dump_file_write(wdh, &s8, 1, err);
}
/*---------------------------------------------------
- * Returns 0 or error
- * Write one block with error control
+ * Returns TRUE on success, FALSE on error
+ * Write a 16-bit value as little-endian
*---------------------------------------------------*/
-static int s16write(const guint16 s16, FILE *hd)
+static gboolean s16write(wtap_dumper *wdh, const guint16 s16, int *err)
{
- size_t nwritten;
-
- nwritten = fwrite(&s16, 1, 2, hd);
- if (nwritten != 2) {
- if (nwritten == 0 && ferror(hd))
- return errno;
- else
- return WTAP_ERR_SHORT_WRITE;
- }
- return 0; /* ok */
+ guint16 s16_le = GUINT16_TO_LE(s16);
+ return wtap_dump_file_write(wdh, &s16_le, 2, err);
}
/*---------------------------------------------------
- * Returns 0 or error
- * Write one block with error control
+ * Returns TRUE on success, FALSE on error
+ * Write a 32-bit value as little-endian
*---------------------------------------------------*/
-static int s32write(const guint32 s32, FILE *hd)
+static gboolean s32write(wtap_dumper *wdh, const guint32 s32, int *err)
{
- size_t nwritten;
-
- nwritten = fwrite(&s32, 1, 4, hd);
- if (nwritten != 4) {
- if (nwritten == 0 && ferror(hd))
- return errno;
- else
- return WTAP_ERR_SHORT_WRITE;
- }
- return 0; /* ok */
+ guint32 s32_le = GUINT32_TO_LE(s32);
+ return wtap_dump_file_write(wdh, &s32_le, 4, err);
}
/*---------------------------------------------------
- *
- * calculates C.c = A.a - B.b
+ * Returns TRUE on success, FALSE on error
+ * Write a 48-bit value as little-endian
*---------------------------------------------------*/
-static void my_timersub(const struct timeval *a,
- const struct timeval *b,
- struct timeval *c)
+static gboolean s48write(wtap_dumper *wdh, const guint64 s48, int *err)
{
- gint32 usec = a->tv_usec;
-
- c->tv_sec = a->tv_sec - b->tv_sec;
- if (b->tv_usec > usec) {
- c->tv_sec--;
- usec += 1000000;
- }
- c->tv_usec = usec - b->tv_usec;
+#ifdef WORDS_BIGENDIAN
+ guint16 s48_upper_le = GUINT16_SWAP_LE_BE((guint16) (s48 >> 32));
+ guint32 s48_lower_le = GUINT32_SWAP_LE_BE((guint32) (s48 & 0xFFFFFFFF));
+#else
+ guint16 s48_upper_le = (guint16) (s48 >> 32);
+ guint32 s48_lower_le = (guint32) (s48 & 0xFFFFFFFF);
+#endif
+ return wtap_dump_file_write(wdh, &s48_lower_le, 4, err) &&
+ wtap_dump_file_write(wdh, &s48_upper_le, 2, err);
}
/*---------------------------------------------------
* Write a record for a packet to a dump file.
* Returns TRUE on success, FALSE on failure.
*---------------------------------------------------*/
static gboolean lanalyzer_dump(wtap_dumper *wdh,
- const struct wtap_pkthdr *phdr,
- const union wtap_pseudo_header *pseudo_header _U_,
- const u_char *pd, int *err)
+ const struct wtap_pkthdr *phdr,
+ const guint8 *pd, int *err, gchar **err_info _U_)
{
- double x;
- int i;
+ guint64 x;
int len;
- LA_TmpInfo *itmp = (LA_TmpInfo*)(wdh->dump.opaque);
- struct timeval td;
+ LA_TmpInfo *itmp = (LA_TmpInfo*)(wdh->priv);
+ nstime_t td;
int thisSize = phdr->caplen + LA_PacketRecordSize + LA_RecordHeaderSize;
+ /* We can only write packet records. */
+ if (phdr->rec_type != REC_TYPE_PACKET) {
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
+ return FALSE;
+ }
+
if (wdh->bytes_dumped + thisSize > LA_ProFileLimit) {
/* printf(" LA_ProFileLimit reached\n"); */
*err = EFBIG;
len = phdr->caplen + (phdr->caplen ? LA_PacketRecordSize : 0);
- *err = s16write(htoles(0x1005), wdh->fh);
- if (*err)
- return FALSE;
- *err = s16write(htoles(len), wdh->fh);
- if (*err)
+ /* len goes into a 16-bit field, so there's a hard limit of 65535. */
+ if (len > 65535) {
+ *err = WTAP_ERR_PACKET_TOO_LARGE;
return FALSE;
+ }
+ if (!s16write(wdh, 0x1005, err))
+ return FALSE;
+ if (!s16write(wdh, (guint16)len, err))
+ return FALSE;
if (!itmp->init) {
/* collect some information for the
itmp->lastlen = 0;
}
- my_timersub(&(phdr->ts),&(itmp->start),&td);
-
- x = (double) td.tv_usec;
- x += (double) td.tv_sec * 1000000;
- x *= 2;
-
- *err = s16write(htoles(0x0001), wdh->fh); /* pr.rx_channels */
- if (*err)
+ if (!s16write(wdh, 0x0001, err)) /* pr.rx_channels */
return FALSE;
- *err = s16write(htoles(0x0008), wdh->fh); /* pr.rx_errors */
- if (*err)
+ if (!s16write(wdh, 0x0008, err)) /* pr.rx_errors */
return FALSE;
- *err = s16write(htoles(phdr->len + 4), wdh->fh); /* pr.rx_frm_len */
- if (*err)
+ if (!s16write(wdh, (guint16) (phdr->len + 4), err)) /* pr.rx_frm_len */
return FALSE;
- *err = s16write(htoles(phdr->caplen), wdh->fh); /* pr.rx_frm_sln */
- if (*err)
+ if (!s16write(wdh, (guint16) phdr->caplen, err)) /* pr.rx_frm_sln */
return FALSE;
- for (i = 0; i < 3; i++) {
- *err = s16write(htoles((guint16) x), wdh->fh);/* pr.rx_time[i] */
- if (*err)
- return FALSE;
- x /= 0xffff;
- }
+ nstime_delta(&td, &phdr->ts, &itmp->start);
- *err = s32write(htolel(++itmp->pkts), wdh->fh); /* pr.pktno */
- if (*err)
+ /* Convert to half-microseconds, rounded up. */
+ x = (td.nsecs + 250) / 500; /* nanoseconds -> half-microseconds, rounded */
+ x += td.secs * 2000000; /* seconds -> half-microseconds */
+
+ if (!s48write(wdh, x, err)) /* pr.rx_time[i] */
return FALSE;
- *err = s16write(htoles(itmp->lastlen), wdh->fh); /* pr.prlen */
- if (*err)
+
+ if (!s32write(wdh, ++itmp->pkts, err)) /* pr.pktno */
+ return FALSE;
+ if (!s16write(wdh, (guint16)itmp->lastlen, err)) /* pr.prlen */
return FALSE;
itmp->lastlen = len;
- *err = s0write(12, wdh->fh);
- if (*err)
- return FALSE;
+ if (!s0write(wdh, 12, err))
+ return FALSE;
- *err = swrite(pd , phdr->caplen , wdh->fh);
- if (*err)
- return FALSE;
+ if (!wtap_dump_file_write(wdh, pd, phdr->caplen, err))
+ return FALSE;
wdh->bytes_dumped += thisSize;
if ( encap != WTAP_ENCAP_ETHERNET
&& encap != WTAP_ENCAP_TOKEN_RING )
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
/*
* printf("lanalyzer_dump_can_write_encap(%d)\n",encap);
*/
* Returns TRUE on success, FALSE on failure; sets "*err" to an
* error code on failure
*---------------------------------------------------*/
-gboolean lanalyzer_dump_open(wtap_dumper *wdh, gboolean cant_seek, int *err)
+gboolean lanalyzer_dump_open(wtap_dumper *wdh, int *err)
{
int jump;
void *tmp;
- /* This is a LANalyzer file. We can't fill in some fields in the
- header until all the packets have been written, so we can't
- write to a pipe. */
- if (cant_seek) {
- *err = WTAP_ERR_CANT_WRITE_TO_PIPE;
- return FALSE;
- }
-
tmp = g_malloc(sizeof(LA_TmpInfo));
if (!tmp) {
- *err = errno;
- return FALSE;
+ *err = errno;
+ return FALSE;
}
((LA_TmpInfo*)tmp)->init = FALSE;
- wdh->dump.opaque = tmp;
- wdh->subtype_write = lanalyzer_dump;
- wdh->subtype_close = lanalyzer_dump_close;
+ wdh->priv = tmp;
+ wdh->subtype_write = lanalyzer_dump;
+ wdh->subtype_finish = lanalyzer_dump_finish;
/* Some of the fields in the file header aren't known yet so
just skip over it for now. It will be created after all
+ sizeof (LA_CyclicInformationFake)
+ LA_IndexRecordSize;
- if (fseek(wdh->fh, jump, SEEK_SET) == -1) {
- *err = errno;
- return FALSE;
- }
+ if (wtap_dump_file_seek(wdh, jump, SEEK_SET, err) == -1)
+ return FALSE;
+
wdh->bytes_dumped = jump;
return TRUE;
}
*---------------------------------------------------*/
static gboolean lanalyzer_dump_header(wtap_dumper *wdh, int *err)
{
- LA_TmpInfo *itmp = (LA_TmpInfo*)(wdh->dump.opaque);
- struct tm *fT = localtime(&(itmp->start.tv_sec));
+ LA_TmpInfo *itmp = (LA_TmpInfo*)(wdh->priv);
guint16 board_type = itmp->encap == WTAP_ENCAP_TOKEN_RING
? BOARD_325TR /* LANalyzer Board Type */
: BOARD_325; /* LANalyzer Board Type */
+ struct tm *fT;
+
+ fT = localtime(&itmp->start.secs);
+ if (fT == NULL)
+ return FALSE;
+
+ if (wtap_dump_file_seek(wdh, 0, SEEK_SET, err) == -1)
+ return FALSE;
- fseek(wdh->fh, 0, SEEK_SET);
-
- *err = swrite(&LA_HeaderRegularFake, sizeof LA_HeaderRegularFake, wdh->fh);
- if (*err)
- return FALSE;
- *err = swrite(&LA_RxChannelNameFake , sizeof LA_RxChannelNameFake , wdh->fh);
- if (*err)
- return FALSE;
- *err = swrite(&LA_TxChannelNameFake , sizeof LA_TxChannelNameFake , wdh->fh);
- if (*err)
- return FALSE;
- *err = swrite(&LA_RxTemplateNameFake, sizeof LA_RxTemplateNameFake, wdh->fh);
- if (*err)
- return FALSE;
- *err = swrite(&LA_TxTemplateNameFake, sizeof LA_TxTemplateNameFake, wdh->fh);
- if (*err)
- return FALSE;
- *err = swrite(&LA_DisplayOptionsFake, sizeof LA_DisplayOptionsFake, wdh->fh);
- if (*err)
- return FALSE;
+ if (!wtap_dump_file_write(wdh, &LA_HeaderRegularFake,
+ sizeof LA_HeaderRegularFake, err))
+ return FALSE;
+ if (!wtap_dump_file_write(wdh, &LA_RxChannelNameFake,
+ sizeof LA_RxChannelNameFake, err))
+ return FALSE;
+ if (!wtap_dump_file_write(wdh, &LA_TxChannelNameFake,
+ sizeof LA_TxChannelNameFake, err))
+ return FALSE;
+ if (!wtap_dump_file_write(wdh, &LA_RxTemplateNameFake,
+ sizeof LA_RxTemplateNameFake, err))
+ return FALSE;
+ if (!wtap_dump_file_write(wdh, &LA_TxTemplateNameFake,
+ sizeof LA_TxTemplateNameFake, err))
+ return FALSE;
+ if (!wtap_dump_file_write(wdh, &LA_DisplayOptionsFake,
+ sizeof LA_DisplayOptionsFake, err))
+ return FALSE;
/*-----------------------------------------------------------------*/
- *err = s16write(htoles(RT_Summary), wdh->fh); /* rid */
- if (*err)
+ if (!s16write(wdh, RT_Summary, err)) /* rid */
+ return FALSE;
+ if (!s16write(wdh, SummarySize, err)) /* rlen */
+ return FALSE;
+ if (!s8write(wdh, (guint8) fT->tm_mday, err)) /* s.datcre.day */
+ return FALSE;
+ if (!s8write(wdh, (guint8) (fT->tm_mon+1), err)) /* s.datcre.mon */
+ return FALSE;
+ if (!s16write(wdh, (guint16) (fT->tm_year + 1900), err)) /* s.datcre.year */
+ return FALSE;
+ if (!s8write(wdh, (guint8) fT->tm_mday, err)) /* s.datclo.day */
return FALSE;
- *err = s16write(htoles(SummarySize), wdh->fh); /* rlen */
- if (*err)
+ if (!s8write(wdh, (guint8) (fT->tm_mon+1), err)) /* s.datclo.mon */
return FALSE;
- *err = s8write(fT->tm_mday, wdh->fh); /* s.datcre.day */
- if (*err)
+ if (!s16write(wdh, (guint16) (fT->tm_year + 1900), err)) /* s.datclo.year */
return FALSE;
- *err = s8write(fT->tm_mon+1, wdh->fh); /* s.datcre.mon */
- if (*err)
+ if (!s8write(wdh, (guint8) fT->tm_sec, err)) /* s.timeopn.second */
return FALSE;
- *err = s16write(htoles(fT->tm_year + 1900), wdh->fh);/* s.datcre.year */
- if (*err)
+ if (!s8write(wdh, (guint8) fT->tm_min, err)) /* s.timeopn.minute */
return FALSE;
- *err = s8write(fT->tm_mday, wdh->fh); /* s.datclo.day */
- if (*err)
+ if (!s8write(wdh, (guint8) fT->tm_hour, err)) /* s.timeopn.hour */
return FALSE;
- *err = s8write(fT->tm_mon+1, wdh->fh); /* s.datclo.mon */
- if (*err)
+ if (!s8write(wdh, (guint8) fT->tm_mday, err)) /* s.timeopn.mday */
return FALSE;
- *err = s16write(htoles(fT->tm_year + 1900), wdh->fh);/* s.datclo.year */
- if (*err)
+ if (!s0write(wdh, 2, err))
return FALSE;
- *err = s8write(fT->tm_sec, wdh->fh); /* s.timeopn.second */
- if (*err)
+ if (!s8write(wdh, (guint8) fT->tm_sec, err)) /* s.timeclo.second */
return FALSE;
- *err = s8write(fT->tm_min, wdh->fh); /* s.timeopn.minute */
- if (*err)
+ if (!s8write(wdh, (guint8) fT->tm_min, err)) /* s.timeclo.minute */
return FALSE;
- *err = s8write(fT->tm_hour, wdh->fh); /* s.timeopn.hour */
- if (*err)
+ if (!s8write(wdh, (guint8) fT->tm_hour, err)) /* s.timeclo.hour */
return FALSE;
- *err = s8write(fT->tm_mday, wdh->fh); /* s.timeopn.mday */
- if (*err)
+ if (!s8write(wdh, (guint8) fT->tm_mday, err)) /* s.timeclo.mday */
return FALSE;
- *err = s0write(2, wdh->fh);
- if (*err)
- return FALSE;
- *err = s8write(fT->tm_sec, wdh->fh); /* s.timeclo.second */
- if (*err)
+ if (!s0write(wdh, 2, err))
return FALSE;
- *err = s8write(fT->tm_min, wdh->fh); /* s.timeclo.minute */
- if (*err)
+ if (!s0write(wdh, 6, err)) /* EAddr == 0 */
return FALSE;
- *err = s8write(fT->tm_hour, wdh->fh); /* s.timeclo.hour */
- if (*err)
+ if (!s16write(wdh, 1, err)) /* s.mxseqno */
return FALSE;
- *err = s8write(fT->tm_mday, wdh->fh); /* s.timeclo.mday */
- if (*err)
+ if (!s16write(wdh, 0, err)) /* s.slcoffo */
return FALSE;
- *err = s0write(2, wdh->fh);
- if (*err)
- return FALSE;
- *err = s0write(6, wdh->fh); /* EAddr == 0 */
- if (*err)
- return FALSE;
- *err = s16write(htoles(1), wdh->fh); /* s.mxseqno */
- if (*err)
+ if (!s16write(wdh, 1514, err)) /* s.mxslc */
return FALSE;
- *err = s16write(htoles(0), wdh->fh); /* s.slcoffo */
- if (*err)
+ if (!s32write(wdh, itmp->pkts, err)) /* s.totpktt */
return FALSE;
- *err = s16write(htoles(1514), wdh->fh); /* s.mxslc */
- if (*err)
+ /*
+ * statrg == 0; ? -1
+ * stptrg == 0; ? -1
+ * s.mxpkta[0]=0
+ */
+ if (!s0write(wdh, 12, err))
return FALSE;
- *err = s32write(htolel(itmp->pkts), wdh->fh); /* s.totpktt */
- if (*err)
+ if (!s32write(wdh, itmp->pkts, err)) /* sr.s.mxpkta[1] */
return FALSE;
- *err = s0write(12, wdh->fh); /* statrg == 0; ? -1*/
- if (*err) /* stptrg == 0; ? -1*/
- return FALSE; /* s.mxpkta[0]=0 */
- *err = s32write(htolel(itmp->pkts), wdh->fh); /* sr.s.mxpkta[1] */
- if (*err)
+ if (!s0write(wdh, 34*4, err)) /* s.mxpkta[2-33]=0 */
return FALSE;
- *err = s0write(34*4, wdh->fh); /* s.mxpkta[2-33]=0 */
- if (*err)
- return FALSE;
- *err = s16write(htoles(board_type), wdh->fh);
- if (*err)
+ if (!s16write(wdh, board_type, err))
return FALSE;
- *err = s0write(20, wdh->fh); /* board_version == 0 */
- if (*err)
+ if (!s0write(wdh, 20, err)) /* board_version == 0 */
return FALSE;
/*-----------------------------------------------------------------*/
- *err = s16write(htoles(RT_SubfileSummary), wdh->fh); /* ssr.rid */
- if (*err)
+ if (!s16write(wdh, RT_SubfileSummary, err)) /* ssr.rid */
return FALSE;
- *err = s16write(htoles(LA_SubfileSummaryRecordSize-4), wdh->fh); /* ssr.rlen */
- if (*err)
+ if (!s16write(wdh, LA_SubfileSummaryRecordSize-4, err)) /* ssr.rlen */
return FALSE;
- *err = s16write(htoles(1), wdh->fh); /* ssr.seqno */
- if (*err)
+ if (!s16write(wdh, 1, err)) /* ssr.seqno */
return FALSE;
- *err = s32write(htolel(itmp->pkts), wdh->fh); /* ssr.totpkts */
- if (*err)
+ if (!s32write(wdh, itmp->pkts, err)) /* ssr.totpkts */
return FALSE;
/*-----------------------------------------------------------------*/
- *err = swrite(&LA_CyclicInformationFake, sizeof LA_CyclicInformationFake, wdh->fh);
- if (*err)
- return FALSE;
+ if (!wtap_dump_file_write(wdh, &LA_CyclicInformationFake,
+ sizeof LA_CyclicInformationFake, err))
+ return FALSE;
/*-----------------------------------------------------------------*/
- *err = s16write(htoles(RT_Index), wdh->fh); /* rid */
- if (*err)
+ if (!s16write(wdh, RT_Index, err)) /* rid */
return FALSE;
- *err = s16write(htoles(LA_IndexRecordSize -4), wdh->fh);/* rlen */
- if (*err)
+ if (!s16write(wdh, LA_IndexRecordSize -4, err)) /* rlen */
return FALSE;
- *err = s16write(htoles(LA_IndexSize), wdh->fh); /* idxsp */
- if (*err)
+ if (!s16write(wdh, LA_IndexSize, err)) /* idxsp */
return FALSE;
- *err = s0write(LA_IndexRecordSize - 6, wdh->fh);
- if (*err)
+ if (!s0write(wdh, LA_IndexRecordSize - 6, err))
return FALSE;
return TRUE;
* Finish writing to a dump file.
* Returns TRUE on success, FALSE on failure.
*---------------------------------------------------*/
-static gboolean lanalyzer_dump_close(wtap_dumper *wdh, int *err)
+static gboolean lanalyzer_dump_finish(wtap_dumper *wdh, int *err)
{
- if (wdh->dump.opaque) {
- lanalyzer_dump_header(wdh,err);
- g_free(wdh->dump.opaque);
- wdh->dump.opaque = 0;
- }
+ lanalyzer_dump_header(wdh,err);
return *err ? FALSE : TRUE;
}
+
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 6
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=6 tabstop=8 expandtab:
+ * :indentSize=6:tabSize=8:noTabs=true:
+ */
git.samba.org / metze / wireshark / wip.git / blobdiff