forked from osmocom/wireshark
d6cd61061e
addition to an error code, an error info string, for WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with "g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed strings returned as the error info string, and change the callers of those routines to, for those errors, put the info string into the printed message or alert box for the error. Add messages for cases where those errors were returned without printing an additional message. Nobody uses the error code from "cf_read()" - "cf_read()" puts up the alert box itself for failures; get rid of the error code, so it just returns a success/failure indication. Rename "file_read_error_message()" to "cf_read_error_message()", as it handles read errors from Wiretap, and have it take an error info string as an argument. (That handles a lot of the work of putting the info string into the error message.) Make some variables in "ascend-grammar.y" static. Check the return value of "erf_read_header()" in "erf_seek_read()". Get rid of an unused #define in "i4btrace.c". svn path=/trunk/; revision=9852
89 lines
2.5 KiB
C
89 lines
2.5 KiB
C
/*
|
|
* $Id: network_instruments.h,v 1.5 2004/01/25 21:55:16 guy Exp $
|
|
*/
|
|
|
|
/***************************************************************************
|
|
NetworkInstruments.h - description
|
|
-------------------
|
|
begin : Wed Oct 29 2003
|
|
copyright : (C) 2003 by root
|
|
email : scotte[AT}netinst.com
|
|
***************************************************************************/
|
|
|
|
/***************************************************************************
|
|
* *
|
|
* 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. *
|
|
* *
|
|
***************************************************************************/
|
|
|
|
#ifndef __NETWORK_INSTRUMENTS_H__
|
|
#define __NETWORK_INSTRUMENTS_H__
|
|
|
|
int network_instruments_open(wtap *wth, int *err, gchar **err_info);
|
|
int network_instruments_dump_can_write_encap(int encap);
|
|
gboolean network_instruments_dump_open(wtap_dumper *wdh, gboolean cant_seek, int *err);
|
|
|
|
typedef struct capture_file_header
|
|
{
|
|
char observer_version[32];
|
|
guint16 offset_to_first_packet;
|
|
char probe_instance;
|
|
char extra_information_present;
|
|
} capture_file_header;
|
|
|
|
typedef struct packet_entry_header
|
|
{
|
|
guint32 packet_magic;
|
|
guint32 network_speed;
|
|
guint16 captured_size;
|
|
guint16 network_size;
|
|
guint16 offset_to_frame;
|
|
guint16 offset_to_next_packet;
|
|
guint8 network_type;
|
|
guint8 flags;
|
|
guint8 extra_information;
|
|
guint8 packet_type;
|
|
guint16 errors;
|
|
guint16 reserved;
|
|
guint64 packet_number;
|
|
guint64 original_packet_number;
|
|
guint64 nano_seconds_since_2000;
|
|
} packet_entry_header;
|
|
|
|
typedef struct tlv_header
|
|
{
|
|
guint16 type;
|
|
guint16 length;
|
|
} tlv_header;
|
|
|
|
typedef struct tlv_alias_list
|
|
{
|
|
tlv_header header;
|
|
char alias_list[1];
|
|
} tlv_alias_list;
|
|
|
|
typedef struct tlv_user_commnent
|
|
{
|
|
tlv_header header;
|
|
char user_comment[1];
|
|
} tlv_user_comment;
|
|
|
|
typedef struct observer_time
|
|
{
|
|
guint64 ns_since2000; /* given in packet_entry_header */
|
|
|
|
guint64 us_since2000; /* Micro-Seconds since 1-1-2000 */
|
|
guint64 sec_since2000; /* Seconds since 1-1-2000 */
|
|
|
|
time_t seconds_from_1970;
|
|
guint64 useconds_from_1970;
|
|
|
|
} observer_time;
|
|
|
|
|
|
#endif
|
|
|