Make hf fileds for ARGGUMENT RESULT and ERROR parameters.

svn path=/trunk/; revision=22266

3 files changed, 61 insertions, 18 deletions

diff --git a/asn1/camel/camel.cnf b/asn1/camel/camel.cnf
index cd91543497..4ad121ecef 100644
--- a/asn1/camel/camel.cnf
+++ b/asn1/camel/camel.cnf
@@ -75,7 +75,7 @@ const value_string camel_opr_code_strings[] = {
 
 #.TABLE_HDR
 /* CAMEL ERRORS */
-const value_string camel_err_code_string_vals[] = {
+static const value_string camel_err_code_string_vals[] = {
 #.TABLE_BODY ERROR
 	{ %(&errorCode)s, "%(_ident)s" },  
 #.TABLE_FTR
@@ -83,16 +83,16 @@ const value_string camel_err_code_string_vals[] = {
 };
 #.END
 
-#.TABLE_HDR
+#.TABLE2_HDR
 static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx) {
   proto_item *cause;
 
   switch(opcode){
-#.TABLE_BODY OPERATION.&ArgumentType
+#.TABLE2_BODY OPERATION.&ArgumentType
     case %(&operationCode)s:  /* %(_ident)s */
-      offset= %(_argument_fn)s(FALSE, tvb, offset, actx, tree, -1);
+      offset= %(_argument_fn)s(FALSE, tvb, offset, actx, tree, hf_camel_%(_ident)s);
       break;
-#.TABLE_FTR
+#.TABLE2_FTR
     cause=proto_tree_add_text(tree, tvb, offset, -1, "Unknown invokeData blob");
     proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
     expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "Unknown invokeData %d",opcode);
@@ -101,16 +101,16 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
   return offset;
 }
 #.END
-#.TABLE_HDR
+#.TABLE2_HDR
 static int dissect_returnResultData(proto_tree *tree, tvbuff_t *tvb, int offset,asn1_ctx_t *actx) {
   proto_item *cause;
 
   switch(opcode){
-#.TABLE_BODY OPERATION.&ResultType
+#.TABLE2_BODY OPERATION.&ResultType
     case %(&operationCode)s:  /* %(_ident)s */
-	  offset= %(_result_fn)s(FALSE, tvb, offset, actx, tree, -1);
+	  offset= %(_result_fn)s(FALSE, tvb, offset, actx, tree, hf_camel_%(_ident)s);
       break;
-#.TABLE_FTR
+#.TABLE2_FTR
   default:
     cause=proto_tree_add_text(tree, tvb, offset, -1, "Unknown returnResultData blob");
     proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
@@ -119,16 +119,16 @@ static int dissect_returnResultData(proto_tree *tree, tvbuff_t *tvb, int offset,
   return offset;
 }
 #.END
-#.TABLE_HDR
+#.TABLE2_HDR
 static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,asn1_ctx_t *actx) {
   proto_item *cause;
 
   switch(errorCode) {
-#.TABLE_BODY ERROR.&ParameterType
+#.TABLE2_BODY ERROR.&ParameterType
     case %(&errorCode)s:  /* %(_ident)s */
-      %(_parameter_fn)s(FALSE, tvb, offset, actx, tree, -1);
+      %(_parameter_fn)s(FALSE, tvb, offset, actx, tree, hf_camel_%(_ident)s);
       break;
-#.TABLE_FTR
+#.TABLE2_FTR
   default:
     cause=proto_tree_add_text(tree, tvb, offset, -1, "Unknown returnErrorData blob");
     proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
@@ -137,6 +137,45 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a
   return offset;
 }
 #.END
+
+#.TABLE3_HDR
+/* CAMEL OPERATIONS hf filelds */
+#.TABLE3_BODY OPERATION
+    { &hf_camel_%(_ident)s,
+      { "%(_ident)s", "camel.%(_ident)s",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "camel.%(_ident)s", HFILL }},
+
+#.TABLE3_FTR
+/* END CAMEL OPERATIONS hf filelds */
+#.END
+#.TABLE3_HDR
+/* CAMEL ERRORS  hf filelds */
+#.TABLE3_BODY ERROR.&ParameterType
+    { &hf_camel_%(_ident)s,
+      { "%(_ident)s", "camel.%(_ident)s",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "camel.%(_ident)s", HFILL }},
+#.TABLE3_FTR
+/* END CAMEL ERRORS hf filelds */
+#.END
+
+#.TABLE4_HDR
+/* CAMEL OPERATIONS hf filelds */
+#.TABLE4_BODY OPERATION
+int hf_camel_%(_ident)s = -1;
+#.TABLE4_FTR
+/* END CAMEL OPERATIONS hf filelds */
+#.END
+
+#.TABLE4_HDR
+/* CAMEL ERRORS hf filelds */
+#.TABLE4_BODY ERROR.&ParameterType
+int hf_camel_%(_ident)s = -1;
+#.TABLE4_FTR
+/* END CAMEL ERRORS hf filelds */
+#.END
+
 # ROS stuff here XXX change when TCAP is redone.
 
 #.FN_BODY Code/local  VAL_PTR = &opcode
diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c
index 2903ebc202..4344909f02 100644
--- a/asn1/camel/packet-camel-template.c
+++ b/asn1/camel/packet-camel-template.c
@@ -100,6 +100,8 @@ int hf_camelsrt_DeltaTime35=-1;
 int hf_camelsrt_DeltaTime80=-1;
 int hf_camel_CAMEL_AChBillingChargingCharacteristics = -1;
 
+#include "packet-camel-table4.c"
+
 #include "packet-camel-hf.c"
 
 static struct camelsrt_info_t * gp_camelsrt_info;
@@ -240,8 +242,10 @@ static const value_string camel_RP_Cause_values[] = {
   { 22,"Memory capacity exceeded" },
   { 0, NULL }
 };
+
 #include "packet-camel-val.h"
 
+#include "packet-camel-table.c"
 
 static char camel_number_to_char(int number)
 {
@@ -288,7 +292,7 @@ dissect_RP_cause_ie(tvbuff_t *tvb, guint32 offset, _U_ guint len,
 
 #include "packet-camel-fn.c"
 
-#include "packet-camel-table.c"
+#include "packet-camel-table2.c"
 
 
 
@@ -536,11 +540,12 @@ void proto_register_camel(void) {
     },
     { &hf_camel_CAMEL_AChBillingChargingCharacteristics,
       { "CAMEL-AChBillingChargingCharacteristics", "camel.CAMEL_AChBillingChargingCharacteristics",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_UINT32, BASE_DEC, NULL, 0,
         "CAMEL-AChBillingChargingCharacteristics", HFILL }},
 
 #ifdef REMOVED
 #endif
+#include "packet-camel-table3.c"
 #include "packet-camel-hfarr.c"
   };
 
diff --git a/asn1/camel/packet-camel-template.h b/asn1/camel/packet-camel-template.h
index 3809337615..957a32a687 100644
--- a/asn1/camel/packet-camel-template.h
+++ b/asn1/camel/packet-camel-template.h
@@ -31,8 +31,8 @@
  */
 
 
-#ifndef PACKET_camel_H
-#define PACKET_camel_H
+#ifndef PACKET_CAMEL_H
+#define PACKET_CAMEL_H
 
 void proto_reg_handoff_camel(void);
 void proto_register_camel(void);
@@ -42,7 +42,6 @@ void proto_register_camel(void);
 
 
 WS_VAR_IMPORT const value_string camel_opr_code_strings[];
-WS_VAR_IMPORT const value_string camel_err_code_string_vals[];
 /* #include "packet-camel-exp.h"*/
 
 #endif  /* PACKET_camel_H */