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.

svn path=/trunk/; revision=14648

1 files changed, 40 insertions, 0 deletions

diff --git a/epan/dissectors/packet-isakmp.h b/epan/dissectors/packet-isakmp.h
new file mode 100644
index 0000000000..e048309521
--- /dev/null
+++ b/epan/dissectors/packet-isakmp.h
@@ -0,0 +1,40 @@
+/* packet-isakmp.h
+ * Declarations of routines for the Internet Security Association and Key
+ * Management Protocol (ISAKMP) (RFC 2408) and the Internet IP Security
+ * Domain of Interpretation for ISAKMP (RFC 2407)
+ * Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
+ *
+ * Added routines for the Internet Key Exchange (IKEv2) Protocol
+ * (draft-ietf-ipsec-ikev2-17.txt)
+ * Shoichi Sakane <sakane@tanu.org>
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef __PACKET_ISAKMP_H__
+#define __PACKET_ISAKMP_H__
+
+void
+isakmp_dissect_payloads(tvbuff_t *tvb, proto_tree *tree, int isakmp_verison,
+			guint8 initial_payload, int offset, int length,
+			packet_info *pinfo);
+
+#endif