Static variables considered harmful. Make the ISAKMP version a

parameter to many functions inside the ISAKMP dissector, as well as to
the "isakmp_dissect_payloads()" routine it exports.  Get rid of
"isakmp_set_version()", as the version can be passed to
"isakmp_dissect_payloads()" from the KINK dissector.

Put the declaration of "isakmp_dissect_payloads()" into a
"packet-isakmp.h" header, and have "packet-isakmp.c" and "packet-kink.h"
include it rather than declariing "isakmp_dissect_payloads()" itself -
or not doing so at all.


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

1 files changed, 2 insertions, 5 deletions

diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c
index 53523bfd14..d725399a1b 100644
--- a/epan/dissectors/packet-kink.c
+++ b/epan/dissectors/packet-kink.c
@@ -35,7 +35,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-kerberos.h"
-
+#include "packet-isakmp.h"
 
 #define KINK_PORT	57203
 
@@ -674,10 +674,7 @@ dissect_payload_kink_isakmp(packet_info *pinfo, tvbuff_t *tvb, int offset, proto
   if(payload_length > PAYLOAD_HEADER){
     isakmp_length = payload_length - 8;
     isakmp_tvb = tvb_new_subset(tvb, offset, (isakmp_length>tvb_length_remaining(tvb, offset))?tvb_length_remaining(tvb, offset):isakmp_length, isakmp_length);
-    if(qmmaj == 1){
-      isakmp_set_version();
-    }
-    isakmp_dissect_payloads(isakmp_tvb, payload_kink_isakmp_tree, inner_next_pload, 0, isakmp_length, pinfo);
+    isakmp_dissect_payloads(isakmp_tvb, payload_kink_isakmp_tree, 1, inner_next_pload, 0, isakmp_length, pinfo);
   }
   
   /* This part consider the padding. Payload_length don't contain the padding. */