/* iptrace.c
- *
- * $Id: iptrace.c,v 1.33 2001/03/10 06:33:57 guy 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <stdlib.h>
#include <errno.h>
#include <string.h>
#include "wtap-int.h"
#include "file_wrappers.h"
-#include "buffer.h"
+#include "atm.h"
#include "iptrace.h"
-static gboolean iptrace_read_1_0(wtap *wth, int *err, int *data_offset);
-static int iptrace_seek_read_1_0(wtap *wth, int seek_off,
- union wtap_pseudo_header *pseudo_header, u_char *pd, int packet_size);
+#define IPTRACE_IFT_HF 0x3d /* Support for PERCS IP-HFI*/
+#define IPTRACE_IFT_IB 0xc7 /* IP over Infiniband. Number by IANA */
+
+static gboolean iptrace_read_1_0(wtap *wth, int *err, gchar **err_info,
+ gint64 *data_offset);
+static gboolean iptrace_seek_read_1_0(wtap *wth, gint64 seek_off,
+ struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info);
-static gboolean iptrace_read_2_0(wtap *wth, int *err, int *data_offset);
-static int iptrace_seek_read_2_0(wtap *wth, int seek_off,
- union wtap_pseudo_header *pseudo_header, u_char *pd, int packet_size);
+static gboolean iptrace_read_2_0(wtap *wth, int *err, gchar **err_info,
+ gint64 *data_offset);
+static gboolean iptrace_seek_read_2_0(wtap *wth, gint64 seek_off,
+ struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info);
-static int iptrace_read_rec_header(FILE_T fh, guint8 *header, int header_len,
- int *err);
-static int iptrace_read_rec_data(FILE_T fh, guint8 *data_ptr, int packet_size,
- int *err);
-static void get_atm_pseudo_header(union wtap_pseudo_header *pseudo_header,
- guint8 *header);
+static gboolean iptrace_read_rec_data(FILE_T fh, Buffer *buf,
+ struct wtap_pkthdr *phdr, int *err, gchar **err_info);
+static void fill_in_pseudo_header(int encap,
+ union wtap_pseudo_header *pseudo_header, guint8 *header);
static int wtap_encap_ift(unsigned int ift);
-int iptrace_open(wtap *wth, int *err)
+#define NAME_SIZE 11
+
+wtap_open_return_val iptrace_open(wtap *wth, int *err, gchar **err_info)
{
- int bytes_read;
- char name[12];
-
- errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(name, 1, 11, wth->fh);
- if (bytes_read != 11) {
- *err = file_error(wth->fh);
- if (*err != 0)
- return -1;
- return 0;
+ char name[NAME_SIZE+1];
+
+ if (!wtap_read_bytes(wth->fh, name, NAME_SIZE, err, err_info)) {
+ if (*err != WTAP_ERR_SHORT_READ)
+ return WTAP_OPEN_ERROR;
+ return WTAP_OPEN_NOT_MINE;
}
- wth->data_offset += 11;
- name[11] = 0;
+ name[NAME_SIZE] = '\0';
if (strcmp(name, "iptrace 1.0") == 0) {
- wth->file_type = WTAP_FILE_IPTRACE_1_0;
+ wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_IPTRACE_1_0;
wth->subtype_read = iptrace_read_1_0;
wth->subtype_seek_read = iptrace_seek_read_1_0;
+ wth->file_tsprec = WTAP_TSPREC_SEC;
}
else if (strcmp(name, "iptrace 2.0") == 0) {
- wth->file_type = WTAP_FILE_IPTRACE_2_0;
+ wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_IPTRACE_2_0;
wth->subtype_read = iptrace_read_2_0;
wth->subtype_seek_read = iptrace_seek_read_2_0;
+ wth->file_tsprec = WTAP_TSPREC_NSEC;
}
else {
- return 0;
+ return WTAP_OPEN_NOT_MINE;
}
- return 1;
+ return WTAP_OPEN_MINE;
}
/***********************************************************
* iptrace 1.0 *
***********************************************************/
-/* iptrace 1.0, discovered through inspection */
+/*
+ * iptrace 1.0, discovered through inspection
+ *
+ * Packet record contains:
+ *
+ * an initial header, with a length field and a time stamp, in
+ * seconds since the Epoch;
+ *
+ * data, with the specified length.
+ *
+ * The data contains:
+ *
+ * a bunch of information about the packet;
+ *
+ * padding, at least for FDDI;
+ *
+ * the raw packet data.
+ */
typedef struct {
/* 0-3 */ guint32 pkt_length; /* packet length + 0x16 */
/* 4-7 */ guint32 tv_sec; /* time stamp, seconds since the Epoch */
/* 29 */ guint8 tx_flag; /* 0=receive, 1=transmit */
} iptrace_1_0_phdr;
-/* Read the next packet */
-static gboolean iptrace_read_1_0(wtap *wth, int *err, int *data_offset)
+#define IPTRACE_1_0_PHDR_SIZE 30 /* initial header plus packet data */
+#define IPTRACE_1_0_PDATA_SIZE 22 /* packet data */
+
+static gboolean
+iptrace_read_rec_1_0(FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf,
+ int *err, gchar **err_info)
{
- int ret;
- guint32 packet_size;
- guint8 header[30];
- guint8 *data_ptr;
+ guint8 header[IPTRACE_1_0_PHDR_SIZE];
iptrace_1_0_phdr pkt_hdr;
+ guint32 packet_size;
- /* Read the descriptor data */
- *data_offset = wth->data_offset;
- ret = iptrace_read_rec_header(wth->fh, header, 30, err);
- if (ret <= 0) {
+ if (!wtap_read_bytes_or_eof(fh, header, sizeof header, err, err_info)) {
/* Read error or EOF */
return FALSE;
}
- wth->data_offset += 30;
-
- /* Read the packet data */
- packet_size = pntohl(&header[0]) - 0x16;
- buffer_assure_space( wth->frame_buffer, packet_size );
- data_ptr = buffer_start_ptr( wth->frame_buffer );
- if (iptrace_read_rec_data(wth->fh, data_ptr, packet_size, err) < 0)
- return FALSE; /* Read error */
- wth->data_offset += packet_size;
-
- wth->phdr.len = packet_size;
- wth->phdr.caplen = packet_size;
- wth->phdr.ts.tv_sec = pntohl(&header[4]);
- wth->phdr.ts.tv_usec = 0;
/*
* Byte 28 of the frame header appears to be a BSD-style IFT_xxx
* <net/if_types.h> header file.
*/
pkt_hdr.if_type = header[28];
- wth->phdr.pkt_encap = wtap_encap_ift(pkt_hdr.if_type);
-
- if (wth->phdr.pkt_encap == WTAP_ENCAP_UNKNOWN) {
- g_message("iptrace: interface type IFT=0x%02x unknown or unsupported",
+ phdr->pkt_encap = wtap_encap_ift(pkt_hdr.if_type);
+ if (phdr->pkt_encap == WTAP_ENCAP_UNKNOWN) {
+ *err = WTAP_ERR_UNSUPPORTED;
+ *err_info = g_strdup_printf("iptrace: interface type IFT=0x%02x unknown or unsupported",
pkt_hdr.if_type);
- *err = WTAP_ERR_UNSUPPORTED_ENCAP;
return FALSE;
}
- if ( wth->phdr.pkt_encap == WTAP_ENCAP_ATM_SNIFFER ) {
- get_atm_pseudo_header(&wth->pseudo_header, header);
+ /* Read the packet metadata */
+ packet_size = pntoh32(&header[0]);
+ if (packet_size < IPTRACE_1_0_PDATA_SIZE) {
+ /*
+ * Uh-oh, the record isn't big enough to even have a
+ * packet meta-data header.
+ */
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup_printf("iptrace: file has a %u-byte record, too small to have even a packet meta-data header",
+ packet_size);
+ return FALSE;
+ }
+ packet_size -= IPTRACE_1_0_PDATA_SIZE;
+
+ /*
+ * AIX appears to put 3 bytes of padding in front of FDDI
+ * frames; strip that crap off.
+ */
+ if (phdr->pkt_encap == WTAP_ENCAP_FDDI_BITSWAPPED) {
+ /*
+ * The packet size is really a record size and includes
+ * the padding.
+ */
+ if (packet_size < 3) {
+ /*
+ * Uh-oh, the record isn't big enough to even have
+ * the padding.
+ */
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup_printf("iptrace: file has a %u-byte record, too small to have even a packet meta-data header",
+ packet_size + IPTRACE_1_0_PDATA_SIZE);
+ return FALSE;
+ }
+ packet_size -= 3;
+
+ /*
+ * Skip the padding.
+ */
+ if (!file_skip(fh, 3, err))
+ return FALSE;
+ }
+ if (packet_size > WTAP_MAX_PACKET_SIZE) {
+ /*
+ * Probably a corrupt capture file; don't blow up trying
+ * to allocate space for an immensely-large packet.
+ */
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup_printf("iptrace: File has %u-byte packet, bigger than maximum of %u",
+ packet_size, WTAP_MAX_PACKET_SIZE);
+ return FALSE;
+ }
+
+ phdr->rec_type = REC_TYPE_PACKET;
+ phdr->presence_flags = WTAP_HAS_TS;
+ phdr->len = packet_size;
+ phdr->caplen = packet_size;
+ phdr->ts.secs = pntoh32(&header[4]);
+ phdr->ts.nsecs = 0;
+
+ /* Fill in the pseudo-header. */
+ fill_in_pseudo_header(phdr->pkt_encap, &phdr->pseudo_header, header);
+
+ /* Get the packet data */
+ return iptrace_read_rec_data(fh, buf, phdr, err, err_info);
+}
+
+/* Read the next packet */
+static gboolean iptrace_read_1_0(wtap *wth, int *err, gchar **err_info,
+ gint64 *data_offset)
+{
+ *data_offset = file_tell(wth->fh);
+
+ /* Read the packet */
+ if (!iptrace_read_rec_1_0(wth->fh, &wth->phdr, wth->frame_buffer,
+ err, err_info)) {
+ /* Read error or EOF */
+ return FALSE;
}
/* If the per-file encapsulation isn't known, set it to this
return TRUE;
}
-static int iptrace_seek_read_1_0(wtap *wth, int seek_off,
- union wtap_pseudo_header *pseudo_header, u_char *pd, int packet_size)
+static gboolean iptrace_seek_read_1_0(wtap *wth, gint64 seek_off,
+ struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info)
{
- int ret;
- int err; /* XXX - return this */
- guint8 header[30];
-
- file_seek(wth->random_fh, seek_off, SEEK_SET);
-
- /* Read the descriptor data */
- ret = iptrace_read_rec_header(wth->random_fh, header, 30, &err);
- if (ret <= 0) {
- /* Read error or EOF */
- return ret;
- }
+ if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
+ return FALSE;
- if ( wtap_encap_ift(header[28]) == WTAP_ENCAP_ATM_SNIFFER ) {
- get_atm_pseudo_header(pseudo_header, header);
+ /* Read the packet */
+ if (!iptrace_read_rec_1_0(wth->random_fh, phdr, buf, err, err_info)) {
+ if (*err == 0)
+ *err = WTAP_ERR_SHORT_READ;
+ return FALSE;
}
-
- /* Read the packet data */
- return iptrace_read_rec_data(wth->random_fh, pd, packet_size, &err);
+ return TRUE;
}
/***********************************************************
* iptrace 2.0 *
***********************************************************/
-/* iptrace 2.0, discovered through inspection */
+/*
+ * iptrace 2.0, discovered through inspection
+ *
+ * Packet record contains:
+ *
+ * an initial header, with a length field and a time stamp, in
+ * seconds since the Epoch;
+ *
+ * data, with the specified length.
+ *
+ * The data contains:
+ *
+ * a bunch of information about the packet;
+ *
+ * padding, at least for FDDI;
+ *
+ * the raw packet data.
+ */
typedef struct {
/* 0-3 */ guint32 pkt_length; /* packet length + 32 */
/* 4-7 */ guint32 tv_sec0; /* time stamp, seconds since the Epoch */
/* 36-39 */ guint32 tv_nsec; /* nanoseconds since that second */
} iptrace_2_0_phdr;
-/* Read the next packet */
-static gboolean iptrace_read_2_0(wtap *wth, int *err, int *data_offset)
+#define IPTRACE_2_0_PHDR_SIZE 40 /* initial header plus packet data */
+#define IPTRACE_2_0_PDATA_SIZE 32 /* packet data */
+
+static gboolean
+iptrace_read_rec_2_0(FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf,
+ int *err, gchar **err_info)
{
- int ret;
- guint32 packet_size;
- guint8 header[40];
- guint8 *data_ptr;
+ guint8 header[IPTRACE_2_0_PHDR_SIZE];
iptrace_2_0_phdr pkt_hdr;
+ guint32 packet_size;
- /* Read the descriptor data */
- *data_offset = wth->data_offset;
- ret = iptrace_read_rec_header(wth->fh, header, 40, err);
- if (ret <= 0) {
+ if (!wtap_read_bytes_or_eof(fh, header, sizeof header, err, err_info)) {
/* Read error or EOF */
return FALSE;
}
- wth->data_offset += 40;
-
- /* Read the packet data */
- packet_size = pntohl(&header[0]) - 32;
- buffer_assure_space( wth->frame_buffer, packet_size );
- data_ptr = buffer_start_ptr( wth->frame_buffer );
- if (iptrace_read_rec_data(wth->fh, data_ptr, packet_size, err) < 0)
- return FALSE; /* Read error */
- wth->data_offset += packet_size;
-
- /* AIX saves time in nsec, not usec. It's easier to make iptrace
- * files more Unix-compliant here than try to get the calling
- * program to know when to use nsec or usec */
-
- wth->phdr.len = packet_size;
- wth->phdr.caplen = packet_size;
- wth->phdr.ts.tv_sec = pntohl(&header[32]);
- wth->phdr.ts.tv_usec = pntohl(&header[36]) / 1000;
/*
* Byte 28 of the frame header appears to be a BSD-style IFT_xxx
* <net/if_types.h> header file.
*/
pkt_hdr.if_type = header[28];
- wth->phdr.pkt_encap = wtap_encap_ift(pkt_hdr.if_type);
-
- if (wth->phdr.pkt_encap == WTAP_ENCAP_UNKNOWN) {
- g_message("iptrace: interface type IFT=0x%02x unknown or unsupported",
+ phdr->pkt_encap = wtap_encap_ift(pkt_hdr.if_type);
+#if 0
+ /*
+ * We used to error out if the interface type in iptrace was
+ * unknown/unhandled, but an iptrace may contain packets
+ * from a variety of interfaces, some known, and others
+ * unknown.
+ *
+ * It is better to display the data even for unknown interface
+ * types, isntead of erroring out. In the future, it would be
+ * nice to be able to flag which frames are shown as data
+ * because their interface type is unknown, and also present
+ * the interface type number to the user so that it can be
+ * reported easily back to the Wireshark developer.
+ *
+ * XXX - what types are there that are used in files but
+ * that we don't handle?
+ */
+ if (phdr->pkt_encap == WTAP_ENCAP_UNKNOWN) {
+ *err = WTAP_ERR_UNSUPPORTED;
+ *err_info = g_strdup_printf("iptrace: interface type IFT=0x%02x unknown or unsupported",
pkt_hdr.if_type);
- *err = WTAP_ERR_UNSUPPORTED_ENCAP;
return FALSE;
}
+#endif
+
+ /* Read the packet metadata */
+ packet_size = pntoh32(&header[0]);
+ if (packet_size < IPTRACE_2_0_PDATA_SIZE) {
+ /*
+ * Uh-oh, the record isn't big enough to even have a
+ * packet meta-data header.
+ */
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup_printf("iptrace: file has a %u-byte record, too small to have even a packet meta-data header",
+ packet_size);
+ return FALSE;
+ }
+ packet_size -= IPTRACE_2_0_PDATA_SIZE;
+
+ /*
+ * AIX appears to put 3 bytes of padding in front of FDDI
+ * frames; strip that crap off.
+ */
+ if (phdr->pkt_encap == WTAP_ENCAP_FDDI_BITSWAPPED) {
+ /*
+ * The packet size is really a record size and includes
+ * the padding.
+ */
+ if (packet_size < 3) {
+ /*
+ * Uh-oh, the record isn't big enough to even have
+ * the padding.
+ */
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup_printf("iptrace: file has a %u-byte record, too small to have even a packet meta-data header",
+ packet_size + IPTRACE_2_0_PDATA_SIZE);
+ return FALSE;
+ }
+ packet_size -= 3;
+
+ /*
+ * Skip the padding.
+ */
+ if (!file_skip(fh, 3, err))
+ return FALSE;
+ }
+ if (packet_size > WTAP_MAX_PACKET_SIZE) {
+ /*
+ * Probably a corrupt capture file; don't blow up trying
+ * to allocate space for an immensely-large packet.
+ */
+ *err = WTAP_ERR_BAD_FILE;
+ *err_info = g_strdup_printf("iptrace: File has %u-byte packet, bigger than maximum of %u",
+ packet_size, WTAP_MAX_PACKET_SIZE);
+ return FALSE;
+ }
+
+ phdr->rec_type = REC_TYPE_PACKET;
+ phdr->presence_flags = WTAP_HAS_TS;
+ phdr->len = packet_size;
+ phdr->caplen = packet_size;
+ phdr->ts.secs = pntoh32(&header[32]);
+ phdr->ts.nsecs = pntoh32(&header[36]);
+
+ /* Fill in the pseudo_header. */
+ fill_in_pseudo_header(phdr->pkt_encap, &phdr->pseudo_header, header);
+
+ /* Get the packet data */
+ return iptrace_read_rec_data(fh, buf, phdr, err, err_info);
+}
+
+/* Read the next packet */
+static gboolean iptrace_read_2_0(wtap *wth, int *err, gchar **err_info,
+ gint64 *data_offset)
+{
+ *data_offset = file_tell(wth->fh);
- if ( wth->phdr.pkt_encap == WTAP_ENCAP_ATM_SNIFFER ) {
- get_atm_pseudo_header(&wth->pseudo_header, header);
+ /* Read the packet */
+ if (!iptrace_read_rec_2_0(wth->fh, &wth->phdr, wth->frame_buffer,
+ err, err_info)) {
+ /* Read error or EOF */
+ return FALSE;
}
/* If the per-file encapsulation isn't known, set it to this
return TRUE;
}
-static int iptrace_seek_read_2_0(wtap *wth, int seek_off,
- union wtap_pseudo_header *pseudo_header, u_char *pd, int packet_size)
+static gboolean iptrace_seek_read_2_0(wtap *wth, gint64 seek_off,
+ struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info)
{
- int ret;
- int err; /* XXX - return this */
- guint8 header[40];
-
- file_seek(wth->random_fh, seek_off, SEEK_SET);
-
- /* Read the descriptor data */
- ret = iptrace_read_rec_header(wth->random_fh, header, 40, &err);
- if (ret <= 0) {
- /* Read error or EOF */
- return ret;
- }
-
- if ( wtap_encap_ift(header[28]) == WTAP_ENCAP_ATM_SNIFFER ) {
- get_atm_pseudo_header(pseudo_header, header);
- }
-
- /* Read the packet data */
- return iptrace_read_rec_data(wth->random_fh, pd, packet_size, &err);
-}
+ if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
+ return FALSE;
-static int
-iptrace_read_rec_header(FILE_T fh, guint8 *header, int header_len, int *err)
-{
- int bytes_read;
-
- errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(header, 1, header_len, fh);
- if (bytes_read != header_len) {
- *err = file_error(fh);
- if (*err != 0)
- return -1;
- if (bytes_read != 0) {
+ /* Read the packet */
+ if (!iptrace_read_rec_2_0(wth->random_fh, phdr, buf, err, err_info)) {
+ if (*err == 0)
*err = WTAP_ERR_SHORT_READ;
- return -1;
- }
- return 0;
+ return FALSE;
}
- return 1;
+ return TRUE;
}
-static int
-iptrace_read_rec_data(FILE_T fh, guint8 *data_ptr, int packet_size, int *err)
+static gboolean
+iptrace_read_rec_data(FILE_T fh, Buffer *buf, struct wtap_pkthdr *phdr,
+ int *err, gchar **err_info)
{
- int bytes_read;
-
- errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read( data_ptr, 1, packet_size, fh );
+ if (!wtap_read_packet_bytes(fh, buf, phdr->caplen, err, err_info))
+ return FALSE;
- if (bytes_read != packet_size) {
- *err = file_error(fh);
- if (*err == 0)
- *err = WTAP_ERR_SHORT_READ;
- return -1;
+ if (phdr->pkt_encap == WTAP_ENCAP_ATM_PDUS) {
+ /*
+ * Attempt to guess from the packet data, the VPI,
+ * and the VCI information about the type of traffic.
+ */
+ atm_guess_traffic_type(phdr, ws_buffer_start_ptr(buf));
}
- return 0;
+
+ return TRUE;
}
/*
- * Fill in the pseudo-header information we can; alas, "iptrace" doesn't
- * tell us what type of traffic is in the packet - it was presumably
- * run on a machine that was one of the endpoints of the connection, so
- * in theory it could presumably have told us, but, for whatever reason,
- * it failed to do so - perhaps the low-level mechanism that feeds the
- * presumably-AAL5 frames to us doesn't have access to that information
- * (e.g., because it's in the ATM driver, and the ATM driver merely knows
- * that stuff on VPI/VCI X.Y should be handed up to some particular
- * client, it doesn't know what that client is).
+ * Fill in the pseudo-header information we can.
+ *
+ * For ATM traffic, "iptrace", alas, doesn't tell us what type of traffic
+ * is in the packet - it was presumably run on a machine that was one of
+ * the endpoints of the connection, so in theory it could presumably have
+ * told us, but, for whatever reason, it failed to do so - perhaps the
+ * low-level mechanism that feeds the presumably-AAL5 frames to us doesn't
+ * have access to that information (e.g., because it's in the ATM driver,
+ * and the ATM driver merely knows that stuff on VPI/VCI X.Y should be
+ * handed up to some particular client, it doesn't know what that client is).
*
* We let our caller try to figure out what kind of traffic it is, either
* by guessing based on the VPI/VCI, guessing based on the header of the
* in some fashion what sort of traffic it is, or being told by the user.
*/
static void
-get_atm_pseudo_header(union wtap_pseudo_header *pseudo_header, guint8 *header)
+fill_in_pseudo_header(int encap, union wtap_pseudo_header *pseudo_header,
+ guint8 *header)
{
char if_text[9];
char *decimal;
int Vpi = 0;
int Vci = 0;
- /* Rip apart the "x.y" text into Vpi/Vci numbers */
- memcpy(if_text, &header[20], 8);
- if_text[8] = '\0';
- decimal = strchr(if_text, '.');
- if (decimal) {
- *decimal = '\0';
- Vpi = strtoul(if_text, NULL, 10);
- decimal++;
- Vci = strtoul(decimal, NULL, 10);
- }
- pseudo_header->ngsniffer_atm.Vpi = Vpi;
- pseudo_header->ngsniffer_atm.Vci = Vci;
+ switch (encap) {
+
+ case WTAP_ENCAP_ATM_PDUS:
+ /* Rip apart the "x.y" text into Vpi/Vci numbers */
+ memcpy(if_text, &header[20], 8);
+ if_text[8] = '\0';
+ decimal = strchr(if_text, '.');
+ if (decimal) {
+ *decimal = '\0';
+ Vpi = (int)strtoul(if_text, NULL, 10);
+ decimal++;
+ Vci = (int)strtoul(decimal, NULL, 10);
+ }
- /*
- * OK, which value means "DTE->DCE" and which value means
- * "DCE->DTE"?
- */
- pseudo_header->ngsniffer_atm.channel = header[29];
-
- /* We don't have this information */
- pseudo_header->ngsniffer_atm.cells = 0;
- pseudo_header->ngsniffer_atm.aal5t_u2u = 0;
- pseudo_header->ngsniffer_atm.aal5t_len = 0;
- pseudo_header->ngsniffer_atm.aal5t_chksum = 0;
-
- /* Assume it's AAL5 traffic, but indicate that we don't know what
- it is beyond that. */
- pseudo_header->ngsniffer_atm.AppTrafType = ATT_AAL5|ATT_HL_UNKNOWN;
- pseudo_header->ngsniffer_atm.AppHLType = AHLT_UNKNOWN;
+ /*
+ * OK, which value means "DTE->DCE" and which value means
+ * "DCE->DTE"?
+ */
+ pseudo_header->atm.channel = header[29];
+
+ pseudo_header->atm.vpi = Vpi;
+ pseudo_header->atm.vci = Vci;
+
+ /* We don't have this information */
+ pseudo_header->atm.flags = 0;
+ pseudo_header->atm.cells = 0;
+ pseudo_header->atm.aal5t_u2u = 0;
+ pseudo_header->atm.aal5t_len = 0;
+ pseudo_header->atm.aal5t_chksum = 0;
+ break;
+
+ case WTAP_ENCAP_ETHERNET:
+ /* We assume there's no FCS in this frame. */
+ pseudo_header->eth.fcs_len = 0;
+ break;
+ }
}
/* Given an RFC1573 (SNMP ifType) interface type,
/* 0x4 */ WTAP_ENCAP_RAW_IP, /* IFT_X25DDN */
/* 0x5 */ WTAP_ENCAP_UNKNOWN, /* IFT_X25 */
/* 0x6 */ WTAP_ENCAP_ETHERNET, /* IFT_ETHER */
-/* 0x7 */ WTAP_ENCAP_UNKNOWN, /* IFT_ISO88023 */
+/* 0x7 */ WTAP_ENCAP_ETHERNET, /* IFT_ISO88023 */
/* 0x8 */ WTAP_ENCAP_UNKNOWN, /* IFT_ISO88024 */
/* 0x9 */ WTAP_ENCAP_TOKEN_RING, /* IFT_ISO88025 */
/* 0xa */ WTAP_ENCAP_UNKNOWN, /* IFT_ISO88026 */
/* 0x22 */ WTAP_ENCAP_UNKNOWN, /* IFT_PARA */
/* 0x23 */ WTAP_ENCAP_UNKNOWN, /* IFT_ARCNET */
/* 0x24 */ WTAP_ENCAP_UNKNOWN, /* IFT_ARCNETPLUS */
-/* 0x25 */ WTAP_ENCAP_ATM_SNIFFER, /* IFT_ATM */
+/* 0x25 */ WTAP_ENCAP_ATM_PDUS, /* IFT_ATM */
};
#define NUM_IFT_ENCAPS (sizeof ift_encap / sizeof ift_encap[0])
return ift_encap[ift];
}
else {
- return WTAP_ENCAP_UNKNOWN;
+ switch(ift) {
+ /* Infiniband*/
+ case IPTRACE_IFT_IB:
+ return WTAP_ENCAP_INFINIBAND;
+ break;
+
+ /* Host Fabric Interface */
+ case IPTRACE_IFT_HF:
+ /* The HFI interface on AIX provides raw IP
+ in the packet trace. It's unclear if the HFI
+ can be configured for any other protocol, and if
+ any field in the iptrace header indicates what
+ that protocol is. For now, we are hard-coding
+ this as RAW_IP, but if we find another iptrace file
+ using HFI that provides another protocol, we will
+ have to figure out which field in the iptrace file
+ encodes it. */
+ return WTAP_ENCAP_RAW_IP;
+ break;
+
+ default:
+ return WTAP_ENCAP_UNKNOWN;
+ }
}
}
+
+/*
+ * 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