/* ascend.c
*
- * $Id: ascend.c,v 1.18 2000/09/07 05:34:07 gram Exp $
+ * $Id: ascend.c,v 1.31 2002/08/28 20:30:44 jmayer Exp $
*
* Wiretap Library
- * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
- *
+ * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* 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.
- *
*/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "ascend-int.h"
#include "file_wrappers.h"
+#include <errno.h>
+
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
around quite a bit, otherwise I'd put a more specific URL here.
Example 'wandsess' output data:
-
+
RECV-iguana:241:(task: B02614C0, time: 1975432.85) 49 octets @ 8003BD94
- [0000]: FF 03 00 3D C0 06 CA 22 2F 45 00 00 28 6A 3B 40
- [0010]: 00 3F 03 D7 37 CE 41 62 12 CF 00 FB 08 20 27 00
- [0020]: 50 E4 08 DD D7 7C 4C 71 92 50 10 7D 78 67 C8 00
- [0030]: 00
+ [0000]: FF 03 00 3D C0 06 CA 22 2F 45 00 00 28 6A 3B 40
+ [0010]: 00 3F 03 D7 37 CE 41 62 12 CF 00 FB 08 20 27 00
+ [0020]: 50 E4 08 DD D7 7C 4C 71 92 50 10 7D 78 67 C8 00
+ [0030]: 00
XMIT-iguana:241:(task: B04E12C0, time: 1975432.85) 53 octets @ 8009EB16
- [0000]: FF 03 00 3D C0 09 1E 31 21 45 00 00 2C 2D BD 40
- [0010]: 00 7A 06 D8 B1 CF 00 FB 08 CE 41 62 12 00 50 20
- [0020]: 29 7C 4C 71 9C 9A 6A 93 A4 60 12 22 38 3F 10 00
- [0030]: 00 02 04 05 B4
+ [0000]: FF 03 00 3D C0 09 1E 31 21 45 00 00 2C 2D BD 40
+ [0010]: 00 7A 06 D8 B1 CF 00 FB 08 CE 41 62 12 00 50 20
+ [0020]: 29 7C 4C 71 9C 9A 6A 93 A4 60 12 22 38 3F 10 00
+ [0030]: 00 02 04 05 B4
Example 'wdd' output data:
Note that a maximum of eight rows will be displayed (for a maximum of
128 bytes), no matter what the octet count is.
-
- When reading a packet, the module prepends an ascend_pkt_hdr to the
+
+ When reading a packet, the module prepends an ascend_pkt_hdr to the
data.
*/
#define ASCEND_W1_SIZE (sizeof ascend_w1magic / sizeof ascend_w1magic[0])
#define ASCEND_W2_SIZE (sizeof ascend_w2magic / sizeof ascend_w2magic[0])
-static gboolean ascend_read(wtap *wth, int *err, int *data_offset);
-static int ascend_seek_read (wtap *wth, int seek_off,
- union wtap_pseudo_header *pseudo_header, guint8 *pd, int len);
+static gboolean ascend_read(wtap *wth, int *err, long *data_offset);
+static gboolean ascend_seek_read (wtap *wth, long seek_off,
+ union wtap_pseudo_header *pseudo_header, guint8 *pd, int len, int *err);
static void ascend_close(wtap *wth);
/* Seeks to the beginning of the next packet, and returns the
- byte offset. Returns -1 on failure. A valid offset is 0; since
- that causes problems with wtap_loop, offsets are incremented by one. */
-/* XXX - Handle I/O errors. */
-static int ascend_seek(wtap *wth, int max_seek)
+ byte offset at which the heade for that packet begins.
+ Returns -1 on failure.
+
+ If it finds a packet, then, if "wth->capture.ascend" is non-null,
+ it sets "wth->capture.ascend->next_packet_seek_start" to the point
+ at which the seek pointer should be set before this routine is called
+ to find the packet *after* the packet it finds. */
+static long ascend_seek(wtap *wth, int max_seek, int *err)
{
- int byte, bytes_read = 0, date_off = 0;
- int x_level = 0, r_level = 0, w1_level = 0, w2_level = 0;
+ int byte, bytes_read = 0;
+ long date_off = -1, cur_off, packet_off;
+ unsigned int r_level = 0, x_level = 0, w1_level = 0, w2_level = 0;
while (((byte = file_getc(wth->fh)) != EOF) && bytes_read < max_seek) {
if (byte == ascend_xmagic[x_level]) {
x_level++;
if (x_level >= ASCEND_X_SIZE) {
- file_seek(wth->fh, -(ASCEND_X_SIZE), SEEK_CUR);
- return file_tell(wth->fh) + 1;
+ /* At what offset are we now? */
+ cur_off = file_tell(wth->fh);
+ if (cur_off == -1) {
+ /* Error. */
+ *err = file_error(wth->fh);
+ return -1;
+ }
+
+ /* Back up over the header we just read; that's where a read
+ of this packet should start. */
+ packet_off = cur_off - ASCEND_X_SIZE;
+ goto found;
}
} else {
x_level = 0;
if (byte == ascend_rmagic[r_level]) {
r_level++;
if (r_level >= ASCEND_R_SIZE) {
- file_seek(wth->fh, -(ASCEND_R_SIZE), SEEK_CUR);
- return file_tell(wth->fh) + 1;
+ /* At what offset are we now? */
+ cur_off = file_tell(wth->fh);
+ if (cur_off == -1) {
+ /* Error. */
+ *err = file_error(wth->fh);
+ return -1;
+ }
+
+ /* Back up over the header we just read; that's where a read
+ of this packet should start. */
+ packet_off = cur_off - ASCEND_R_SIZE;
+ goto found;
}
} else {
r_level = 0;
if (byte == ascend_w1magic[w1_level]) {
w1_level++;
if (w1_level >= ASCEND_W1_SIZE) {
- date_off = file_tell(wth->fh) - ASCEND_W1_SIZE + 1;
+ /* Get the offset at which the "Date:" header started. */
+ cur_off = file_tell(wth->fh);
+ if (cur_off == -1) {
+ /* Error. */
+ *err = file_error(wth->fh);
+ return -1;
+ }
+
+ date_off = cur_off - ASCEND_W1_SIZE;
}
} else {
w1_level = 0;
}
if (byte == ascend_w2magic[w2_level]) {
w2_level++;
- if (w2_level >= ASCEND_W2_SIZE && date_off) {
- file_seek(wth->fh, date_off - 1, SEEK_SET);
- return date_off;
+ if (w2_level >= ASCEND_W2_SIZE) {
+ /* At what offset are we now? */
+ cur_off = file_tell(wth->fh);
+ if (cur_off == -1) {
+ /* Error. */
+ *err = file_error(wth->fh);
+ return -1;
+ }
+
+ if (date_off != -1) {
+ /* This packet has a date/time header; a read of it should
+ start at the beginning of *that* header. */
+ packet_off = date_off;
+ } else {
+ /* This packet has only a per-packet header.
+ Back up over that header, which we just read; that's where
+ a read of this packet should start. */
+ packet_off = cur_off - ASCEND_W2_SIZE;
+ }
+ goto found;
}
} else {
w2_level = 0;
}
bytes_read++;
}
+ if (byte != EOF || file_eof(wth->fh)) {
+ /* Either we didn't find the offset, or we got an EOF. */
+ *err = 0;
+ } else {
+ /* We (presumably) got an error (there's no equivalent to "ferror()"
+ in zlib, alas, so we don't have a wrapper to check for an error). */
+ *err = file_error(wth->fh);
+ }
return -1;
+
+found:
+ /*
+ * The search for the packet after this one should start right
+ * after the header for this packet. (Ideally, it should
+ * start after the *data* for this one, but we haven't
+ * read that yet.)
+ */
+ if (wth->capture.ascend != NULL)
+ wth->capture.ascend->next_packet_seek_start = cur_off + 1;
+
+ /*
+ * Move to where the read for this packet should start, and return
+ * that seek offset.
+ */
+ if (file_seek(wth->fh, packet_off, SEEK_SET, err) == -1)
+ return -1;
+ return packet_off;
}
-/* XXX - return -1 on I/O error and actually do something with 'err'. */
int ascend_open(wtap *wth, int *err)
{
- int offset;
+ long offset;
+ struct stat statbuf;
+
+ /* We haven't yet allocated a data structure for our private stuff;
+ set the pointer to null, so that "ascend_seek()" knows not to
+ fill it in. */
+ wth->capture.ascend = NULL;
- file_seek(wth->fh, 0, SEEK_SET);
- offset = ascend_seek(wth, ASCEND_MAX_SEEK);
- if (offset < 1) {
- return 0;
+ offset = ascend_seek(wth, ASCEND_MAX_SEEK, err);
+ if (offset == -1) {
+ if (*err == 0)
+ return 0;
+ else
+ return -1;
}
wth->data_offset = offset;
wth->subtype_close = ascend_close;
wth->capture.ascend = g_malloc(sizeof(ascend_t));
- /* MAXen and Pipelines report the time since reboot. In order to keep
+ /* The first packet we want to read is the one that "ascend_seek()"
+ just found; start searching for it at the offset at which it
+ found it. */
+ wth->capture.ascend->next_packet_seek_start = offset;
+
+ /* MAXen and Pipelines report the time since reboot. In order to keep
from reporting packet times near the epoch, we subtract the first
packet's timestamp from the capture file's ctime, which gives us an
offset that we can apply to each packet.
-
- NOTE: Since we can't fstat a compressed file, assume that the first
- packet time is 0 and other packets are relative to this.
*/
- wth->capture.ascend->inittime = 0;
+ if (fstat(wtap_fd(wth), &statbuf) == -1) {
+ *err = errno;
+ g_free(wth->capture.ascend);
+ return -1;
+ }
+ wth->capture.ascend->inittime = statbuf.st_ctime;
wth->capture.ascend->adjusted = 0;
- wth->capture.ascend->seek_add = -1;
init_parse_ascend();
}
/* Read the next packet; called from wtap_loop(). */
-static gboolean ascend_read(wtap *wth, int *err, int *data_offset)
+static gboolean ascend_read(wtap *wth, int *err, long *data_offset)
{
- int offset;
+ long offset;
guint8 *buf = buffer_start_ptr(wth->frame_buffer);
ascend_pkthdr header;
/* (f)lex reads large chunks of the file into memory, so file_tell() doesn't
- give us the correct location of the packet. Instead, we seek to the
- location of the last packet and try to find the next packet. In
- addition, we fool around with the seek offset in case a valid packet
- starts at the beginning of the file. */
- file_seek(wth->fh, wth->data_offset + wth->capture.ascend->seek_add, SEEK_SET);
- wth->capture.ascend->seek_add = 0;
- offset = ascend_seek(wth, ASCEND_MAX_SEEK);
- if (offset < 1) {
+ give us the correct location of the packet. Instead, we seek to the
+ offset after the header of the previous packet and try to find the next
+ packet. */
+ if (file_seek(wth->fh, wth->capture.ascend->next_packet_seek_start,
+ SEEK_SET, err) == -1)
+ return FALSE;
+ offset = ascend_seek(wth, ASCEND_MAX_SEEK, err);
+ if (offset == -1)
return FALSE;
- }
if (! parse_ascend(wth->fh, buf, &wth->pseudo_header.ascend, &header, 0)) {
*err = WTAP_ERR_BAD_RECORD;
return FALSE;
if (! wth->capture.ascend->adjusted) {
wth->capture.ascend->adjusted = 1;
- wth->capture.ascend->inittime = -header.secs;
+ if (header.start_time != 0) {
+ /*
+ * Capture file contained a date and time.
+ * We do this only if this is the very first packet we've seen -
+ * i.e., if "wth->capture.ascend->adjusted" is false - because
+ * if we get a date and time after the first packet, we can't
+ * go back and adjust the time stamps of the packets we've already
+ * processed, and basing the time stamps of this and following
+ * packets on the time stamp from the file text rather than the
+ * ctime of the capture file means times before this and after
+ * this can't be compared.
+ */
+ wth->capture.ascend->inittime = header.start_time;
+ }
+ if (wth->capture.ascend->inittime > header.secs)
+ wth->capture.ascend->inittime -= header.secs;
}
wth->phdr.ts.tv_sec = header.secs + wth->capture.ascend->inittime;
wth->phdr.ts.tv_usec = header.usecs;
return TRUE;
}
-static int ascend_seek_read (wtap *wth, int seek_off,
- union wtap_pseudo_header *pseudo_header, guint8 *pd, int len)
+static gboolean ascend_seek_read (wtap *wth, long seek_off,
+ union wtap_pseudo_header *pseudo_header, guint8 *pd, int len, int *err)
{
- file_seek(wth->random_fh, seek_off - 1, SEEK_SET);
- return parse_ascend(wth->random_fh, pd, &pseudo_header->ascend, NULL, len);
+ if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
+ return FALSE;
+ if (! parse_ascend(wth->random_fh, pd, &pseudo_header->ascend, NULL, len)) {
+ *err = WTAP_ERR_BAD_RECORD;
+ return FALSE;
+ }
+ return TRUE;
}
static void ascend_close(wtap *wth)
git.samba.org / obnox / wireshark / wip.git / blobdiff