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
55 lines
1.6 KiB
C
55 lines
1.6 KiB
C
/* ascend-int.h
|
|
* Definitions for routines common to multiple modules in the Lucent/Ascend
|
|
* capture file reading code code, but not used outside that code.
|
|
*
|
|
* $Id: ascend-int.h,v 1.11 2004/01/25 21:55:12 guy Exp $
|
|
*
|
|
* Ethereal - Network traffic analyzer
|
|
* By Gerald Combs <gerald@ethereal.com>
|
|
* Copyright 1998 Gerald Combs
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef __ASCEND_INT_H__
|
|
#define __ASCEND_INT_H__
|
|
|
|
typedef struct {
|
|
time_t start_time;
|
|
time_t secs;
|
|
time_t usecs;
|
|
guint32 caplen;
|
|
guint32 len;
|
|
} ascend_pkthdr;
|
|
|
|
extern int at_eof;
|
|
|
|
extern gchar *ascend_parse_error;
|
|
|
|
/*
|
|
* Pointer to the pseudo-header for the current packet.
|
|
*/
|
|
extern struct ascend_phdr *pseudo_header;
|
|
|
|
/* Here we provide interfaces to make our scanner act and look like lex */
|
|
int ascendlex(void);
|
|
|
|
void init_parse_ascend(void);
|
|
void ascend_init_lexer(FILE_T fh);
|
|
int parse_ascend(FILE_T fh, guint8 *pd, struct ascend_phdr *phdr,
|
|
ascend_pkthdr *hdr, int len);
|
|
|
|
#endif /* ! __ASCEND_INT_H__ */
|