Generate "conversations" code correctly, adaptions to changes in asn2eth generator.

svn path=/trunk/; revision=12991

2 files changed, 25 insertions, 20 deletions

diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf
index 731a126a2d..f0216d3cd3 100644
--- a/asn1/h245/h245.cnf
+++ b/asn1/h245/h245.cnf
@@ -5,7 +5,7 @@
 #.EXPORTS
 #----------------------------------------------------------------------------------------
 T38FaxProfile
-DataProtocolCapability
+DataProtocolCapability NO_PROT_PREFIX
 OpenLogicalChannel
 
 #----------------------------------------------------------------------------------------
@@ -19,12 +19,12 @@ OpenLogicalChannel
 	        if ( h245_shorttypes == TRUE )
 	        {
 	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
-				val_to_str(value, RequestMessage_short_vals, "<unknown>"));
+				val_to_str(value, h245_RequestMessage_short_vals, "<unknown>"));
 		}
 		else
 		{
 	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
-				val_to_str(value, RequestMessage_vals, "<unknown>"));
+				val_to_str(value, h245_RequestMessage_vals, "<unknown>"));
 		}
 	}
 
@@ -46,12 +46,12 @@ OpenLogicalChannel
 	        if ( h245_shorttypes == TRUE )
 	        {
 	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
-				val_to_str(value, ResponseMessage_short_vals, "<unknown>"));
+				val_to_str(value, h245_ResponseMessage_short_vals, "<unknown>"));
 		}
 		else
 		{
 	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
-				val_to_str(value, ResponseMessage_vals, "<unknown>"));
+				val_to_str(value, h245_ResponseMessage_vals, "<unknown>"));
 		}
 	}
 
@@ -69,12 +69,12 @@ OpenLogicalChannel
 	        if ( h245_shorttypes == TRUE )
 	        {
 	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
-				val_to_str(value, IndicationMessage_short_vals, "<unknown>"));
+				val_to_str(value, h245_IndicationMessage_short_vals, "<unknown>"));
 		}
 		else
 		{
 	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
-				val_to_str(value, IndicationMessage_vals, "<unknown>"));
+				val_to_str(value, h245_IndicationMessage_vals, "<unknown>"));
 		}
 	}
 
@@ -92,12 +92,12 @@ OpenLogicalChannel
 	        if ( h245_shorttypes == TRUE )
 	        {
 	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
-				val_to_str(value, CommandMessage_short_vals, "<unknown>"));
+				val_to_str(value, h245_CommandMessage_short_vals, "<unknown>"));
 		}
 		else
 		{
 	        	col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
-				val_to_str(value, CommandMessage_vals, "<unknown>"));
+				val_to_str(value, h245_CommandMessage_vals, "<unknown>"));
 		}
 	}
 
@@ -111,7 +111,7 @@ OpenLogicalChannel
                               ett_h245_AudioCapability, AudioCapability_choice, "AudioCapability",
                               &value);
 
-        codec_type = val_to_str(value, AudioCapability_vals, "<unknown>");
+        codec_type = val_to_str(value, h245_AudioCapability_vals, "<unknown>");
 #.END
 #----------------------------------------------------------------------------------------
 #.FN_BODY VideoCapability
@@ -121,7 +121,7 @@ OpenLogicalChannel
                               ett_h245_VideoCapability, VideoCapability_choice, "VideoCapability",
                               &value);
 
-        codec_type = val_to_str(value, VideoCapability_vals, "<unknown>");
+        codec_type = val_to_str(value, h245_VideoCapability_vals, "<unknown>");
 #.END
 #----------------------------------------------------------------------------------------
 #.FN_BODY Application
@@ -131,7 +131,7 @@ OpenLogicalChannel
                               ett_h245_Application, Application_choice, "Application",
                               &value);
 
-        codec_type = val_to_str(value, Application_vals, "<unknown>");
+        codec_type = val_to_str(value, h245_Application_vals, "<unknown>");
 #.END
 #----------------------------------------------------------------------------------------
 #.FN_FTR MasterSlaveDeterminationAck
@@ -235,7 +235,7 @@ guint32 value_len;
 
 #.END
 #----------------------------------------------------------------------------------------
-#.FN_BODY tsapIdentifier
+#.FN_BODY UnicastAddress/iPAddress/tsapIdentifier
 guint32 tsapIdentifier;
 
 
@@ -393,6 +393,7 @@ MultiplexElement/repeatCount ME_repeatCount
 FECCapability/rfc2733 FECC_rfc2733
 RequestModeAck/response Req_mode_ack_response
 UserInputIndication/signalUpdate/rtp Si_rtp
+UnicastAddress/iPAddress/tsapIdentifier TsapIdentifier
 #----------------------------------------------------------------------------------------
 #.FIELD_RENAME
 #----------------------------------------------------------------------------------------
@@ -634,11 +635,15 @@ VBDCapability/type vbd_cap_type
 OpenLogicalChannelAck/reverseLogicalChannelParameters olc_ack_reverseLogicalChannelParameters
 H2250LogicalChannelAckParameters/mediaChannel ack_mediaChannel
 H2250LogicalChannelAckParameters/mediaControlChannel ack_mediaControlChannel
+UnicastAddress/iP6Address/tsapIdentifier ipv6_tsapIdentifier 
+UnicastAddress/iPSourceRouteAddress/tsapIdentifier iPSrcRoute_tsapIdentifier 
+MulticastAddress/iPAddress/tsapIdentifier multicast_tsapIdentifier
+MulticastAddress/iP6Address/tsapIdentifier multicast_IPv6_tsapIdentifier
 #----------------------------------------------------------------------------------------
 #.TYPE_ATTR
 UnicastAddress/iPAddress/network  TYPE = FT_IPv4  DISPLAY = BASE_NONE  STRINGS = NULL
 UnicastAddress/iP6Address/network  TYPE = FT_IPv6  DISPLAY = BASE_NONE  STRINGS = NULL
 MulticastAddress/iPAddress/network  TYPE = FT_IPv4  DISPLAY = BASE_NONE  STRINGS = NULL
 MulticastAddress/iP6Address/network  TYPE = FT_IPv6  DISPLAY = BASE_NONE  STRINGS = NULL
-RTPPayloadType/payloadDescriptor/rfc-number TYPE = FT_UINT32  DISPLAY = BASE_DEC  STRINGS = VALS(RFC_number_vals)
+RTPPayloadType/payloadDescriptor/rfc-number TYPE = FT_UINT32  DISPLAY = BASE_DEC  STRINGS = VALS(h245_RFC_number_vals)
 #----------------------------------------------------------------------------------------
diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c
index 3fc6a3c9ae..404cc69981 100644
--- a/asn1/h245/packet-h245-template.c
+++ b/asn1/h245/packet-h245-template.c
@@ -73,7 +73,7 @@ static h245_packet_info h245_pi;
 
 static gboolean h245_reassembly = TRUE;
 static gboolean h245_shorttypes = FALSE;
-static const value_string RequestMessage_short_vals[] = {
+static const value_string h245_RequestMessage_short_vals[] = {
 	{  0,	"NSM" },
 	{  1,	"MSD" },
 	{  2,	"TCS" },
@@ -92,7 +92,7 @@ static const value_string RequestMessage_short_vals[] = {
 	{ 15,	"GR" },
 	{  0, NULL }
 };
-static const value_string ResponseMessage_short_vals[] = {
+static const value_string h245_ResponseMessage_short_vals[] = {
 	{  0,	"NSM" },
 	{  1,	"MSDAck" },
 	{  2,	"MSDReject" },
@@ -120,7 +120,7 @@ static const value_string ResponseMessage_short_vals[] = {
 	{ 24,	"GR" },
 	{  0, NULL }
 };
-static const value_string IndicationMessage_short_vals[] = {
+static const value_string h245_IndicationMessage_short_vals[] = {
 	{  0,	"NSM" },
 	{  1,	"FNU" },
 	{  2,	"MSDRelease" },
@@ -147,7 +147,7 @@ static const value_string IndicationMessage_short_vals[] = {
 	{ 22,	"GI" },
 	{  0, NULL }
 };
-static const value_string CommandMessage_short_vals[] = {
+static const value_string h245_CommandMessage_short_vals[] = {
 	{  0,	"NSM" },
 	{  1,	"MLOC" },
 	{  2,	"STCS" },
@@ -176,7 +176,7 @@ static guint32 rtcp_ipv4_port;
 static gboolean media_channel;
 static gboolean media_control_channel;
 
-static const value_string RFC_number_vals[] = {
+static const value_string h245_RFC_number_vals[] = {
 	{  2190,	"RFC 2190 - H.263 Video Streams" },
 	{  2429,	"RFC 2429 - 1998 Version of ITU-T Rec. H.263 Video (H.263+)" },
 	{  3267,	"RFC 3267 - Adaptive Multi-Rate (AMR) and Adaptive Multi-Rate Wideband (AMR-WB)" },
@@ -225,7 +225,7 @@ void proto_register_h245(void) {
   static hf_register_info hf[] = {
     { &hf_h245_pdu_type,
  { "PDU Type", "h245.pdu_type", FT_UINT32, BASE_DEC,
-		VALS(MultimediaSystemControlMessage_vals), 0, "Type of H.245 PDU", HFILL }},
+		VALS(h245_MultimediaSystemControlMessage_vals), 0, "Type of H.245 PDU", HFILL }},
 #include "packet-h245-hfarr.c"
   };