/* csids.c
*
- * $Id: csids.c,v 1.2 2000/08/15 18:19:06 mhall Exp $
+ * $Id: csids.c,v 1.14 2002/06/07 07:27:34 guy Exp $
*
* Copyright (c) 2000 by Mike Hall <mlh@io.com>
* Copyright (c) 2000 by Cisco Systems
* 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
* of data following for that packet.
*
* 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.
- *
+ * were byteswapped. We will check for this and handle it before handing to
+ * ethereal.
*/
-static int csids_read(wtap *wth, int *err);
-static int csids_seek_read(wtap *wth, int seek_off,
- union wtap_pseudo_header *pseudo_header, guint8 *pd, int len);
+static gboolean csids_read(wtap *wth, int *err, long *data_offset);
+static gboolean csids_seek_read(wtap *wth, long seek_off,
+ union wtap_pseudo_header *pseudo_header, guint8 *pd, int len, int *err);
+static void csids_close(wtap *wth);
struct csids_header {
guint32 seconds; /* seconds since epoch */
struct csids_header hdr;
bytesRead=0;
- file_seek(wth->fh, 0, SEEK_SET);
-
/* check the file to make sure it is a csids file. */
- bytesRead = file_read( &hdr, sizeof( struct csids_header) , 1, wth->fh );
+ bytesRead = file_read( &hdr, 1, sizeof( struct csids_header), wth->fh );
if( bytesRead != sizeof( struct csids_header) ) {
*err = file_error( wth->fh );
if( *err != 0 ) {
}
hdr.seconds = pntohl( &hdr.seconds );
hdr.caplen = pntohs( &hdr.caplen );
- bytesRead = file_read( &tmp, 2, 1, wth->fh );
+ bytesRead = file_read( &tmp, 1, 2, wth->fh );
if( bytesRead != 2 ) {
*err = file_error( wth->fh );
if( *err != 0 ) {
return 0;
}
}
- bytesRead = file_read( &iplen, 2, 1, wth->fh );
+ bytesRead = file_read( &iplen, 1, 2, wth->fh );
if( bytesRead != 2 ) {
*err = file_error( wth->fh );
if( *err != 0 ) {
byteswap = FALSE;
}
+ /* no file header. So reset the fh to 0 so we can read the first packet */
+ if (file_seek(wth->fh, 0, SEEK_SET, err) == -1)
+ return -1;
+
wth->data_offset = 0;
wth->capture.csids = g_malloc(sizeof(csids_t));
wth->capture.csids->byteswapped = byteswap;
wth->file_encap = WTAP_ENCAP_RAW_IP;
wth->file_type = WTAP_FILE_CSIDS;
- wth->snapshot_length = 16384; /* just guessing */
- wth->subtype_read = csids_read;
- wth->subtype_seek_read = csids_seek_read;
-
- /* no file header. So reset the fh to 0 so we can read the first packet */
- file_seek(wth->fh, 0, SEEK_SET);
+ wth->snapshot_length = 0; /* not known */
+ wth->subtype_read = csids_read;
+ wth->subtype_seek_read = csids_seek_read;
+ wth->subtype_close = csids_close;
return 1;
}
/* Find the next packet and parse it; called from wtap_loop(). */
-static int csids_read(wtap *wth, int *err)
+static gboolean csids_read(wtap *wth, int *err, long *data_offset)
{
guint8 *buf;
int bytesRead = 0;
struct csids_header hdr;
- int packet_offset = wth->data_offset;
- bytesRead = file_read( &hdr, sizeof( struct csids_header) , 1, wth->fh );
+ *data_offset = wth->data_offset;
+
+ bytesRead = file_read( &hdr, 1, sizeof( struct csids_header) , wth->fh );
if( bytesRead != sizeof( struct csids_header) ) {
*err = file_error( wth->fh );
- if( *err != 0 ) {
- return -1;
- } else {
- return 0;
- }
+ if (*err == 0 && bytesRead != 0)
+ *err = WTAP_ERR_SHORT_READ;
+ return FALSE;
}
hdr.seconds = pntohl(&hdr.seconds);
hdr.caplen = pntohs(&hdr.caplen);
buffer_assure_space(wth->frame_buffer, hdr.caplen);
buf = buffer_start_ptr(wth->frame_buffer);
- bytesRead = file_read( buf, hdr.caplen, 1, wth->fh );
+ bytesRead = file_read( buf, 1, hdr.caplen, wth->fh );
if( bytesRead != hdr.caplen ) {
*err = file_error( wth->fh );
- if( *err != 0 ) {
- return -1;
- }
+ if (*err == 0)
+ *err = WTAP_ERR_SHORT_READ;
+ return FALSE;
}
wth->data_offset += hdr.caplen;
if( wth->capture.csids->byteswapped == TRUE ) {
guint16* swap = (guint16*)buf;
- *(++swap) = BSWAP16(*swap); /* the ip len */
- *(++swap) = BSWAP16(*swap); /* ip id */
- *(++swap) = BSWAP16(*swap); /* ip flags and fragoff */
+ swap++;
+ *(swap) = BSWAP16(*swap); /* the ip len */
+ swap++;
+ *(swap) = BSWAP16(*swap); /* ip id */
+ swap++;
+ *(swap) = BSWAP16(*swap); /* ip flags and fragoff */
}
- /* This is a hack to fix the fact that have to atleast return 1
- * or we stop processing. csids has no file header. We recover from
- * this hack in csids_seek_read by checking the seek_off == 1 and
- * setting it back to 0.
- */
- return packet_offset ? packet_offset : 1;
+ return TRUE;
}
/* Used to read packets in random-access fashion */
-static int
+static gboolean
csids_seek_read (wtap *wth,
- int seek_off,
- union wtap_pseudo_header *pseudo_header,
+ long seek_off,
+ union wtap_pseudo_header *pseudo_header _U_,
guint8 *pd,
- int len)
+ int len,
+ int *err)
{
- int err = 0;
- int bytesRead = 0;
+ int bytesRead;
struct csids_header hdr;
- /* hack to fix a problem with the way error checking is done. If the
- * the return value from csids_read is 0 for the first packet, then
- * we stop there. So I return 1. But that messes up the offset for
- * the seek_off on this call. So if seek_off is 1 then make it 0 and
- * if it is not 1 leave it alone. --mlh
- */
- int real_seek_off = seek_off;
- if( real_seek_off == 1 ) {
- real_seek_off = 0;
- }
-
- file_seek(wth->random_fh, real_seek_off , SEEK_SET);
+ if( file_seek( wth->random_fh, seek_off, SEEK_SET, err ) == -1 )
+ return FALSE;
- bytesRead = file_read( &hdr, sizeof( struct csids_header) , 1, wth->random_fh );
+ bytesRead = file_read( &hdr, 1, sizeof( struct csids_header), wth->random_fh );
if( bytesRead != sizeof( struct csids_header) ) {
- err = file_error( wth->fh );
- if( err != 0 ) {
- return -1;
- } else {
- return 0;
+ *err = file_error( wth->random_fh );
+ if( *err == 0 ) {
+ *err = WTAP_ERR_SHORT_READ;
}
+ return FALSE;
}
hdr.seconds = pntohl(&hdr.seconds);
hdr.caplen = pntohs(&hdr.caplen);
if( len != hdr.caplen ) {
- return -1;
+ *err = WTAP_ERR_BAD_RECORD;
+ return FALSE;
}
- bytesRead = file_read( pd, hdr.caplen, 1, wth->random_fh );
+ bytesRead = file_read( pd, 1, hdr.caplen, wth->random_fh );
if( bytesRead != hdr.caplen ) {
- err = file_error( wth->fh );
- if( err != 0 ) {
- return -1;
- }
+ *err = file_error( wth->random_fh );
+ if( *err == 0 ) {
+ *err = WTAP_ERR_SHORT_READ;
+ }
+ return FALSE;
}
if( wth->capture.csids->byteswapped == TRUE ) {
guint16* swap = (guint16*)pd;
- *(++swap) = BSWAP16(*swap); /* the ip len */
- *(++swap) = BSWAP16(*swap); /* ip id */
- *(++swap) = BSWAP16(*swap); /* ip flags and fragoff */
+ swap++;
+ *(swap) = BSWAP16(*swap); /* the ip len */
+ swap++;
+ *(swap) = BSWAP16(*swap); /* ip id */
+ swap++;
+ *(swap) = BSWAP16(*swap); /* ip flags and fragoff */
}
- return 0;
+ return TRUE;
}
-
-
+static void
+csids_close(wtap *wth)
+{
+ g_free(wth->capture.csids);
+}
git.samba.org / obnox / wireshark / wip.git / blobdiff