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

Add support for OSI CLTP. 

Redo the way the variable part of COTP and CLTP packets are handled, by
having a single routine to handle it for all packets, rather than having
the dissector for each type of packet handle the parameters those
packets are supposed to have.

Fix "is_LI_NORMAL_AK()" to test (heuristically) whether an AK COTP
packet is normal rather than extended, rather than testing whether it's
normal, and invert the test where it's used (i.e. make what it does
correspond to what its name says, which means we invert the test it
does, and then change the code that uses it appropriately).

Add support for the "preferred maximum TPDU size" and "inactivity timer"
parameters, and fix various problems in the dissection of particular
parameters.

svn path=/trunk/; revision=2100
This commit is contained in:
Guy Harris 2000-07-01 08:55:28 +00:00
parent 2f5825776b
commit c3587ce540
4 changed files with 777 additions and 738 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1504
packet-clnp.c
View File

File diff suppressed because it is too large Load Diff

4
packet-clnp.h
View File

@ -1,7 +1,7 @@
/* packet-clnp.h
* Defines and such for CLNP (and COTP) protocol decode.
*
* $Id: packet-clnp.h,v 1.2 2000/04/17 01:36:30 guy Exp $
* $Id: packet-clnp.h,v 1.3 2000/07/01 08:55:27 guy Exp $
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
* Ethereal - Network traffic analyzer
@ -34,6 +34,6 @@
*/
extern
void dissect_cotp(const u_char *, int, frame_data *, proto_tree *);
void dissect_ositp(const u_char *, int, frame_data *, proto_tree *);
#endif /* _PACKET_CLNP_H */

3
packet-osi.h
View File

@ -1,6 +1,6 @@
/* packet-osi.h
*
* $Id: packet-osi.h,v 1.3 2000/06/19 04:49:36 guy Exp $
* $Id: packet-osi.h,v 1.4 2000/07/01 08:55:28 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -70,6 +70,7 @@
#define PROTO_STRING_ESIS "ISO 9542 ESIS Routeing Information Exchange Protocol"
#define PROTO_STRING_CLNP "ISO 8473 CLNP ConnectionLess Network Protocol"
#define PROTO_STRING_COTP "ISO 8073 COTP Connection-Oriented Transport Protocol"
#define PROTO_STRING_CLTP "ISO 8602 CLTP ConnectionLess Transport Protocol"
#define PROTO_STRING_LSP "ISO 10589 ISIS Link State Protocol Data Unit"
#define PROTO_STRING_CSNP "ISO 10589 ISIS Complete Sequence Numbers Protocol Data Unit"
#define PROTO_STRING_PSNP "ISO 10589 ISIS Partial Sequence Numbers Protocol Data Unit"

4
packet-x25.c
View File

@ -2,7 +2,7 @@
* Routines for x25 packet disassembly
* Olivier Abad <oabad@cybercable.fr>
*
* $Id: packet-x25.c,v 1.32 2000/05/31 05:07:54 guy Exp $
* $Id: packet-x25.c,v 1.33 2000/07/01 08:55:28 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -1542,7 +1542,7 @@ dissect_x25(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case PRT_ID_ISO_8073:
/* ISO 8073 COTP */
x25_hash_add_proto_start(vc, pinfo->fd->abs_secs,
pinfo->fd->abs_usecs, dissect_cotp);
pinfo->fd->abs_usecs, dissect_ositp);
break;
default: