aboutsummaryrefslogtreecommitdiffstats
path: root/packet-clnp.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2000-04-28 19:35:41 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2000-04-28 19:35:41 +0000
commit903a7d178edcc36d6eab30163b1f1a4acc016090 (patch)
tree8329c5927c7d0ce704b8b439bab8e01734b0c0d9 /packet-clnp.c
parent7c722106575d9a95aff1e3e165bc9e40ba4fde57 (diff)
Changes from Gerrit Gehnen to
1) fix some problems with the SINEC H1 dissector; 2) make it easier to plug in other dissectors atop OSI transport protocols (by making the H1 dissector return an indication of whether it recognizes the packet as an H1 packet or not, so that, if it doesn't, additional dissectors can be tried). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1895 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-clnp.c')
-rw-r--r--packet-clnp.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/packet-clnp.c b/packet-clnp.c
index 2552b8c79e..66ba406951 100644
--- a/packet-clnp.c
+++ b/packet-clnp.c
@@ -1,7 +1,7 @@
/* packet-clnp.c
* Routines for ISO/OSI network and transport protocol packet disassembly
*
- * $Id: packet-clnp.c,v 1.4 2000/04/18 18:01:50 deniel Exp $
+ * $Id: packet-clnp.c,v 1.5 2000/04/28 19:35:39 guy Exp $
* Laurent Deniel <deniel@worldnet.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
@@ -428,8 +428,12 @@ static gboolean osi_decode_DT(const u_char *pd, int offset,
offset += li + 1;
if (uses_inactive_subset){
- dissect_h1(pd, offset, fd, tree);
- return TRUE;
+ if (dissect_h1(pd, offset, fd, tree)) {
+ return TRUE;
+ }
+ /* Fill in other Dissectors using inactive subset here */
+ dissect_data(pd, offset, fd, tree);
+ return FALSE;
}
else {
dissect_data(pd, offset, fd, tree);