2002-07-31 19:27:57 +00:00
|
|
|
/* cosine.c
|
|
|
|
*
|
2004-07-18 00:24:25 +00:00
|
|
|
* $Id$
|
2002-07-31 19:27:57 +00:00
|
|
|
*
|
|
|
|
* CoSine IPNOS L2 debug output parsing
|
|
|
|
* Copyright (c) 2002 by Motonori Shindo <mshindo@mshindo.net>
|
|
|
|
*
|
|
|
|
* Wiretap Library
|
|
|
|
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
|
2002-08-28 20:30:45 +00:00
|
|
|
*
|
2002-07-31 19:27:57 +00:00
|
|
|
* 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.
|
2002-08-28 20:30:45 +00:00
|
|
|
*
|
2002-07-31 19:27:57 +00:00
|
|
|
* 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.
|
2002-08-28 20:30:45 +00:00
|
|
|
*
|
2002-07-31 19:27:57 +00:00
|
|
|
* 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
|
|
|
|
#include "wtap-int.h"
|
|
|
|
#include "buffer.h"
|
|
|
|
#include "cosine.h"
|
|
|
|
#include "file_wrappers.h"
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
2002-08-28 20:30:45 +00:00
|
|
|
IPNOS: CONFIG VPN(100) VR(1.1.1.1)# diags
|
|
|
|
ipnos diags: Control (1/0) :: layer-2 ?
|
|
|
|
Registered commands for area "layer-2"
|
|
|
|
apply-pkt-log-profile Configure packet logging on an interface
|
|
|
|
create-pkt-log-profile Set packet-log-profile to be used for packet logging (see layer-2 pkt-log)
|
|
|
|
detail Get Layer 2 low-level details
|
2002-07-31 19:27:57 +00:00
|
|
|
|
2002-08-28 20:30:45 +00:00
|
|
|
ipnos diags: Control (1/0) :: layer-2 create ?
|
2002-07-31 19:27:57 +00:00
|
|
|
create-pkt-log-profile <pkt-log-profile-id ctl-tx-trace-length ctl-rx-trace-length data-tx-trace-length data-rx-trace-length pe-logging-or-control-blade>
|
|
|
|
|
2002-08-28 20:30:45 +00:00
|
|
|
ipnos diags: Control (1/0) :: layer-2 create 1 32 32 0 0 0
|
|
|
|
ipnos diags: Control (1/0) :: layer-2 create 2 32 32 100 100 0
|
|
|
|
ipnos diags: Control (1/0) :: layer-2 apply ?
|
|
|
|
apply-pkt-log-profile <slot port channel subif pkt-log-profile-id>
|
2002-07-31 19:27:57 +00:00
|
|
|
|
2002-08-28 20:30:45 +00:00
|
|
|
ipnos diags: Control (1/0) :: layer-2 apply 3 0x0701 100 0 1
|
|
|
|
Successfully applied packet-log-profile on LI
|
2002-07-31 19:27:57 +00:00
|
|
|
|
2002-08-28 20:30:45 +00:00
|
|
|
-- Note that only the control packets are logged because the data packet size parameters are 0 in profile 1
|
|
|
|
IPNOS: CONFIG VPN(200) VR(3.3.3.3)# ping 20.20.20.43
|
|
|
|
vpn 200 : [max tries 4, timeout 5 seconds, data length 64 bytes, ttl 255]
|
|
|
|
ping #1 ok, RTT 0.000 seconds
|
|
|
|
ping #2 ok, RTT 0.000 seconds
|
|
|
|
ping #3 ok, RTT 0.000 seconds
|
|
|
|
ping #4 ok, RTT 0.000 seconds
|
|
|
|
[finished]
|
2002-07-31 19:27:57 +00:00
|
|
|
|
|
|
|
IPNOS: CONFIG VPN(200) VR(3.3.3.3)# 2000-2-1,18:19:46.8: l2-tx (PPP:3/7/1:100), Length:16, Pro:0, Off:0, Pri:0, RM:0, Err:0 [0x4000, 0x0]
|
|
|
|
|
|
|
|
|
2002-08-28 20:30:45 +00:00
|
|
|
2000-2-1,18:19:46.8: l2-rx (PPP:3/7/1:100), Length:16, Pro:0, Off:0, Pri:0, RM:0, Err:0 [0x4001, 0x30000]
|
|
|
|
|
|
|
|
2000-2-1,18:19:46.8: l2-tx (PPP:3/7/1:100), Length:16, Pro:0, Off:0, Pri:0, RM:0, Err:0 [0x4000, 0x0]
|
|
|
|
|
|
|
|
2000-2-1,18:19:46.8: l2-rx (PPP:3/7/1:100), Length:16, Pro:0, Off:0, Pri:0, RM:0, Err:0 [0x4001, 0x8030000]
|
2002-07-31 19:27:57 +00:00
|
|
|
|
2002-08-28 20:30:45 +00:00
|
|
|
ipnos diags: Control (1/0) :: layer-2 apply 3 0x0701 100 0 0
|
|
|
|
Successfully applied packet-log-profile on LI
|
|
|
|
ipnos diags: Control (1/0) :: layer-2 apply 3 0x0701 100 0 2
|
|
|
|
Successfully applied packet-log-profile on LI
|
|
|
|
|
|
|
|
-- Note that both control and data packets are logged because the data packet size parameter is 100 in profile 2
|
2002-07-31 19:27:57 +00:00
|
|
|
Please ignore the event-log messages getting mixed up with the ping command
|
|
|
|
ping 20.20.20.43 cou2000-2-1,18:20:17.0: l2-tx (PPP:3/7/1:100), Length:16, Pro:0, Off:0, Pri:0, RM:0, Err:0 [0x4000, 0x0]
|
|
|
|
|
2002-08-28 20:30:45 +00:00
|
|
|
00 D0 D8 D2 FF 03 C0 21 09 29 00 08 6B 60 84 AA
|
|
|
|
|
|
|
|
2000-2-1,18:20:17.0: l2-rx (PPP:3/7/1:100), Length:16, Pro:0, Off:0, Pri:0, RM:0, Err:0 [0x4001, 0x30000]
|
|
|
|
00 D0 D8 D2 FF 03 C0 21 09 29 00 08 6D FE FA AA
|
|
|
|
|
|
|
|
2000-2-1,18:20:17.0: l2-tx (PPP:3/7/1:100), Length:16, Pro:0, Off:0, Pri:0, RM:0, Err:0 [0x4000, 0x0]
|
|
|
|
00 D0 D8 D2 FF 03 C0 21 0A 29 00 08 6B 60 84 AA
|
|
|
|
|
|
|
|
2000-2-1,18:20:17.0: l2-rx (PPP:3/7/1:100), Length:16, Pro:0, Off:0, Pri:0, RM:0, Err:0 [0x4001, 0x8030000]
|
|
|
|
00 D0 D8 D2 FF 03 C0 21 0A 29 00 08 6D FE FA AA
|
|
|
|
|
|
|
|
nt 1 length 500
|
|
|
|
vpn 200 : [max tries 1, timeout 5 seconds, data length 500 bytes, ttl 255]
|
|
|
|
2000-2-1,18:20:24.1: l2-tx (PPP:3/7/1:100), Length:536, Pro:1, Off:8, Pri:7, RM:0, Err:0 [0x4070, 0x801]
|
|
|
|
00 D0 D8 D2 FF 03 00 21 45 00 02 10 00 27 00 00
|
|
|
|
FF 01 69 51 14 14 14 22 14 14 14 2B 08 00 AD B8
|
|
|
|
00 03 00 01 10 11 12 13 14 15 16 17 18 19 1A 1B
|
|
|
|
1C 1D 1E 1F 20 21 22 23 24 25 26 27 28 29 2A 2B
|
|
|
|
2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B
|
|
|
|
3C 3D 3E 3F 40 41 42 43 44 45 46 47 48 49 4A 4B
|
|
|
|
4C 4D 4E 4F
|
|
|
|
|
|
|
|
ping #1 ok, RTT 0.010 seconds
|
|
|
|
2000-2-1,18:20:24.1: l2-rx (PPP:3/7/1:100), Length:536, Pro:1, Off:8, Pri:7, RM:0, Err:0 [0x4071, 0x30801]
|
|
|
|
00 D0 D8 D2 FF 03 00 21 45 00 02 10 00 23 00 00
|
|
|
|
FF 01 69 55 14 14 14 2B 14 14 14 22 00 00 B5 B8
|
|
|
|
00 03 00 01 10 11 12 13 14 15 16 17 18 19 1A 1B
|
|
|
|
1C 1D 1E 1F 20 21 22 23 24 25 26 27 28 29 2A 2B
|
|
|
|
2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B
|
|
|
|
3C 3D 3E 3F 40 41 42 43 44 45 46 47 48 49 4A 4B
|
|
|
|
4C 4D 4E 4F
|
|
|
|
|
|
|
|
[finished]
|
2002-07-31 19:27:57 +00:00
|
|
|
|
|
|
|
IPNOS: CONFIG VPN(200) VR(3.3.3.3)# 2000-2-1,18:20:27.0: l2-tx (PPP:3/7/1:100), Length:16, Pro:0, Off:0, Pri:0, RM:0, Err:0 [0x4000, 0x0]
|
|
|
|
|
2002-08-28 20:30:45 +00:00
|
|
|
00 D0 D8 D2 FF 03 C0 21 09 2A 00 08 6B 60 84 AA
|
|
|
|
|
|
|
|
2000-2-1,18:20:27.0: l2-rx (PPP:3/7/1:100), Length:16, Pro:0, Off:0, Pri:0, RM:0, Err:0 [0x4001, 0x30000]
|
|
|
|
00 D0 D8 D2 FF 03 C0 21 09 2A 00 08 6D FE FA AA
|
|
|
|
|
|
|
|
2000-2-1,18:20:27.0: l2-tx (PPP:3/7/1:100), Length:16, Pro:0, Off:0, Pri:0, RM:0, Err:0 [0x4000, 0x0]
|
|
|
|
00 D0 D8 D2 FF 03 C0 21 0A 2A 00 08 6B 60 84 AA
|
|
|
|
|
|
|
|
2000-2-1,18:20:27.0: l2-rx (PPP:3/7/1:100), Length:16, Pro:0, Off:0, Pri:0, RM:0, Err:0 [0x4001, 0x30000]
|
|
|
|
00 D0 D8 D2 FF 03 C0 21 0A 2A 00 08 6D FE FA AA
|
|
|
|
|
|
|
|
|
|
|
|
ipnos diags: Control (1/0) :: layer-2 apply 3 0x0701 100 0 0
|
|
|
|
Successfully applied packet-log-profile on LI
|
|
|
|
ipnos diags: Control (1/0) ::
|
2002-07-31 19:27:57 +00:00
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* XXX TODO:
|
|
|
|
|
|
|
|
o Handle a case where an empty line doesn't exists as a delimiter of
|
|
|
|
each packet. If the output is sent to a control blade and
|
|
|
|
displayed as an event log, there's always an empty line between
|
|
|
|
each packet output, but it may not be true when it is an PE
|
|
|
|
output.
|
|
|
|
|
|
|
|
o Some telnet client on Windows may put in a line break at 80
|
|
|
|
columns when it save the session to a text file ("CRT" is such an
|
|
|
|
example). I don't think it's a good idea for the telnet client to
|
|
|
|
do so, but CRT is widely used in Windows community, I should
|
|
|
|
take care of that in the future.
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Magic text to check for CoSine L2 debug output */
|
|
|
|
#define COSINE_HDR_MAGIC_STR1 "l2-tx"
|
|
|
|
#define COSINE_HDR_MAGIC_STR2 "l2-rx"
|
|
|
|
|
|
|
|
/* Magic text for start of packet */
|
2002-08-28 20:30:45 +00:00
|
|
|
#define COSINE_REC_MAGIC_STR1 COSINE_HDR_MAGIC_STR1
|
2002-07-31 19:27:57 +00:00
|
|
|
#define COSINE_REC_MAGIC_STR2 COSINE_HDR_MAGIC_STR2
|
|
|
|
|
|
|
|
#define COSINE_HEADER_LINES_TO_CHECK 200
|
2002-08-28 20:30:45 +00:00
|
|
|
#define COSINE_LINE_LENGTH 240
|
2002-07-31 19:27:57 +00:00
|
|
|
|
2002-08-16 00:41:39 +00:00
|
|
|
#define COSINE_MAX_PACKET_LEN 65536
|
2002-07-31 19:27:57 +00:00
|
|
|
|
2004-01-24 16:48:12 +00:00
|
|
|
static gboolean empty_line(const gchar *line);
|
2002-07-31 19:27:57 +00:00
|
|
|
static long cosine_seek_next_packet(wtap *wth, int *err, char *hdr);
|
|
|
|
static gboolean cosine_check_file_type(wtap *wth, int *err);
|
Have the Wiretap open, read, and seek-and-read routines return, in
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
2004-01-25 21:55:17 +00:00
|
|
|
static gboolean cosine_read(wtap *wth, int *err, gchar **err_info,
|
|
|
|
long *data_offset);
|
2002-07-31 19:27:57 +00:00
|
|
|
static gboolean cosine_seek_read(wtap *wth, long seek_off,
|
2002-08-28 20:30:45 +00:00
|
|
|
union wtap_pseudo_header *pseudo_header, guint8 *pd,
|
Have the Wiretap open, read, and seek-and-read routines return, in
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
2004-01-25 21:55:17 +00:00
|
|
|
int len, int *err, gchar **err_info);
|
2002-08-28 20:30:45 +00:00
|
|
|
static int parse_cosine_rec_hdr(wtap *wth, const char *line,
|
Have the Wiretap open, read, and seek-and-read routines return, in
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
2004-01-25 21:55:17 +00:00
|
|
|
union wtap_pseudo_header *pseudo_header, int *err, gchar **err_info);
|
2002-07-31 19:27:57 +00:00
|
|
|
static int parse_cosine_hex_dump(FILE_T fh, int pkt_len, guint8* buf,
|
Have the Wiretap open, read, and seek-and-read routines return, in
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
2004-01-25 21:55:17 +00:00
|
|
|
int *err, gchar **err_info);
|
2002-07-31 19:27:57 +00:00
|
|
|
static int parse_single_hex_dump_line(char* rec, guint8 *buf,
|
|
|
|
guint byte_offset);
|
|
|
|
|
2002-08-28 20:30:45 +00:00
|
|
|
/* Returns TRUE if the line appears to be an empty line. Otherwise it
|
2002-07-31 19:27:57 +00:00
|
|
|
returns FALSE. */
|
2004-01-24 16:48:12 +00:00
|
|
|
static gboolean empty_line(const gchar *line)
|
2002-07-31 19:27:57 +00:00
|
|
|
{
|
|
|
|
while (*line) {
|
2004-02-09 00:06:30 +00:00
|
|
|
if (isspace((guchar)*line)) {
|
2002-07-31 19:27:57 +00:00
|
|
|
line++;
|
|
|
|
continue;
|
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (*line == '\0')
|
|
|
|
return TRUE;
|
2002-08-28 20:30:45 +00:00
|
|
|
else
|
2002-07-31 19:27:57 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Seeks to the beginning of the next packet, and returns the
|
2002-08-28 20:30:45 +00:00
|
|
|
byte offset. Copy the header line to hdr. Returns -1 on failure,
|
2002-07-31 19:27:57 +00:00
|
|
|
and sets "*err" to the error and set hdr as NULL. */
|
|
|
|
static long cosine_seek_next_packet(wtap *wth, int *err, char *hdr)
|
|
|
|
{
|
|
|
|
long cur_off;
|
|
|
|
char buf[COSINE_LINE_LENGTH];
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
cur_off = file_tell(wth->fh);
|
|
|
|
if (cur_off == -1) {
|
|
|
|
/* Error */
|
|
|
|
*err = file_error(wth->fh);
|
|
|
|
hdr = NULL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (file_gets(buf, sizeof(buf), wth->fh) != NULL) {
|
2002-08-28 20:30:45 +00:00
|
|
|
if (strstr(buf, COSINE_REC_MAGIC_STR1) ||
|
2002-07-31 19:27:57 +00:00
|
|
|
strstr(buf, COSINE_REC_MAGIC_STR2)) {
|
|
|
|
strncpy(hdr, buf, COSINE_LINE_LENGTH-1);
|
|
|
|
hdr[COSINE_LINE_LENGTH-1] = '\0';
|
|
|
|
return cur_off;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (file_eof(wth->fh)) {
|
|
|
|
/* We got an EOF. */
|
|
|
|
*err = 0;
|
|
|
|
} else {
|
2002-08-28 20:30:45 +00:00
|
|
|
/* We (presumably) got an error (there's no
|
|
|
|
equivalent to "ferror()" in zlib, alas,
|
|
|
|
so we don't have a wrapper to check for
|
2002-07-31 19:27:57 +00:00
|
|
|
an error). */
|
|
|
|
*err = file_error(wth->fh);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
hdr = NULL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Look through the first part of a file to see if this is
|
2002-08-28 20:30:45 +00:00
|
|
|
* a CoSine L2 debug output.
|
2002-07-31 19:27:57 +00:00
|
|
|
*
|
|
|
|
* Returns TRUE if it is, FALSE if it isn't or if we get an I/O error;
|
|
|
|
* if we get an I/O error, "*err" will be set to a non-zero value.
|
|
|
|
*/
|
|
|
|
static gboolean cosine_check_file_type(wtap *wth, int *err)
|
|
|
|
{
|
|
|
|
char buf[COSINE_LINE_LENGTH];
|
|
|
|
guint reclen, line;
|
|
|
|
|
|
|
|
buf[COSINE_LINE_LENGTH-1] = '\0';
|
|
|
|
|
|
|
|
for (line = 0; line < COSINE_HEADER_LINES_TO_CHECK; line++) {
|
|
|
|
if (file_gets(buf, COSINE_LINE_LENGTH, wth->fh) != NULL) {
|
|
|
|
|
|
|
|
reclen = strlen(buf);
|
|
|
|
if (reclen < strlen(COSINE_HDR_MAGIC_STR1) ||
|
|
|
|
reclen < strlen(COSINE_HDR_MAGIC_STR2)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strstr(buf, COSINE_HDR_MAGIC_STR1) ||
|
|
|
|
strstr(buf, COSINE_HDR_MAGIC_STR2)) {
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* EOF or error. */
|
|
|
|
if (file_eof(wth->fh))
|
|
|
|
*err = 0;
|
|
|
|
else
|
|
|
|
*err = file_error(wth->fh);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*err = 0;
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Have the Wiretap open, read, and seek-and-read routines return, in
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
2004-01-25 21:55:17 +00:00
|
|
|
int cosine_open(wtap *wth, int *err, gchar **err_info _U_)
|
2002-07-31 19:27:57 +00:00
|
|
|
{
|
|
|
|
/* Look for CoSine header */
|
|
|
|
if (!cosine_check_file_type(wth, err)) {
|
|
|
|
if (*err == 0)
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2003-11-25 05:58:56 +00:00
|
|
|
if (file_seek(wth->fh, 0L, SEEK_SET, err) == -1) /* rewind */
|
2002-07-31 19:27:57 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
wth->data_offset = 0;
|
|
|
|
wth->file_encap = WTAP_ENCAP_COSINE;
|
|
|
|
wth->file_type = WTAP_FILE_COSINE;
|
|
|
|
wth->snapshot_length = 0; /* not known */
|
|
|
|
wth->subtype_read = cosine_read;
|
|
|
|
wth->subtype_seek_read = cosine_seek_read;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2005-04-03 11:00:49 +00:00
|
|
|
/* Find the next packet and parse it; called from wtap_read(). */
|
Have the Wiretap open, read, and seek-and-read routines return, in
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
2004-01-25 21:55:17 +00:00
|
|
|
static gboolean cosine_read(wtap *wth, int *err, gchar **err_info,
|
|
|
|
long *data_offset)
|
2002-07-31 19:27:57 +00:00
|
|
|
{
|
|
|
|
long offset;
|
|
|
|
guint8 *buf;
|
|
|
|
int pkt_len, caplen;
|
|
|
|
char line[COSINE_LINE_LENGTH];
|
|
|
|
|
|
|
|
/* Find the next packet */
|
|
|
|
offset = cosine_seek_next_packet(wth, err, line);
|
|
|
|
if (offset < 0)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
/* Parse the header */
|
Have the Wiretap open, read, and seek-and-read routines return, in
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
2004-01-25 21:55:17 +00:00
|
|
|
pkt_len = parse_cosine_rec_hdr(wth, line, &wth->pseudo_header, err,
|
|
|
|
err_info);
|
2002-07-31 19:27:57 +00:00
|
|
|
if (pkt_len == -1)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
/* Make sure we have enough room for the packet */
|
|
|
|
buffer_assure_space(wth->frame_buffer, COSINE_MAX_PACKET_LEN);
|
|
|
|
buf = buffer_start_ptr(wth->frame_buffer);
|
|
|
|
|
|
|
|
/* Convert the ASCII hex dump to binary data */
|
Have the Wiretap open, read, and seek-and-read routines return, in
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
2004-01-25 21:55:17 +00:00
|
|
|
if ((caplen = parse_cosine_hex_dump(wth->fh, pkt_len, buf, err,
|
|
|
|
err_info)) == -1)
|
2002-07-31 19:27:57 +00:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
wth->data_offset = offset;
|
|
|
|
wth->phdr.caplen = caplen;
|
|
|
|
*data_offset = offset;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Used to read packets in random-access fashion */
|
|
|
|
static gboolean
|
|
|
|
cosine_seek_read (wtap *wth, long seek_off,
|
Have the Wiretap open, read, and seek-and-read routines return, in
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
2004-01-25 21:55:17 +00:00
|
|
|
union wtap_pseudo_header *pseudo_header, guint8 *pd, int len,
|
|
|
|
int *err, gchar **err_info)
|
2002-07-31 19:27:57 +00:00
|
|
|
{
|
|
|
|
char line[COSINE_LINE_LENGTH];
|
|
|
|
|
2003-11-25 05:58:56 +00:00
|
|
|
if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
|
2002-07-31 19:27:57 +00:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (file_gets(line, COSINE_LINE_LENGTH, wth->random_fh) == NULL) {
|
|
|
|
*err = file_error(wth->random_fh);
|
|
|
|
if (*err == 0) {
|
|
|
|
*err = WTAP_ERR_SHORT_READ;
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
Have the Wiretap open, read, and seek-and-read routines return, in
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
2004-01-25 21:55:17 +00:00
|
|
|
if (parse_cosine_rec_hdr(NULL, line, pseudo_header, err, err_info) == -1)
|
2002-07-31 19:27:57 +00:00
|
|
|
return FALSE;
|
|
|
|
|
Have the Wiretap open, read, and seek-and-read routines return, in
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
2004-01-25 21:55:17 +00:00
|
|
|
return parse_cosine_hex_dump(wth->random_fh, len, pd, err, err_info);
|
2002-07-31 19:27:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Parses a packet record header. There are two possible formats:
|
|
|
|
1) output to a control blade with date and time
|
|
|
|
2002-5-10,20:1:31.4: l2-tx (FR:3/7/1:1), Length:18, Pro:0, Off:0, Pri:0, RM:0, Err:0 [0x4000, 0x0]
|
|
|
|
2) output to PE without date and time
|
|
|
|
l2-tx (FR:3/7/1:1), Length:18, Pro:0, Off:0, Pri:0, RM:0, Err:0 [0x4000, 0x0] */
|
|
|
|
static int
|
Have the Wiretap open, read, and seek-and-read routines return, in
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
2004-01-25 21:55:17 +00:00
|
|
|
parse_cosine_rec_hdr(wtap *wth, const char *line,
|
|
|
|
union wtap_pseudo_header *pseudo_header, int *err, gchar **err_info)
|
2002-07-31 19:27:57 +00:00
|
|
|
{
|
|
|
|
int num_items_scanned;
|
|
|
|
int yy, mm, dd, hr, min, sec, csec, pkt_len;
|
2004-01-24 16:48:12 +00:00
|
|
|
int pro, off, pri, rm, error;
|
|
|
|
guint code1, code2;
|
2002-07-31 19:27:57 +00:00
|
|
|
char if_name[COSINE_MAX_IF_NAME_LEN], direction[6];
|
|
|
|
struct tm tm;
|
|
|
|
|
2002-08-28 20:30:45 +00:00
|
|
|
if (sscanf(line, "%d-%d-%d,%d:%d:%d.%d:",
|
2002-07-31 19:27:57 +00:00
|
|
|
&yy, &mm, &dd, &hr, &min, &sec, &csec) == 7) {
|
|
|
|
/* appears to be output to a control blade */
|
2002-08-28 20:30:45 +00:00
|
|
|
num_items_scanned = sscanf(line,
|
2002-07-31 19:27:57 +00:00
|
|
|
"%d-%d-%d,%d:%d:%d.%d: %5s (%127[A-Za-z0-9/:]), Length:%d, Pro:%d, Off:%d, Pri:%d, RM:%d, Err:%d [%x, %x]",
|
|
|
|
&yy, &mm, &dd, &hr, &min, &sec, &csec,
|
2002-08-28 20:30:45 +00:00
|
|
|
direction, if_name, &pkt_len,
|
|
|
|
&pro, &off, &pri, &rm, &error,
|
2002-07-31 19:27:57 +00:00
|
|
|
&code1, &code2);
|
|
|
|
|
|
|
|
if (num_items_scanned != 17) {
|
|
|
|
*err = WTAP_ERR_BAD_RECORD;
|
Have the Wiretap open, read, and seek-and-read routines return, in
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
2004-01-25 21:55:17 +00:00
|
|
|
*err_info = g_strdup("cosine: purported control blade line doesn't have code values");
|
2002-07-31 19:27:57 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* appears to be output to PE */
|
2002-08-28 20:30:45 +00:00
|
|
|
num_items_scanned = sscanf(line,
|
2002-07-31 19:27:57 +00:00
|
|
|
"%5s (%127[A-Za-z0-9/:]), Length:%d, Pro:%d, Off:%d, Pri:%d, RM:%d, Err:%d [%x, %x]",
|
2002-08-28 20:30:45 +00:00
|
|
|
direction, if_name, &pkt_len,
|
|
|
|
&pro, &off, &pri, &rm, &error,
|
2002-07-31 19:27:57 +00:00
|
|
|
&code1, &code2);
|
|
|
|
|
|
|
|
if (num_items_scanned != 10) {
|
|
|
|
*err = WTAP_ERR_BAD_RECORD;
|
Have the Wiretap open, read, and seek-and-read routines return, in
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
2004-01-25 21:55:17 +00:00
|
|
|
*err_info = g_strdup("cosine: header line is neither control blade nor PE output");
|
2002-07-31 19:27:57 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
yy = mm = dd = hr = min = sec = csec = 0;
|
|
|
|
}
|
|
|
|
|
2002-08-28 20:30:45 +00:00
|
|
|
if (wth) {
|
2002-07-31 19:27:57 +00:00
|
|
|
tm.tm_year = yy - 1900;
|
|
|
|
tm.tm_mon = mm - 1;
|
|
|
|
tm.tm_mday = dd;
|
|
|
|
tm.tm_hour = hr;
|
|
|
|
tm.tm_min = min;
|
|
|
|
tm.tm_sec = sec;
|
|
|
|
tm.tm_isdst = -1;
|
2005-08-24 21:31:56 +00:00
|
|
|
wth->phdr.ts.secs = mktime(&tm);
|
|
|
|
wth->phdr.ts.nsecs = csec * 10000000;
|
2002-07-31 19:27:57 +00:00
|
|
|
wth->phdr.len = pkt_len;
|
2002-08-28 20:30:45 +00:00
|
|
|
}
|
|
|
|
/* XXX need to handle other encapsulations like Cisco HDLC,
|
2002-07-31 19:27:57 +00:00
|
|
|
Frame Relay and ATM */
|
|
|
|
if (strncmp(if_name, "TEST:", 5) == 0) {
|
|
|
|
pseudo_header->cosine.encap = COSINE_ENCAP_TEST;
|
|
|
|
} else if (strncmp(if_name, "PPoATM:", 7) == 0) {
|
|
|
|
pseudo_header->cosine.encap = COSINE_ENCAP_PPoATM;
|
|
|
|
} else if (strncmp(if_name, "PPoFR:", 6) == 0) {
|
|
|
|
pseudo_header->cosine.encap = COSINE_ENCAP_PPoFR;
|
|
|
|
} else if (strncmp(if_name, "ATM:", 4) == 0) {
|
|
|
|
pseudo_header->cosine.encap = COSINE_ENCAP_ATM;
|
|
|
|
} else if (strncmp(if_name, "FR:", 3) == 0) {
|
|
|
|
pseudo_header->cosine.encap = COSINE_ENCAP_FR;
|
|
|
|
} else if (strncmp(if_name, "HDLC:", 5) == 0) {
|
|
|
|
pseudo_header->cosine.encap = COSINE_ENCAP_HDLC;
|
|
|
|
} else if (strncmp(if_name, "PPP:", 4) == 0) {
|
|
|
|
pseudo_header->cosine.encap = COSINE_ENCAP_PPP;
|
|
|
|
} else if (strncmp(if_name, "ETH:", 4) == 0) {
|
|
|
|
pseudo_header->cosine.encap = COSINE_ENCAP_ETH;
|
|
|
|
} else {
|
|
|
|
pseudo_header->cosine.encap = COSINE_ENCAP_UNKNOWN;
|
|
|
|
}
|
|
|
|
if (strncmp(direction, "l2-tx", 5) == 0) {
|
|
|
|
pseudo_header->cosine.direction = COSINE_DIR_TX;
|
|
|
|
} else if (strncmp(direction, "l2-rx", 5) == 0) {
|
|
|
|
pseudo_header->cosine.direction = COSINE_DIR_RX;
|
2002-08-28 20:30:45 +00:00
|
|
|
}
|
|
|
|
strncpy(pseudo_header->cosine.if_name, if_name,
|
2002-07-31 19:27:57 +00:00
|
|
|
COSINE_MAX_IF_NAME_LEN - 1);
|
|
|
|
pseudo_header->cosine.pro = pro;
|
|
|
|
pseudo_header->cosine.off = off;
|
|
|
|
pseudo_header->cosine.pri = pri;
|
|
|
|
pseudo_header->cosine.rm = rm;
|
|
|
|
pseudo_header->cosine.err = error;
|
|
|
|
|
|
|
|
return pkt_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Converts ASCII hex dump to binary data. Returns the capture length.
|
|
|
|
If any error is encountered, -1 is returned. */
|
|
|
|
static int
|
Have the Wiretap open, read, and seek-and-read routines return, in
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
2004-01-25 21:55:17 +00:00
|
|
|
parse_cosine_hex_dump(FILE_T fh, int pkt_len, guint8* buf, int *err,
|
|
|
|
gchar **err_info)
|
2002-07-31 19:27:57 +00:00
|
|
|
{
|
2004-01-24 16:48:12 +00:00
|
|
|
gchar line[COSINE_LINE_LENGTH];
|
2002-07-31 19:27:57 +00:00
|
|
|
int i, hex_lines, n, caplen = 0;
|
2002-08-28 20:30:45 +00:00
|
|
|
|
2002-07-31 19:27:57 +00:00
|
|
|
/* Calculate the number of hex dump lines, each
|
|
|
|
* containing 16 bytes of data */
|
|
|
|
hex_lines = pkt_len / 16 + ((pkt_len % 16) ? 1 : 0);
|
|
|
|
|
|
|
|
for (i = 0; i < hex_lines; i++) {
|
|
|
|
if (file_gets(line, COSINE_LINE_LENGTH, fh) == NULL) {
|
|
|
|
*err = file_error(fh);
|
|
|
|
if (*err == 0) {
|
|
|
|
*err = WTAP_ERR_SHORT_READ;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (empty_line(line)) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if ((n = parse_single_hex_dump_line(line, buf, i*16)) == -1) {
|
|
|
|
*err = WTAP_ERR_BAD_RECORD;
|
Have the Wiretap open, read, and seek-and-read routines return, in
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
2004-01-25 21:55:17 +00:00
|
|
|
*err_info = g_strdup("cosine: hex dump line doesn't have 16 numbers");
|
2002-07-31 19:27:57 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
caplen += n;
|
|
|
|
}
|
|
|
|
return caplen;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Take a string representing one line from a hex dump and converts
|
|
|
|
* the text to binary data. We place the bytes in the buffer at the
|
|
|
|
* specified offset.
|
|
|
|
*
|
|
|
|
* Returns number of bytes successfully read, -1 if bad. */
|
|
|
|
static int
|
2002-08-28 20:30:45 +00:00
|
|
|
parse_single_hex_dump_line(char* rec, guint8 *buf, guint byte_offset)
|
2002-07-31 19:27:57 +00:00
|
|
|
{
|
|
|
|
int num_items_scanned, i;
|
|
|
|
unsigned int bytes[16];
|
|
|
|
|
2002-08-28 20:30:45 +00:00
|
|
|
num_items_scanned = sscanf(rec, "%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
|
|
|
|
&bytes[0], &bytes[1], &bytes[2], &bytes[3],
|
2002-07-31 19:27:57 +00:00
|
|
|
&bytes[4], &bytes[5], &bytes[6], &bytes[7],
|
2002-08-28 20:30:45 +00:00
|
|
|
&bytes[8], &bytes[9], &bytes[10], &bytes[11],
|
2002-07-31 19:27:57 +00:00
|
|
|
&bytes[12], &bytes[13], &bytes[14], &bytes[15]);
|
|
|
|
if (num_items_scanned == 0)
|
|
|
|
return -1;
|
|
|
|
|
2002-08-28 20:30:45 +00:00
|
|
|
if (num_items_scanned > 16)
|
2002-07-31 19:27:57 +00:00
|
|
|
num_items_scanned = 16;
|
|
|
|
|
|
|
|
for (i=0; i<num_items_scanned; i++) {
|
|
|
|
buf[byte_offset + i] = (guint8)bytes[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
return num_items_scanned;
|
|
|
|
}
|