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/wtap.h | |
| 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/wtap.h')
| -rw-r--r-- | wiretap/wtap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 1aa567f210..84bf02f1fc 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -1,6 +1,6 @@ /* wtap.h * - * $Id: wtap.h,v 1.109 2002/04/08 09:44:42 guy Exp $ + * $Id: wtap.h,v 1.110 2002/04/09 08:15:04 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -18,7 +18,6 @@ * 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 __WTAP_H__ @@ -186,8 +185,9 @@ */ /* Packet "pseudo-header" information for X.25 capture files. */ +#define FROM_DCE 0x80 struct x25_phdr { - guint8 flags; /* ENCAP_LAPB : 1st bit means From DCE */ + guint8 flags; /* ENCAP_LAPB, ENCAP_V120 : 1st bit means From DCE */ }; /* Packet "pseudo-header" for ATM Sniffer capture files. */ |