wiretap: DPA-400 logfile support
Wiretap support for reading the Unigraf DPA-400 DisplayPort AUX channel monitor logfiles. Bug: 14651 Change-Id: Ia8714a72a9439dd566ef604e001ebf45ecaab76d Reviewed-on: https://code.wireshark.org/review/27415 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Dirk Eibach
Guy Harris
parent
bfd51199e7
commit
c430645b4d
|
|
@ -33,6 +33,7 @@ set(WIRETAP_NONGENERATED_FILES
|
|||
csids.c
|
||||
daintree-sna.c
|
||||
dbs-etherwatch.c
|
||||
dpa400.c
|
||||
dct3trace.c
|
||||
erf.c
|
||||
eyesdn.c
|
||||
|
|
|
|||
|
|
@ -0,0 +1,234 @@
|
|||
/* dpa400.c
|
||||
*
|
||||
* Unigraf DisplayPort AUX channel monitor output parser
|
||||
* Copyright 2018, Dirk Eibach, Guntermann & Drunck GmbH <dirk.eibach@gdsys.cc>
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "wtap-int.h"
|
||||
#include "file_wrappers.h"
|
||||
|
||||
enum {
|
||||
DPA400_DATA = 0x00,
|
||||
DPA400_DATA_END = 0x01,
|
||||
DPA400_EVENT = 0x02,
|
||||
DPA400_START = 0x03,
|
||||
DPA400_STOP = 0x04,
|
||||
DPA400_TS_OVERFLOW = 0x84,
|
||||
};
|
||||
|
||||
struct dpa400_header {
|
||||
guint8 t0;
|
||||
guint8 sb0;
|
||||
guint8 t1;
|
||||
guint8 sb1;
|
||||
guint8 t2;
|
||||
guint8 sb2;
|
||||
};
|
||||
|
||||
static gboolean dpa400_read_header(FILE_T fh, struct dpa400_header *hdr, int *err, gchar **err_info)
|
||||
{
|
||||
if (!wtap_read_bytes_or_eof(fh, hdr, sizeof(struct dpa400_header), err, err_info))
|
||||
return FALSE;
|
||||
|
||||
if (hdr->sb0 || hdr->sb1 || hdr->sb2) {
|
||||
*err = WTAP_ERR_BAD_FILE;
|
||||
*err_info = g_strdup("dpa400: malformed packet header");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void get_ts(struct dpa400_header *hdr, nstime_t *ts)
|
||||
{
|
||||
guint32 val;
|
||||
|
||||
val = (hdr->t0 | (hdr->t1 << 8) | ((hdr->t2 & 0x7f) << 16)) << 5;
|
||||
|
||||
ts->secs = val / 1000000;
|
||||
ts->nsecs = (val % 1000000) * 1000;
|
||||
}
|
||||
|
||||
static void get_ts_overflow(nstime_t *ts)
|
||||
{
|
||||
guint32 val = 0x7fffff << 5;
|
||||
|
||||
ts->secs = val / 1000000;
|
||||
ts->nsecs = (val % 1000000) * 1000;
|
||||
}
|
||||
|
||||
static guint8 get_from(struct dpa400_header *hdr)
|
||||
{
|
||||
return hdr->t2 & 0x80;
|
||||
}
|
||||
|
||||
static gboolean dpa400_read_packet(wtap *wth, FILE_T fh, wtap_rec *rec,
|
||||
Buffer *buf, int *err, gchar **err_info)
|
||||
{
|
||||
guint8 chunk[2];
|
||||
guint32 ctr = 0;
|
||||
|
||||
if (!wth || !rec || !buf)
|
||||
return FALSE;
|
||||
|
||||
if (!wtap_read_bytes_or_eof(fh, chunk, sizeof(chunk), err, err_info))
|
||||
return FALSE;
|
||||
|
||||
if (chunk[1] != 1) {
|
||||
*err = WTAP_ERR_BAD_FILE;
|
||||
*err_info = g_strdup("dpa400: malformed packet framing");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
ws_buffer_clean(buf);
|
||||
|
||||
ws_buffer_append(buf, &chunk[0], 1);
|
||||
ctr++;
|
||||
|
||||
switch (chunk[0]) {
|
||||
case DPA400_STOP: {
|
||||
struct dpa400_header hdr;
|
||||
|
||||
if (!dpa400_read_header(fh, &hdr, err, err_info))
|
||||
return FALSE;
|
||||
|
||||
get_ts(&hdr, &rec->ts);
|
||||
|
||||
rec->rec_type = REC_TYPE_PACKET;
|
||||
rec->presence_flags = WTAP_HAS_TS;
|
||||
rec->rec_header.packet_header.caplen = rec->rec_header.packet_header.len = 0;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case DPA400_START:
|
||||
case DPA400_EVENT: {
|
||||
struct dpa400_header hdr;
|
||||
|
||||
if (!dpa400_read_header(fh, &hdr, err, err_info))
|
||||
return FALSE;
|
||||
|
||||
get_ts(&hdr, &rec->ts);
|
||||
|
||||
if (!wtap_read_bytes_or_eof(fh, chunk, sizeof(chunk), err, err_info))
|
||||
return FALSE;
|
||||
|
||||
if (chunk[1]) {
|
||||
*err = WTAP_ERR_BAD_FILE;
|
||||
*err_info = g_strdup("dpa400: malformed packet");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
ws_buffer_append(buf, &chunk[0], 1);
|
||||
ctr++;
|
||||
|
||||
rec->rec_type = REC_TYPE_PACKET;
|
||||
rec->presence_flags = WTAP_HAS_TS;
|
||||
rec->rec_header.packet_header.caplen = rec->rec_header.packet_header.len = ctr;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case DPA400_DATA: {
|
||||
struct dpa400_header hdr;
|
||||
guint8 from_source;
|
||||
|
||||
if (!dpa400_read_header(fh, &hdr, err, err_info))
|
||||
return FALSE;
|
||||
|
||||
get_ts(&hdr, &rec->ts);
|
||||
|
||||
from_source = !get_from(&hdr);
|
||||
ws_buffer_append(buf, &from_source, 1);
|
||||
|
||||
while (1) {
|
||||
if (!wtap_read_bytes_or_eof(fh, chunk, sizeof(chunk), err, err_info))
|
||||
return FALSE;
|
||||
|
||||
if (chunk[1])
|
||||
break;
|
||||
|
||||
if (++ctr > WTAP_MAX_PACKET_SIZE_STANDARD) {
|
||||
*err = WTAP_ERR_BAD_FILE;
|
||||
*err_info = g_strdup_printf("dpa400: File has data record bigger than maximum of %u",
|
||||
WTAP_MAX_PACKET_SIZE_STANDARD);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
ws_buffer_append(buf, &chunk[0], 1);
|
||||
}
|
||||
|
||||
rec->rec_type = REC_TYPE_PACKET;
|
||||
rec->presence_flags = WTAP_HAS_TS;
|
||||
rec->rec_header.packet_header.caplen = rec->rec_header.packet_header.len = ctr;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case DPA400_TS_OVERFLOW: {
|
||||
get_ts_overflow(&rec->ts);
|
||||
|
||||
rec->rec_type = REC_TYPE_PACKET;
|
||||
rec->presence_flags = WTAP_HAS_TS;
|
||||
rec->rec_header.packet_header.caplen = rec->rec_header.packet_header.len = ctr;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
*err = WTAP_ERR_BAD_FILE;
|
||||
*err_info = g_strdup_printf("dpa400: unknown packet type %02x", chunk[0]);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean dpa400_seek_read(wtap *wth, gint64 seek_off, wtap_rec *rec, Buffer *buf,
|
||||
int *err, gchar **err_info)
|
||||
{
|
||||
if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
|
||||
return FALSE;
|
||||
|
||||
return dpa400_read_packet(wth, wth->random_fh, rec, buf, err, err_info);
|
||||
}
|
||||
|
||||
static gboolean dpa400_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
|
||||
{
|
||||
*err = 0;
|
||||
|
||||
*data_offset = file_tell(wth->fh);
|
||||
|
||||
return dpa400_read_packet(wth, wth->fh, &wth->rec, wth->rec_data, err, err_info);
|
||||
}
|
||||
|
||||
wtap_open_return_val dpa400_open(wtap *wth, int *err, gchar **err_info)
|
||||
{
|
||||
char magic[4];
|
||||
const char dpa_magic[] = { 'D', 'B', 'F', 'R' };
|
||||
|
||||
/* Read in the number that should be at the start of a "dpa-400" file */
|
||||
if (!wtap_read_bytes(wth->fh, &magic, sizeof magic, err, err_info)) {
|
||||
if (*err != WTAP_ERR_SHORT_READ)
|
||||
return WTAP_OPEN_ERROR;
|
||||
return WTAP_OPEN_NOT_MINE;
|
||||
}
|
||||
|
||||
if (memcmp(magic, dpa_magic, sizeof(dpa_magic)))
|
||||
return WTAP_OPEN_NOT_MINE;
|
||||
|
||||
wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_DPA400;
|
||||
wth->file_encap = WTAP_ENCAP_DPAUXMON;
|
||||
wth->file_tsprec = WTAP_TSPREC_USEC;
|
||||
wth->subtype_read = dpa400_read;
|
||||
wth->subtype_seek_read = dpa400_seek_read;
|
||||
wth->snapshot_length = 0;
|
||||
|
||||
return WTAP_OPEN_MINE;
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
/* dpa400.h
|
||||
*
|
||||
* Copyright 2018, Dirk Eibach, Guntermann & Drunck GmbH <dirk.eibach@gdsys.cc>
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#ifndef __DPA400_H__
|
||||
#define __DPA400_H__
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include "wtap.h"
|
||||
|
||||
wtap_open_return_val dpa400_open(wtap *wth, int *err, gchar **err_info);
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
* 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:
|
||||
*/
|
||||
|
|
@ -72,6 +72,7 @@
|
|||
#include "pcap-encap.h"
|
||||
#include "nettrace_3gpp_32_423.h"
|
||||
#include "mplog.h"
|
||||
#include "dpa400.h"
|
||||
|
||||
/*
|
||||
* Add an extension, and all compressed versions thereof, to a GSList
|
||||
|
|
@ -351,6 +352,7 @@ static const struct open_info open_info_base[] = {
|
|||
{ "Gammu DCT3 trace", OPEN_INFO_MAGIC, dct3trace_open, NULL, NULL, NULL },
|
||||
{ "MIME Files Format", OPEN_INFO_MAGIC, mime_file_open, NULL, NULL, NULL },
|
||||
{ "Micropross mplog", OPEN_INFO_MAGIC, mplog_open, "mplog", NULL, NULL },
|
||||
{ "Unigraf DPA-400 capture", OPEN_INFO_MAGIC, dpa400_open, "bin", NULL, NULL },
|
||||
{ "Novell LANalyzer", OPEN_INFO_HEURISTIC, lanalyzer_open, "tr1", NULL, NULL },
|
||||
/*
|
||||
* PacketLogger must come before MPEG, because its files
|
||||
|
|
@ -1602,6 +1604,11 @@ static const struct file_type_subtype_info dump_open_table_base[] = {
|
|||
|
||||
/* WTAP_FILE_TYPE_SUBTYPE_MPLOG */
|
||||
{ "Micropross mplog file", "mplog", "mplog", NULL,
|
||||
FALSE, FALSE, 0,
|
||||
NULL, NULL, NULL },
|
||||
|
||||
/* WTAP_FILE_TYPE_SUBTYPE_DPA400 */
|
||||
{ "Unigraf DisplayPort AUX channel monitor output parser", "dpa400", "bin", NULL,
|
||||
FALSE, FALSE, 0,
|
||||
NULL, NULL, NULL }
|
||||
};
|
||||
|
|
|
|||
|
|
@ -372,6 +372,7 @@ extern "C" {
|
|||
#define WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_5 78
|
||||
#define WTAP_FILE_TYPE_SUBTYPE_NETTRACE_3GPP_32_423 79
|
||||
#define WTAP_FILE_TYPE_SUBTYPE_MPLOG 80
|
||||
#define WTAP_FILE_TYPE_SUBTYPE_DPA400 81
|
||||
|
||||
#define WTAP_NUM_FILE_TYPES_SUBTYPES wtap_get_num_file_types_subtypes()
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue