osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Martin Thomas: handle address lengths based on TOA bit in X.25. 

svn path=/trunk/; revision=5423
This commit is contained in:
Guy Harris 2002-05-09 05:49:28 +00:00
parent e932bc78a9
commit cbad622d0e
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AUTHORS
View File

@ -656,6 +656,10 @@ Martin Thomas <martin_a_thomas[AT]yahoo.com> {
102, containing OSI transport layer PDUs) 102, containing OSI transport layer PDUs)
} }
Martin Thomas <Martin.Thomas[AT]am1.ericsson.se> {
Handle address lengths based on TOA bit in X.25
}
Hartmut Mueller <hartmut[AT]wendolene.ping.de> { Hartmut Mueller <hartmut[AT]wendolene.ping.de> {
BACNET support BACNET support
} }

1
doc/ethereal.pod.template
View File

@ -1318,6 +1318,7 @@ B<http://www.ethereal.com>.
Todd Sabin <tas[AT]webspan.net> Todd Sabin <tas[AT]webspan.net>
Eduardo Pérez Ureta <eperez[AT]dei.inf.uc3m.es> Eduardo Pérez Ureta <eperez[AT]dei.inf.uc3m.es>
Martin Thomas <martin_a_thomas[AT]yahoo.com> Martin Thomas <martin_a_thomas[AT]yahoo.com>
Martin Thomas <Martin.Thomas[AT]am1.ericsson.se>
Hartmut Mueller <hartmut[AT]wendolene.ping.de> Hartmut Mueller <hartmut[AT]wendolene.ping.de>
Michal Melerowicz <Michal.Melerowicz[AT]nokia.com> Michal Melerowicz <Michal.Melerowicz[AT]nokia.com>
Hannes Gredler <hannes[AT]juniper.net> Hannes Gredler <hannes[AT]juniper.net>

9
packet-x25.c
View File

@ -2,7 +2,7 @@
* Routines for x25 packet disassembly * Routines for x25 packet disassembly
* Olivier Abad <oabad@cybercable.fr> * Olivier Abad <oabad@cybercable.fr>
* *
* $Id: packet-x25.c,v 1.65 2002/04/09 08:15:02 guy Exp $ * $Id: packet-x25.c,v 1.66 2002/05/09 05:49:26 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com> * By Gerald Combs <gerald@ethereal.com>
@ -1313,6 +1313,13 @@ x25_ntoa(proto_tree *tree, int *offset, tvbuff_t *tvb,
byte = tvb_get_guint8(tvb, *offset); byte = tvb_get_guint8(tvb, *offset);
len1 = (byte >> 4) & 0x0F; len1 = (byte >> 4) & 0x0F;
len2 = (byte >> 0) & 0x0F; len2 = (byte >> 0) & 0x0F;
if (!toa) { /* then switch the length indicators.. */
i = len1;
len1 = len2;
len2 = i;
}
if (tree) { if (tree) {
proto_tree_add_text(tree, tvb, *offset, 1, proto_tree_add_text(tree, tvb, *offset, 1,
decode_numeric_bitfield(byte, 0xF0, 1*8, decode_numeric_bitfield(byte, 0xF0, 1*8,