diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-04-09 08:15:04 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-04-09 08:15:04 +0000 |
| commit | bf7e4ce90948af368a11a043fa2617f72e357b96 (patch) | |
| tree | 32f8d9aeea2e18b5e05ebebd666859514fc47739 /wiretap/radcom.c | |
| parent | 7b12868ebf417936bc3fabee7791753bd9eba569 (diff) | |
Move the definition of the FROM_DCE bit in the "flags" field of a
"struct x25_phdr" to "wiretap/wtap.h".
Have two X.25 dissectors, one of which assumes that there's a "struct
x25_phdr" pseudo-header and one of which doesn't; the former uses the
information in that pseudo-header to determine whether the packet is
DTE->DCE or DCE->DTE, and the latter assumes it has no clue whether the
packet is DTE->DCE or DCE->TDE. Use the former one in the LAPB
dissector, and the latter one in the XOT dissector and in the LLC
dissector table.
In the X.25-over-TCP dissector, handle multiple X.25 packets per TCP
segment, and handle X.25 packets split across TCP segments.
svn path=/trunk/; revision=5134
Diffstat (limited to 'wiretap/radcom.c')
| -rw-r--r-- | wiretap/radcom.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/radcom.c b/wiretap/radcom.c index 4337ea1dda..c603474347 100644 --- a/wiretap/radcom.c +++ b/wiretap/radcom.c @@ -1,6 +1,6 @@ /* radcom.c * - * $Id: radcom.c,v 1.35 2002/03/05 08:39:29 guy Exp $ + * $Id: radcom.c,v 1.36 2002/04/09 08:15:04 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -279,7 +279,7 @@ static gboolean radcom_read(wtap *wth, int *err, long *data_offset) tm.tm_isdst = -1; wth->phdr.ts.tv_sec = mktime(&tm); wth->phdr.ts.tv_usec = pletohl(&hdr.date.usec); - wth->pseudo_header.x25.flags = (hdr.dce & 0x1) ? 0x00 : 0x80; + wth->pseudo_header.x25.flags = (hdr.dce & 0x1) ? 0x00 : FROM_DCE; /* * Read the packet data. @@ -332,7 +332,7 @@ radcom_seek_read(wtap *wth, long seek_off, return FALSE; } - pseudo_header->x25.flags = (hdr.dce & 0x1) ? 0x00 : 0x80; + pseudo_header->x25.flags = (hdr.dce & 0x1) ? 0x00 : FROM_DCE; /* * Read the packet data. |