2014-05-09 05:18:49 +00:00
|
|
|
/* daintree_sna.c
|
2009-05-24 22:49:36 +00:00
|
|
|
* Routines for opening .dcf capture files created by Daintree's
|
|
|
|
* Sensor Network Analyzer for 802.15.4 radios
|
|
|
|
* Copyright 2009, Exegin Technologies Limited <fff@exegin.com>
|
|
|
|
*
|
|
|
|
* Wireshark - Network traffic analyzer
|
|
|
|
* By Gerald Combs <gerald@wireshark.org>
|
|
|
|
* Copyright 1998 Gerald Combs
|
|
|
|
*
|
2013-11-08 17:17:57 +00:00
|
|
|
* Started with packetlogger.c as a template, but little packetlogger code
|
|
|
|
* remains. Borrowed many snippets from dbs-etherwatch.c, the
|
2013-05-17 00:00:13 +00:00
|
|
|
* daintree_sna_process_hex_data function having the largest chunk.
|
2013-11-08 17:17:57 +00:00
|
|
|
*
|
2018-02-18 21:40:50 +00:00
|
|
|
* SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
*/
|
2009-05-24 22:49:36 +00:00
|
|
|
|
2013-11-08 17:17:57 +00:00
|
|
|
/* This module reads capture files saved by Daintree's Sensor Network Analyzer.
|
2009-05-24 22:49:36 +00:00
|
|
|
* Daintree captures are plain text files with a two line header,
|
|
|
|
* followed by packet records, one per line, with whitespace separated fields
|
|
|
|
* consisting of: packet number, time, bytes of capture data, capture data,
|
|
|
|
* unknown, unknown, signal strength?, unknown, etc, and terminated with CRLF.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Example capture file:
|
2013-11-08 17:17:57 +00:00
|
|
|
|
2009-05-24 22:49:36 +00:00
|
|
|
#Format=4
|
|
|
|
# SNA v2.2.0.4 SUS:20090709 ACT:819705
|
|
|
|
1 1233783799.326400 10 030809ffffffff07ffff 42 1 -69 25 2 0 1 32767
|
|
|
|
2 1233783799.477440 5 02000bffff 110 1 -44 25 6 0 1 32767
|
|
|
|
3 1233783799.809920 5 020013ffff 107 1 -45 25 43 0 1 3276
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include "wtap-int.h"
|
|
|
|
#include "file_wrappers.h"
|
|
|
|
#include "daintree-sna.h"
|
|
|
|
|
|
|
|
typedef struct daintree_sna_header {
|
|
|
|
guint32 len;
|
|
|
|
guint64 ts;
|
|
|
|
} daintree_sna_header_t;
|
|
|
|
|
|
|
|
#define DAINTREE_SNA_HEADER_SIZE 2
|
|
|
|
#define FCS_LENGTH 2
|
|
|
|
|
2016-12-14 23:02:33 +00:00
|
|
|
static const char daintree_magic_text[] = "#Format=";
|
2009-05-24 22:49:36 +00:00
|
|
|
|
2016-12-14 23:02:33 +00:00
|
|
|
#define DAINTREE_MAGIC_TEXT_SIZE (sizeof daintree_magic_text - 1)
|
2009-05-24 22:49:36 +00:00
|
|
|
#define DAINTREE_MAX_LINE_SIZE 512
|
2009-12-04 16:56:34 +00:00
|
|
|
#define READDATA_BUF_SIZE (DAINTREE_MAX_LINE_SIZE/2)
|
|
|
|
#define READDATA_MAX_FIELD_SIZE "255" /* DAINTREE_MAX_LINE_SIZE/2 -1 */
|
2009-12-04 16:42:14 +00:00
|
|
|
|
2009-05-24 22:49:36 +00:00
|
|
|
#define COMMENT_LINE daintree_magic_text[0]
|
|
|
|
|
2019-04-05 01:56:27 +00:00
|
|
|
static gboolean daintree_sna_read(wtap *wth, wtap_rec *rec,
|
|
|
|
Buffer *buf, int *err, gchar **err_info, gint64 *data_offset);
|
2009-05-24 22:49:36 +00:00
|
|
|
|
2014-05-23 10:50:02 +00:00
|
|
|
static gboolean daintree_sna_seek_read(wtap *wth, gint64 seek_off,
|
2018-02-09 00:19:12 +00:00
|
|
|
wtap_rec *rec, Buffer *buf, int *err, gchar **err_info);
|
2009-05-24 22:49:36 +00:00
|
|
|
|
2018-02-09 00:19:12 +00:00
|
|
|
static gboolean daintree_sna_read_packet(FILE_T fh, wtap_rec *rec,
|
2016-04-30 09:05:09 +00:00
|
|
|
Buffer *buf, int *err, gchar **err_info);
|
2009-05-24 22:49:36 +00:00
|
|
|
|
wiretap: register most built-in file types from its module.
Remove most of the built-in file types from the table in
wiretap/file_access.c and, instead, have the file types register
themselves, using wtap_register_file_type_subtypes().
This reduces the source code changes needed to add a new file type from
three (add the handler, add the file type to the table in file_access.c,
add a #define for the file type in wiretap/wtap.h) to one (add the
handler). (It also requires adding the handler's source file to
wiretap/CMakeLists.txt, but that's required in both cases.)
A few remain because the WTAP_FILE_TYPE_SUBTYPE_ #define is used
elsewhere; that needs to be fixed.
Fix the wiretap/CMakefile.txt file to scan k12text.l, as that now
contains a registration routine. In the process, avoid scanning files
that don't implement a file type and won't ever have a registration
routine.
Add a Lua routine to fetch the total number of file types; we use that
in some code to construct the wtap_filetypes table, which we need to do
in order to continue to have all the values that used to come from the
WTAP_FILE_TYPE_SUBTYPE_ types.
While we're at it, add modelines to a file that lacked them.
2021-02-14 08:34:10 +00:00
|
|
|
static int daintree_sna_file_type_subtype = -1;
|
|
|
|
|
|
|
|
void register_daintree_sna(void);
|
|
|
|
|
2009-05-24 22:49:36 +00:00
|
|
|
/* Open a file and determine if it's a Daintree file */
|
2014-10-09 23:44:15 +00:00
|
|
|
wtap_open_return_val daintree_sna_open(wtap *wth, int *err, gchar **err_info)
|
2009-05-24 22:49:36 +00:00
|
|
|
{
|
2012-04-22 02:03:29 +00:00
|
|
|
char readLine[DAINTREE_MAX_LINE_SIZE];
|
2009-05-24 22:49:36 +00:00
|
|
|
|
|
|
|
/* get first line of file header */
|
2014-05-09 05:18:49 +00:00
|
|
|
if (file_gets(readLine, DAINTREE_MAX_LINE_SIZE, wth->fh)==NULL) {
|
|
|
|
*err = file_error(wth->fh, err_info);
|
Do not call wtap_file_read_unknown_bytes() or
wtap_file_read_expected_bytes() from an open routine - open routines are
supposed to return -1 on error, 0 if the file doesn't appear to be a
file of the specified type, or 1 if the file does appear to be a file of
the specified type, but those macros will cause the caller to return
FALSE on errors (so that, even if there's an I/O error, it reports "the
file isn't a file of the specified type" rather than "we got an error
trying to read the file").
When doing reads in an open routine before we've concluded that the file
is probably of the right type, return 0, rather than -1, if we get
WTAP_ERR_SHORT_READ - if we don't have enough data to check whether a
file is of a given type, we should keep trying other types, not give up.
For reads done *after* we've concluded the file is probably of the right
type, if a read doesn't return the number of bytes we asked for, but
returns an error of 0, return WTAP_ERR_SHORT_READ - the file is
apparently cut short.
For NetMon and NetXRay/Windows Sniffer files, use a #define for the
magic number size, and use that for both magic numbers.
svn path=/trunk/; revision=46803
2012-12-27 12:19:25 +00:00
|
|
|
if (*err != 0 && *err != WTAP_ERR_SHORT_READ)
|
2014-10-09 23:44:15 +00:00
|
|
|
return WTAP_OPEN_ERROR;
|
|
|
|
return WTAP_OPEN_NOT_MINE;
|
Do not call wtap_file_read_unknown_bytes() or
wtap_file_read_expected_bytes() from an open routine - open routines are
supposed to return -1 on error, 0 if the file doesn't appear to be a
file of the specified type, or 1 if the file does appear to be a file of
the specified type, but those macros will cause the caller to return
FALSE on errors (so that, even if there's an I/O error, it reports "the
file isn't a file of the specified type" rather than "we got an error
trying to read the file").
When doing reads in an open routine before we've concluded that the file
is probably of the right type, return 0, rather than -1, if we get
WTAP_ERR_SHORT_READ - if we don't have enough data to check whether a
file is of a given type, we should keep trying other types, not give up.
For reads done *after* we've concluded the file is probably of the right
type, if a read doesn't return the number of bytes we asked for, but
returns an error of 0, return WTAP_ERR_SHORT_READ - the file is
apparently cut short.
For NetMon and NetXRay/Windows Sniffer files, use a #define for the
magic number size, and use that for both magic numbers.
svn path=/trunk/; revision=46803
2012-12-27 12:19:25 +00:00
|
|
|
}
|
2009-05-24 22:49:36 +00:00
|
|
|
|
|
|
|
/* check magic text */
|
2016-12-14 23:02:33 +00:00
|
|
|
if (strncmp(readLine, daintree_magic_text, DAINTREE_MAGIC_TEXT_SIZE) != 0)
|
2014-10-09 23:44:15 +00:00
|
|
|
return WTAP_OPEN_NOT_MINE; /* not daintree format */
|
2009-05-24 22:49:36 +00:00
|
|
|
|
|
|
|
/* read second header line */
|
2014-05-09 05:18:49 +00:00
|
|
|
if (file_gets(readLine, DAINTREE_MAX_LINE_SIZE, wth->fh)==NULL) {
|
|
|
|
*err = file_error(wth->fh, err_info);
|
Do not call wtap_file_read_unknown_bytes() or
wtap_file_read_expected_bytes() from an open routine - open routines are
supposed to return -1 on error, 0 if the file doesn't appear to be a
file of the specified type, or 1 if the file does appear to be a file of
the specified type, but those macros will cause the caller to return
FALSE on errors (so that, even if there's an I/O error, it reports "the
file isn't a file of the specified type" rather than "we got an error
trying to read the file").
When doing reads in an open routine before we've concluded that the file
is probably of the right type, return 0, rather than -1, if we get
WTAP_ERR_SHORT_READ - if we don't have enough data to check whether a
file is of a given type, we should keep trying other types, not give up.
For reads done *after* we've concluded the file is probably of the right
type, if a read doesn't return the number of bytes we asked for, but
returns an error of 0, return WTAP_ERR_SHORT_READ - the file is
apparently cut short.
For NetMon and NetXRay/Windows Sniffer files, use a #define for the
magic number size, and use that for both magic numbers.
svn path=/trunk/; revision=46803
2012-12-27 12:19:25 +00:00
|
|
|
if (*err != 0 && *err != WTAP_ERR_SHORT_READ)
|
2014-10-09 23:44:15 +00:00
|
|
|
return WTAP_OPEN_ERROR;
|
|
|
|
return WTAP_OPEN_NOT_MINE;
|
Do not call wtap_file_read_unknown_bytes() or
wtap_file_read_expected_bytes() from an open routine - open routines are
supposed to return -1 on error, 0 if the file doesn't appear to be a
file of the specified type, or 1 if the file does appear to be a file of
the specified type, but those macros will cause the caller to return
FALSE on errors (so that, even if there's an I/O error, it reports "the
file isn't a file of the specified type" rather than "we got an error
trying to read the file").
When doing reads in an open routine before we've concluded that the file
is probably of the right type, return 0, rather than -1, if we get
WTAP_ERR_SHORT_READ - if we don't have enough data to check whether a
file is of a given type, we should keep trying other types, not give up.
For reads done *after* we've concluded the file is probably of the right
type, if a read doesn't return the number of bytes we asked for, but
returns an error of 0, return WTAP_ERR_SHORT_READ - the file is
apparently cut short.
For NetMon and NetXRay/Windows Sniffer files, use a #define for the
magic number size, and use that for both magic numbers.
svn path=/trunk/; revision=46803
2012-12-27 12:19:25 +00:00
|
|
|
}
|
2014-10-09 23:44:15 +00:00
|
|
|
if (readLine[0] != COMMENT_LINE)
|
|
|
|
return WTAP_OPEN_NOT_MINE; /* daintree files have a two line header */
|
2009-05-24 22:49:36 +00:00
|
|
|
|
|
|
|
/* set up the pointers to the handlers for this file type */
|
2014-05-09 05:18:49 +00:00
|
|
|
wth->subtype_read = daintree_sna_read;
|
|
|
|
wth->subtype_seek_read = daintree_sna_seek_read;
|
2009-05-24 22:49:36 +00:00
|
|
|
|
|
|
|
/* set up for file type */
|
wiretap: register most built-in file types from its module.
Remove most of the built-in file types from the table in
wiretap/file_access.c and, instead, have the file types register
themselves, using wtap_register_file_type_subtypes().
This reduces the source code changes needed to add a new file type from
three (add the handler, add the file type to the table in file_access.c,
add a #define for the file type in wiretap/wtap.h) to one (add the
handler). (It also requires adding the handler's source file to
wiretap/CMakeLists.txt, but that's required in both cases.)
A few remain because the WTAP_FILE_TYPE_SUBTYPE_ #define is used
elsewhere; that needs to be fixed.
Fix the wiretap/CMakefile.txt file to scan k12text.l, as that now
contains a registration routine. In the process, avoid scanning files
that don't implement a file type and won't ever have a registration
routine.
Add a Lua routine to fetch the total number of file types; we use that
in some code to construct the wtap_filetypes table, which we need to do
in order to continue to have all the values that used to come from the
WTAP_FILE_TYPE_SUBTYPE_ types.
While we're at it, add modelines to a file that lacked them.
2021-02-14 08:34:10 +00:00
|
|
|
wth->file_type_subtype = daintree_sna_file_type_subtype;
|
2014-05-09 05:18:49 +00:00
|
|
|
wth->file_encap = WTAP_ENCAP_IEEE802_15_4_NOFCS;
|
2014-09-28 18:37:06 +00:00
|
|
|
wth->file_tsprec = WTAP_TSPREC_USEC;
|
2014-05-09 05:18:49 +00:00
|
|
|
wth->snapshot_length = 0; /* not available in header */
|
2009-05-24 22:49:36 +00:00
|
|
|
|
2020-07-29 08:30:54 +00:00
|
|
|
/*
|
|
|
|
* Add an IDB; we don't know how many interfaces were
|
|
|
|
* involved, so we just say one interface, about which
|
|
|
|
* we only know the link-layer type, snapshot length,
|
|
|
|
* and time stamp resolution.
|
|
|
|
*/
|
|
|
|
wtap_add_generated_idb(wth);
|
|
|
|
|
2014-10-09 23:44:15 +00:00
|
|
|
return WTAP_OPEN_MINE; /* it's a Daintree file */
|
2009-05-24 22:49:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Read the capture file sequentially
|
|
|
|
* Wireshark scans the file with sequential reads during preview and initial display. */
|
2014-05-23 10:50:02 +00:00
|
|
|
static gboolean
|
2019-04-05 01:56:27 +00:00
|
|
|
daintree_sna_read(wtap *wth, wtap_rec *rec, Buffer *buf,
|
|
|
|
int *err, gchar **err_info, gint64 *data_offset)
|
2009-05-24 22:49:36 +00:00
|
|
|
{
|
2014-05-09 05:18:49 +00:00
|
|
|
*data_offset = file_tell(wth->fh);
|
2009-05-24 22:49:36 +00:00
|
|
|
|
2016-04-30 09:05:09 +00:00
|
|
|
/* parse that line and the following packet data */
|
2019-04-05 01:56:27 +00:00
|
|
|
return daintree_sna_read_packet(wth->fh, rec, buf, err, err_info);
|
2009-05-24 22:49:36 +00:00
|
|
|
}
|
|
|
|
|
2013-11-08 17:17:57 +00:00
|
|
|
/* Read the capture file randomly
|
2009-05-24 22:49:36 +00:00
|
|
|
* Wireshark opens the capture file for random access when displaying user-selected packets */
|
2014-05-23 10:50:02 +00:00
|
|
|
static gboolean
|
2018-02-09 00:19:12 +00:00
|
|
|
daintree_sna_seek_read(wtap *wth, gint64 seek_off, wtap_rec *rec,
|
2014-01-02 20:47:21 +00:00
|
|
|
Buffer *buf, int *err, gchar **err_info)
|
2009-05-24 22:49:36 +00:00
|
|
|
{
|
2014-05-09 05:18:49 +00:00
|
|
|
if(file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
|
2014-05-23 10:50:02 +00:00
|
|
|
return FALSE;
|
2009-05-24 22:49:36 +00:00
|
|
|
|
2016-04-30 09:05:09 +00:00
|
|
|
/* parse that line and the following packet data */
|
2018-02-09 00:19:12 +00:00
|
|
|
return daintree_sna_read_packet(wth->random_fh, rec, buf, err,
|
2013-06-17 21:18:47 +00:00
|
|
|
err_info);
|
2013-05-17 00:00:13 +00:00
|
|
|
}
|
2009-05-24 22:49:36 +00:00
|
|
|
|
2020-12-17 13:23:14 +00:00
|
|
|
/* Read a header line, scan it, and fill in a struct wtap_rec.
|
2016-04-30 09:05:09 +00:00
|
|
|
* Then convert packet data from ASCII hex string to binary in place,
|
|
|
|
* sanity-check its length against what we assume is the packet length field,
|
|
|
|
* and copy it into a Buffer. */
|
2013-05-17 00:00:13 +00:00
|
|
|
static gboolean
|
2018-02-09 00:19:12 +00:00
|
|
|
daintree_sna_read_packet(FILE_T fh, wtap_rec *rec, Buffer *buf,
|
2016-04-30 09:05:09 +00:00
|
|
|
int *err, gchar **err_info)
|
2013-05-17 00:00:13 +00:00
|
|
|
{
|
|
|
|
guint64 seconds;
|
|
|
|
int useconds;
|
2016-04-30 09:05:09 +00:00
|
|
|
char readLine[DAINTREE_MAX_LINE_SIZE];
|
|
|
|
char readData[READDATA_BUF_SIZE];
|
|
|
|
guchar *str = (guchar *)readData;
|
|
|
|
guint bytes;
|
|
|
|
guint8 *p;
|
|
|
|
|
|
|
|
/* we've only seen file header lines starting with '#', but
|
|
|
|
* if others appear in the file, they are tossed */
|
|
|
|
do {
|
|
|
|
if (file_gets(readLine, DAINTREE_MAX_LINE_SIZE, fh) == NULL) {
|
|
|
|
*err = file_error(fh, err_info);
|
|
|
|
return FALSE; /* all done */
|
|
|
|
}
|
|
|
|
} while (readLine[0] == COMMENT_LINE);
|
2013-05-17 00:00:13 +00:00
|
|
|
|
2018-02-09 00:19:12 +00:00
|
|
|
rec->rec_type = REC_TYPE_PACKET;
|
|
|
|
rec->presence_flags = WTAP_HAS_TS|WTAP_HAS_CAP_LEN;
|
2013-05-17 00:00:13 +00:00
|
|
|
|
|
|
|
if (sscanf(readLine, "%*s %18" G_GINT64_MODIFIER "u.%9d %9u %" READDATA_MAX_FIELD_SIZE "s",
|
2018-02-09 00:19:12 +00:00
|
|
|
&seconds, &useconds, &rec->rec_header.packet_header.len, readData) != 4) {
|
2011-12-13 09:53:50 +00:00
|
|
|
*err = WTAP_ERR_BAD_FILE;
|
2013-05-17 00:00:13 +00:00
|
|
|
*err_info = g_strdup("daintree_sna: invalid read record");
|
2009-05-24 22:49:36 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2013-05-17 00:00:13 +00:00
|
|
|
/* Daintree doesn't store the FCS, but pads end of packet with 0xffff, which we toss */
|
2018-02-09 00:19:12 +00:00
|
|
|
if (rec->rec_header.packet_header.len <= FCS_LENGTH) {
|
2011-12-13 09:53:50 +00:00
|
|
|
*err = WTAP_ERR_BAD_FILE;
|
2013-05-17 00:00:13 +00:00
|
|
|
*err_info = g_strdup_printf("daintree_sna: packet length <= %u bytes, no frame data present",
|
|
|
|
FCS_LENGTH);
|
2009-05-24 22:49:36 +00:00
|
|
|
return FALSE;
|
2013-05-17 00:00:13 +00:00
|
|
|
}
|
2018-02-09 00:19:12 +00:00
|
|
|
rec->rec_header.packet_header.len -= FCS_LENGTH;
|
2013-05-17 00:00:13 +00:00
|
|
|
|
2018-02-09 00:19:12 +00:00
|
|
|
rec->ts.secs = (time_t) seconds;
|
|
|
|
rec->ts.nsecs = useconds * 1000; /* convert mS to nS */
|
2009-05-24 22:49:36 +00:00
|
|
|
|
2016-04-30 09:05:09 +00:00
|
|
|
/*
|
Allow bigger snapshot lengths for D-Bus captures.
Use WTAP_MAX_PACKET_SIZE_STANDARD, set to 256KB, for everything except
for D-Bus captures. Use WTAP_MAX_PACKET_SIZE_DBUS, set to 128MB, for
them, because that's the largest possible D-Bus message size. See
https://bugs.freedesktop.org/show_bug.cgi?id=100220
for an example of the problems caused by limiting the snapshot length to
256KB for D-Bus.
Have a snapshot length of 0 in a capture_file structure mean "there is
no snapshot length for the file"; we don't need the has_snap field in
that case, a value of 0 mean "no, we don't have a snapshot length".
In dumpcap, start out with a pipe buffer size of 2KB, and grow it as
necessary. When checking for a too-big packet from a pipe, check
against the appropriate maximum - 128MB for DLT_DBUS, 256KB for
everything else.
Change-Id: Ib2ce7a0cf37b971fbc0318024fd011e18add8b20
Reviewed-on: https://code.wireshark.org/review/21952
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-05 01:58:40 +00:00
|
|
|
* READDATA_BUF_SIZE is < WTAP_MAX_PACKET_SIZE_STANDARD, and is the maximum
|
2016-04-30 09:05:09 +00:00
|
|
|
* number of bytes of packet data we can generate, so we don't
|
|
|
|
* need to check the packet length.
|
|
|
|
*/
|
2009-05-24 22:49:36 +00:00
|
|
|
p = str; /* overlay source buffer */
|
|
|
|
bytes = 0;
|
2011-09-01 09:43:10 +00:00
|
|
|
/* convert hex string to guint8 */
|
2009-05-24 22:49:36 +00:00
|
|
|
while(*str) {
|
|
|
|
/* most significant nibble */
|
2014-10-17 20:37:11 +00:00
|
|
|
if (!g_ascii_isxdigit(*str)) {
|
2013-05-17 00:00:13 +00:00
|
|
|
*err = WTAP_ERR_BAD_FILE;
|
|
|
|
*err_info = g_strdup("daintree_sna: non-hex digit in hex data");
|
2014-05-23 10:50:02 +00:00
|
|
|
return FALSE;
|
2013-05-17 00:00:13 +00:00
|
|
|
}
|
2014-10-17 20:37:11 +00:00
|
|
|
if(g_ascii_isdigit(*str)) {
|
2009-05-24 22:49:36 +00:00
|
|
|
*p = (*str - '0') << 4;
|
|
|
|
} else {
|
2014-10-17 20:37:11 +00:00
|
|
|
*p = ((g_ascii_tolower(*str) - 'a') + 10) << 4;
|
2009-05-24 22:49:36 +00:00
|
|
|
}
|
|
|
|
str++;
|
|
|
|
|
|
|
|
/* least significant nibble */
|
2014-10-17 20:37:11 +00:00
|
|
|
if (!g_ascii_isxdigit(*str)) {
|
2013-05-17 00:00:13 +00:00
|
|
|
*err = WTAP_ERR_BAD_FILE;
|
|
|
|
*err_info = g_strdup("daintree_sna: non-hex digit in hex data");
|
2014-05-23 10:50:02 +00:00
|
|
|
return FALSE;
|
2013-05-17 00:00:13 +00:00
|
|
|
}
|
2014-10-17 20:37:11 +00:00
|
|
|
if(g_ascii_isdigit(*str)) {
|
2009-05-24 22:49:36 +00:00
|
|
|
*p += *str - '0';
|
|
|
|
} else {
|
2014-10-17 20:37:11 +00:00
|
|
|
*p += (g_ascii_tolower(*str) - 'a') + 10;
|
2009-05-24 22:49:36 +00:00
|
|
|
}
|
|
|
|
str++;
|
|
|
|
|
|
|
|
/* next byte in buffer */
|
|
|
|
p++;
|
|
|
|
bytes++;
|
|
|
|
}
|
|
|
|
|
2013-05-17 00:00:13 +00:00
|
|
|
/* Daintree doesn't store the FCS, but pads end of packet with 0xffff, which we toss */
|
|
|
|
if (bytes <= FCS_LENGTH) {
|
|
|
|
*err = WTAP_ERR_BAD_FILE;
|
|
|
|
*err_info = g_strdup_printf("daintree_sna: Only %u bytes of packet data",
|
|
|
|
bytes);
|
2014-05-23 10:50:02 +00:00
|
|
|
return FALSE;
|
2013-05-17 00:00:13 +00:00
|
|
|
}
|
|
|
|
bytes -= FCS_LENGTH;
|
2018-02-09 00:19:12 +00:00
|
|
|
if (bytes > rec->rec_header.packet_header.len) {
|
2013-05-17 00:00:13 +00:00
|
|
|
*err = WTAP_ERR_BAD_FILE;
|
|
|
|
*err_info = g_strdup_printf("daintree_sna: capture length (%u) > packet length (%u)",
|
2018-02-09 00:19:12 +00:00
|
|
|
bytes, rec->rec_header.packet_header.len);
|
2014-05-23 10:50:02 +00:00
|
|
|
return FALSE;
|
2013-05-17 00:00:13 +00:00
|
|
|
}
|
|
|
|
|
2018-02-09 00:19:12 +00:00
|
|
|
rec->rec_header.packet_header.caplen = bytes;
|
2013-06-16 00:20:00 +00:00
|
|
|
|
2014-08-02 11:00:48 +00:00
|
|
|
ws_buffer_assure_space(buf, bytes);
|
|
|
|
memcpy(ws_buffer_start_ptr(buf), readData, bytes);
|
2014-05-23 10:50:02 +00:00
|
|
|
return TRUE;
|
2009-05-24 22:49:36 +00:00
|
|
|
}
|
2015-01-02 00:45:22 +00:00
|
|
|
|
wiretap: have file handlers advertise blocks and options supported.
Instead of a "supports name resolution" Boolean and bitflags for types of
comments supported, provide a list of block types that the file
type/subtype supports, with each block type having a list of options
supported. Indicate whether "supported" means "one instance" or
"multiple instances".
"Supports" doesn't just mean "can be written", it also means "could be
read".
Rename WTAP_BLOCK_IF_DESCRIPTION to WTAP_BLOCK_IF_ID_AND_INFO, to
indicate that it provides, in addition to information about the
interface, an ID (implicitly, in pcapng files, by its ordinal number)
that is associated with every packet in the file. Emphasize that in
comments - just because your capture file format can list the interfaces
on which a capture was done, that doesn't mean it supports this; it
doesn't do so if the file doesn't indicate, for every packet, on which
of those interfaces it was captured (I'm looking at *you*, Microsoft
Network Monitor...).
Use APIs to query that information to do what the "does this file
type/subtype support name resolution information", "does this file
type/subtype support all of these comment types", and "does this file
type/subtype support - and require - interface IDs" APIs did.
Provide backwards compatibility for Lua.
This allows us to eliminate the WTAP_FILE_TYPE_SUBTYPE_ values for IBM's
iptrace; do so.
2021-02-21 22:18:04 +00:00
|
|
|
static const struct supported_block_type daintree_sna_blocks_supported[] = {
|
|
|
|
/*
|
|
|
|
* We support packet blocks, with no comments or other options.
|
|
|
|
*/
|
|
|
|
{ WTAP_BLOCK_PACKET, MULTIPLE_BLOCKS_SUPPORTED, NO_OPTIONS_SUPPORTED }
|
|
|
|
};
|
|
|
|
|
wiretap: register most built-in file types from its module.
Remove most of the built-in file types from the table in
wiretap/file_access.c and, instead, have the file types register
themselves, using wtap_register_file_type_subtypes().
This reduces the source code changes needed to add a new file type from
three (add the handler, add the file type to the table in file_access.c,
add a #define for the file type in wiretap/wtap.h) to one (add the
handler). (It also requires adding the handler's source file to
wiretap/CMakeLists.txt, but that's required in both cases.)
A few remain because the WTAP_FILE_TYPE_SUBTYPE_ #define is used
elsewhere; that needs to be fixed.
Fix the wiretap/CMakefile.txt file to scan k12text.l, as that now
contains a registration routine. In the process, avoid scanning files
that don't implement a file type and won't ever have a registration
routine.
Add a Lua routine to fetch the total number of file types; we use that
in some code to construct the wtap_filetypes table, which we need to do
in order to continue to have all the values that used to come from the
WTAP_FILE_TYPE_SUBTYPE_ types.
While we're at it, add modelines to a file that lacked them.
2021-02-14 08:34:10 +00:00
|
|
|
static const struct file_type_subtype_info daintree_sna_info = {
|
|
|
|
"Daintree SNA", "dsna", "dcf", NULL,
|
wiretap: have file handlers advertise blocks and options supported.
Instead of a "supports name resolution" Boolean and bitflags for types of
comments supported, provide a list of block types that the file
type/subtype supports, with each block type having a list of options
supported. Indicate whether "supported" means "one instance" or
"multiple instances".
"Supports" doesn't just mean "can be written", it also means "could be
read".
Rename WTAP_BLOCK_IF_DESCRIPTION to WTAP_BLOCK_IF_ID_AND_INFO, to
indicate that it provides, in addition to information about the
interface, an ID (implicitly, in pcapng files, by its ordinal number)
that is associated with every packet in the file. Emphasize that in
comments - just because your capture file format can list the interfaces
on which a capture was done, that doesn't mean it supports this; it
doesn't do so if the file doesn't indicate, for every packet, on which
of those interfaces it was captured (I'm looking at *you*, Microsoft
Network Monitor...).
Use APIs to query that information to do what the "does this file
type/subtype support name resolution information", "does this file
type/subtype support all of these comment types", and "does this file
type/subtype support - and require - interface IDs" APIs did.
Provide backwards compatibility for Lua.
This allows us to eliminate the WTAP_FILE_TYPE_SUBTYPE_ values for IBM's
iptrace; do so.
2021-02-21 22:18:04 +00:00
|
|
|
FALSE, BLOCKS_SUPPORTED(daintree_sna_blocks_supported),
|
wiretap: register most built-in file types from its module.
Remove most of the built-in file types from the table in
wiretap/file_access.c and, instead, have the file types register
themselves, using wtap_register_file_type_subtypes().
This reduces the source code changes needed to add a new file type from
three (add the handler, add the file type to the table in file_access.c,
add a #define for the file type in wiretap/wtap.h) to one (add the
handler). (It also requires adding the handler's source file to
wiretap/CMakeLists.txt, but that's required in both cases.)
A few remain because the WTAP_FILE_TYPE_SUBTYPE_ #define is used
elsewhere; that needs to be fixed.
Fix the wiretap/CMakefile.txt file to scan k12text.l, as that now
contains a registration routine. In the process, avoid scanning files
that don't implement a file type and won't ever have a registration
routine.
Add a Lua routine to fetch the total number of file types; we use that
in some code to construct the wtap_filetypes table, which we need to do
in order to continue to have all the values that used to come from the
WTAP_FILE_TYPE_SUBTYPE_ types.
While we're at it, add modelines to a file that lacked them.
2021-02-14 08:34:10 +00:00
|
|
|
NULL, NULL, NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
void register_daintree_sna(void)
|
|
|
|
{
|
2021-02-24 03:10:35 +00:00
|
|
|
daintree_sna_file_type_subtype = wtap_register_file_type_subtype(&daintree_sna_info);
|
wiretap: more work on file type/subtypes.
Provide a wiretap routine to get an array of all savable file
type/subtypes, sorted with pcap and pcapng at the top, followed by the
other types, sorted either by the name or the description.
Use that routine to list options for the -F flag for various commands
Rename wtap_get_savable_file_types_subtypes() to
wtap_get_savable_file_types_subtypes_for_file(), to indicate that it
provides an array of all file type/subtypes in which a given file can be
saved. Have it sort all types, other than the default type/subtype and,
if there is one, the "other" type (both of which are put at the top), by
the name or the description.
Don't allow wtap_register_file_type_subtypes() to override any existing
registrations; have them always register a new type. In that routine,
if there are any emply slots in the table, due to an entry being
unregistered, use it rather than allocating a new slot.
Don't allow unregistration of built-in types.
Rename the "dump open table" to the "file type/subtype table", as it has
entries for all types/subtypes, even if we can't write them.
Initialize that table in a routine that pre-allocates the GArray before
filling it with built-in types/subtypes, so it doesn't keep getting
reallocated.
Get rid of wtap_num_file_types_subtypes - it's just a copy of the size
of the GArray.
Don't have wtap_file_type_subtype_description() crash if handed an
file type/subtype that isn't a valid array index - just return NULL, as
we do with wtap_file_type_subtype_name().
In wtap_name_to_file_type_subtype(), don't use WTAP_FILE_TYPE_SUBTYPE_
names for the backwards-compatibility names - map those names to the
current names, and then look them up. This reduces the number of
uses of hardwired WTAP_FILE_TYPE_SUBTYPE_ values.
Clean up the type of wtap_module_count - it has no need to be a gulong.
Have built-in wiretap file handlers register names to be used for their
file type/subtypes, rather than building the table in init.lua.
Add a new Lua C function get_wtap_filetypes() to construct the
wtap_filetypes table, based on the registered names, and use it in
init.lua.
Add a #define WSLUA_INTERNAL_FUNCTION to register functions intended
only for internal use in init.lua, so they can be made available from
Lua without being documented.
Get rid of WTAP_NUM_FILE_TYPES_SUBTYPES - most code has no need to use
it, as it can just request arrays of types, and the space of
type/subtype codes can be sparse due to registration in any case, so
code has to be careful using it.
wtap_get_num_file_types_subtypes() is no longer used, so remove it. It
returns the number of elements in the file type/subtype array, which is
not necessarily the name of known file type/subtypes, as there may have
been some deregistered types, and those types do *not* get removed from
the array, they just get cleared so that they're available for future
allocation (we don't want the indices of any registered types to changes
if another type is deregistered, as those indicates are the type/subtype
values, so we can't shrink the array).
Clean up white space and remove some comments that shouldn't have been
added.
2021-02-17 06:24:47 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Register name for backwards compatibility with the
|
|
|
|
* wtap_filetypes table in Lua.
|
|
|
|
*/
|
|
|
|
wtap_register_backwards_compatibility_lua_name("DAINTREE_SNA",
|
|
|
|
daintree_sna_file_type_subtype);
|
wiretap: register most built-in file types from its module.
Remove most of the built-in file types from the table in
wiretap/file_access.c and, instead, have the file types register
themselves, using wtap_register_file_type_subtypes().
This reduces the source code changes needed to add a new file type from
three (add the handler, add the file type to the table in file_access.c,
add a #define for the file type in wiretap/wtap.h) to one (add the
handler). (It also requires adding the handler's source file to
wiretap/CMakeLists.txt, but that's required in both cases.)
A few remain because the WTAP_FILE_TYPE_SUBTYPE_ #define is used
elsewhere; that needs to be fixed.
Fix the wiretap/CMakefile.txt file to scan k12text.l, as that now
contains a registration routine. In the process, avoid scanning files
that don't implement a file type and won't ever have a registration
routine.
Add a Lua routine to fetch the total number of file types; we use that
in some code to construct the wtap_filetypes table, which we need to do
in order to continue to have all the values that used to come from the
WTAP_FILE_TYPE_SUBTYPE_ types.
While we're at it, add modelines to a file that lacked them.
2021-02-14 08:34:10 +00:00
|
|
|
}
|
|
|
|
|
2015-01-02 00:45:22 +00:00
|
|
|
/*
|
2019-07-26 18:43:17 +00:00
|
|
|
* Editor modelines - https://www.wireshark.org/tools/modelines.html
|
2015-01-02 00:45:22 +00:00
|
|
|
*
|
|
|
|
* Local variables:
|
|
|
|
* c-basic-offset: 8
|
|
|
|
* tab-width: 8
|
|
|
|
* indent-tabs-mode: t
|
|
|
|
* End:
|
|
|
|
*
|
|
|
|
* vi: set shiftwidth=8 tabstop=8 noexpandtab:
|
|
|
|
* :indentSize=8:tabSize=8:noTabs=false:
|
|
|
|
*/
|