From Graeme Lunt

 
 I attach my RTSE dissector (in tar file) which requires the included ROS dissector, as well as a patch to the latest pres.{cnf,asn}. The ROS dissector uses a new field in the SESSION_DATA_STRUCTURE to pass the ROS operation to the sub-dissector, though this is also set by other dissectors (RTSE uses it in X.410 mode). 
 
 Note that X.400 P1 in X.410 mode doesn't use ROS, so it is useful not to explicitly include ROS in my X411 dissector. However, the inclusion of a ROS dissector won't effect any dissectors that currently implement their own ROS.
 
 I also include dissectors for:
 
 X.411 	(P1) 		X.400 OSI Message Transfer Service
 X.420 	(P22) 	X.400 OSI Information Object
 STANAG 4406	(P772)	STANAG 4406 Military Message Extensions (to P22)
 
 These rely on the RTSE and ROS dissectors.

Withs some changes to remove various warnings and errors.

svn path=/trunk/; revision=15680

7 files changed, 14 insertions, 8 deletions

diff --git a/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c
index bddc97f1a0..cbfbe60692 100644
--- a/asn1/pres/packet-pres-template.c
+++ b/asn1/pres/packet-pres-template.c
@@ -39,6 +39,7 @@
 #include "packet-ber.h"
 #include "packet-ses.h"
 #include "packet-pres.h"
+#include "packet-rtse.h"
 
 
 #define PNAME  "ISO 8823 OSI Presentation Protocol"
diff --git a/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c
index 8d432e5dc7..6d50788596 100644
--- a/asn1/ros/packet-ros-template.c
+++ b/asn1/ros/packet-ros-template.c
@@ -35,7 +35,7 @@
 #include <string.h>
 
 #include "packet-ber.h"
-#include "packet-acse.h"
+#include "packet-pres.h"
 #include "packet-ros.h"
 
 #define PNAME  "X.880 OSI Remote Operations Service"
@@ -56,8 +56,6 @@ static guint32 opcode;
 static gint ett_ros = -1;
 #include "packet-ros-ett.c"
 
-#include "packet-ros-fn.c"
-
 static dissector_table_t ros_oid_dissector_table=NULL;
 static GHashTable *oid_table=NULL;
 static gint ett_ros_unknown = -1;
@@ -95,6 +93,9 @@ call_ros_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *p
 	return offset;
 }
 
+#include "packet-ros-fn.c"
+
+
 /*
 * Dissect ROS PDUs inside a PPDU.
 */
diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c
index 6bf6c6484a..61be93a243 100644
--- a/asn1/rtse/packet-rtse-template.c
+++ b/asn1/rtse/packet-rtse-template.c
@@ -57,6 +57,8 @@ static guint32 app_proto=0;
 
 static proto_tree *top_tree=NULL;
 
+static int dissect_rtse_EXTERNAL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_);
+
 
 #include "packet-rtse-hf.c"
 
@@ -64,7 +66,6 @@ static proto_tree *top_tree=NULL;
 static gint ett_rtse = -1;
 #include "packet-rtse-ett.c"
 
-#include "packet-rtse-fn.c"
 
 static dissector_table_t rtse_oid_dissector_table=NULL;
 static GHashTable *oid_table=NULL;
@@ -103,6 +104,8 @@ call_rtse_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *
 	return offset;
 }
 
+#include "packet-rtse-fn.c"
+
 /*
 * Dissect RTSE PDUs inside a PPDU.
 */
diff --git a/asn1/rtse/packet-rtse-template.h b/asn1/rtse/packet-rtse-template.h
index 76003742a0..901ac4bb83 100644
--- a/asn1/rtse/packet-rtse-template.h
+++ b/asn1/rtse/packet-rtse-template.h
@@ -26,7 +26,8 @@
 #ifndef PACKET_RTSE_H
 #define PACKET_RTSE_H
 
-/*#include "packet-rtse-exp.h"*/
+#include "packet-rtse-exp.h"
+
 void register_rtse_oid_dissector_handle(const char *oid, dissector_handle_t dissector, int proto _U_, const char *name);
 
 #endif  /* PACKET_RTSE_H */
diff --git a/asn1/s4406/packet-s4406-template.c b/asn1/s4406/packet-s4406-template.c
index d864769cbc..be7c53d40e 100644
--- a/asn1/s4406/packet-s4406-template.c
+++ b/asn1/s4406/packet-s4406-template.c
@@ -39,6 +39,8 @@
 #include "packet-x509if.h"
 
 #include "packet-s4406.h"
+#include "packet-x411.h" 
+#include "packet-x420.h" 
 
 #define PNAME  "STANAG 4406 Military Message Extensions"
 #define PSNAME "STANAG 4406"
diff --git a/asn1/x420/packet-x420-template.c b/asn1/x420/packet-x420-template.c
index d7a55fd108..bb727a78c1 100644
--- a/asn1/x420/packet-x420-template.c
+++ b/asn1/x420/packet-x420-template.c
@@ -67,11 +67,9 @@ static void
 dissect_x420(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 {
 	int offset = 0;
-	int old_offset;
 	proto_item *item=NULL;
 	proto_tree *tree=NULL;
 	int (*x420_dissector)(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) = NULL;
-	char *x420_op_name;
 
 	if(parent_tree){
 		item = proto_tree_add_item(parent_tree, proto_x420, tvb, 0, -1, FALSE);
diff --git a/asn1/x420/packet-x420-template.h b/asn1/x420/packet-x420-template.h
index 68c9880aec..bf603bb4f8 100644
--- a/asn1/x420/packet-x420-template.h
+++ b/asn1/x420/packet-x420-template.h
@@ -26,6 +26,6 @@
 #ifndef PACKET_X420_H
 #define PACKET_X420_H
 
-/*#include "packet-x420-exp.h"*/
+#include "packet-x420-exp.h"
 
 #endif  /* PACKET_X420_H */