osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Work with isdn_l2. 

svn path=/trunk/; revision=21986
This commit is contained in:
Martin Mathieson 2007-05-29 14:38:40 +00:00
parent 8e98967075
commit 2d6388599a
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wiretap/catapult_dct2000.c
View File

@ -778,6 +778,7 @@ gboolean parse_line(gint line_length, gint *seconds, gint *useconds,
int seconds_chars;
char subsecond_decimals_buff[MAX_SUBSECOND_DECIMALS+1];
int subsecond_decimals_chars;
int skip_first_byte = FALSE;
gboolean atm_header_present = FALSE;
@ -959,7 +960,13 @@ gboolean parse_line(gint line_length, gint *seconds, gint *useconds,
else
if (strcmp(protocol_name, "isdn_l3") == 0)
{
/* Despite the name, this does seem to correspond to L2... */
/* TODO: find out what this byte means... */
skip_first_byte = TRUE;
*encap = WTAP_ENCAP_ISDN;
}
else
if (strcmp(protocol_name, "isdn_l2") == 0)
{
*encap = WTAP_ENCAP_ISDN;
}
else
@ -1081,7 +1088,7 @@ gboolean parse_line(gint line_length, gint *seconds, gint *useconds,
(n < line_length);
n++, seconds_chars++)
{
if (!isdigit((int)linebuff[n]))
if (!isdigit((int)linebuff[n]))
{
/* Found a non-digit before decimal point. Fail */
return FALSE;
@ -1113,7 +1120,7 @@ gboolean parse_line(gint line_length, gint *seconds, gint *useconds,
(n < line_length);
n++, subsecond_decimals_chars++)
{
if (!isdigit((int)linebuff[n]))
if (!isdigit((int)linebuff[n]))
{
return FALSE;
}
@ -1151,15 +1158,14 @@ gboolean parse_line(gint line_length, gint *seconds, gint *useconds,
/* Set number of chars that comprise the hex string protocol data */
*data_chars = line_length - n;
/* Need to skip first byte (2 hex string chars) from ISDN messages.
TODO: find out what this byte means...
*/
if (*encap == WTAP_ENCAP_ISDN)
/* May need to skip first byte (2 hex string chars) */
if (skip_first_byte)
{
*data_offset += 2;
*data_chars -= 2;
}
return TRUE;
}