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

Gerrit Gehnen's patch to add support for the "Inactive Subset" of the 

ISO 8473 CLNP protocol.

svn path=/trunk/; revision=1513
This commit is contained in:
Guy Harris 2000-01-20 19:16:41 +00:00
parent ea77c943c5
commit 0ce1dab01d
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AUTHORS
View File

@ -228,6 +228,10 @@ Thomas Parvais <thomas.parvais@advalvas.be> {
updates to L2TP support
}
Gerrit Gehnen <G.Gehnen@atrie.de> {
support for "Inactive Subset" of ISO CLNP
}
Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.

1
doc/ethereal.pod.template
View File

@ -807,6 +807,7 @@ B<http://ethereal.zing.org>.
John Thomes <john@ensemblecom.com>
Laurent Cazalet <laurent.cazalet@mailclub.net>
Thomas Parvais <thomas.parvais@advalvas.be>
Gerrit Gehnen <G.Gehnen@atrie.de>
Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to give his
permission to use his version of snprintf.c.

15
packet-osi.c
View File

@ -1,7 +1,7 @@
/* packet-osi.c
* Routines for ISO/OSI network and transport protocol packet disassembly
*
* $Id: packet-osi.c,v 1.16 2000/01/13 06:07:53 guy Exp $
* $Id: packet-osi.c,v 1.17 2000/01/20 19:16:33 guy Exp $
* Laurent Deniel <deniel@worldnet.fr>
*
* Ethereal - Network traffic analyzer
@ -1450,6 +1450,18 @@ void dissect_clnp(const u_char *pd, int offset, frame_data *fd,
u_char src_len, dst_len, nsel;
u_int first_offset = offset;
if (pd[offset]==NLPID_NULL) {
if (tree) {
ti = proto_tree_add_item(tree, proto_clnp, offset, 1, NULL);
clnp_tree = proto_item_add_subtree(ti, ett_clnp);
proto_tree_add_item_format(clnp_tree, hf_clnp_id, offset, 1,
clnp.cnf_proto_id,
"Inactive subset");
}
dissect_cotp(pd, offset+1, fd, tree);
return;
}
if (fd->cap_len < offset + sizeof(clnp)) {
dissect_data(pd, offset, fd, tree);
return;
@ -1601,6 +1613,7 @@ void dissect_osi(const u_char *pd, int offset, frame_data *fd,
/* ESIS is not currently decoded */
case NLPID_ISO8473_CLNP:
case NLPID_NULL: /* "Inactive Subset" of ISO 8473 CLNP */
if (check_col(fd, COL_PROTOCOL)) {
col_add_str(fd, COL_PROTOCOL, "CLNP");
}