diff options
| -rw-r--r-- | asn1/h248/MEGACO.asn | 46 | ||||
| -rw-r--r-- | asn1/h248/h248.cnf | 40 | ||||
| -rw-r--r-- | epan/dissectors/packet-h248.c | 787 |
3 files changed, 413 insertions, 460 deletions
diff --git a/asn1/h248/MEGACO.asn b/asn1/h248/MEGACO.asn index 021bb2fcbc..f45317d6eb 100644 --- a/asn1/h248/MEGACO.asn +++ b/asn1/h248/MEGACO.asn @@ -367,7 +367,7 @@ BEGIN streamMode [0] IMPLICIT NULL OPTIONAL, reserveValue [1] IMPLICIT NULL OPTIONAL, reserveGroup [2] IMPLICIT NULL OPTIONAL, - propertyParms [3] IMPLICIT SEQUENCE OF IndAudPropertyParm OPTIONAL, + propertyParms [3] IMPLICIT IndAudPropertyParms OPTIONAL, ... } @@ -376,6 +376,8 @@ BEGIN name [0] IMPLICIT PkgdName, ... } + + IndAudPropertyParms ::= SEQUENCE OF IndAudPropertyParm IndAudLocalRemoteDescriptor ::= SEQUENCE { @@ -388,7 +390,7 @@ BEGIN IndAudTerminationStateDescriptor ::= SEQUENCE { - propertyParms [0] IMPLICIT SEQUENCE OF IndAudPropertyParm, + propertyParms [0] IMPLICIT IndAudPropertyParms, eventBufferControl [1] IMPLICIT NULL OPTIONAL, serviceState [2] IMPLICIT NULL OPTIONAL, ... @@ -477,19 +479,21 @@ BEGIN } EventName ::= OCTET STRING - + + ExtraInfo ::= CHOICE + { + relation [0] IMPLICIT Relation, + range [1] IMPLICIT BOOLEAN, + sublist [2] IMPLICIT BOOLEAN + } + EventParameter ::= SEQUENCE { eventParameterName [0] IMPLICIT Name, value [1] IMPLICIT Value, -- For use of extraInfo see the comment related to PropertyParm - extraInfo CHOICE - { - relation [0] IMPLICIT Relation, - range [1] IMPLICIT BOOLEAN, - sublist [2] IMPLICIT BOOLEAN - } OPTIONAL, + extraInfo [2] ExtraInfo OPTIONAL, ... } @@ -600,13 +604,8 @@ BEGIN PropertyParm ::= SEQUENCE { propertyName [0] IMPLICIT PkgdName, - value [1] IMPLICIT SEQUENCE OF PropertyID, - extraInfo [2] CHOICE - { - relation [0] IMPLICIT Relation, - range [1] IMPLICIT BOOLEAN, - sublist [2] IMPLICIT BOOLEAN - } OPTIONAL, + value [1] IMPLICIT SEQUENCE OF PropertyID, + extraInfo [2] ExtraInfo OPTIONAL, ... } @@ -689,7 +688,7 @@ BEGIN requestID [0] IMPLICIT RequestID OPTIONAL, -- RequestID must be present if eventList -- is non empty - eventList [1] IMPLICIT SEQUENCE OF RequestedEvent, + eventList [1] IMPLICIT RequestedEvents, ... } @@ -701,7 +700,9 @@ BEGIN evParList [3] IMPLICIT SEQUENCE OF EventParameter, ... } - + + RequestedEvents ::= SEQUENCE OF RequestedEvent + RequestedActions ::= SEQUENCE { keepActive [0] IMPLICIT BOOLEAN OPTIONAL, @@ -800,12 +801,7 @@ BEGIN sigParameterName [0] IMPLICIT Name, value [1] IMPLICIT Value, -- For use of extraInfo see the comment related to PropertyParm - extraInfo [2] CHOICE - { - relation [0] IMPLICIT Relation, - range [1] IMPLICIT BOOLEAN, - sublist [2] IMPLICIT BOOLEAN - } OPTIONAL, + extraInfo [2] ExtraInfo OPTIONAL, ... } @@ -891,7 +887,7 @@ BEGIN ip6Address [2] IMPLICIT IP6Address, domainName [3] IMPLICIT DomainName, deviceName [4] IMPLICIT PathName, - mtpAddress [5] IMPLICIT OCTET STRING(SIZE(2..4)), + mtpAddress [5] IMPLICIT MtpAddress, ... } diff --git a/asn1/h248/h248.cnf b/asn1/h248/h248.cnf index ae577a860d..40a1aecbee 100644 --- a/asn1/h248/h248.cnf +++ b/asn1/h248/h248.cnf @@ -17,8 +17,48 @@ SignalName EventName #.TYPE_RENAME +IndAudMediaDescriptor/streams indAudMediaDescriptorStreams #.FIELD_RENAME +IP4Address/address iP4Address +IP6Address/address iP6Address +ContextAttrAuditRequest/emergency cAAREmergency +ContextAttrAuditRequest/priority cAARPriority +SecondRequestedEvent/eventAction secondaryEventAction +TerminationStateDescriptor/eventBufferControl tSEventBufferControl +SecondEventsDescriptor/eventList secondaryEventList +IndAudEventBufferDescriptor/eventName iAEBDEventName +TerminationID/id terminationId +IndAudStreamParms/localControlDescriptor iASPLocalControlDescriptor +IndAudStreamParms/localDescriptor iASPLocalDescriptor +MediaDescriptor/streams/oneStream mediaDescriptorOneStream +MediaDescriptor/streams/multiStream mediaDescriptorMultiStream +MediaDescriptor/streams/multiStream/_item mediaDescriptorMultiStream_item +DomainName/name domName +IndAudEventsDescriptor/pkgdName iAEDPkgdName +IndAudLocalRemoteDescriptor/propGrps iAPropertyGroup +IndAudLocalControlDescriptor/propertyParms indAudPropertyParms +IndAudTerminationStateDescriptor/propertyParms indAudPropertyParms +IndAudLocalControlDescriptor/reserveGroup iALCDReserveGroup +IndAudLocalControlDescriptor/reserveValue iALCDReserveValue +IndAudLocalControlDescriptor/streamMode iALCDStreamMode +IndAudStreamDescriptor/streamParms indAudStreamParms +IndAudMediaDescriptor/termStateDescr indAudTerminationStateDescriptor +IndAudSignal/signalName iASignalName +IndAudSeqSigList/signalList iASignalList +IndAudSignalsDescriptor/signal indAudSignal +IndAudSignalsDescriptor/seqSigList indAudSeqSigList +IndAudTerminationStateDescriptor/serviceState iATSDServiceState +IndAudStreamParms/remoteDescriptor iASPRemoteDescriptor +PropertyParm/value propertyParamValue +IndAudMediaDescriptor/streams indAudMediaDescriptorStreams +AmmRequest/terminationID terminationIDList +AmmsReply/terminationID terminationIDList +SubtractRequest/terminationID terminationIDList +NotifyRequest/terminationID terminationIDList +NotifyReply/terminationID terminationIDList +ServiceChangeRequest/terminationID terminationIDList +ServiceChangeReply/terminationID terminationIDList #.END diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index fd58b94bc5..1fb38aef68 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -85,10 +85,10 @@ static int hf_h248_ip6Address = -1; /* IP6Address */ static int hf_h248_domainName = -1; /* DomainName */ static int hf_h248_deviceName = -1; /* PathName */ static int hf_h248_mtpAddress = -1; /* MtpAddress */ -static int hf_h248_name = -1; /* IA5String */ +static int hf_h248_domName = -1; /* IA5String */ static int hf_h248_portNumber = -1; /* INTEGER_0_65535 */ -static int hf_h248_address = -1; /* OCTET_STRING_SIZE_4 */ -static int hf_h248_address1 = -1; /* OCTET_STRING_SIZE_16 */ +static int hf_h248_iP4Address = -1; /* OCTET_STRING_SIZE_4 */ +static int hf_h248_iP6Address = -1; /* OCTET_STRING_SIZE_16 */ static int hf_h248_transactionRequest = -1; /* TransactionRequest */ static int hf_h248_transactionPending = -1; /* TransactionPending */ static int hf_h248_transactionReply = -1; /* TransactionReply */ @@ -120,8 +120,8 @@ static int hf_h248_emergency = -1; /* BOOLEAN */ static int hf_h248_topologyReq = -1; /* SEQUNCE_OF_TopologyRequest */ static int hf_h248_topologyReq_item = -1; /* TopologyRequest */ static int hf_h248_topology = -1; /* NULL */ -static int hf_h248_emergency1 = -1; /* NULL */ -static int hf_h248_priority1 = -1; /* NULL */ +static int hf_h248_cAAREmergency = -1; /* NULL */ +static int hf_h248_cAARPriority = -1; /* NULL */ static int hf_h248_command = -1; /* Command */ static int hf_h248_optional = -1; /* NULL */ static int hf_h248_wildcardReturn = -1; /* NULL */ @@ -145,7 +145,7 @@ static int hf_h248_terminationFrom = -1; /* TerminationID */ static int hf_h248_terminationTo = -1; /* TerminationID */ static int hf_h248_topologyDirection = -1; /* T_topologyDirection */ static int hf_h248_streamID = -1; /* StreamID */ -static int hf_h248_terminationID = -1; /* TerminationIDList */ +static int hf_h248_terminationIDList = -1; /* TerminationIDList */ static int hf_h248_descriptors = -1; /* SEQUNCE_OF_AmmDescriptor */ static int hf_h248_descriptors_item = -1; /* AmmDescriptor */ static int hf_h248_mediaDescriptor = -1; /* MediaDescriptor */ @@ -157,7 +157,7 @@ static int hf_h248_signalsDescriptor = -1; /* SignalsDescriptor */ static int hf_h248_digitMapDescriptor = -1; /* DigitMapDescriptor */ static int hf_h248_auditDescriptor = -1; /* AuditDescriptor */ static int hf_h248_terminationAudit = -1; /* TerminationAudit */ -static int hf_h248_terminationID1 = -1; /* TerminationID */ +static int hf_h248_terminationID = -1; /* TerminationID */ static int hf_h248_contextAuditResult = -1; /* TerminationIDList */ static int hf_h248_error = -1; /* ErrorDescriptor */ static int hf_h248_auditResult = -1; /* AuditResult */ @@ -177,34 +177,34 @@ static int hf_h248_indaudsignalsDescriptor = -1; /* IndAudSignalsDescriptor */ static int hf_h248_indauddigitMapDescriptor = -1; /* IndAudDigitMapDescriptor */ static int hf_h248_indaudstatisticsDescriptor = -1; /* IndAudStatisticsDescriptor */ static int hf_h248_indaudpackagesDescriptor = -1; /* IndAudPackagesDescriptor */ -static int hf_h248_termStateDescr = -1; /* IndAudTerminationStateDescriptor */ -static int hf_h248_streams = -1; /* T_streams */ +static int hf_h248_indAudTerminationStateDescriptor = -1; /* IndAudTerminationStateDescriptor */ +static int hf_h248_indAudMediaDescriptorStreams = -1; /* indAudMediaDescriptorStreams */ static int hf_h248_oneStream = -1; /* IndAudStreamParms */ static int hf_h248_multiStream = -1; /* SEQUNCE_OF_IndAudStreamDescriptor */ static int hf_h248_multiStream_item = -1; /* IndAudStreamDescriptor */ -static int hf_h248_streamParms = -1; /* IndAudStreamParms */ -static int hf_h248_localControlDescriptor = -1; /* IndAudLocalControlDescriptor */ -static int hf_h248_localDescriptor = -1; /* IndAudLocalRemoteDescriptor */ -static int hf_h248_remoteDescriptor = -1; /* IndAudLocalRemoteDescriptor */ -static int hf_h248_streamMode = -1; /* NULL */ -static int hf_h248_reserveValue = -1; /* NULL */ -static int hf_h248_reserveGroup = -1; /* NULL */ -static int hf_h248_propertyParms = -1; /* SEQUNCE_OF_IndAudPropertyParm */ -static int hf_h248_propertyParms_item = -1; /* IndAudPropertyParm */ -static int hf_h248_name1 = -1; /* PkgdName */ +static int hf_h248_indAudStreamParms = -1; /* IndAudStreamParms */ +static int hf_h248_iASPLocalControlDescriptor = -1; /* IndAudLocalControlDescriptor */ +static int hf_h248_iASPLocalDescriptor = -1; /* IndAudLocalRemoteDescriptor */ +static int hf_h248_iASPRemoteDescriptor = -1; /* IndAudLocalRemoteDescriptor */ +static int hf_h248_iALCDStreamMode = -1; /* NULL */ +static int hf_h248_iALCDReserveValue = -1; /* NULL */ +static int hf_h248_iALCDReserveGroup = -1; /* NULL */ +static int hf_h248_indAudPropertyParms = -1; /* IndAudPropertyParms */ +static int hf_h248_name = -1; /* PkgdName */ +static int hf_h248_IndAudPropertyParms_item = -1; /* IndAudPropertyParm */ static int hf_h248_propGroupID = -1; /* INTEGER_0_65535 */ -static int hf_h248_propGrps = -1; /* IndAudPropertyGroup */ +static int hf_h248_iAPropertyGroup = -1; /* IndAudPropertyGroup */ static int hf_h248_IndAudPropertyGroup_item = -1; /* IndAudPropertyParm */ static int hf_h248_eventBufferControl = -1; /* NULL */ -static int hf_h248_serviceState = -1; /* NULL */ +static int hf_h248_iATSDServiceState = -1; /* NULL */ static int hf_h248_requestID = -1; /* RequestID */ -static int hf_h248_pkgdName = -1; /* PkgdName */ -static int hf_h248_eventName = -1; /* PkgdName */ -static int hf_h248_signal = -1; /* IndAudSignal */ -static int hf_h248_seqSigList = -1; /* IndAudSeqSigList */ +static int hf_h248_iAEDPkgdName = -1; /* PkgdName */ +static int hf_h248_iAEBDEventName = -1; /* PkgdName */ +static int hf_h248_indAudSignal = -1; /* IndAudSignal */ +static int hf_h248_indAudSeqSigList = -1; /* IndAudSeqSigList */ static int hf_h248_id = -1; /* INTEGER_0_65535 */ -static int hf_h248_signalList = -1; /* IndAudSignal */ -static int hf_h248_signalName = -1; /* PkgdName */ +static int hf_h248_iASignalList = -1; /* IndAudSignal */ +static int hf_h248_iASignalName = -1; /* PkgdName */ static int hf_h248_digitMapName = -1; /* DigitMapName */ static int hf_h248_statName = -1; /* PkgdName */ static int hf_h248_packageName = -1; /* Name */ @@ -212,77 +212,75 @@ static int hf_h248_packageVersion = -1; /* INTEGER_0_99 */ static int hf_h248_requestId = -1; /* RequestID */ static int hf_h248_observedEventLst = -1; /* SEQUNCE_OF_ObservedEvent */ static int hf_h248_observedEventLst_item = -1; /* ObservedEvent */ -static int hf_h248_eventName1 = -1; /* EventName */ +static int hf_h248_eventName = -1; /* EventName */ static int hf_h248_eventParList = -1; /* SEQUNCE_OF_EventParameter */ static int hf_h248_eventParList_item = -1; /* EventParameter */ static int hf_h248_timeNotation = -1; /* TimeNotation */ -static int hf_h248_eventParameterName = -1; /* Name */ -static int hf_h248_value = -1; /* Value */ -static int hf_h248_extraInfo = -1; /* T_extraInfo */ static int hf_h248_relation = -1; /* Relation */ static int hf_h248_range = -1; /* BOOLEAN */ static int hf_h248_sublist = -1; /* BOOLEAN */ +static int hf_h248_eventParameterName = -1; /* Name */ +static int hf_h248_value = -1; /* Value */ +static int hf_h248_extraInfo = -1; /* ExtraInfo */ static int hf_h248_serviceChangeParms = -1; /* ServiceChangeParm */ static int hf_h248_serviceChangeResult = -1; /* ServiceChangeResult */ static int hf_h248_serviceChangeResParms = -1; /* ServiceChangeResParm */ static int hf_h248_wildcard = -1; /* SEQUNCE_OF_WildcardField */ static int hf_h248_wildcard_item = -1; /* WildcardField */ -static int hf_h248_id1 = -1; /* OCTET_STRING_SIZE_1_8 */ +static int hf_h248_terminationId = -1; /* OCTET_STRING_SIZE_1_8 */ static int hf_h248_TerminationIDList_item = -1; /* TerminationID */ -static int hf_h248_termStateDescr1 = -1; /* TerminationStateDescriptor */ -static int hf_h248_streams1 = -1; /* T_streams1 */ -static int hf_h248_oneStream1 = -1; /* StreamParms */ -static int hf_h248_multiStream1 = -1; /* SEQUNCE_OF_StreamDescriptor */ -static int hf_h248_multiStream_item1 = -1; /* StreamDescriptor */ -static int hf_h248_streamParms1 = -1; /* StreamParms */ -static int hf_h248_localControlDescriptor1 = -1; /* LocalControlDescriptor */ -static int hf_h248_localDescriptor1 = -1; /* LocalRemoteDescriptor */ -static int hf_h248_remoteDescriptor1 = -1; /* LocalRemoteDescriptor */ -static int hf_h248_streamMode1 = -1; /* StreamMode */ -static int hf_h248_reserveValue1 = -1; /* BOOLEAN */ -static int hf_h248_reserveGroup1 = -1; /* BOOLEAN */ -static int hf_h248_propertyParms1 = -1; /* SEQUNCE_OF_PropertyParm */ -static int hf_h248_propertyParms_item1 = -1; /* PropertyParm */ +static int hf_h248_termStateDescr = -1; /* TerminationStateDescriptor */ +static int hf_h248_streams = -1; /* T_streams */ +static int hf_h248_mediaDescriptorOneStream = -1; /* StreamParms */ +static int hf_h248_mediaDescriptorMultiStream = -1; /* SEQUNCE_OF_StreamDescriptor */ +static int hf_h248_mediaDescriptorMultiStream_item = -1; /* StreamDescriptor */ +static int hf_h248_streamParms = -1; /* StreamParms */ +static int hf_h248_localControlDescriptor = -1; /* LocalControlDescriptor */ +static int hf_h248_localDescriptor = -1; /* LocalRemoteDescriptor */ +static int hf_h248_remoteDescriptor = -1; /* LocalRemoteDescriptor */ +static int hf_h248_streamMode = -1; /* StreamMode */ +static int hf_h248_reserveValue = -1; /* BOOLEAN */ +static int hf_h248_reserveGroup = -1; /* BOOLEAN */ +static int hf_h248_propertyParms = -1; /* SEQUNCE_OF_PropertyParm */ +static int hf_h248_propertyParms_item = -1; /* PropertyParm */ static int hf_h248_propertyName = -1; /* PkgdName */ -static int hf_h248_value1 = -1; /* SEQUNCE_OF_PropertyID */ +static int hf_h248_propertyParamValue = -1; /* SEQUNCE_OF_PropertyID */ static int hf_h248_value_item = -1; /* PropertyID */ -static int hf_h248_extraInfo1 = -1; /* T_extraInfo1 */ -static int hf_h248_propGrps1 = -1; /* SEQUNCE_OF_PropertyGroup */ +static int hf_h248_propGrps = -1; /* SEQUNCE_OF_PropertyGroup */ static int hf_h248_propGrps_item = -1; /* PropertyGroup */ static int hf_h248_PropertyGroup_item = -1; /* PropertyParm */ -static int hf_h248_eventBufferControl1 = -1; /* EventBufferControl */ -static int hf_h248_serviceState1 = -1; /* ServiceState */ +static int hf_h248_tSEventBufferControl = -1; /* EventBufferControl */ +static int hf_h248_serviceState = -1; /* ServiceState */ static int hf_h248_muxType = -1; /* MuxType */ static int hf_h248_termList = -1; /* SEQUNCE_OF_TerminationID */ static int hf_h248_termList_item = -1; /* TerminationID */ static int hf_h248_nonStandardData = -1; /* NonStandardData */ -static int hf_h248_eventList = -1; /* SEQUNCE_OF_RequestedEvent */ -static int hf_h248_eventList_item = -1; /* RequestedEvent */ -static int hf_h248_pkgdName1 = -1; /* EventName */ +static int hf_h248_eventList = -1; /* RequestedEvents */ +static int hf_h248_pkgdName = -1; /* EventName */ static int hf_h248_eventAction = -1; /* RequestedActions */ static int hf_h248_evParList = -1; /* SEQUNCE_OF_EventParameter */ static int hf_h248_evParList_item = -1; /* EventParameter */ +static int hf_h248_RequestedEvents_item = -1; /* RequestedEvent */ static int hf_h248_keepActive = -1; /* BOOLEAN */ static int hf_h248_eventDM = -1; /* EventDM */ static int hf_h248_secondEvent = -1; /* SecondEventsDescriptor */ static int hf_h248_digitMapValue = -1; /* DigitMapValue */ -static int hf_h248_eventList1 = -1; /* SEQUNCE_OF_SecondRequestedEvent */ -static int hf_h248_eventList_item1 = -1; /* SecondRequestedEvent */ -static int hf_h248_eventAction1 = -1; /* SecondRequestedActions */ +static int hf_h248_secondaryEventList = -1; /* SEQUNCE_OF_SecondRequestedEvent */ +static int hf_h248_eventList_item = -1; /* SecondRequestedEvent */ +static int hf_h248_secondaryEventAction = -1; /* SecondRequestedActions */ static int hf_h248_EventBufferDescriptor_item = -1; /* EventSpec */ static int hf_h248_SignalsDescriptor_item = -1; /* SignalRequest */ -static int hf_h248_signal1 = -1; /* Signal */ -static int hf_h248_seqSigList1 = -1; /* SeqSigList */ -static int hf_h248_signalList1 = -1; /* SEQUNCE_OF_Signal */ +static int hf_h248_signal = -1; /* Signal */ +static int hf_h248_seqSigList = -1; /* SeqSigList */ +static int hf_h248_signalList = -1; /* SEQUNCE_OF_Signal */ static int hf_h248_signalList_item = -1; /* Signal */ -static int hf_h248_signalName1 = -1; /* SignalName */ +static int hf_h248_signalName = -1; /* SignalName */ static int hf_h248_sigType = -1; /* SignalType */ static int hf_h248_duration = -1; /* INTEGER_0_65535 */ static int hf_h248_notifyCompletion = -1; /* NotifyCompletion */ static int hf_h248_sigParList = -1; /* SEQUNCE_OF_SigParameter */ static int hf_h248_sigParList_item = -1; /* SigParameter */ static int hf_h248_sigParameterName = -1; /* Name */ -static int hf_h248_extraInfo2 = -1; /* T_extraInfo2 */ static int hf_h248_mtl = -1; /* SEQUNCE_OF_ModemType */ static int hf_h248_mtl_item = -1; /* ModemType */ static int hf_h248_mpl = -1; /* SEQUNCE_OF_PropertyParm */ @@ -301,7 +299,6 @@ static int hf_h248_serviceChangeDelay = -1; /* INTEGER_0_4294967295 */ static int hf_h248_serviceChangeMgcId = -1; /* MId */ static int hf_h248_timeStamp = -1; /* TimeNotation */ static int hf_h248_serviceChangeInfo = -1; /* AuditDescriptor */ -static int hf_h248_mtpAddress1 = -1; /* OCTET_STRING_SIZE_2_4 */ static int hf_h248_timestamp = -1; /* TimeNotation */ static int hf_h248_profileName = -1; /* IA5String_SIZE_1_67 */ static int hf_h248_PackagesDescriptor_item = -1; /* PackagesItem */ @@ -390,13 +387,13 @@ static gint ett_h248_T_auditToken = -1; static gint ett_h248_SEQUNCE_OF_IndAuditParameter = -1; static gint ett_h248_IndAuditParameter = -1; static gint ett_h248_IndAudMediaDescriptor = -1; -static gint ett_h248_T_streams = -1; +static gint ett_h248_indAudMediaDescriptorStreams = -1; static gint ett_h248_SEQUNCE_OF_IndAudStreamDescriptor = -1; static gint ett_h248_IndAudStreamDescriptor = -1; static gint ett_h248_IndAudStreamParms = -1; static gint ett_h248_IndAudLocalControlDescriptor = -1; -static gint ett_h248_SEQUNCE_OF_IndAudPropertyParm = -1; static gint ett_h248_IndAudPropertyParm = -1; +static gint ett_h248_IndAudPropertyParms = -1; static gint ett_h248_IndAudLocalRemoteDescriptor = -1; static gint ett_h248_IndAudPropertyGroup = -1; static gint ett_h248_IndAudTerminationStateDescriptor = -1; @@ -414,8 +411,8 @@ static gint ett_h248_ObservedEventsDescriptor = -1; static gint ett_h248_SEQUNCE_OF_ObservedEvent = -1; static gint ett_h248_ObservedEvent = -1; static gint ett_h248_SEQUNCE_OF_EventParameter = -1; +static gint ett_h248_ExtraInfo = -1; static gint ett_h248_EventParameter = -1; -static gint ett_h248_T_extraInfo = -1; static gint ett_h248_ServiceChangeRequest = -1; static gint ett_h248_ServiceChangeReply = -1; static gint ett_h248_ServiceChangeResult = -1; @@ -423,7 +420,7 @@ static gint ett_h248_TerminationID = -1; static gint ett_h248_SEQUNCE_OF_WildcardField = -1; static gint ett_h248_TerminationIDList = -1; static gint ett_h248_MediaDescriptor = -1; -static gint ett_h248_T_streams1 = -1; +static gint ett_h248_T_streams = -1; static gint ett_h248_SEQUNCE_OF_StreamDescriptor = -1; static gint ett_h248_StreamDescriptor = -1; static gint ett_h248_StreamParms = -1; @@ -431,7 +428,6 @@ static gint ett_h248_LocalControlDescriptor = -1; static gint ett_h248_SEQUNCE_OF_PropertyParm = -1; static gint ett_h248_PropertyParm = -1; static gint ett_h248_SEQUNCE_OF_PropertyID = -1; -static gint ett_h248_T_extraInfo1 = -1; static gint ett_h248_LocalRemoteDescriptor = -1; static gint ett_h248_SEQUNCE_OF_PropertyGroup = -1; static gint ett_h248_PropertyGroup = -1; @@ -439,8 +435,8 @@ static gint ett_h248_TerminationStateDescriptor = -1; static gint ett_h248_MuxDescriptor = -1; static gint ett_h248_SEQUNCE_OF_TerminationID = -1; static gint ett_h248_EventsDescriptor = -1; -static gint ett_h248_SEQUNCE_OF_RequestedEvent = -1; static gint ett_h248_RequestedEvent = -1; +static gint ett_h248_RequestedEvents = -1; static gint ett_h248_RequestedActions = -1; static gint ett_h248_EventDM = -1; static gint ett_h248_SecondEventsDescriptor = -1; @@ -457,7 +453,6 @@ static gint ett_h248_Signal = -1; static gint ett_h248_SEQUNCE_OF_SigParameter = -1; static gint ett_h248_NotifyCompletion = -1; static gint ett_h248_SigParameter = -1; -static gint ett_h248_T_extraInfo2 = -1; static gint ett_h248_ModemDescriptor = -1; static gint ett_h248_SEQUNCE_OF_ModemType = -1; static gint ett_h248_DigitMapDescriptor = -1; @@ -976,8 +971,8 @@ dissect_h248_OCTET_STRING_SIZE_4(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } -static int dissect_address_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_OCTET_STRING_SIZE_4(TRUE, tvb, offset, pinfo, tree, hf_h248_address); +static int dissect_iP4Address_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_OCTET_STRING_SIZE_4(TRUE, tvb, offset, pinfo, tree, hf_h248_iP4Address); } @@ -1005,7 +1000,7 @@ static int dissect_manufacturerCode_impl(packet_info *pinfo, proto_tree *tree, t } static const ber_sequence IP4Address_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_address_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_iP4Address_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_portNumber_impl }, { 0, 0, 0, NULL } }; @@ -1029,12 +1024,12 @@ dissect_h248_OCTET_STRING_SIZE_16(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static int dissect_address1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_OCTET_STRING_SIZE_16(TRUE, tvb, offset, pinfo, tree, hf_h248_address1); +static int dissect_iP6Address_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_OCTET_STRING_SIZE_16(TRUE, tvb, offset, pinfo, tree, hf_h248_iP6Address); } static const ber_sequence IP6Address_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_address1_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_iP6Address_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_portNumber_impl }, { 0, 0, 0, NULL } }; @@ -1059,15 +1054,15 @@ dissect_h248_IA5String(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac return offset; } -static int dissect_name_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_IA5String(TRUE, tvb, offset, pinfo, tree, hf_h248_name); +static int dissect_domName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_IA5String(TRUE, tvb, offset, pinfo, tree, hf_h248_domName); } static int dissect_digitMapBody_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_h248_IA5String(TRUE, tvb, offset, pinfo, tree, hf_h248_digitMapBody); } static const ber_sequence DomainName_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_name_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_portNumber_impl }, { 0, 0, 0, NULL } }; @@ -1242,11 +1237,11 @@ static int dissect_range_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv static int dissect_sublist_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_h248_BOOLEAN(TRUE, tvb, offset, pinfo, tree, hf_h248_sublist); } -static int dissect_reserveValue1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_BOOLEAN(TRUE, tvb, offset, pinfo, tree, hf_h248_reserveValue1); +static int dissect_reserveValue_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_BOOLEAN(TRUE, tvb, offset, pinfo, tree, hf_h248_reserveValue); } -static int dissect_reserveGroup1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_BOOLEAN(TRUE, tvb, offset, pinfo, tree, hf_h248_reserveGroup1); +static int dissect_reserveGroup_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_BOOLEAN(TRUE, tvb, offset, pinfo, tree, hf_h248_reserveGroup); } static int dissect_keepActive_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_h248_BOOLEAN(TRUE, tvb, offset, pinfo, tree, hf_h248_keepActive); @@ -1287,13 +1282,13 @@ dissect_h248_OCTET_STRING_SIZE_1_8(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static int dissect_id1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_OCTET_STRING_SIZE_1_8(TRUE, tvb, offset, pinfo, tree, hf_h248_id1); +static int dissect_terminationId_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_OCTET_STRING_SIZE_1_8(TRUE, tvb, offset, pinfo, tree, hf_h248_terminationId); } static const ber_sequence TerminationID_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_wildcard_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_id1_impl }, + { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_terminationId_impl }, { 0, 0, 0, NULL } }; @@ -1310,8 +1305,8 @@ static int dissect_terminationFrom_impl(packet_info *pinfo, proto_tree *tree, tv static int dissect_terminationTo_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_h248_TerminationID(TRUE, tvb, offset, pinfo, tree, hf_h248_terminationTo); } -static int dissect_terminationID1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_TerminationID(TRUE, tvb, offset, pinfo, tree, hf_h248_terminationID1); +static int dissect_terminationID_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_TerminationID(TRUE, tvb, offset, pinfo, tree, hf_h248_terminationID); } static int dissect_TerminationIDList_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_h248_TerminationID(FALSE, tvb, offset, pinfo, tree, hf_h248_TerminationIDList_item); @@ -1422,11 +1417,11 @@ static int dissect_immAckRequired_impl(packet_info *pinfo, proto_tree *tree, tvb static int dissect_topology_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_h248_NULL(TRUE, tvb, offset, pinfo, tree, hf_h248_topology); } -static int dissect_emergency1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_NULL(TRUE, tvb, offset, pinfo, tree, hf_h248_emergency1); +static int dissect_cAAREmergency_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_NULL(TRUE, tvb, offset, pinfo, tree, hf_h248_cAAREmergency); } -static int dissect_priority1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_NULL(TRUE, tvb, offset, pinfo, tree, hf_h248_priority1); +static int dissect_cAARPriority_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_NULL(TRUE, tvb, offset, pinfo, tree, hf_h248_cAARPriority); } static int dissect_optional_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_h248_NULL(TRUE, tvb, offset, pinfo, tree, hf_h248_optional); @@ -1434,26 +1429,26 @@ static int dissect_optional_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t static int dissect_wildcardReturn_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_h248_NULL(TRUE, tvb, offset, pinfo, tree, hf_h248_wildcardReturn); } -static int dissect_streamMode_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_NULL(TRUE, tvb, offset, pinfo, tree, hf_h248_streamMode); +static int dissect_iALCDStreamMode_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_NULL(TRUE, tvb, offset, pinfo, tree, hf_h248_iALCDStreamMode); } -static int dissect_reserveValue_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_NULL(TRUE, tvb, offset, pinfo, tree, hf_h248_reserveValue); +static int dissect_iALCDReserveValue_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_NULL(TRUE, tvb, offset, pinfo, tree, hf_h248_iALCDReserveValue); } -static int dissect_reserveGroup_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_NULL(TRUE, tvb, offset, pinfo, tree, hf_h248_reserveGroup); +static int dissect_iALCDReserveGroup_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_NULL(TRUE, tvb, offset, pinfo, tree, hf_h248_iALCDReserveGroup); } static int dissect_eventBufferControl_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_h248_NULL(TRUE, tvb, offset, pinfo, tree, hf_h248_eventBufferControl); } -static int dissect_serviceState_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_NULL(TRUE, tvb, offset, pinfo, tree, hf_h248_serviceState); +static int dissect_iATSDServiceState_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_NULL(TRUE, tvb, offset, pinfo, tree, hf_h248_iATSDServiceState); } static const ber_sequence ContextAttrAuditRequest_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_topology_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_emergency1_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_priority1_impl }, + { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cAAREmergency_impl }, + { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cAARPriority_impl }, { 0, 0, 0, NULL } }; @@ -1479,24 +1474,24 @@ dissect_h248_TerminationIDList(gboolean implicit_tag _U_, tvbuff_t *tvb, int off return offset; } -static int dissect_terminationID_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_TerminationIDList(TRUE, tvb, offset, pinfo, tree, hf_h248_terminationID); +static int dissect_terminationIDList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_TerminationIDList(TRUE, tvb, offset, pinfo, tree, hf_h248_terminationIDList); } static int dissect_contextAuditResult_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_h248_TerminationIDList(TRUE, tvb, offset, pinfo, tree, hf_h248_contextAuditResult); } -static int dissect_name1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_PkgdName(TRUE, tvb, offset, pinfo, tree, hf_h248_name1); +static int dissect_name_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_PkgdName(TRUE, tvb, offset, pinfo, tree, hf_h248_name); } -static int dissect_pkgdName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_PkgdName(TRUE, tvb, offset, pinfo, tree, hf_h248_pkgdName); +static int dissect_iAEDPkgdName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_PkgdName(TRUE, tvb, offset, pinfo, tree, hf_h248_iAEDPkgdName); } -static int dissect_eventName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_PkgdName(TRUE, tvb, offset, pinfo, tree, hf_h248_eventName); +static int dissect_iAEBDEventName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_PkgdName(TRUE, tvb, offset, pinfo, tree, hf_h248_iAEBDEventName); } -static int dissect_signalName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_PkgdName(TRUE, tvb, offset, pinfo, tree, hf_h248_signalName); +static int dissect_iASignalName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_PkgdName(TRUE, tvb, offset, pinfo, tree, hf_h248_iASignalName); } static int dissect_statName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_h248_PkgdName(TRUE, tvb, offset, pinfo, tree, hf_h248_statName); @@ -1520,8 +1515,8 @@ dissect_h248_SEQUNCE_OF_PropertyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static int dissect_value1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_SEQUNCE_OF_PropertyID(TRUE, tvb, offset, pinfo, tree, hf_h248_value1); +static int dissect_propertyParamValue_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_SEQUNCE_OF_PropertyID(TRUE, tvb, offset, pinfo, tree, hf_h248_propertyParamValue); } @@ -1544,14 +1539,14 @@ static int dissect_relation_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } -static const value_string T_extraInfo1_vals[] = { +static const value_string ExtraInfo_vals[] = { { 0, "relation" }, { 1, "range" }, { 2, "sublist" }, { 0, NULL } }; -static const ber_choice T_extraInfo1_choice[] = { +static const ber_choice ExtraInfo_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_relation_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_range_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_sublist_impl }, @@ -1559,20 +1554,20 @@ static const ber_choice T_extraInfo1_choice[] = { }; static int -dissect_h248_T_extraInfo1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h248_ExtraInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_extraInfo1_choice, hf_index, ett_h248_T_extraInfo1); + ExtraInfo_choice, hf_index, ett_h248_ExtraInfo); return offset; } -static int dissect_extraInfo1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_T_extraInfo1(FALSE, tvb, offset, pinfo, tree, hf_h248_extraInfo1); +static int dissect_extraInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_ExtraInfo(FALSE, tvb, offset, pinfo, tree, hf_h248_extraInfo); } static const ber_sequence PropertyParm_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_propertyName_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_value1_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_extraInfo1 }, + { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_propertyParamValue_impl }, + { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_extraInfo }, { 0, 0, 0, NULL } }; @@ -1583,8 +1578,8 @@ dissect_h248_PropertyParm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, return offset; } -static int dissect_propertyParms_item1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_PropertyParm(FALSE, tvb, offset, pinfo, tree, hf_h248_propertyParms_item1); +static int dissect_propertyParms_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_PropertyParm(FALSE, tvb, offset, pinfo, tree, hf_h248_propertyParms_item); } static int dissect_PropertyGroup_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_h248_PropertyParm(FALSE, tvb, offset, pinfo, tree, hf_h248_PropertyGroup_item); @@ -1594,7 +1589,7 @@ static int dissect_mpl_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } static const ber_sequence SEQUNCE_OF_PropertyParm_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_propertyParms_item1 }, + { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_propertyParms_item }, }; static int @@ -1604,8 +1599,8 @@ dissect_h248_SEQUNCE_OF_PropertyParm(gboolean implicit_tag _U_, tvbuff_t *tvb, i return offset; } -static int dissect_propertyParms1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_SEQUNCE_OF_PropertyParm(TRUE, tvb, offset, pinfo, tree, hf_h248_propertyParms1); +static int dissect_propertyParms_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_SEQUNCE_OF_PropertyParm(TRUE, tvb, offset, pinfo, tree, hf_h248_propertyParms); } static int dissect_mpl_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_h248_SEQUNCE_OF_PropertyParm(TRUE, tvb, offset, pinfo, tree, hf_h248_mpl); @@ -1625,8 +1620,8 @@ dissect_h248_EventBufferControl(gboolean implicit_tag _U_, tvbuff_t *tvb, int of return offset; } -static int dissect_eventBufferControl1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_EventBufferControl(TRUE, tvb, offset, pinfo, tree, hf_h248_eventBufferControl1); +static int dissect_tSEventBufferControl_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_EventBufferControl(TRUE, tvb, offset, pinfo, tree, hf_h248_tSEventBufferControl); } @@ -1644,14 +1639,14 @@ dissect_h248_ServiceState(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, return offset; } -static int dissect_serviceState1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_ServiceState(TRUE, tvb, offset, pinfo, tree, hf_h248_serviceState1); +static int dissect_serviceState_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_ServiceState(TRUE, tvb, offset, pinfo, tree, hf_h248_serviceState); } static const ber_sequence TerminationStateDescriptor_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_propertyParms1_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventBufferControl1_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceState1_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_propertyParms_impl }, + { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_tSEventBufferControl_impl }, + { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceState_impl }, { 0, 0, 0, NULL } }; @@ -1662,8 +1657,8 @@ dissect_h248_TerminationStateDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static int dissect_termStateDescr1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_TerminationStateDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_termStateDescr1); +static int dissect_termStateDescr_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_TerminationStateDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_termStateDescr); } @@ -1683,15 +1678,15 @@ dissect_h248_StreamMode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa return offset; } -static int dissect_streamMode1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_StreamMode(TRUE, tvb, offset, pinfo, tree, hf_h248_streamMode1); +static int dissect_streamMode_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_StreamMode(TRUE, tvb, offset, pinfo, tree, hf_h248_streamMode); } static const ber_sequence LocalControlDescriptor_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamMode1_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reserveValue1_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reserveGroup1_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_propertyParms1_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamMode_impl }, + { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reserveValue_impl }, + { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reserveGroup_impl }, + { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_propertyParms_impl }, { 0, 0, 0, NULL } }; @@ -1702,8 +1697,8 @@ dissect_h248_LocalControlDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb, in return offset; } -static int dissect_localControlDescriptor1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_LocalControlDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_localControlDescriptor1); +static int dissect_localControlDescriptor_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_LocalControlDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_localControlDescriptor); } static const ber_sequence PropertyGroup_sequence_of[1] = { @@ -1732,12 +1727,12 @@ dissect_h248_SEQUNCE_OF_PropertyGroup(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static int dissect_propGrps1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_SEQUNCE_OF_PropertyGroup(TRUE, tvb, offset, pinfo, tree, hf_h248_propGrps1); +static int dissect_propGrps_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_SEQUNCE_OF_PropertyGroup(TRUE, tvb, offset, pinfo, tree, hf_h248_propGrps); } static const ber_sequence LocalRemoteDescriptor_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_propGrps1_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_propGrps_impl }, { 0, 0, 0, NULL } }; @@ -1748,17 +1743,17 @@ dissect_h248_LocalRemoteDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static int dissect_localDescriptor1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_LocalRemoteDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_localDescriptor1); +static int dissect_localDescriptor_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_LocalRemoteDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_localDescriptor); } -static int dissect_remoteDescriptor1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_LocalRemoteDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_remoteDescriptor1); +static int dissect_remoteDescriptor_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_LocalRemoteDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_remoteDescriptor); } static const ber_sequence StreamParms_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localControlDescriptor1_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localDescriptor1_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_remoteDescriptor1_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localControlDescriptor_impl }, + { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localDescriptor_impl }, + { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_remoteDescriptor_impl }, { 0, 0, 0, NULL } }; @@ -1769,16 +1764,16 @@ dissect_h248_StreamParms(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p return offset; } -static int dissect_oneStream1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_StreamParms(TRUE, tvb, offset, pinfo, tree, hf_h248_oneStream1); +static int dissect_mediaDescriptorOneStream_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_StreamParms(TRUE, tvb, offset, pinfo, tree, hf_h248_mediaDescriptorOneStream); } -static int dissect_streamParms1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_StreamParms(TRUE, tvb, offset, pinfo, tree, hf_h248_streamParms1); +static int dissect_streamParms_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_StreamParms(TRUE, tvb, offset, pinfo, tree, hf_h248_streamParms); } static const ber_sequence StreamDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_streamID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_streamParms1_impl }, + { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_streamParms_impl }, { 0, 0, 0, NULL } }; @@ -1789,12 +1784,12 @@ dissect_h248_StreamDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs return offset; } -static int dissect_multiStream_item1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_StreamDescriptor(FALSE, tvb, offset, pinfo, tree, hf_h248_multiStream_item1); +static int dissect_mediaDescriptorMultiStream_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_StreamDescriptor(FALSE, tvb, offset, pinfo, tree, hf_h248_mediaDescriptorMultiStream_item); } static const ber_sequence SEQUNCE_OF_StreamDescriptor_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_multiStream_item1 }, + { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mediaDescriptorMultiStream_item }, }; static int @@ -1804,37 +1799,37 @@ dissect_h248_SEQUNCE_OF_StreamDescriptor(gboolean implicit_tag _U_, tvbuff_t *tv return offset; } -static int dissect_multiStream1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_SEQUNCE_OF_StreamDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_multiStream1); +static int dissect_mediaDescriptorMultiStream_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_SEQUNCE_OF_StreamDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_mediaDescriptorMultiStream); } -static const value_string T_streams1_vals[] = { +static const value_string T_streams_vals[] = { { 0, "oneStream" }, { 1, "multiStream" }, { 0, NULL } }; -static const ber_choice T_streams1_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_oneStream1_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_multiStream1_impl }, +static const ber_choice T_streams_choice[] = { + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mediaDescriptorOneStream_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mediaDescriptorMultiStream_impl }, { 0, 0, 0, 0, NULL } }; static int -dissect_h248_T_streams1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h248_T_streams(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_streams1_choice, hf_index, ett_h248_T_streams1); + T_streams_choice, hf_index, ett_h248_T_streams); return offset; } -static int dissect_streams1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_T_streams1(FALSE, tvb, offset, pinfo, tree, hf_h248_streams1); +static int dissect_streams(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_T_streams(FALSE, tvb, offset, pinfo, tree, hf_h248_streams); } static const ber_sequence MediaDescriptor_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_termStateDescr1_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_streams1 }, + { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_termStateDescr_impl }, + { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_streams }, { 0, 0, 0, NULL } }; @@ -2102,11 +2097,11 @@ static int dissect_requestId_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_h248_RequestID(TRUE, tvb, offset, pinfo, tree, hf_h248_requestId); } -static int dissect_eventName1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_EventName(TRUE, tvb, offset, pinfo, tree, hf_h248_eventName1); +static int dissect_eventName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_EventName(TRUE, tvb, offset, pinfo, tree, hf_h248_eventName); } -static int dissect_pkgdName1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_EventName(TRUE, tvb, offset, pinfo, tree, hf_h248_pkgdName1); +static int dissect_pkgdName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_EventName(TRUE, tvb, offset, pinfo, tree, hf_h248_pkgdName); } @@ -2182,8 +2177,8 @@ static int dissect_eventDM(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_h248_EventDM(FALSE, tvb, offset, pinfo, tree, hf_h248_eventDM); } -static int dissect_signalName1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_SignalName(TRUE, tvb, offset, pinfo, tree, hf_h248_signalName1); +static int dissect_signalName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_SignalName(TRUE, tvb, offset, pinfo, tree, hf_h248_signalName); } @@ -2246,36 +2241,10 @@ static int dissect_statValue_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_h248_Value(TRUE, tvb, offset, pinfo, tree, hf_h248_statValue); } - -static const value_string T_extraInfo2_vals[] = { - { 0, "relation" }, - { 1, "range" }, - { 2, "sublist" }, - { 0, NULL } -}; - -static const ber_choice T_extraInfo2_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_relation_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_range_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_sublist_impl }, - { 0, 0, 0, 0, NULL } -}; - -static int -dissect_h248_T_extraInfo2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_extraInfo2_choice, hf_index, ett_h248_T_extraInfo2); - - return offset; -} -static int dissect_extraInfo2(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_T_extraInfo2(FALSE, tvb, offset, pinfo, tree, hf_h248_extraInfo2); -} - static const ber_sequence SigParameter_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sigParameterName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_value_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_extraInfo2 }, + { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_extraInfo }, { 0, 0, 0, NULL } }; @@ -2306,7 +2275,7 @@ static int dissect_sigParList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ } static const ber_sequence Signal_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_signalName1_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_signalName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sigType_impl }, { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_duration_impl }, @@ -2323,8 +2292,8 @@ dissect_h248_Signal(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet return offset; } -static int dissect_signal1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_Signal(TRUE, tvb, offset, pinfo, tree, hf_h248_signal1); +static int dissect_signal_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_Signal(TRUE, tvb, offset, pinfo, tree, hf_h248_signal); } static int dissect_signalList_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_h248_Signal(FALSE, tvb, offset, pinfo, tree, hf_h248_signalList_item); @@ -2341,13 +2310,13 @@ dissect_h248_SEQUNCE_OF_Signal(gboolean implicit_tag _U_, tvbuff_t *tvb, int off return offset; } -static int dissect_signalList1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_SEQUNCE_OF_Signal(TRUE, tvb, offset, pinfo, tree, hf_h248_signalList1); +static int dissect_signalList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_SEQUNCE_OF_Signal(TRUE, tvb, offset, pinfo, tree, hf_h248_signalList); } static const ber_sequence SeqSigList_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_id_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_signalList1_impl }, + { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_signalList_impl }, { 0, 0, 0, NULL } }; @@ -2358,8 +2327,8 @@ dissect_h248_SeqSigList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa return offset; } -static int dissect_seqSigList1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_SeqSigList(TRUE, tvb, offset, pinfo, tree, hf_h248_seqSigList1); +static int dissect_seqSigList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_SeqSigList(TRUE, tvb, offset, pinfo, tree, hf_h248_seqSigList); } @@ -2370,8 +2339,8 @@ static const value_string SignalRequest_vals[] = { }; static const ber_choice SignalRequest_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_signal1_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_seqSigList1_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_signal_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_seqSigList_impl }, { 0, 0, 0, 0, NULL } }; @@ -2415,40 +2384,14 @@ dissect_h248_SecondRequestedActions(gboolean implicit_tag _U_, tvbuff_t *tvb, in return offset; } -static int dissect_eventAction1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_SecondRequestedActions(TRUE, tvb, offset, pinfo, tree, hf_h248_eventAction1); -} - - -static const value_string T_extraInfo_vals[] = { - { 0, "relation" }, - { 1, "range" }, - { 2, "sublist" }, - { 0, NULL } -}; - -static const ber_choice T_extraInfo_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_relation_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_range_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_sublist_impl }, - { 0, 0, 0, 0, NULL } -}; - -static int -dissect_h248_T_extraInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_extraInfo_choice, hf_index, ett_h248_T_extraInfo); - - return offset; -} -static int dissect_extraInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_T_extraInfo(FALSE, tvb, offset, pinfo, tree, hf_h248_extraInfo); +static int dissect_secondaryEventAction_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_SecondRequestedActions(TRUE, tvb, offset, pinfo, tree, hf_h248_secondaryEventAction); } static const ber_sequence EventParameter_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventParameterName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_value_impl }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_extraInfo }, + { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_extraInfo }, { 0, 0, 0, NULL } }; @@ -2485,9 +2428,9 @@ static int dissect_evParList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } static const ber_sequence SecondRequestedEvent_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pkgdName1_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pkgdName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventAction1_impl }, + { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_secondaryEventAction_impl }, { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_evParList_impl }, { 0, 0, 0, NULL } }; @@ -2499,12 +2442,12 @@ dissect_h248_SecondRequestedEvent(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static int dissect_eventList_item1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_SecondRequestedEvent(FALSE, tvb, offset, pinfo, tree, hf_h248_eventList_item1); +static int dissect_eventList_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_SecondRequestedEvent(FALSE, tvb, offset, pinfo, tree, hf_h248_eventList_item); } static const ber_sequence SEQUNCE_OF_SecondRequestedEvent_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_eventList_item1 }, + { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_eventList_item }, }; static int @@ -2514,13 +2457,13 @@ dissect_h248_SEQUNCE_OF_SecondRequestedEvent(gboolean implicit_tag _U_, tvbuff_t return offset; } -static int dissect_eventList1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_SEQUNCE_OF_SecondRequestedEvent(TRUE, tvb, offset, pinfo, tree, hf_h248_eventList1); +static int dissect_secondaryEventList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_SEQUNCE_OF_SecondRequestedEvent(TRUE, tvb, offset, pinfo, tree, hf_h248_secondaryEventList); } static const ber_sequence SecondEventsDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_eventList1_impl }, + { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_secondaryEventList_impl }, { 0, 0, 0, NULL } }; @@ -2555,7 +2498,7 @@ static int dissect_eventAction_impl(packet_info *pinfo, proto_tree *tree, tvbuff } static const ber_sequence RequestedEvent_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pkgdName1_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pkgdName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventAction_impl }, { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_evParList_impl }, @@ -2569,23 +2512,23 @@ dissect_h248_RequestedEvent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset return offset; } -static int dissect_eventList_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_RequestedEvent(FALSE, tvb, offset, pinfo, tree, hf_h248_eventList_item); +static int dissect_RequestedEvents_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_RequestedEvent(FALSE, tvb, offset, pinfo, tree, hf_h248_RequestedEvents_item); } -static const ber_sequence SEQUNCE_OF_RequestedEvent_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_eventList_item }, +static const ber_sequence RequestedEvents_sequence_of[1] = { + { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RequestedEvents_item }, }; static int -dissect_h248_SEQUNCE_OF_RequestedEvent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h248_RequestedEvents(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_OF_RequestedEvent_sequence_of, hf_index, ett_h248_SEQUNCE_OF_RequestedEvent); + RequestedEvents_sequence_of, hf_index, ett_h248_RequestedEvents); return offset; } static int dissect_eventList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_SEQUNCE_OF_RequestedEvent(TRUE, tvb, offset, pinfo, tree, hf_h248_eventList); + return dissect_h248_RequestedEvents(TRUE, tvb, offset, pinfo, tree, hf_h248_eventList); } static const ber_sequence EventsDescriptor_sequence[] = { @@ -2606,7 +2549,7 @@ static int dissect_eventsDescriptor_impl(packet_info *pinfo, proto_tree *tree, t } static const ber_sequence EventSpec_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventName1_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl }, { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_eventParList_impl }, { 0, 0, 0, NULL } @@ -2682,7 +2625,7 @@ static int dissect_auditToken_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ } static const ber_sequence IndAudPropertyParm_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_name1_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_name_impl }, { 0, 0, 0, NULL } }; @@ -2693,32 +2636,32 @@ dissect_h248_IndAudPropertyParm(gboolean implicit_tag _U_, tvbuff_t *tvb, int of return offset; } -static int dissect_propertyParms_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_IndAudPropertyParm(FALSE, tvb, offset, pinfo, tree, hf_h248_propertyParms_item); +static int dissect_IndAudPropertyParms_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_IndAudPropertyParm(FALSE, tvb, offset, pinfo, tree, hf_h248_IndAudPropertyParms_item); } static int dissect_IndAudPropertyGroup_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_h248_IndAudPropertyParm(FALSE, tvb, offset, pinfo, tree, hf_h248_IndAudPropertyGroup_item); } -static const ber_sequence SEQUNCE_OF_IndAudPropertyParm_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_propertyParms_item }, +static const ber_sequence IndAudPropertyParms_sequence_of[1] = { + { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_IndAudPropertyParms_item }, }; static int -dissect_h248_SEQUNCE_OF_IndAudPropertyParm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h248_IndAudPropertyParms(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_OF_IndAudPropertyParm_sequence_of, hf_index, ett_h248_SEQUNCE_OF_IndAudPropertyParm); + IndAudPropertyParms_sequence_of, hf_index, ett_h248_IndAudPropertyParms); return offset; } -static int dissect_propertyParms_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_SEQUNCE_OF_IndAudPropertyParm(TRUE, tvb, offset, pinfo, tree, hf_h248_propertyParms); +static int dissect_indAudPropertyParms_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_IndAudPropertyParms(TRUE, tvb, offset, pinfo, tree, hf_h248_indAudPropertyParms); } static const ber_sequence IndAudTerminationStateDescriptor_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_propertyParms_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_indAudPropertyParms_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventBufferControl_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceState_impl }, + { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iATSDServiceState_impl }, { 0, 0, 0, NULL } }; @@ -2729,15 +2672,15 @@ dissect_h248_IndAudTerminationStateDescriptor(gboolean implicit_tag _U_, tvbuff_ return offset; } -static int dissect_termStateDescr_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_IndAudTerminationStateDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_termStateDescr); +static int dissect_indAudTerminationStateDescriptor_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_IndAudTerminationStateDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_indAudTerminationStateDescriptor); } static const ber_sequence IndAudLocalControlDescriptor_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamMode_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reserveValue_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reserveGroup_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_propertyParms_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iALCDStreamMode_impl }, + { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iALCDReserveValue_impl }, + { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iALCDReserveGroup_impl }, + { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_indAudPropertyParms_impl }, { 0, 0, 0, NULL } }; @@ -2748,8 +2691,8 @@ dissect_h248_IndAudLocalControlDescriptor(gboolean implicit_tag _U_, tvbuff_t *t return offset; } -static int dissect_localControlDescriptor_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_IndAudLocalControlDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_localControlDescriptor); +static int dissect_iASPLocalControlDescriptor_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_IndAudLocalControlDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_iASPLocalControlDescriptor); } static const ber_sequence IndAudPropertyGroup_sequence_of[1] = { @@ -2763,13 +2706,13 @@ dissect_h248_IndAudPropertyGroup(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } -static int dissect_propGrps_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_IndAudPropertyGroup(TRUE, tvb, offset, pinfo, tree, hf_h248_propGrps); +static int dissect_iAPropertyGroup_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_IndAudPropertyGroup(TRUE, tvb, offset, pinfo, tree, hf_h248_iAPropertyGroup); } static const ber_sequence IndAudLocalRemoteDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_propGroupID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_propGrps_impl }, + { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_iAPropertyGroup_impl }, { 0, 0, 0, NULL } }; @@ -2780,17 +2723,17 @@ dissect_h248_IndAudLocalRemoteDescriptor(gboolean implicit_tag _U_, tvbuff_t *tv return offset; } -static int dissect_localDescriptor_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_IndAudLocalRemoteDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_localDescriptor); +static int dissect_iASPLocalDescriptor_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_IndAudLocalRemoteDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_iASPLocalDescriptor); } -static int dissect_remoteDescriptor_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_IndAudLocalRemoteDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_remoteDescriptor); +static int dissect_iASPRemoteDescriptor_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_IndAudLocalRemoteDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_iASPRemoteDescriptor); } static const ber_sequence IndAudStreamParms_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localControlDescriptor_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localDescriptor_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_remoteDescriptor_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iASPLocalControlDescriptor_impl }, + { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iASPLocalDescriptor_impl }, + { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iASPRemoteDescriptor_impl }, { 0, 0, 0, NULL } }; @@ -2804,13 +2747,13 @@ dissect_h248_IndAudStreamParms(gboolean implicit_tag _U_, tvbuff_t *tvb, int off static int dissect_oneStream_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_h248_IndAudStreamParms(TRUE, tvb, offset, pinfo, tree, hf_h248_oneStream); } -static int dissect_streamParms_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_IndAudStreamParms(TRUE, tvb, offset, pinfo, tree, hf_h248_streamParms); +static int dissect_indAudStreamParms_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_IndAudStreamParms(TRUE, tvb, offset, pinfo, tree, hf_h248_indAudStreamParms); } static const ber_sequence IndAudStreamDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_streamID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_streamParms_impl }, + { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_indAudStreamParms_impl }, { 0, 0, 0, NULL } }; @@ -2841,32 +2784,32 @@ static int dissect_multiStream_impl(packet_info *pinfo, proto_tree *tree, tvbuff } -static const value_string T_streams_vals[] = { +static const value_string indAudMediaDescriptorStreams_vals[] = { { 0, "oneStream" }, { 1, "multiStream" }, { 0, NULL } }; -static const ber_choice T_streams_choice[] = { +static const ber_choice indAudMediaDescriptorStreams_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_oneStream_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_multiStream_impl }, { 0, 0, 0, 0, NULL } }; static int -dissect_h248_T_streams(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h248_indAudMediaDescriptorStreams(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_streams_choice, hf_index, ett_h248_T_streams); + indAudMediaDescriptorStreams_choice, hf_index, ett_h248_indAudMediaDescriptorStreams); return offset; } -static int dissect_streams(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_T_streams(FALSE, tvb, offset, pinfo, tree, hf_h248_streams); +static int dissect_indAudMediaDescriptorStreams(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_indAudMediaDescriptorStreams(FALSE, tvb, offset, pinfo, tree, hf_h248_indAudMediaDescriptorStreams); } static const ber_sequence IndAudMediaDescriptor_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_termStateDescr_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_streams }, + { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_indAudTerminationStateDescriptor_impl }, + { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_indAudMediaDescriptorStreams }, { 0, 0, 0, NULL } }; @@ -2883,7 +2826,7 @@ static int dissect_indaudmediaDescriptor_impl(packet_info *pinfo, proto_tree *tr static const ber_sequence IndAudEventsDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_pkgdName_impl }, + { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_iAEDPkgdName_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl }, { 0, 0, 0, NULL } }; @@ -2900,7 +2843,7 @@ static int dissect_indaudeventsDescriptor_impl(packet_info *pinfo, proto_tree *t } static const ber_sequence IndAudEventBufferDescriptor_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventName_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_iAEBDEventName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl }, { 0, 0, 0, NULL } }; @@ -2917,7 +2860,7 @@ static int dissect_indaudeventBufferDescriptor_impl(packet_info *pinfo, proto_tr } static const ber_sequence IndAudSignal_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_signalName_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_iASignalName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl }, { 0, 0, 0, NULL } }; @@ -2929,16 +2872,16 @@ dissect_h248_IndAudSignal(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, return offset; } -static int dissect_signal_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_IndAudSignal(TRUE, tvb, offset, pinfo, tree, hf_h248_signal); +static int dissect_indAudSignal_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_IndAudSignal(TRUE, tvb, offset, pinfo, tree, hf_h248_indAudSignal); } -static int dissect_signalList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_IndAudSignal(TRUE, tvb, offset, pinfo, tree, hf_h248_signalList); +static int dissect_iASignalList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_IndAudSignal(TRUE, tvb, offset, pinfo, tree, hf_h248_iASignalList); } static const ber_sequence IndAudSeqSigList_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_id_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_signalList_impl }, + { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iASignalList_impl }, { 0, 0, 0, NULL } }; @@ -2949,8 +2892,8 @@ dissect_h248_IndAudSeqSigList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs return offset; } -static int dissect_seqSigList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_IndAudSeqSigList(TRUE, tvb, offset, pinfo, tree, hf_h248_seqSigList); +static int dissect_indAudSeqSigList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_IndAudSeqSigList(TRUE, tvb, offset, pinfo, tree, hf_h248_indAudSeqSigList); } @@ -2961,8 +2904,8 @@ static const value_string IndAudSignalsDescriptor_vals[] = { }; static const ber_choice IndAudSignalsDescriptor_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_signal_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_seqSigList_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_indAudSignal_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_indAudSeqSigList_impl }, { 0, 0, 0, 0, NULL } }; @@ -3150,7 +3093,7 @@ static int dissect_descriptors_impl(packet_info *pinfo, proto_tree *tree, tvbuff } static const ber_sequence AmmRequest_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_descriptors_impl }, { 0, 0, 0, NULL } }; @@ -3173,7 +3116,7 @@ static int dissect_modReq_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t } static const ber_sequence SubtractRequest_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_auditDescriptor_impl }, { 0, 0, 0, NULL } }; @@ -3190,7 +3133,7 @@ static int dissect_subtractReq_impl(packet_info *pinfo, proto_tree *tree, tvbuff } static const ber_sequence AuditRequest_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID1_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_auditDescriptor_impl }, { 0, 0, 0, NULL } }; @@ -3233,7 +3176,7 @@ static int dissect_timestamp_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } static const ber_sequence ObservedEvent_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventName1_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl }, { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_eventParList_impl }, { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_timeNotation_impl }, @@ -3284,7 +3227,7 @@ static int dissect_observedEventsDescriptor_impl(packet_info *pinfo, proto_tree } static const ber_sequence NotifyRequest_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_observedEventsDescriptor_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_errorDescriptor_impl }, { 0, 0, 0, NULL } @@ -3324,18 +3267,6 @@ static int dissect_serviceChangeMethod_impl(packet_info *pinfo, proto_tree *tree } -static int -dissect_h248_OCTET_STRING_SIZE_2_4(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); - - return offset; -} -static int dissect_mtpAddress1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_OCTET_STRING_SIZE_2_4(TRUE, tvb, offset, pinfo, tree, hf_h248_mtpAddress1); -} - - static const value_string ServiceChangeAddress_vals[] = { { 0, "portNumber" }, { 1, "ip4Address" }, @@ -3352,7 +3283,7 @@ static const ber_choice ServiceChangeAddress_choice[] = { { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ip6Address_impl }, { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_domainName_impl }, { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_deviceName_impl }, - { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_mtpAddress1_impl }, + { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_mtpAddress_impl }, { 0, 0, 0, 0, NULL } }; @@ -3434,7 +3365,7 @@ static int dissect_serviceChangeParms_impl(packet_info *pinfo, proto_tree *tree, } static const ber_sequence ServiceChangeRequest_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceChangeParms_impl }, { 0, 0, 0, NULL } }; @@ -3713,7 +3644,7 @@ static int dissect_terminationAuditResult_impl(packet_info *pinfo, proto_tree *t } static const ber_sequence AmmsReply_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_terminationAudit_impl }, { 0, 0, 0, NULL } }; @@ -3739,7 +3670,7 @@ static int dissect_subtractReply_impl(packet_info *pinfo, proto_tree *tree, tvbu } static const ber_sequence AuditResult_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID1_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_terminationAuditResult_impl }, { 0, 0, 0, NULL } }; @@ -3785,7 +3716,7 @@ static int dissect_auditValueReply(packet_info *pinfo, proto_tree *tree, tvbuff_ } static const ber_sequence NotifyReply_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_errorDescriptor_impl }, { 0, 0, 0, NULL } }; @@ -3846,7 +3777,7 @@ static int dissect_serviceChangeResult(packet_info *pinfo, proto_tree *tree, tvb } static const ber_sequence ServiceChangeReply_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl }, + { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl }, { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_serviceChangeResult }, { 0, 0, 0, NULL } }; @@ -4253,8 +4184,8 @@ void proto_register_h248(void) { { &hf_h248_mtpAddress, { "mtpAddress", "h248.mtpAddress", FT_BYTES, BASE_HEX, NULL, 0, - "MId/mtpAddress", HFILL }}, - { &hf_h248_name, + "", HFILL }}, + { &hf_h248_domName, { "name", "h248.name", FT_STRING, BASE_NONE, NULL, 0, "DomainName/name", HFILL }}, @@ -4262,11 +4193,11 @@ void proto_register_h248(void) { { "portNumber", "h248.portNumber", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, - { &hf_h248_address, + { &hf_h248_iP4Address, { "address", "h248.address", FT_BYTES, BASE_HEX, NULL, 0, "IP4Address/address", HFILL }}, - { &hf_h248_address1, + { &hf_h248_iP6Address, { "address", "h248.address", FT_BYTES, BASE_HEX, NULL, 0, "IP6Address/address", HFILL }}, @@ -4394,11 +4325,11 @@ void proto_register_h248(void) { { "topology", "h248.topology", FT_NONE, BASE_NONE, NULL, 0, "ContextAttrAuditRequest/topology", HFILL }}, - { &hf_h248_emergency1, + { &hf_h248_cAAREmergency, { "emergency", "h248.emergency", FT_NONE, BASE_NONE, NULL, 0, "ContextAttrAuditRequest/emergency", HFILL }}, - { &hf_h248_priority1, + { &hf_h248_cAARPriority, { "priority", "h248.priority", FT_NONE, BASE_NONE, NULL, 0, "ContextAttrAuditRequest/priority", HFILL }}, @@ -4494,7 +4425,7 @@ void proto_register_h248(void) { { "streamID", "h248.streamID", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, - { &hf_h248_terminationID, + { &hf_h248_terminationIDList, { "terminationID", "h248.terminationID", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, @@ -4542,7 +4473,7 @@ void proto_register_h248(void) { { "terminationAudit", "h248.terminationAudit", FT_UINT32, BASE_DEC, NULL, 0, "AmmsReply/terminationAudit", HFILL }}, - { &hf_h248_terminationID1, + { &hf_h248_terminationID, { "terminationID", "h248.terminationID", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }}, @@ -4622,13 +4553,13 @@ void proto_register_h248(void) { { "indaudpackagesDescriptor", "h248.indaudpackagesDescriptor", FT_NONE, BASE_NONE, NULL, 0, "IndAuditParameter/indaudpackagesDescriptor", HFILL }}, - { &hf_h248_termStateDescr, + { &hf_h248_indAudTerminationStateDescriptor, { "termStateDescr", "h248.termStateDescr", FT_NONE, BASE_NONE, NULL, 0, "IndAudMediaDescriptor/termStateDescr", HFILL }}, - { &hf_h248_streams, + { &hf_h248_indAudMediaDescriptorStreams, { "streams", "h248.streams", - FT_UINT32, BASE_DEC, VALS(T_streams_vals), 0, + FT_UINT32, BASE_DEC, VALS(indAudMediaDescriptorStreams_vals), 0, "IndAudMediaDescriptor/streams", HFILL }}, { &hf_h248_oneStream, { "oneStream", "h248.oneStream", @@ -4642,51 +4573,51 @@ void proto_register_h248(void) { { "Item", "h248.multiStream_item", FT_NONE, BASE_NONE, NULL, 0, "IndAudMediaDescriptor/streams/multiStream/_item", HFILL }}, - { &hf_h248_streamParms, + { &hf_h248_indAudStreamParms, { "streamParms", "h248.streamParms", FT_NONE, BASE_NONE, NULL, 0, "IndAudStreamDescriptor/streamParms", HFILL }}, - { &hf_h248_localControlDescriptor, + { &hf_h248_iASPLocalControlDescriptor, { "localControlDescriptor", "h248.localControlDescriptor", FT_NONE, BASE_NONE, NULL, 0, "IndAudStreamParms/localControlDescriptor", HFILL }}, - { &hf_h248_localDescriptor, + { &hf_h248_iASPLocalDescriptor, { "localDescriptor", "h248.localDescriptor", FT_NONE, BASE_NONE, NULL, 0, "IndAudStreamParms/localDescriptor", HFILL }}, - { &hf_h248_remoteDescriptor, + { &hf_h248_iASPRemoteDescriptor, { "remoteDescriptor", "h248.remoteDescriptor", FT_NONE, BASE_NONE, NULL, 0, "IndAudStreamParms/remoteDescriptor", HFILL }}, - { &hf_h248_streamMode, + { &hf_h248_iALCDStreamMode, { "streamMode", "h248.streamMode", FT_NONE, BASE_NONE, NULL, 0, "IndAudLocalControlDescriptor/streamMode", HFILL }}, - { &hf_h248_reserveValue, + { &hf_h248_iALCDReserveValue, { "reserveValue", "h248.reserveValue", FT_NONE, BASE_NONE, NULL, 0, "IndAudLocalControlDescriptor/reserveValue", HFILL }}, - { &hf_h248_reserveGroup, + { &hf_h248_iALCDReserveGroup, { "reserveGroup", "h248.reserveGroup", FT_NONE, BASE_NONE, NULL, 0, "IndAudLocalControlDescriptor/reserveGroup", HFILL }}, - { &hf_h248_propertyParms, + { &hf_h248_indAudPropertyParms, { "propertyParms", "h248.propertyParms", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, - { &hf_h248_propertyParms_item, - { "Item", "h248.propertyParms_item", - FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }}, - { &hf_h248_name1, + { &hf_h248_name, { "name", "h248.name", FT_BYTES, BASE_HEX, NULL, 0, "IndAudPropertyParm/name", HFILL }}, + { &hf_h248_IndAudPropertyParms_item, + { "Item", "h248.IndAudPropertyParms_item", + FT_NONE, BASE_NONE, NULL, 0, + "IndAudPropertyParms/_item", HFILL }}, { &hf_h248_propGroupID, { "propGroupID", "h248.propGroupID", FT_UINT32, BASE_DEC, NULL, 0, "IndAudLocalRemoteDescriptor/propGroupID", HFILL }}, - { &hf_h248_propGrps, + { &hf_h248_iAPropertyGroup, { "propGrps", "h248.propGrps", FT_UINT32, BASE_DEC, NULL, 0, "IndAudLocalRemoteDescriptor/propGrps", HFILL }}, @@ -4698,7 +4629,7 @@ void proto_register_h248(void) { { "eventBufferControl", "h248.eventBufferControl", FT_NONE, BASE_NONE, NULL, 0, "IndAudTerminationStateDescriptor/eventBufferControl", HFILL }}, - { &hf_h248_serviceState, + { &hf_h248_iATSDServiceState, { "serviceState", "h248.serviceState", FT_NONE, BASE_NONE, NULL, 0, "IndAudTerminationStateDescriptor/serviceState", HFILL }}, @@ -4706,19 +4637,19 @@ void proto_register_h248(void) { { "requestID", "h248.requestID", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, - { &hf_h248_pkgdName, + { &hf_h248_iAEDPkgdName, { "pkgdName", "h248.pkgdName", FT_BYTES, BASE_HEX, NULL, 0, "IndAudEventsDescriptor/pkgdName", HFILL }}, - { &hf_h248_eventName, + { &hf_h248_iAEBDEventName, { "eventName", "h248.eventName", FT_BYTES, BASE_HEX, NULL, 0, "IndAudEventBufferDescriptor/eventName", HFILL }}, - { &hf_h248_signal, + { &hf_h248_indAudSignal, { "signal", "h248.signal", FT_NONE, BASE_NONE, NULL, 0, "IndAudSignalsDescriptor/signal", HFILL }}, - { &hf_h248_seqSigList, + { &hf_h248_indAudSeqSigList, { "seqSigList", "h248.seqSigList", FT_NONE, BASE_NONE, NULL, 0, "IndAudSignalsDescriptor/seqSigList", HFILL }}, @@ -4726,11 +4657,11 @@ void proto_register_h248(void) { { "id", "h248.id", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, - { &hf_h248_signalList, + { &hf_h248_iASignalList, { "signalList", "h248.signalList", FT_NONE, BASE_NONE, NULL, 0, "IndAudSeqSigList/signalList", HFILL }}, - { &hf_h248_signalName, + { &hf_h248_iASignalName, { "signalName", "h248.signalName", FT_BYTES, BASE_HEX, NULL, 0, "IndAudSignal/signalName", HFILL }}, @@ -4762,7 +4693,7 @@ void proto_register_h248(void) { { "Item", "h248.observedEventLst_item", FT_NONE, BASE_NONE, NULL, 0, "ObservedEventsDescriptor/observedEventLst/_item", HFILL }}, - { &hf_h248_eventName1, + { &hf_h248_eventName, { "eventName", "h248.eventName", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }}, @@ -4778,6 +4709,18 @@ void proto_register_h248(void) { { "timeNotation", "h248.timeNotation", FT_NONE, BASE_NONE, NULL, 0, "ObservedEvent/timeNotation", HFILL }}, + { &hf_h248_relation, + { "relation", "h248.relation", + FT_UINT32, BASE_DEC, VALS(Relation_vals), 0, + "ExtraInfo/relation", HFILL }}, + { &hf_h248_range, + { "range", "h248.range", + FT_BOOLEAN, 8, NULL, 0, + "ExtraInfo/range", HFILL }}, + { &hf_h248_sublist, + { "sublist", "h248.sublist", + FT_BOOLEAN, 8, NULL, 0, + "ExtraInfo/sublist", HFILL }}, { &hf_h248_eventParameterName, { "eventParameterName", "h248.eventParameterName", FT_BYTES, BASE_HEX, NULL, 0, @@ -4788,19 +4731,7 @@ void proto_register_h248(void) { "", HFILL }}, { &hf_h248_extraInfo, { "extraInfo", "h248.extraInfo", - FT_UINT32, BASE_DEC, VALS(T_extraInfo_vals), 0, - "EventParameter/extraInfo", HFILL }}, - { &hf_h248_relation, - { "relation", "h248.relation", - FT_UINT32, BASE_DEC, VALS(Relation_vals), 0, - "", HFILL }}, - { &hf_h248_range, - { "range", "h248.range", - FT_BOOLEAN, 8, NULL, 0, - "", HFILL }}, - { &hf_h248_sublist, - { "sublist", "h248.sublist", - FT_BOOLEAN, 8, NULL, 0, + FT_UINT32, BASE_DEC, VALS(ExtraInfo_vals), 0, "", HFILL }}, { &hf_h248_serviceChangeParms, { "serviceChangeParms", "h248.serviceChangeParms", @@ -4822,7 +4753,7 @@ void proto_register_h248(void) { { "Item", "h248.wildcard_item", FT_BYTES, BASE_HEX, NULL, 0, "TerminationID/wildcard/_item", HFILL }}, - { &hf_h248_id1, + { &hf_h248_terminationId, { "id", "h248.id", FT_BYTES, BASE_HEX, NULL, 0, "TerminationID/id", HFILL }}, @@ -4830,59 +4761,59 @@ void proto_register_h248(void) { { "Item", "h248.TerminationIDList_item", FT_NONE, BASE_NONE, NULL, 0, "TerminationIDList/_item", HFILL }}, - { &hf_h248_termStateDescr1, + { &hf_h248_termStateDescr, { "termStateDescr", "h248.termStateDescr", FT_NONE, BASE_NONE, NULL, 0, "MediaDescriptor/termStateDescr", HFILL }}, - { &hf_h248_streams1, + { &hf_h248_streams, { "streams", "h248.streams", - FT_UINT32, BASE_DEC, VALS(T_streams1_vals), 0, + FT_UINT32, BASE_DEC, VALS(T_streams_vals), 0, "MediaDescriptor/streams", HFILL }}, - { &hf_h248_oneStream1, + { &hf_h248_mediaDescriptorOneStream, { "oneStream", "h248.oneStream", FT_NONE, BASE_NONE, NULL, 0, "MediaDescriptor/streams/oneStream", HFILL }}, - { &hf_h248_multiStream1, + { &hf_h248_mediaDescriptorMultiStream, { "multiStream", "h248.multiStream", FT_UINT32, BASE_DEC, NULL, 0, "MediaDescriptor/streams/multiStream", HFILL }}, - { &hf_h248_multiStream_item1, + { &hf_h248_mediaDescriptorMultiStream_item, { "Item", "h248.multiStream_item", FT_NONE, BASE_NONE, NULL, 0, "MediaDescriptor/streams/multiStream/_item", HFILL }}, - { &hf_h248_streamParms1, + { &hf_h248_streamParms, { "streamParms", "h248.streamParms", FT_NONE, BASE_NONE, NULL, 0, "StreamDescriptor/streamParms", HFILL }}, - { &hf_h248_localControlDescriptor1, + { &hf_h248_localControlDescriptor, { "localControlDescriptor", "h248.localControlDescriptor", FT_NONE, BASE_NONE, NULL, 0, "StreamParms/localControlDescriptor", HFILL }}, - { &hf_h248_localDescriptor1, + { &hf_h248_localDescriptor, { "localDescriptor", "h248.localDescriptor", FT_NONE, BASE_NONE, NULL, 0, "StreamParms/localDescriptor", HFILL }}, - { &hf_h248_remoteDescriptor1, + { &hf_h248_remoteDescriptor, { "remoteDescriptor", "h248.remoteDescriptor", FT_NONE, BASE_NONE, NULL, 0, "StreamParms/remoteDescriptor", HFILL }}, - { &hf_h248_streamMode1, + { &hf_h248_streamMode, { "streamMode", "h248.streamMode", FT_UINT32, BASE_DEC, VALS(StreamMode_vals), 0, "LocalControlDescriptor/streamMode", HFILL }}, - { &hf_h248_reserveValue1, + { &hf_h248_reserveValue, { "reserveValue", "h248.reserveValue", FT_BOOLEAN, 8, NULL, 0, "LocalControlDescriptor/reserveValue", HFILL }}, - { &hf_h248_reserveGroup1, + { &hf_h248_reserveGroup, { "reserveGroup", "h248.reserveGroup", FT_BOOLEAN, 8, NULL, 0, "LocalControlDescriptor/reserveGroup", HFILL }}, - { &hf_h248_propertyParms1, + { &hf_h248_propertyParms, { "propertyParms", "h248.propertyParms", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, - { &hf_h248_propertyParms_item1, + { &hf_h248_propertyParms_item, { "Item", "h248.propertyParms_item", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }}, @@ -4890,7 +4821,7 @@ void proto_register_h248(void) { { "propertyName", "h248.propertyName", FT_BYTES, BASE_HEX, NULL, 0, "PropertyParm/propertyName", HFILL }}, - { &hf_h248_value1, + { &hf_h248_propertyParamValue, { "value", "h248.value", FT_UINT32, BASE_DEC, NULL, 0, "PropertyParm/value", HFILL }}, @@ -4898,11 +4829,7 @@ void proto_register_h248(void) { { "Item", "h248.value_item", FT_BYTES, BASE_HEX, NULL, 0, "PropertyParm/value/_item", HFILL }}, - { &hf_h248_extraInfo1, - { "extraInfo", "h248.extraInfo", - FT_UINT32, BASE_DEC, VALS(T_extraInfo1_vals), 0, - "PropertyParm/extraInfo", HFILL }}, - { &hf_h248_propGrps1, + { &hf_h248_propGrps, { "propGrps", "h248.propGrps", FT_UINT32, BASE_DEC, NULL, 0, "LocalRemoteDescriptor/propGrps", HFILL }}, @@ -4914,11 +4841,11 @@ void proto_register_h248(void) { { "Item", "h248.PropertyGroup_item", FT_NONE, BASE_NONE, NULL, 0, "PropertyGroup/_item", HFILL }}, - { &hf_h248_eventBufferControl1, + { &hf_h248_tSEventBufferControl, { "eventBufferControl", "h248.eventBufferControl", FT_UINT32, BASE_DEC, VALS(EventBufferControl_vals), 0, "TerminationStateDescriptor/eventBufferControl", HFILL }}, - { &hf_h248_serviceState1, + { &hf_h248_serviceState, { "serviceState", "h248.serviceState", FT_UINT32, BASE_DEC, VALS(ServiceState_vals), 0, "TerminationStateDescriptor/serviceState", HFILL }}, @@ -4942,11 +4869,7 @@ void proto_register_h248(void) { { "eventList", "h248.eventList", FT_UINT32, BASE_DEC, NULL, 0, "EventsDescriptor/eventList", HFILL }}, - { &hf_h248_eventList_item, - { "Item", "h248.eventList_item", - FT_NONE, BASE_NONE, NULL, 0, - "EventsDescriptor/eventList/_item", HFILL }}, - { &hf_h248_pkgdName1, + { &hf_h248_pkgdName, { "pkgdName", "h248.pkgdName", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }}, @@ -4962,6 +4885,10 @@ void proto_register_h248(void) { { "Item", "h248.evParList_item", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }}, + { &hf_h248_RequestedEvents_item, + { "Item", "h248.RequestedEvents_item", + FT_NONE, BASE_NONE, NULL, 0, + "RequestedEvents/_item", HFILL }}, { &hf_h248_keepActive, { "keepActive", "h248.keepActive", FT_BOOLEAN, 8, NULL, 0, @@ -4978,15 +4905,15 @@ void proto_register_h248(void) { { "digitMapValue", "h248.digitMapValue", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }}, - { &hf_h248_eventList1, + { &hf_h248_secondaryEventList, { "eventList", "h248.eventList", FT_UINT32, BASE_DEC, NULL, 0, "SecondEventsDescriptor/eventList", HFILL }}, - { &hf_h248_eventList_item1, + { &hf_h248_eventList_item, { "Item", "h248.eventList_item", FT_NONE, BASE_NONE, NULL, 0, "SecondEventsDescriptor/eventList/_item", HFILL }}, - { &hf_h248_eventAction1, + { &hf_h248_secondaryEventAction, { "eventAction", "h248.eventAction", FT_NONE, BASE_NONE, NULL, 0, "SecondRequestedEvent/eventAction", HFILL }}, @@ -4998,15 +4925,15 @@ void proto_register_h248(void) { { "Item", "h248.SignalsDescriptor_item", FT_UINT32, BASE_DEC, VALS(SignalRequest_vals), 0, "SignalsDescriptor/_item", HFILL }}, - { &hf_h248_signal1, + { &hf_h248_signal, { "signal", "h248.signal", FT_NONE, BASE_NONE, NULL, 0, "SignalRequest/signal", HFILL }}, - { &hf_h248_seqSigList1, + { &hf_h248_seqSigList, { "seqSigList", "h248.seqSigList", FT_NONE, BASE_NONE, NULL, 0, "SignalRequest/seqSigList", HFILL }}, - { &hf_h248_signalList1, + { &hf_h248_signalList, { "signalList", "h248.signalList", FT_UINT32, BASE_DEC, NULL, 0, "SeqSigList/signalList", HFILL }}, @@ -5014,7 +4941,7 @@ void proto_register_h248(void) { { "Item", "h248.signalList_item", FT_NONE, BASE_NONE, NULL, 0, "SeqSigList/signalList/_item", HFILL }}, - { &hf_h248_signalName1, + { &hf_h248_signalName, { "signalName", "h248.signalName", FT_BYTES, BASE_HEX, NULL, 0, "Signal/signalName", HFILL }}, @@ -5042,10 +4969,6 @@ void proto_register_h248(void) { { "sigParameterName", "h248.sigParameterName", FT_BYTES, BASE_HEX, NULL, 0, "SigParameter/sigParameterName", HFILL }}, - { &hf_h248_extraInfo2, - { "extraInfo", "h248.extraInfo", - FT_UINT32, BASE_DEC, VALS(T_extraInfo2_vals), 0, - "SigParameter/extraInfo", HFILL }}, { &hf_h248_mtl, { "mtl", "h248.mtl", FT_UINT32, BASE_DEC, NULL, 0, @@ -5118,10 +5041,6 @@ void proto_register_h248(void) { { "serviceChangeInfo", "h248.serviceChangeInfo", FT_NONE, BASE_NONE, NULL, 0, "ServiceChangeParm/serviceChangeInfo", HFILL }}, - { &hf_h248_mtpAddress1, - { "mtpAddress", "h248.mtpAddress", - FT_BYTES, BASE_HEX, NULL, 0, - "ServiceChangeAddress/mtpAddress", HFILL }}, { &hf_h248_timestamp, { "timestamp", "h248.timestamp", FT_NONE, BASE_NONE, NULL, 0, @@ -5304,13 +5223,13 @@ void proto_register_h248(void) { &ett_h248_SEQUNCE_OF_IndAuditParameter, &ett_h248_IndAuditParameter, &ett_h248_IndAudMediaDescriptor, - &ett_h248_T_streams, + &ett_h248_indAudMediaDescriptorStreams, &ett_h248_SEQUNCE_OF_IndAudStreamDescriptor, &ett_h248_IndAudStreamDescriptor, &ett_h248_IndAudStreamParms, &ett_h248_IndAudLocalControlDescriptor, - &ett_h248_SEQUNCE_OF_IndAudPropertyParm, &ett_h248_IndAudPropertyParm, + &ett_h248_IndAudPropertyParms, &ett_h248_IndAudLocalRemoteDescriptor, &ett_h248_IndAudPropertyGroup, &ett_h248_IndAudTerminationStateDescriptor, @@ -5328,8 +5247,8 @@ void proto_register_h248(void) { &ett_h248_SEQUNCE_OF_ObservedEvent, &ett_h248_ObservedEvent, &ett_h248_SEQUNCE_OF_EventParameter, + &ett_h248_ExtraInfo, &ett_h248_EventParameter, - &ett_h248_T_extraInfo, &ett_h248_ServiceChangeRequest, &ett_h248_ServiceChangeReply, &ett_h248_ServiceChangeResult, @@ -5337,7 +5256,7 @@ void proto_register_h248(void) { &ett_h248_SEQUNCE_OF_WildcardField, &ett_h248_TerminationIDList, &ett_h248_MediaDescriptor, - &ett_h248_T_streams1, + &ett_h248_T_streams, &ett_h248_SEQUNCE_OF_StreamDescriptor, &ett_h248_StreamDescriptor, &ett_h248_StreamParms, @@ -5345,7 +5264,6 @@ void proto_register_h248(void) { &ett_h248_SEQUNCE_OF_PropertyParm, &ett_h248_PropertyParm, &ett_h248_SEQUNCE_OF_PropertyID, - &ett_h248_T_extraInfo1, &ett_h248_LocalRemoteDescriptor, &ett_h248_SEQUNCE_OF_PropertyGroup, &ett_h248_PropertyGroup, @@ -5353,8 +5271,8 @@ void proto_register_h248(void) { &ett_h248_MuxDescriptor, &ett_h248_SEQUNCE_OF_TerminationID, &ett_h248_EventsDescriptor, - &ett_h248_SEQUNCE_OF_RequestedEvent, &ett_h248_RequestedEvent, + &ett_h248_RequestedEvents, &ett_h248_RequestedActions, &ett_h248_EventDM, &ett_h248_SecondEventsDescriptor, @@ -5371,7 +5289,6 @@ void proto_register_h248(void) { &ett_h248_SEQUNCE_OF_SigParameter, &ett_h248_NotifyCompletion, &ett_h248_SigParameter, - &ett_h248_T_extraInfo2, &ett_h248_ModemDescriptor, &ett_h248_SEQUNCE_OF_ModemType, &ett_h248_DigitMapDescriptor, |