- update ftam.cnf for new asn2eth compiler

- usage of #.FN_PARS in h225 and h245 dissectors
- PER dissectors regenerated

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

3 files changed, 109 insertions, 130 deletions

diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf
index 52b3cb9ec0..a3a17a9cdf 100755
--- a/asn1/ftam/ftam.cnf
+++ b/asn1/ftam/ftam.cnf
@@ -710,7 +710,7 @@ Legal-Qualification-Attribute/actual-values	actual_values9
   
   if( (branch_taken!=-1) && ftam_FTAM_Regime_PDU_vals[branch_taken].strptr ){
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_append_fstr(pinfo->cinfo, COL_INFO, " %s:", ftam_FTAM_Regime_PDU_vals[branch_taken].strptr);
+		col_append_fstr(pinfo->cinfo, COL_INFO, " %%s:", ftam_FTAM_Regime_PDU_vals[branch_taken].strptr);
 	}
   }
 
@@ -722,7 +722,7 @@ Legal-Qualification-Attribute/actual-values	actual_values9
 
   if( (branch_taken!=-1) && ftam_File_PDU_vals[branch_taken].strptr ){
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_append_fstr(pinfo->cinfo, COL_INFO, " %s:", ftam_File_PDU_vals[branch_taken].strptr);
+		col_append_fstr(pinfo->cinfo, COL_INFO, " %%s:", ftam_File_PDU_vals[branch_taken].strptr);
 	}
   }
 
@@ -734,7 +734,7 @@ Legal-Qualification-Attribute/actual-values	actual_values9
 
   if( (branch_taken!=-1) && ftam_Bulk_Data_PDU_vals[branch_taken].strptr ){
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_append_fstr(pinfo->cinfo, COL_INFO, " %s:", ftam_Bulk_Data_PDU_vals[branch_taken].strptr);
+		col_append_fstr(pinfo->cinfo, COL_INFO, " %%s:", ftam_Bulk_Data_PDU_vals[branch_taken].strptr);
 	}
   }
 
@@ -746,6 +746,6 @@ Legal-Qualification-Attribute/actual-values	actual_values9
 
   if( (branch_taken!=-1) && ftam_FSM_PDU_vals[branch_taken].strptr ){
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_append_fstr(pinfo->cinfo, COL_INFO, " %s:", ftam_FSM_PDU_vals[branch_taken].strptr);
+		col_append_fstr(pinfo->cinfo, COL_INFO, " %%s:", ftam_FSM_PDU_vals[branch_taken].strptr);
 	}
   }
diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf
index a80cbba178..52caf33aba 100644
--- a/asn1/h225/h225.cnf
+++ b/asn1/h225/h225.cnf
@@ -137,16 +137,15 @@ RegistrationRejectReason/securityError reg_securityError
 CallIdentifier/guid guid
 
 #----------------------------------------------------------------------------------------
+#.FN_PARS H323-UU-PDU/h323-message-body
+  VAL_PTR = &message_body_val
 #.FN_BODY H323-UU-PDU/h323-message-body
 	guint32 message_body_val;
 
 	contains_faststart = FALSE;
-	offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h225_T_h323_message_body, T_h323_message_body_choice, "T_h323_message_body",
-                              &message_body_val);
-
+%(DEFAULT_BODY)s
 	if (check_col(pinfo->cinfo, COL_INFO)){
-		col_append_fstr(pinfo->cinfo, COL_INFO, "CS: %s ",
+		col_append_fstr(pinfo->cinfo, COL_INFO, "CS: %%s ",
 			val_to_str(message_body_val, T_h323_message_body_vals, "<unknown>"));
         }
 
@@ -188,15 +187,14 @@ CallIdentifier/guid guid
 
 #.END
 #----------------------------------------------------------------------------------------
+#.FN_PARS RasMessage
+  VAL_PTR = &rasmessage_value
 #.FN_BODY RasMessage
   	guint32 rasmessage_value;
 
-  	offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h225_RasMessage, RasMessage_choice, "RasMessage",
-                               &rasmessage_value);
-			       
+%(DEFAULT_BODY)s
 	if (check_col(pinfo->cinfo, COL_INFO)){
-		col_add_fstr(pinfo->cinfo, COL_INFO, "RAS: %s ",
+		col_add_fstr(pinfo->cinfo, COL_INFO, "RAS: %%s ",
 			val_to_str(rasmessage_value, RasMessage_vals, "<unknown>"));
 	}
 
@@ -369,112 +367,101 @@ CallIdentifier/guid guid
 
 #.END
 #----------------------------------------------------------------------------------------
+#.FN_PARS 
+FacilityReason            VAL_PTR = &value
+GatekeeperRejectReason    VAL_PTR = &value
+UnregRequestReason        VAL_PTR = &value
+UnregRejectReason         VAL_PTR = &value
+BandRejectReason          VAL_PTR = &value
+DisengageReason           VAL_PTR = &value
+DisengageRejectReason     VAL_PTR = &value
+AdmissionRejectReason     VAL_PTR = &value
+LocationRejectReason      VAL_PTR = &value
+RegistrationRejectReason  VAL_PTR = &value
+InfoRequestNakReason      VAL_PTR = &value
+ReleaseCompleteReason     VAL_PTR = &value
+#.END
+
 #.FN_BODY FacilityReason
 	guint32 value;
 	
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h225_FacilityReason, FacilityReason_choice, "FacilityReason",
-                              &value);
+%(DEFAULT_BODY)s
 	h225_pi->reason = value;
-
 #.END
 #----------------------------------------------------------------------------------------
 #.FN_BODY GatekeeperRejectReason
   guint32 value;
 	
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h225_GatekeeperRejectReason, GatekeeperRejectReason_choice, "GatekeeperRejectReason",
-                              &value);
+%(DEFAULT_BODY)s
   h225_pi->reason = value;
-
 #.END
 #----------------------------------------------------------------------------------------
 #.FN_BODY UnregRequestReason
   guint32 value;
 	
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h225_UnregRequestReason, UnregRequestReason_choice, "UnregRequestReason",
-                              &value);
+%(DEFAULT_BODY)s
   h225_pi->reason = value;
-
 #.END
 #----------------------------------------------------------------------------------------
 #.FN_BODY UnregRejectReason
   guint32 value;
 
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h225_UnregRejectReason, UnregRejectReason_choice, "UnregRejectReason",
-                              &value);
+%(DEFAULT_BODY)s
   h225_pi->reason = value;
 #.END
 #----------------------------------------------------------------------------------------
 #.FN_BODY BandRejectReason
   guint32 value;
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h225_BandRejectReason, BandRejectReason_choice, "BandRejectReason",
-                              &value);
+
+%(DEFAULT_BODY)s
   h225_pi->reason = value;
 #.END
 #----------------------------------------------------------------------------------------
 #.FN_BODY DisengageReason
   guint32 value;
 	
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h225_DisengageReason, DisengageReason_choice, "DisengageReason",
-                              &value);
+%(DEFAULT_BODY)s
   h225_pi->reason = value;
 #----------------------------------------------------------------------------------------
 #.FN_BODY DisengageRejectReason
   guint32 value;
 	
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h225_DisengageRejectReason, DisengageRejectReason_choice, "DisengageRejectReason",
-                              &value);
+%(DEFAULT_BODY)s
   h225_pi->reason = value;
 #.END
 #----------------------------------------------------------------------------------------
 #.FN_BODY AdmissionRejectReason
   guint32 value;
 
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h225_AdmissionRejectReason, AdmissionRejectReason_choice, "AdmissionRejectReason",
-                              &value);
+%(DEFAULT_BODY)s
   h225_pi->reason = value;
 #.END
 #----------------------------------------------------------------------------------------
 #.FN_BODY LocationRejectReason
   guint32 value;
 
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h225_LocationRejectReason, LocationRejectReason_choice, "LocationRejectReason",
-                              &value);
+%(DEFAULT_BODY)s
   h225_pi->reason = value;
 #.END
 #----------------------------------------------------------------------------------------
 #.FN_BODY RegistrationRejectReason
   guint32 value;
 
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h225_RegistrationRejectReason, RegistrationRejectReason_choice, "RegistrationRejectReason",
-                              &value);
+%(DEFAULT_BODY)s
   h225_pi->reason = value;
 #.END
 #----------------------------------------------------------------------------------------
 #.FN_BODY InfoRequestNakReason
   guint32 value;
 	
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h225_InfoRequestNakReason, InfoRequestNakReason_choice, "InfoRequestNakReason",
-                              &value);
+%(DEFAULT_BODY)s
   h225_pi->reason = value;
 #.END
 #----------------------------------------------------------------------------------------
 #.FN_BODY ReleaseCompleteReason
   guint32 value;
 	
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h225_ReleaseCompleteReason, ReleaseCompleteReason_choice, "ReleaseCompleteReason",
-                              &value);
+%(DEFAULT_BODY)s
   h225_pi->reason = value;
 #.END
 #----------------------------------------------------------------------------------------
@@ -526,17 +513,18 @@ CallIdentifier/guid guid
 
 #--- NonStandardParameter ---------------------------------------------------------------
 
+#.FN_PARS
+NonStandardIdentifier         VAL_PTR = &value
+NonStandardIdentifier/object  VAL_PTR = nsiOID
+#.END
+
 #.FN_BODY NonStandardIdentifier
 	guint32 value;
 
 	nsiOID[0] = '\0';
 	h221NonStandard = 0;
 
-	offset = dissect_per_choice(tvb, offset, pinfo, tree,
-				hf_h225_nonStandardIdentifier,
-				ett_h225_NonStandardIdentifier, NonStandardIdentifier_choice, "NonStandardIdentifier",
-				&value);
-
+%(DEFAULT_BODY)s
 	switch (value) {
 		case 0 :  /* object */
 			nsp_handle = dissector_get_string_handle(nsp_object_dissector_table, nsiOID);
@@ -547,8 +535,6 @@ CallIdentifier/guid guid
 		default :
 			nsp_handle = NULL;
     }
-#.FN_PARS NonStandardIdentifier/object
-  VAL_PTR = nsiOID
 #.END
 
 #.FN_HDR H221NonStandard
diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf
index 5af2f2b603..6d8d5c8b8c 100644
--- a/asn1/h245/h245.cnf
+++ b/asn1/h245/h245.cnf
@@ -9,27 +9,27 @@ DataProtocolCapability NO_PROT_PREFIX
 OpenLogicalChannel
 
 #----------------------------------------------------------------------------------------
+#.FN_PARS RequestMessage
+  VAL_PTR = &value
 #.FN_BODY RequestMessage
   guint32 value;
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h245_RequestMessage, RequestMessage_choice, "RequestMessage",
-                              &value);
 
+%(DEFAULT_BODY)s
 	if (check_col(pinfo->cinfo, COL_INFO)){
 	        if ( h245_shorttypes == TRUE )
 	        {
-	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
+	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%%s ",
 				val_to_str(value, h245_RequestMessage_short_vals, "<unknown>"));
 		}
 		else
 		{
-	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
+	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%%s ",
 				val_to_str(value, h245_RequestMessage_vals, "<unknown>"));
 		}
 	}
 
 	if (( check_col(pinfo->cinfo, COL_INFO)) && ( codec_type != NULL ) && ( value == 3) ){
-		col_append_fstr(pinfo->cinfo, COL_INFO, "(%s) ", codec_type );
+		col_append_fstr(pinfo->cinfo, COL_INFO, "(%%s) ", codec_type );
 	}
 
         col_set_fence(pinfo->cinfo,COL_INFO);
@@ -38,33 +38,32 @@ OpenLogicalChannel
 
     /* if it is TCS*/
     if ((codec_type != NULL) && ( value == 2))
-                g_snprintf(h245_pi->frame_label, 50, "%s (%s) ",val_to_str(value, h245_RequestMessage_short_vals, "UKN"), h245_pi->frame_label);
+                g_snprintf(h245_pi->frame_label, 50, "%%s (%%s) ",val_to_str(value, h245_RequestMessage_short_vals, "UKN"), h245_pi->frame_label);
     else
-                g_snprintf(h245_pi->frame_label, 50, "%s ", val_to_str(value, h245_RequestMessage_short_vals, "UKN"));
+                g_snprintf(h245_pi->frame_label, 50, "%%s ", val_to_str(value, h245_RequestMessage_short_vals, "UKN"));
 
-    g_snprintf(h245_pi->comment, 50, "%s %s ", h245_pi->comment, val_to_str(value, h245_RequestMessage_vals, "<unknown>"));
+    g_snprintf(h245_pi->comment, 50, "%%s %%s ", h245_pi->comment, val_to_str(value, h245_RequestMessage_vals, "<unknown>"));
 
     /* if it is OLC or RM*/
     if ((codec_type != NULL) && (( value == 3) || ( value == 8)))
-                g_snprintf(h245_pi->frame_label, 50, "%s (%s) ", h245_pi->frame_label, codec_type);
+                g_snprintf(h245_pi->frame_label, 50, "%%s (%%s) ", h245_pi->frame_label, codec_type);
 #.END
 #----------------------------------------------------------------------------------------
+#.FN_PARS ResponseMessage
+  VAL_PTR = &value
 #.FN_BODY ResponseMessage
   guint32 value;
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h245_ResponseMessage, ResponseMessage_choice, "ResponseMessage",
-                              &value);
-
 
+%(DEFAULT_BODY)s
 	if (check_col(pinfo->cinfo, COL_INFO)){
 	        if ( h245_shorttypes == TRUE )
 	        {
-	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
+	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%%s ",
 				val_to_str(value, h245_ResponseMessage_short_vals, "<unknown>"));
 		}
 		else
 		{
-	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
+	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%%s ",
 				val_to_str(value, h245_ResponseMessage_vals, "<unknown>"));
 		}
 	}
@@ -72,126 +71,121 @@ OpenLogicalChannel
 	col_set_fence(pinfo->cinfo,COL_INFO);
 
     /* Add to packet info */
-    g_snprintf(h245_pi->frame_label, 50, "%s %s ", h245_pi->frame_label, val_to_str(value, h245_ResponseMessage_short_vals, "UKN"));
-    g_snprintf(h245_pi->comment, 50, "%s %s ", h245_pi->comment, val_to_str(value, h245_ResponseMessage_vals, "<unknown>"));
+    g_snprintf(h245_pi->frame_label, 50, "%%s %%s ", h245_pi->frame_label, val_to_str(value, h245_ResponseMessage_short_vals, "UKN"));
+    g_snprintf(h245_pi->comment, 50, "%%s %%s ", h245_pi->comment, val_to_str(value, h245_ResponseMessage_vals, "<unknown>"));
 #.END
 #----------------------------------------------------------------------------------------
+#.FN_PARS IndicationMessage
+  VAL_PTR = &value
 #.FN_BODY IndicationMessage
   guint32 value;
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h245_IndicationMessage, IndicationMessage_choice, "IndicationMessage",
-                              &value);
-
 
+%(DEFAULT_BODY)s
 	if (check_col(pinfo->cinfo, COL_INFO)){
 	        if ( h245_shorttypes == TRUE )
 	        {
-	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
+	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%%s ",
 				val_to_str(value, h245_IndicationMessage_short_vals, "<unknown>"));
 		}
 		else
 		{
-	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
+	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%%s ",
 				val_to_str(value, h245_IndicationMessage_vals, "<unknown>"));
 		}
 	}
 
 	col_set_fence(pinfo->cinfo,COL_INFO);
     /* Add to packet info */
-    g_snprintf(h245_pi->frame_label, 50, "%s %s ", h245_pi->frame_label, val_to_str(value, h245_IndicationMessage_short_vals, "UKN"));
-    g_snprintf(h245_pi->comment, 50, "%s %s ", h245_pi->comment, val_to_str(value, h245_IndicationMessage_vals, "<unknown>"));
+    g_snprintf(h245_pi->frame_label, 50, "%%s %%s ", h245_pi->frame_label, val_to_str(value, h245_IndicationMessage_short_vals, "UKN"));
+    g_snprintf(h245_pi->comment, 50, "%%s %%s ", h245_pi->comment, val_to_str(value, h245_IndicationMessage_vals, "<unknown>"));
 #.END
 #----------------------------------------------------------------------------------------
+#.FN_PARS CommandMessage
+  VAL_PTR = &value
 #.FN_BODY CommandMessage
   guint32 value;
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h245_CommandMessage, CommandMessage_choice, "CommandMessage",
-                              &value);
-
 
+%(DEFAULT_BODY)s
 	if (check_col(pinfo->cinfo, COL_INFO)){
 	        if ( h245_shorttypes == TRUE )
 	        {
-	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
+	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%%s ",
 				val_to_str(value, h245_CommandMessage_short_vals, "<unknown>"));
 		}
 		else
 		{
-	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
+	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%%s ",
 				val_to_str(value, h245_CommandMessage_vals, "<unknown>"));
 		}
 	}
 
 	col_set_fence(pinfo->cinfo,COL_INFO);
     /* Add to packet info */
-    g_snprintf(h245_pi->frame_label, 50, "%s %s ", h245_pi->frame_label, val_to_str(value, h245_CommandMessage_short_vals, "UKN"));
-    g_snprintf(h245_pi->comment, 50, "%s %s ", h245_pi->comment, val_to_str(value, h245_CommandMessage_vals, "<unknown>"));
+    g_snprintf(h245_pi->frame_label, 50, "%%s %%s ", h245_pi->frame_label, val_to_str(value, h245_CommandMessage_short_vals, "UKN"));
+    g_snprintf(h245_pi->comment, 50, "%%s %%s ", h245_pi->comment, val_to_str(value, h245_CommandMessage_vals, "<unknown>"));
 
 #.END
 #----------------------------------------------------------------------------------------
+#.FN_PARS AudioCapability
+  VAL_PTR = &value
 #.FN_BODY AudioCapability
   guint32 value;
 
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h245_AudioCapability, AudioCapability_choice, "AudioCapability",
-                              &value);
-
+%(DEFAULT_BODY)s
         codec_type = val_to_str(value, h245_AudioCapability_short_vals, "<unknown>");
-		if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, val_to_str(value, h245_AudioCapability_short_vals, "ukn"));
+		if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%%s %%s", h245_pi->frame_label, val_to_str(value, h245_AudioCapability_short_vals, "ukn"));
 
 #.END
 #----------------------------------------------------------------------------------------
+#.FN_PARS VideoCapability
+  VAL_PTR = &value
 #.FN_BODY VideoCapability
   guint32 value;
 
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h245_VideoCapability, VideoCapability_choice, "VideoCapability",
-                              &value);
-
+%(DEFAULT_BODY)s
         codec_type = val_to_str(value, h245_VideoCapability_vals, "<unknown>");
-		if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, codec_type);
+		if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%%s %%s", h245_pi->frame_label, codec_type);
 
 #.END
 #----------------------------------------------------------------------------------------
+#.FN_PARS Application
+  VAL_PTR = &value
 #.FN_BODY Application
   guint32 value;
 
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h245_Application, Application_choice, "Application",
-                              &value);
-
+%(DEFAULT_BODY)s
         codec_type = val_to_str(value, h245_Application_vals, "<unknown>");
-		if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, codec_type);
+		if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%%s %%s", h245_pi->frame_label, codec_type);
 #.END
 #----------------------------------------------------------------------------------------
+#.FN_PARS AudioMode
+  VAL_PTR = &value
 #.FN_BODY AudioMode
   guint32 value;
 
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h245_AudioMode, AudioMode_choice, "AudioMode",
-                              &value);
+%(DEFAULT_BODY)s
   codec_type = val_to_str(value, h245_AudioMode_vals, "<unknown>");
-		if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, val_to_str(value, h245_AudioMode_vals, "ukn"));
+		if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%%s %%s", h245_pi->frame_label, val_to_str(value, h245_AudioMode_vals, "ukn"));
 #.END
 #----------------------------------------------------------------------------------------
+#.FN_PARS VideoMode
+  VAL_PTR = &value
 #.FN_BODY VideoMode
   guint32 value;
 
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h245_VideoMode, VideoMode_choice, "VideoMode",
-                              &value);
+%(DEFAULT_BODY)s
   codec_type = val_to_str(value, h245_VideoMode_vals, "<unknown>");
-		if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, val_to_str(value, h245_VideoMode_vals, "ukn"));
+		if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%%s %%s", h245_pi->frame_label, val_to_str(value, h245_VideoMode_vals, "ukn"));
 #.END
 #----------------------------------------------------------------------------------------
+#.FN_PARS DataModeApplication
+  VAL_PTR = &value
 #.FN_BODY DataModeApplication
   guint32 value;
 
-  offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h245_DataModeApplication, DataModeApplication_choice, "DataModeApplication",
-                              &value);
+%(DEFAULT_BODY)s
   codec_type = val_to_str(value, h245_DataModeApplication_vals, "<unknown>");
-		if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, val_to_str(value, h245_DataModeApplication_vals, "ukn"));
+		if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%%s %%s", h245_pi->frame_label, val_to_str(value, h245_DataModeApplication_vals, "ukn"));
 #.END
 #----------------------------------------------------------------------------------------
 #.FN_FTR MasterSlaveDeterminationAck
@@ -275,12 +269,13 @@ OpenLogicalChannel
   VAL_PTR = &subMessageIdentifer
 #.END
 #----------------------------------------------------------------------------------------
+#.FN_PARS UnicastAddress/iPAddress/network
+  VAL_PTR = &value_tvb
 #.FN_BODY UnicastAddress/iPAddress/network
 
 	tvbuff_t *value_tvb;
 
-  offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
-                                    4, 4, &value_tvb);
+%(DEFAULT_BODY)s
   if ( media_channel )
 	tvb_memcpy(value_tvb, (char *)&ipv4_address, 0, 4);
 
@@ -414,17 +409,17 @@ OpenLogicalChannel
 
 #--- NonStandardParameter ---------------------------------------------------------------
 
+#.FN_PARS
+NonStandardIdentifier         VAL_PTR = &value
+NonStandardIdentifier/object  VAL_PTR = nsiOID
+#.END
 #.FN_BODY NonStandardIdentifier
 	guint32 value;
 
 	nsiOID[0] = '\0';
 	h221NonStandard = 0;
 
-	offset = dissect_per_choice(tvb, offset, pinfo, tree,
-				hf_h245_nonStandardIdentifier,
-				ett_h245_NonStandardIdentifier, NonStandardIdentifier_choice, "NonStandardIdentifier",
-				&value);
-
+%(DEFAULT_BODY)s
 	switch (value) {
 		case 0 :  /* object */
 			nsp_handle = dissector_get_string_handle(nsp_object_dissector_table, nsiOID);
@@ -435,8 +430,6 @@ OpenLogicalChannel
 		default :
 			nsp_handle = NULL;
     }
-#.FN_PARS NonStandardIdentifier/object
-  VAL_PTR = nsiOID
 #.END
 
 #.FN_HDR NonStandardIdentifier/h221NonStandard