*
* For a time there was an error in iplogging and the ip length, flags, and id
* were byteswapped. We will check for this and handle it before handing to
- * ethereal.
+ * wireshark.
*/
static gboolean csids_read(wtap *wth, int *err, gchar **err_info,
- long *data_offset);
-static gboolean csids_seek_read(wtap *wth, long seek_off,
+ gint64 *data_offset);
+static gboolean csids_seek_read(wtap *wth, gint64 seek_off,
union wtap_pseudo_header *pseudo_header, guint8 *pd, int len,
int *err, gchar **err_info);
-static void csids_close(wtap *wth);
struct csids_header {
guint32 seconds; /* seconds since epoch */
guint16 caplen; /* the capture length */
};
+typedef struct {
+ gboolean byteswapped;
+} csids_t;
+
/* XXX - return -1 on I/O error and actually do something with 'err'. */
-int csids_open(wtap *wth, int *err, gchar **err_info _U_)
+int csids_open(wtap *wth, int *err, gchar **err_info)
{
/* There is no file header. There is only a header for each packet
* so we read a packet header and compare the caplen with iplen. They
gboolean byteswap = FALSE;
struct csids_header hdr;
- bytesRead=0;
+ csids_t *csids;
/* check the file to make sure it is a csids file. */
- bytesRead = file_read( &hdr, 1, sizeof( struct csids_header), wth->fh );
+ bytesRead = file_read( &hdr, sizeof( struct csids_header), wth->fh );
if( bytesRead != sizeof( struct csids_header) ) {
- *err = file_error( wth->fh );
+ *err = file_error( wth->fh, err_info );
if( *err != 0 ) {
return -1;
} else {
return 0;
}
}
- if( hdr.zeropad != 0 ) {
+ if( hdr.zeropad != 0 || hdr.caplen == 0 ) {
return 0;
}
hdr.seconds = pntohl( &hdr.seconds );
hdr.caplen = pntohs( &hdr.caplen );
- bytesRead = file_read( &tmp, 1, 2, wth->fh );
+ bytesRead = file_read( &tmp, 2, wth->fh );
if( bytesRead != 2 ) {
- *err = file_error( wth->fh );
+ *err = file_error( wth->fh, err_info );
if( *err != 0 ) {
return -1;
} else {
return 0;
}
}
- bytesRead = file_read( &iplen, 1, 2, wth->fh );
+ bytesRead = file_read( &iplen, 2, wth->fh );
if( bytesRead != 2 ) {
- *err = file_error( wth->fh );
+ *err = file_error( wth->fh, err_info );
if( *err != 0 ) {
return -1;
} else {
}
}
iplen = pntohs(&iplen);
+
+ if ( iplen == 0 )
+ return(0);
+
/* if iplen and hdr.caplen are equal, default to no byteswap. */
if( iplen > hdr.caplen ) {
/* maybe this is just a byteswapped version. the iplen ipflags */
return -1;
wth->data_offset = 0;
- wth->capture.csids = g_malloc(sizeof(csids_t));
- wth->capture.csids->byteswapped = byteswap;
+ csids = (csids_t *)g_malloc(sizeof(csids_t));
+ wth->priv = (void *)csids;
+ csids->byteswapped = byteswap;
wth->file_encap = WTAP_ENCAP_RAW_IP;
wth->file_type = WTAP_FILE_CSIDS;
wth->snapshot_length = 0; /* not known */
wth->subtype_read = csids_read;
wth->subtype_seek_read = csids_seek_read;
- wth->subtype_close = csids_close;
+ wth->tsprecision = WTAP_FILE_TSPREC_SEC;
return 1;
}
-/* Find the next packet and parse it; called from wtap_loop(). */
-static gboolean csids_read(wtap *wth, int *err, gchar **err_info _U_,
- long *data_offset)
+/* Find the next packet and parse it; called from wtap_read(). */
+static gboolean csids_read(wtap *wth, int *err, gchar **err_info,
+ gint64 *data_offset)
{
+ csids_t *csids = (csids_t *)wth->priv;
guint8 *buf;
int bytesRead = 0;
struct csids_header hdr;
*data_offset = wth->data_offset;
- bytesRead = file_read( &hdr, 1, sizeof( struct csids_header) , wth->fh );
+ bytesRead = file_read( &hdr, sizeof( struct csids_header) , wth->fh );
if( bytesRead != sizeof( struct csids_header) ) {
- *err = file_error( wth->fh );
+ *err = file_error( wth->fh, err_info );
if (*err == 0 && bytesRead != 0)
*err = WTAP_ERR_SHORT_READ;
return FALSE;
buffer_assure_space(wth->frame_buffer, hdr.caplen);
buf = buffer_start_ptr(wth->frame_buffer);
- bytesRead = file_read( buf, 1, hdr.caplen, wth->fh );
+ bytesRead = file_read( buf, hdr.caplen, wth->fh );
if( bytesRead != hdr.caplen ) {
- *err = file_error( wth->fh );
+ *err = file_error( wth->fh, err_info );
if (*err == 0)
*err = WTAP_ERR_SHORT_READ;
return FALSE;
wth->phdr.len = hdr.caplen;
wth->phdr.caplen = hdr.caplen;
- wth->phdr.ts.tv_sec = hdr.seconds;
- wth->phdr.ts.tv_usec = 0;
-
- if( wth->capture.csids->byteswapped == TRUE ) {
- guint16* swap = (guint16*)buf;
- swap++;
- *(swap) = BSWAP16(*swap); /* the ip len */
- swap++;
- *(swap) = BSWAP16(*swap); /* ip id */
- swap++;
- *(swap) = BSWAP16(*swap); /* ip flags and fragoff */
+ wth->phdr.ts.secs = hdr.seconds;
+ wth->phdr.ts.nsecs = 0;
+
+ if( csids->byteswapped ) {
+ PBSWAP16(buf); /* the ip len */
+ PBSWAP16(buf+2); /* ip id */
+ PBSWAP16(buf+4); /* ip flags and fragoff */
}
return TRUE;
/* Used to read packets in random-access fashion */
static gboolean
csids_seek_read (wtap *wth,
- long seek_off,
+ gint64 seek_off,
union wtap_pseudo_header *pseudo_header _U_,
guint8 *pd,
int len,
int *err,
gchar **err_info)
{
+ csids_t *csids = (csids_t *)wth->priv;
int bytesRead;
struct csids_header hdr;
if( file_seek( wth->random_fh, seek_off, SEEK_SET, err ) == -1 )
return FALSE;
- bytesRead = file_read( &hdr, 1, sizeof( struct csids_header), wth->random_fh );
+ bytesRead = file_read( &hdr, sizeof( struct csids_header), wth->random_fh );
if( bytesRead != sizeof( struct csids_header) ) {
- *err = file_error( wth->random_fh );
+ *err = file_error( wth->random_fh, err_info );
if( *err == 0 ) {
*err = WTAP_ERR_SHORT_READ;
}
hdr.caplen = pntohs(&hdr.caplen);
if( len != hdr.caplen ) {
- *err = WTAP_ERR_BAD_RECORD;
+ *err = WTAP_ERR_BAD_FILE;
*err_info = g_strdup_printf("csids: record length %u doesn't match requested length %d",
hdr.caplen, len);
return FALSE;
}
- bytesRead = file_read( pd, 1, hdr.caplen, wth->random_fh );
+ bytesRead = file_read( pd, hdr.caplen, wth->random_fh );
if( bytesRead != hdr.caplen ) {
- *err = file_error( wth->random_fh );
+ *err = file_error( wth->random_fh, err_info );
if( *err == 0 ) {
*err = WTAP_ERR_SHORT_READ;
}
return FALSE;
}
- if( wth->capture.csids->byteswapped == TRUE ) {
- guint16* swap = (guint16*)pd;
- swap++;
- *(swap) = BSWAP16(*swap); /* the ip len */
- swap++;
- *(swap) = BSWAP16(*swap); /* ip id */
- swap++;
- *(swap) = BSWAP16(*swap); /* ip flags and fragoff */
+ if( csids->byteswapped ) {
+ PBSWAP16(pd); /* the ip len */
+ PBSWAP16(pd+2); /* ip id */
+ PBSWAP16(pd+4); /* ip flags and fragoff */
}
return TRUE;
}
-
-static void
-csids_close(wtap *wth)
-{
- g_free(wth->capture.csids);
-}