Fix to WTP retransmission indicator dissection, from Olivier Biot.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3316 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/AUTHORS b/AUTHORS
index 4511bb2d2e94de3f27cde9c95c5ca3c1b8c92447..eaea54bae7830f889b2f4d72d0b2445d279ed2f2 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -567,6 +567,14 @@ Hannes Gredler <hannes@juniper.net> {
        Many ISIS enhancements
 }
 
+Inoue <inoue@ainet.or.jp> {
+       Preference dialog crash fix
+}
+
+Olivier Biot <Olivier.Biot@siemens.atea.be> {
+       Fix to WTP retransmission indicator dissection
+}
+
 Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.
 

diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index dc4276b1f009d40b51ff2ee5f9b36f12d426482f..47566f441f54289f426bc73f510e81cb8af1550a 100644 (file)
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -1086,6 +1086,8 @@ B<http://www.ethereal.com>.
   Hartmut Mueller          <hartmut@wendolene.ping.de>
   Michal Melerowicz        <Michal.Melerowicz@nokia.com>
   Hannes Gredler           <hannes@juniper.net>
+  Inoue                    <inoue@ainet.or.jp>
+  Olivier Biot             <Olivier.Biot@siemens.atea.be>
 
 Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to give his
 permission to use his version of snprintf.c.

diff --git a/packet-wtp.c b/packet-wtp.c
index 73cfe766029dc4cd2a658b1280ee59594fd725f3..a1bbd71195d6b87b163273f44b0015cf5256dee8 100644 (file)
--- a/packet-wtp.c
+++ b/packet-wtp.c
@@ -2,7 +2,7 @@
  *
  * Routines to dissect WTP component of WAP traffic.
  * 
- * $Id: packet-wtp.c,v 1.12 2001/03/23 20:11:46 guy Exp $
+ * $Id: packet-wtp.c,v 1.13 2001/04/17 18:57:09 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -458,8 +458,17 @@ static char transaction_class(unsigned char octet)
 
 static char retransmission_indicator(unsigned char octet)
 {
-       char ch = (octet >> 0) & 0x01; /* ......,X */
-       return ch;
+       switch ( pdu_type(octet) ) {
+               case INVOKE:
+               case RESULT:
+               case ACK:
+               case SEGMENTED_INVOKE:
+               case SEGMENTED_RESULT:
+               case NEGATIVE_ACK:
+                       return (octet >> 0) & 0x01; /* ......,X */
+               default:
+                       return 0;
+       }
 };
 
 /* Register the protocol with Ethereal */