#include "config.h"
-#include <glib.h>
-#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <string.h>
-#include <ctype.h>
-#include "wtap.h"
#include "wtap-int.h"
-#include "buffer.h"
#include "file_wrappers.h"
#include "daintree-sna.h"
static gboolean daintree_sna_seek_read(wtap *wth, gint64 seek_off,
struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info);
-static gboolean daintree_sna_scan_header(struct wtap_pkthdr *phdr,
- char *readLine, char *readData, int *err, gchar **err_info);
-
-static gboolean daintree_sna_process_hex_data(struct wtap_pkthdr *phdr,
- Buffer *buf, char *readData, int *err, gchar **err_info);
+static gboolean daintree_sna_read_packet(FILE_T fh, struct wtap_pkthdr *phdr,
+ Buffer *buf, int *err, gchar **err_info);
/* Open a file and determine if it's a Daintree file */
-int daintree_sna_open(wtap *wth, int *err, gchar **err_info)
+wtap_open_return_val daintree_sna_open(wtap *wth, int *err, gchar **err_info)
{
char readLine[DAINTREE_MAX_LINE_SIZE];
- guint i;
/* get first line of file header */
if (file_gets(readLine, DAINTREE_MAX_LINE_SIZE, wth->fh)==NULL) {
*err = file_error(wth->fh, err_info);
if (*err != 0 && *err != WTAP_ERR_SHORT_READ)
- return -1;
- return 0;
+ return WTAP_OPEN_ERROR;
+ return WTAP_OPEN_NOT_MINE;
}
/* check magic text */
- i = 0;
- while (i < DAINTREE_MAGIC_TEXT_SIZE) {
- if (readLine[i] != daintree_magic_text[i]) return 0; /* not daintree format */
- i++;
- }
+ if (memcmp(readLine, daintree_magic_text, DAINTREE_MAGIC_TEXT_SIZE) != 0)
+ return WTAP_OPEN_NOT_MINE; /* not daintree format */
/* read second header line */
if (file_gets(readLine, DAINTREE_MAX_LINE_SIZE, wth->fh)==NULL) {
*err = file_error(wth->fh, err_info);
if (*err != 0 && *err != WTAP_ERR_SHORT_READ)
- return -1;
- return 0;
+ return WTAP_OPEN_ERROR;
+ return WTAP_OPEN_NOT_MINE;
}
- if (readLine[0] != COMMENT_LINE) return 0; /* daintree files have a two line header */
+ if (readLine[0] != COMMENT_LINE)
+ return WTAP_OPEN_NOT_MINE; /* daintree files have a two line header */
/* set up the pointers to the handlers for this file type */
wth->subtype_read = daintree_sna_read;
/* set up for file type */
wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_DAINTREE_SNA;
wth->file_encap = WTAP_ENCAP_IEEE802_15_4_NOFCS;
- wth->tsprecision = WTAP_FILE_TSPREC_USEC;
+ wth->file_tsprec = WTAP_TSPREC_USEC;
wth->snapshot_length = 0; /* not available in header */
- return 1; /* it's a Daintree file */
+ return WTAP_OPEN_MINE; /* it's a Daintree file */
}
/* Read the capture file sequentially
static gboolean
daintree_sna_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
{
- char readLine[DAINTREE_MAX_LINE_SIZE];
- char readData[READDATA_BUF_SIZE];
-
*data_offset = file_tell(wth->fh);
- /* 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, wth->fh) == NULL) {
- *err = file_error(wth->fh, err_info);
- return FALSE; /* all done */
- }
- } while (readLine[0] == COMMENT_LINE);
-
- /* parse one line of capture data */
- if (!daintree_sna_scan_header(&wth->phdr, readLine, readData,
- err, err_info))
- return FALSE;
-
- /* process packet data */
- return daintree_sna_process_hex_data(&wth->phdr, wth->frame_buffer,
- readData, err, err_info);
+ /* parse that line and the following packet data */
+ return daintree_sna_read_packet(wth->fh, &wth->phdr,
+ wth->frame_buffer, err, err_info);
}
/* Read the capture file randomly
daintree_sna_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr,
Buffer *buf, int *err, gchar **err_info)
{
- char readLine[DAINTREE_MAX_LINE_SIZE];
- char readData[READDATA_BUF_SIZE];
-
if(file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
return FALSE;
- /* It appears only file header lines start with '#', but
- * if we find any others, we toss them */
- do {
- if (file_gets(readLine, DAINTREE_MAX_LINE_SIZE, wth->random_fh) == NULL) {
- *err = file_error(wth->random_fh, err_info);
- return FALSE; /* all done */
- }
- } while (readLine[0] == COMMENT_LINE);
-
- /* parse one line of capture data */
- if (!daintree_sna_scan_header(phdr, readLine, readData, err, err_info))
- return FALSE;
-
- /* process packet data */
- return daintree_sna_process_hex_data(phdr, buf, readData, err,
+ /* parse that line and the following packet data */
+ return daintree_sna_read_packet(wth->random_fh, phdr, buf, err,
err_info);
}
-/* Scan a header line and fill in a struct wtap_pkthdr */
+/* Read a header line, scan it, and fill in a struct wtap_pkthdr.
+ * 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. */
static gboolean
-daintree_sna_scan_header(struct wtap_pkthdr *phdr, char *readLine,
- char *readData, int *err, gchar **err_info)
+daintree_sna_read_packet(FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf,
+ int *err, gchar **err_info)
{
guint64 seconds;
int useconds;
+ 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);
+
+ phdr->rec_type = REC_TYPE_PACKET;
phdr->presence_flags = WTAP_HAS_TS|WTAP_HAS_CAP_LEN;
if (sscanf(readLine, "%*s %18" G_GINT64_MODIFIER "u.%9d %9u %" READDATA_MAX_FIELD_SIZE "s",
phdr->ts.secs = (time_t) seconds;
phdr->ts.nsecs = useconds * 1000; /* convert mS to nS */
- return TRUE;
-}
-
-/* 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 */
-static gboolean
-daintree_sna_process_hex_data(struct wtap_pkthdr *phdr, Buffer *buf,
- char *readData, int *err, gchar **err_info)
-{
- guchar *str = (guchar *)readData;
- guint bytes;
- guint8 *p;
-
+ /*
+ * READDATA_BUF_SIZE is < WTAP_MAX_PACKET_SIZE, and is the maximum
+ * number of bytes of packet data we can generate, so we don't
+ * need to check the packet length.
+ */
p = str; /* overlay source buffer */
bytes = 0;
/* convert hex string to guint8 */
while(*str) {
/* most significant nibble */
- if (!isxdigit((guchar)*str)) {
+ if (!g_ascii_isxdigit(*str)) {
*err = WTAP_ERR_BAD_FILE;
*err_info = g_strdup("daintree_sna: non-hex digit in hex data");
return FALSE;
}
- if(isdigit((guchar)*str)) {
+ if(g_ascii_isdigit(*str)) {
*p = (*str - '0') << 4;
} else {
- *p = ((tolower(*str) - 'a') + 10) << 4;
+ *p = ((g_ascii_tolower(*str) - 'a') + 10) << 4;
}
str++;
/* least significant nibble */
- if (!isxdigit((guchar)*str)) {
+ if (!g_ascii_isxdigit(*str)) {
*err = WTAP_ERR_BAD_FILE;
*err_info = g_strdup("daintree_sna: non-hex digit in hex data");
return FALSE;
}
- if(isdigit((guchar)*str)) {
+ if(g_ascii_isdigit(*str)) {
*p += *str - '0';
} else {
- *p += (tolower(*str) - 'a') + 10;
+ *p += (g_ascii_tolower(*str) - 'a') + 10;
}
str++;
phdr->caplen = bytes;
- buffer_assure_space(buf, bytes);
- memcpy(buffer_start_ptr(buf), readData, bytes);
+ ws_buffer_assure_space(buf, bytes);
+ memcpy(ws_buffer_start_ptr(buf), readData, bytes);
return TRUE;
}
+
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * 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:
+ */
git.samba.org / metze / wireshark / wip.git / blobdiff