- use #.FN_HDR where #.FN_BODY is not necessary

- modify subtypes for individual TCMessage/ansi... fields instead of switching based on hf_index inside common TransactionPDU type

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

diff --git a/asn1/tcap/tcap.cnf b/asn1/tcap/tcap.cnf
index f17dc267df42b833c19a9f03b5d2bb7856dad9c2..b43c3a5777cc2f1f752f5d87c7bb9ba7c41acb81 100644 (file)
--- a/asn1/tcap/tcap.cnf
+++ b/asn1/tcap/tcap.cnf
@@ -228,7 +228,7 @@ if (parameter_tvb){
                col_append_fstr(actx->pinfo->cinfo, COL_INFO, ") ");
           }
 }
-#.FN_BODY Begin
+#.FN_HDR Begin
 gp_tcapsrt_info->ope=TC_BEGIN;
 
 /*  Do not change col_add_str() to col_append_str() here: we _want_ this call
@@ -240,56 +240,56 @@ gp_tcapsrt_info->ope=TC_BEGIN;
  */
 if (check_col(actx->pinfo->cinfo, COL_INFO))
                col_add_str(actx->pinfo->cinfo, COL_INFO, "Begin ");
+#.END
 
-%(DEFAULT_BODY)s
 
-#.FN_BODY End
+#.FN_HDR End
 gp_tcapsrt_info->ope=TC_END;
 
 if (check_col(actx->pinfo->cinfo, COL_INFO))
                col_add_str(actx->pinfo->cinfo, COL_INFO, "End ");
+#.END
 
-%(DEFAULT_BODY)s
 
-#.FN_BODY Continue
+#.FN_HDR Continue
 gp_tcapsrt_info->ope=TC_CONT;
 
 if (check_col(actx->pinfo->cinfo, COL_INFO))
                col_add_str(actx->pinfo->cinfo, COL_INFO, "Continue ");
+#.END
 
-%(DEFAULT_BODY)s
 
-#.FN_BODY Abort
+#.FN_HDR Abort
 gp_tcapsrt_info->ope=TC_ABORT;
 
 if (check_col(actx->pinfo->cinfo, COL_INFO))
                col_add_str(actx->pinfo->cinfo, COL_INFO, "Abort ");
+#.END
 
- %(DEFAULT_BODY)s
 
-#.FN_BODY AbortPDU
+#.FN_HDR AbortPDU
 if (check_col(actx->pinfo->cinfo, COL_INFO))
                col_add_str(actx->pinfo->cinfo, COL_INFO, "Abort ");
+#.END
 
-%(DEFAULT_BODY)s
 
-#.FN_BODY TransactionPDU
-if ((hf_index == hf_tcap_ansiqueryWithPerm)&&(check_col(actx->pinfo->cinfo, COL_INFO)))
+#.FN_HDR TCMessage/ansiqueryWithPerm
+if (check_col(actx->pinfo->cinfo, COL_INFO))
                                col_add_str(actx->pinfo->cinfo, COL_INFO, "QueryWithPerm ");
-
-if ((hf_index == hf_tcap_ansiqueryWithoutPerm)&&(check_col(actx->pinfo->cinfo, COL_INFO)))
+#.FN_HDR TCMessage/ansiqueryWithoutPerm
+if (check_col(actx->pinfo->cinfo, COL_INFO))
                                col_add_str(actx->pinfo->cinfo, COL_INFO, "QueryWithOutPerm ");
-
-if ((hf_index == hf_tcap_ansiresponse)&&(check_col(actx->pinfo->cinfo, COL_INFO)))
+#.FN_HDR TCMessage/ansiresponse
+if (check_col(actx->pinfo->cinfo, COL_INFO))
                                col_add_str(actx->pinfo->cinfo, COL_INFO, "Response ");
-
-if ((hf_index == hf_tcap_ansiconversationWithPerm)&&(check_col(actx->pinfo->cinfo, COL_INFO)))
+#.FN_HDR TCMessage/ansiconversationWithPerm
+if (check_col(actx->pinfo->cinfo, COL_INFO))
                                col_add_str(actx->pinfo->cinfo, COL_INFO, "ConversationWithPerm ");
-
-if ((hf_index == hf_tcap_ansiconversationWithoutPerm)&&(check_col(actx->pinfo->cinfo, COL_INFO)))
+#.FN_HDR TCMessage/ansiconversationWithoutPerm
+if (check_col(actx->pinfo->cinfo, COL_INFO))
                                col_add_str(actx->pinfo->cinfo, COL_INFO, "ConversationWithoutPerm ");
 
-%(DEFAULT_BODY)s
+#.END
 
 #.FN_BODY TransactionID VAL_PTR = &next_tvb
 

diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index c8cdf986ca94a4eadefe7a6fb27d275593bcb059..f52570fafeebfb1b51dcfddcbc06f2a8d6571a7e 100644 (file)
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* ./packet-tcap.c                                                            */
+/* .\packet-tcap.c                                                            */
 /* ../../tools/asn2wrs.py -b -e -p tcap -c tcap.cnf -s packet-tcap-template tcap.asn */
 
 /* Input file: packet-tcap-template.c */
@@ -98,11 +98,11 @@ static int hf_tcap_end = -1;                      /* End */
 static int hf_tcap_continue = -1;                 /* Continue */
 static int hf_tcap_abort = -1;                    /* Abort */
 static int hf_tcap_ansiunidirectional = -1;       /* UniTransactionPDU */
-static int hf_tcap_ansiqueryWithPerm = -1;        /* TransactionPDU */
-static int hf_tcap_ansiqueryWithoutPerm = -1;     /* TransactionPDU */
-static int hf_tcap_ansiresponse = -1;             /* TransactionPDU */
-static int hf_tcap_ansiconversationWithPerm = -1;  /* TransactionPDU */
-static int hf_tcap_ansiconversationWithoutPerm = -1;  /* TransactionPDU */
+static int hf_tcap_ansiqueryWithPerm = -1;        /* T_ansiqueryWithPerm */
+static int hf_tcap_ansiqueryWithoutPerm = -1;     /* T_ansiqueryWithoutPerm */
+static int hf_tcap_ansiresponse = -1;             /* T_ansiresponse */
+static int hf_tcap_ansiconversationWithPerm = -1;  /* T_ansiconversationWithPerm */
+static int hf_tcap_ansiconversationWithoutPerm = -1;  /* T_ansiconversationWithoutPerm */
 static int hf_tcap_ansiabort = -1;                /* AbortPDU */
 static int hf_tcap_dialoguePortion = -1;          /* DialoguePortion */
 static int hf_tcap_components = -1;               /* ComponentPortion */
@@ -1438,9 +1438,6 @@ if (check_col(actx->pinfo->cinfo, COL_INFO))
   offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
                                        Begin_sequence, hf_index, ett_tcap_Begin);
 
-
-
-
   return offset;
 }
 static int dissect_begin_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
@@ -1513,9 +1510,6 @@ if (check_col(actx->pinfo->cinfo, COL_INFO))
   offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
                                        End_sequence, hf_index, ett_tcap_End);
 
-
-
-
   return offset;
 }
 static int dissect_end_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
@@ -1542,9 +1536,6 @@ if (check_col(actx->pinfo->cinfo, COL_INFO))
   offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
                                        Continue_sequence, hf_index, ett_tcap_Continue);
 
-
-
-
   return offset;
 }
 static int dissect_continue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
@@ -1613,12 +1604,9 @@ gp_tcapsrt_info->ope=TC_ABORT;
 if (check_col(actx->pinfo->cinfo, COL_INFO))
                col_add_str(actx->pinfo->cinfo, COL_INFO, "Abort ");
 
-   offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
                                        Abort_sequence, hf_index, ett_tcap_Abort);
 
-
-
-
   return offset;
 }
 static int dissect_abort_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
@@ -2177,44 +2165,91 @@ static const ber_old_sequence_t TransactionPDU_sequence[] = {
 
 static int
 dissect_tcap_TransactionPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 277 "tcap.cnf"
-if ((hf_index == hf_tcap_ansiqueryWithPerm)&&(check_col(actx->pinfo->cinfo, COL_INFO)))
-                               col_add_str(actx->pinfo->cinfo, COL_INFO, "QueryWithPerm ");
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TransactionPDU_sequence, hf_index, ett_tcap_TransactionPDU);
 
-if ((hf_index == hf_tcap_ansiqueryWithoutPerm)&&(check_col(actx->pinfo->cinfo, COL_INFO)))
-                               col_add_str(actx->pinfo->cinfo, COL_INFO, "QueryWithOutPerm ");
+  return offset;
+}
 
-if ((hf_index == hf_tcap_ansiresponse)&&(check_col(actx->pinfo->cinfo, COL_INFO)))
-                               col_add_str(actx->pinfo->cinfo, COL_INFO, "Response ");
 
-if ((hf_index == hf_tcap_ansiconversationWithPerm)&&(check_col(actx->pinfo->cinfo, COL_INFO)))
-                               col_add_str(actx->pinfo->cinfo, COL_INFO, "ConversationWithPerm ");
 
-if ((hf_index == hf_tcap_ansiconversationWithoutPerm)&&(check_col(actx->pinfo->cinfo, COL_INFO)))
-                               col_add_str(actx->pinfo->cinfo, COL_INFO, "ConversationWithoutPerm ");
+static int
+dissect_tcap_T_ansiqueryWithPerm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 277 "tcap.cnf"
+if (check_col(actx->pinfo->cinfo, COL_INFO))
+                               col_add_str(actx->pinfo->cinfo, COL_INFO, "QueryWithPerm ");
 
-  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
-                                       TransactionPDU_sequence, hf_index, ett_tcap_TransactionPDU);
+  offset = dissect_tcap_TransactionPDU(implicit_tag, tvb, offset, actx, tree, hf_index);
 
+  return offset;
+}
+static int dissect_ansiqueryWithPerm_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
+  return dissect_tcap_T_ansiqueryWithPerm(TRUE, tvb, offset, actx, tree, hf_tcap_ansiqueryWithPerm);
+}
 
 
 
+static int
+dissect_tcap_T_ansiqueryWithoutPerm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 280 "tcap.cnf"
+if (check_col(actx->pinfo->cinfo, COL_INFO))
+                               col_add_str(actx->pinfo->cinfo, COL_INFO, "QueryWithOutPerm ");
+
+  offset = dissect_tcap_TransactionPDU(implicit_tag, tvb, offset, actx, tree, hf_index);
+
   return offset;
 }
-static int dissect_ansiqueryWithPerm_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
-  return dissect_tcap_TransactionPDU(TRUE, tvb, offset, actx, tree, hf_tcap_ansiqueryWithPerm);
-}
 static int dissect_ansiqueryWithoutPerm_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
-  return dissect_tcap_TransactionPDU(TRUE, tvb, offset, actx, tree, hf_tcap_ansiqueryWithoutPerm);
+  return dissect_tcap_T_ansiqueryWithoutPerm(TRUE, tvb, offset, actx, tree, hf_tcap_ansiqueryWithoutPerm);
+}
+
+
+
+static int
+dissect_tcap_T_ansiresponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 283 "tcap.cnf"
+if (check_col(actx->pinfo->cinfo, COL_INFO))
+                               col_add_str(actx->pinfo->cinfo, COL_INFO, "Response ");
+
+  offset = dissect_tcap_TransactionPDU(implicit_tag, tvb, offset, actx, tree, hf_index);
+
+  return offset;
 }
 static int dissect_ansiresponse_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
-  return dissect_tcap_TransactionPDU(TRUE, tvb, offset, actx, tree, hf_tcap_ansiresponse);
+  return dissect_tcap_T_ansiresponse(TRUE, tvb, offset, actx, tree, hf_tcap_ansiresponse);
+}
+
+
+
+static int
+dissect_tcap_T_ansiconversationWithPerm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 286 "tcap.cnf"
+if (check_col(actx->pinfo->cinfo, COL_INFO))
+                               col_add_str(actx->pinfo->cinfo, COL_INFO, "ConversationWithPerm ");
+
+  offset = dissect_tcap_TransactionPDU(implicit_tag, tvb, offset, actx, tree, hf_index);
+
+  return offset;
 }
 static int dissect_ansiconversationWithPerm_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
-  return dissect_tcap_TransactionPDU(TRUE, tvb, offset, actx, tree, hf_tcap_ansiconversationWithPerm);
+  return dissect_tcap_T_ansiconversationWithPerm(TRUE, tvb, offset, actx, tree, hf_tcap_ansiconversationWithPerm);
+}
+
+
+
+static int
+dissect_tcap_T_ansiconversationWithoutPerm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 289 "tcap.cnf"
+if (check_col(actx->pinfo->cinfo, COL_INFO))
+                               col_add_str(actx->pinfo->cinfo, COL_INFO, "ConversationWithoutPerm ");
+
+
+  offset = dissect_tcap_TransactionPDU(implicit_tag, tvb, offset, actx, tree, hf_index);
+
+  return offset;
 }
 static int dissect_ansiconversationWithoutPerm_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
-  return dissect_tcap_TransactionPDU(TRUE, tvb, offset, actx, tree, hf_tcap_ansiconversationWithoutPerm);
+  return dissect_tcap_T_ansiconversationWithoutPerm(TRUE, tvb, offset, actx, tree, hf_tcap_ansiconversationWithoutPerm);
 }
 
 
@@ -2286,9 +2321,6 @@ if (check_col(actx->pinfo->cinfo, COL_INFO))
   offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
                                        AbortPDU_sequence, hf_index, ett_tcap_AbortPDU);
 
-
-
-
   return offset;
 }
 static int dissect_ansiabort_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
@@ -2651,23 +2683,23 @@ proto_register_tcap(void)
     { &hf_tcap_ansiqueryWithPerm,
       { "ansiqueryWithPerm", "tcap.ansiqueryWithPerm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "tcap.TransactionPDU", HFILL }},
+        "tcap.T_ansiqueryWithPerm", HFILL }},
     { &hf_tcap_ansiqueryWithoutPerm,
       { "ansiqueryWithoutPerm", "tcap.ansiqueryWithoutPerm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "tcap.TransactionPDU", HFILL }},
+        "tcap.T_ansiqueryWithoutPerm", HFILL }},
     { &hf_tcap_ansiresponse,
       { "ansiresponse", "tcap.ansiresponse",
         FT_NONE, BASE_NONE, NULL, 0,
-        "tcap.TransactionPDU", HFILL }},
+        "tcap.T_ansiresponse", HFILL }},
     { &hf_tcap_ansiconversationWithPerm,
       { "ansiconversationWithPerm", "tcap.ansiconversationWithPerm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "tcap.TransactionPDU", HFILL }},
+        "tcap.T_ansiconversationWithPerm", HFILL }},
     { &hf_tcap_ansiconversationWithoutPerm,
       { "ansiconversationWithoutPerm", "tcap.ansiconversationWithoutPerm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "tcap.TransactionPDU", HFILL }},
+        "tcap.T_ansiconversationWithoutPerm", HFILL }},
     { &hf_tcap_ansiabort,
       { "ansiabort", "tcap.ansiabort",
         FT_NONE, BASE_NONE, NULL, 0,