Updates to the ROS dissector to support IDMP and fix to IDMP for implicit declaration of return value of call_ros_oid_callback().

svn path=/trunk/; revision=33182

1 files changed, 18 insertions, 1 deletions

diff --git a/asn1/ros/ros.cnf b/asn1/ros/ros.cnf
index 8e26fceb62..589737d1df 100644
--- a/asn1/ros/ros.cnf
+++ b/asn1/ros/ros.cnf
@@ -28,6 +28,8 @@ Reject/problem/returnResult	rejectResult
 
 #.FN_BODY Invoke/argument
   char *oid;
+  struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE *)actx->pinfo->private_data;
+
   /* not sure what the length should be - -1 for now */
   proto_tree_add_text(tree, tvb, offset,-1, "invoke argument");
 
@@ -43,6 +45,8 @@ Reject/problem/returnResult	rejectResult
 
 #.FN_BODY ReturnResult/result/result
   char *oid;
+  struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE *)actx->pinfo->private_data;
+
   /* not sure what the length should be - -1 for now */
   proto_tree_add_text(tree, tvb, offset,-1, "return result");
 
@@ -58,6 +62,8 @@ Reject/problem/returnResult	rejectResult
 
 #.FN_BODY ReturnError/parameter
   char *oid;
+  struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE *)actx->pinfo->private_data;
+
   /* not sure what the length should be - -1 for now */
   proto_tree_add_text(tree, tvb, offset,-1, "return result");
 
@@ -71,9 +77,10 @@ Reject/problem/returnResult	rejectResult
 	offset = call_ros_oid_callback(oid, tvb, offset, actx->pinfo, top_tree);
   }
 
-
 #.FN_BODY ROS/bind-invoke
   char *oid;
+  struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE *)actx->pinfo->private_data;
+
   /* not sure what the length should be - -1 for now */
   proto_tree_add_text(tree, tvb, offset,-1, "bind-invoke");
 
@@ -85,6 +92,8 @@ Reject/problem/returnResult	rejectResult
 
 #.FN_BODY ROS/bind-result
   char *oid;
+  struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE *)actx->pinfo->private_data;
+
   /* not sure what the length should be - -1 for now */
   proto_tree_add_text(tree, tvb, offset,-1, "bind-result");
 
@@ -96,6 +105,8 @@ Reject/problem/returnResult	rejectResult
 
 #.FN_BODY ROS/bind-error
   char *oid;
+  struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE *)actx->pinfo->private_data;
+
   /* not sure what the length should be - -1 for now */
   proto_tree_add_text(tree, tvb, offset,-1, "bind-error");
 
@@ -108,6 +119,8 @@ Reject/problem/returnResult	rejectResult
 
 #.FN_BODY ROS/unbind-invoke
   char *oid;
+  struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE *)actx->pinfo->private_data;
+
   /* not sure what the length should be - -1 for now */
   proto_tree_add_text(tree, tvb, offset,-1, "unbind-invoke");
 
@@ -120,6 +133,8 @@ Reject/problem/returnResult	rejectResult
 
 #.FN_BODY ROS/unbind-result
   char *oid;
+  struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE *)actx->pinfo->private_data;
+
   /* not sure what the length should be - -1 for now */
   proto_tree_add_text(tree, tvb, offset,-1, "unbind-result");
 
@@ -131,6 +146,8 @@ Reject/problem/returnResult	rejectResult
 
 #.FN_BODY ROS/unbind-error
   char *oid;
+  struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE *)actx->pinfo->private_data;
+
   /* not sure what the length should be - -1 for now */
   proto_tree_add_text(tree, tvb, offset,-1, "unbind-error");