diff options
| -rw-r--r-- | asn1/h450/packet-h450-template.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-h225.c | 108 | ||||
| -rw-r--r-- | epan/dissectors/packet-h235.c | 10 | ||||
| -rw-r--r-- | epan/dissectors/packet-h245.c | 318 | ||||
| -rw-r--r-- | epan/dissectors/packet-h450.c | 78 | ||||
| -rw-r--r-- | epan/dissectors/packet-per.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-per.h | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-t38.c | 12 | ||||
| -rwxr-xr-x | tools/asn2eth.py | 7 |
9 files changed, 272 insertions, 273 deletions
diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c index 5ead752ebe..c8884d2ffa 100644 --- a/asn1/h450/packet-h450-template.c +++ b/asn1/h450/packet-h450-template.c @@ -444,7 +444,7 @@ static const per_choice_t opcode_choice[] = { static int dissect_h4501_opcode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h4501_opcode, ett_h4501_opcode, opcode_choice, "Opcode", NULL); + offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h4501_opcode, ett_h4501_opcode, opcode_choice, NULL); return offset; } @@ -540,7 +540,7 @@ static const per_choice_t errorCode_choice[] = { static int dissect_h4501_errorCode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h4501_errorCode, ett_h4501_errorCode, errorCode_choice, "errorCode", NULL); + offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h4501_errorCode, ett_h4501_errorCode, errorCode_choice, NULL); return offset; } @@ -565,7 +565,7 @@ static const per_choice_t problem_choice[] = { static int dissect_h4501_problem(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h4501_problem, ett_h4501_problem, problem_choice, "problem", NULL); + offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h4501_problem, ett_h4501_problem, problem_choice, NULL); return offset; } static int @@ -666,7 +666,7 @@ static const per_choice_t ROS_choice[] = { static int dissect_h4501_ROS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h4501_ROS, ett_h4501_ROS, ROS_choice, "ROS", NULL); + offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h4501_ROS, ett_h4501_ROS, ROS_choice, NULL); return offset; } diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index edd7ae8134..286e6902e6 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* ./packet-h225.c */ +/* .\packet-h225.c */ /* ../../tools/asn2eth.py -X -e -p h225 -c h225.cnf -s packet-h225-template h225.asn */ /* Input file: packet-h225-template.c */ @@ -1865,7 +1865,7 @@ static const per_choice_t T_h245routing_choice[] = { static int dissect_h225_T_h245routing(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_T_h245routing, T_h245routing_choice, "T_h245routing", + ett_h225_T_h245routing, T_h245routing_choice, NULL); return offset; @@ -2098,7 +2098,7 @@ dissect_h225_NonStandardIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo h221NonStandard = 0; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_NonStandardIdentifier, NonStandardIdentifier_choice, "NonStandardIdentifier", + ett_h225_NonStandardIdentifier, NonStandardIdentifier_choice, &value); switch (value) { @@ -2203,7 +2203,7 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb, int offset, packet_info *pinfo ipv4_port=0; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_H245TransportAddress, H245TransportAddress_choice, "H245TransportAddress", + ett_h225_H245TransportAddress, H245TransportAddress_choice, NULL); /* we need this info for TAPing */ @@ -2353,7 +2353,7 @@ static const per_choice_t T_routing_choice[] = { static int dissect_h225_T_routing(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_T_routing, T_routing_choice, "T_routing", + ett_h225_T_routing, T_routing_choice, NULL); return offset; @@ -2445,7 +2445,7 @@ static const per_choice_t TransportAddress_choice[] = { static int dissect_h225_TransportAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_TransportAddress, TransportAddress_choice, "TransportAddress", + ett_h225_TransportAddress, TransportAddress_choice, NULL); return offset; @@ -2532,7 +2532,7 @@ static const per_choice_t PublicTypeOfNumber_choice[] = { static int dissect_h225_PublicTypeOfNumber(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_PublicTypeOfNumber, PublicTypeOfNumber_choice, "PublicTypeOfNumber", + ett_h225_PublicTypeOfNumber, PublicTypeOfNumber_choice, NULL); return offset; @@ -2609,7 +2609,7 @@ static const per_choice_t PrivateTypeOfNumber_choice[] = { static int dissect_h225_PrivateTypeOfNumber(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_PrivateTypeOfNumber, PrivateTypeOfNumber_choice, "PrivateTypeOfNumber", + ett_h225_PrivateTypeOfNumber, PrivateTypeOfNumber_choice, NULL); return offset; @@ -2658,7 +2658,7 @@ static const per_choice_t PartyNumber_choice[] = { int dissect_h225_PartyNumber(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_PartyNumber, PartyNumber_choice, "PartyNumber", + ett_h225_PartyNumber, PartyNumber_choice, NULL); return offset; @@ -2745,7 +2745,7 @@ static const per_choice_t T_system_id_choice[] = { static int dissect_h225_T_system_id(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_T_system_id, T_system_id_choice, "T_system_id", + ett_h225_T_system_id, T_system_id_choice, NULL); return offset; @@ -2852,7 +2852,7 @@ static const per_choice_t MobileUIM_choice[] = { static int dissect_h225_MobileUIM(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_MobileUIM, MobileUIM_choice, "MobileUIM", + ett_h225_MobileUIM, MobileUIM_choice, NULL); return offset; @@ -2887,7 +2887,7 @@ static const per_choice_t AliasAddress_choice[] = { int dissect_h225_AliasAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_AliasAddress, AliasAddress_choice, "AliasAddress", + ett_h225_AliasAddress, AliasAddress_choice, NULL); return offset; @@ -3467,7 +3467,7 @@ static const per_choice_t SupportedProtocols_choice[] = { static int dissect_h225_SupportedProtocols(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_SupportedProtocols, SupportedProtocols_choice, "SupportedProtocols", + ett_h225_SupportedProtocols, SupportedProtocols_choice, NULL); return offset; @@ -3817,7 +3817,7 @@ static const per_choice_t TunnelledProtocol_id_choice[] = { static int dissect_h225_TunnelledProtocol_id(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_TunnelledProtocol_id, TunnelledProtocol_id_choice, "TunnelledProtocol_id", + ett_h225_TunnelledProtocol_id, TunnelledProtocol_id_choice, NULL); return offset; @@ -3997,7 +3997,7 @@ static const per_choice_t T_conferenceGoal_choice[] = { static int dissect_h225_T_conferenceGoal(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_T_conferenceGoal, T_conferenceGoal_choice, "T_conferenceGoal", + ett_h225_T_conferenceGoal, T_conferenceGoal_choice, NULL); return offset; @@ -4068,7 +4068,7 @@ static const per_choice_t CallType_choice[] = { static int dissect_h225_CallType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_CallType, CallType_choice, "CallType", + ett_h225_CallType, CallType_choice, NULL); return offset; @@ -4127,7 +4127,7 @@ static const per_choice_t SecurityServiceMode_choice[] = { static int dissect_h225_SecurityServiceMode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_SecurityServiceMode, SecurityServiceMode_choice, "SecurityServiceMode", + ett_h225_SecurityServiceMode, SecurityServiceMode_choice, NULL); return offset; @@ -4185,7 +4185,7 @@ static const per_choice_t H245Security_choice[] = { static int dissect_h225_H245Security(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_H245Security, H245Security_choice, "H245Security", + ett_h225_H245Security, H245Security_choice, NULL); return offset; @@ -4311,7 +4311,7 @@ static const per_choice_t CryptoH323Token_choice[] = { static int dissect_h225_CryptoH323Token(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_CryptoH323Token, CryptoH323Token_choice, "CryptoH323Token", + ett_h225_CryptoH323Token, CryptoH323Token_choice, NULL); return offset; @@ -4417,7 +4417,7 @@ static const per_choice_t ScnConnectionType_choice[] = { static int dissect_h225_ScnConnectionType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_ScnConnectionType, ScnConnectionType_choice, "ScnConnectionType", + ett_h225_ScnConnectionType, ScnConnectionType_choice, NULL); return offset; @@ -4450,7 +4450,7 @@ static const per_choice_t ScnConnectionAggregation_choice[] = { static int dissect_h225_ScnConnectionAggregation(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_ScnConnectionAggregation, ScnConnectionAggregation_choice, "ScnConnectionAggregation", + ett_h225_ScnConnectionAggregation, ScnConnectionAggregation_choice, NULL); return offset; @@ -4525,7 +4525,7 @@ static const per_choice_t PresentationIndicator_choice[] = { int dissect_h225_PresentationIndicator(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_PresentationIndicator, PresentationIndicator_choice, "PresentationIndicator", + ett_h225_PresentationIndicator, PresentationIndicator_choice, NULL); return offset; @@ -4629,7 +4629,7 @@ static const per_choice_t T_billingMode_choice[] = { static int dissect_h225_T_billingMode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_T_billingMode, T_billingMode_choice, "T_billingMode", + ett_h225_T_billingMode, T_billingMode_choice, NULL); return offset; @@ -4670,7 +4670,7 @@ static const per_choice_t CallCreditServiceControl_callStartingPoint_choice[] = static int dissect_h225_CallCreditServiceControl_callStartingPoint(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_CallCreditServiceControl_callStartingPoint, CallCreditServiceControl_callStartingPoint_choice, "CallCreditServiceControl_callStartingPoint", + ett_h225_CallCreditServiceControl_callStartingPoint, CallCreditServiceControl_callStartingPoint_choice, NULL); return offset; @@ -4720,7 +4720,7 @@ static const per_choice_t ServiceControlDescriptor_choice[] = { static int dissect_h225_ServiceControlDescriptor(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_ServiceControlDescriptor, ServiceControlDescriptor_choice, "ServiceControlDescriptor", + ett_h225_ServiceControlDescriptor, ServiceControlDescriptor_choice, NULL); return offset; @@ -4747,7 +4747,7 @@ static const per_choice_t ServiceControlSession_reason_choice[] = { static int dissect_h225_ServiceControlSession_reason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_ServiceControlSession_reason, ServiceControlSession_reason_choice, "ServiceControlSession_reason", + ett_h225_ServiceControlSession_reason, ServiceControlSession_reason_choice, NULL); return offset; @@ -5151,7 +5151,7 @@ static const per_choice_t GenericIdentifier_choice[] = { static int dissect_h225_GenericIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_GenericIdentifier, GenericIdentifier_choice, "GenericIdentifier", + ett_h225_GenericIdentifier, GenericIdentifier_choice, NULL); return offset; @@ -5278,7 +5278,7 @@ static const per_choice_t Content_choice[] = { static int dissect_h225_Content(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_Content, Content_choice, "Content", + ett_h225_Content, Content_choice, NULL); return offset; @@ -5742,7 +5742,7 @@ static const per_choice_t SecurityErrors_choice[] = { static int dissect_h225_SecurityErrors(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_SecurityErrors, SecurityErrors_choice, "SecurityErrors", + ett_h225_SecurityErrors, SecurityErrors_choice, NULL); return offset; @@ -5821,7 +5821,7 @@ dissect_h225_ReleaseCompleteReason(tvbuff_t *tvb, int offset, packet_info *pinfo guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_ReleaseCompleteReason, ReleaseCompleteReason_choice, "ReleaseCompleteReason", + ett_h225_ReleaseCompleteReason, ReleaseCompleteReason_choice, &value); h225_pi->reason = value; @@ -5898,7 +5898,7 @@ dissect_h225_FacilityReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, p guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_FacilityReason, FacilityReason_choice, "FacilityReason", + ett_h225_FacilityReason, FacilityReason_choice, &value); h225_pi->reason = value; @@ -6154,7 +6154,7 @@ dissect_h225_T_h323_message_body(tvbuff_t *tvb, int offset, packet_info *pinfo _ contains_faststart = FALSE; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_T_h323_message_body, T_h323_message_body_choice, "T_h323_message_body", + ett_h225_T_h323_message_body, T_h323_message_body_choice, &message_body_val); if (check_col(pinfo->cinfo, COL_INFO)){ @@ -6492,7 +6492,7 @@ static const per_choice_t AddressPattern_choice[] = { static int dissect_h225_AddressPattern(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_AddressPattern, AddressPattern_choice, "AddressPattern", + ett_h225_AddressPattern, AddressPattern_choice, NULL); return offset; @@ -6613,7 +6613,7 @@ static const per_choice_t UseSpecifiedTransport_choice[] = { static int dissect_h225_UseSpecifiedTransport(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_UseSpecifiedTransport, UseSpecifiedTransport_choice, "UseSpecifiedTransport", + ett_h225_UseSpecifiedTransport, UseSpecifiedTransport_choice, NULL); return offset; @@ -6700,7 +6700,7 @@ static const per_choice_t SecurityErrors2_choice[] = { static int dissect_h225_SecurityErrors2(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_SecurityErrors2, SecurityErrors2_choice, "SecurityErrors2", + ett_h225_SecurityErrors2, SecurityErrors2_choice, NULL); return offset; @@ -6764,7 +6764,7 @@ static const per_choice_t EncryptIntAlg_choice[] = { static int dissect_h225_EncryptIntAlg(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_EncryptIntAlg, EncryptIntAlg_choice, "EncryptIntAlg", + ett_h225_EncryptIntAlg, EncryptIntAlg_choice, NULL); return offset; @@ -6796,7 +6796,7 @@ static const per_choice_t NonIsoIntegrityMechanism_choice[] = { static int dissect_h225_NonIsoIntegrityMechanism(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_NonIsoIntegrityMechanism, NonIsoIntegrityMechanism_choice, "NonIsoIntegrityMechanism", + ett_h225_NonIsoIntegrityMechanism, NonIsoIntegrityMechanism_choice, NULL); return offset; @@ -6825,7 +6825,7 @@ static const per_choice_t IntegrityMechanism_choice[] = { static int dissect_h225_IntegrityMechanism(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_IntegrityMechanism, IntegrityMechanism_choice, "IntegrityMechanism", + ett_h225_IntegrityMechanism, IntegrityMechanism_choice, NULL); return offset; @@ -7057,7 +7057,7 @@ static const per_choice_t CallTerminationCause_choice[] = { static int dissect_h225_CallTerminationCause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_CallTerminationCause, CallTerminationCause_choice, "CallTerminationCause", + ett_h225_CallTerminationCause, CallTerminationCause_choice, NULL); return offset; @@ -7376,7 +7376,7 @@ dissect_h225_GatekeeperRejectReason(tvbuff_t *tvb, int offset, packet_info *pinf guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_GatekeeperRejectReason, GatekeeperRejectReason_choice, "GatekeeperRejectReason", + ett_h225_GatekeeperRejectReason, GatekeeperRejectReason_choice, &value); h225_pi->reason = value; @@ -7666,7 +7666,7 @@ dissect_h225_RegistrationRejectReason(tvbuff_t *tvb, int offset, packet_info *pi guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_RegistrationRejectReason, RegistrationRejectReason_choice, "RegistrationRejectReason", + ett_h225_RegistrationRejectReason, RegistrationRejectReason_choice, &value); h225_pi->reason = value; @@ -7730,7 +7730,7 @@ dissect_h225_UnregRequestReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_UnregRequestReason, UnregRequestReason_choice, "UnregRequestReason", + ett_h225_UnregRequestReason, UnregRequestReason_choice, &value); h225_pi->reason = value; @@ -7820,7 +7820,7 @@ dissect_h225_UnregRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_ guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_UnregRejectReason, UnregRejectReason_choice, "UnregRejectReason", + ett_h225_UnregRejectReason, UnregRejectReason_choice, &value); h225_pi->reason = value; @@ -7871,7 +7871,7 @@ static const per_choice_t CallModel_choice[] = { static int dissect_h225_CallModel(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_CallModel, CallModel_choice, "CallModel", + ett_h225_CallModel, CallModel_choice, NULL); return offset; @@ -7928,7 +7928,7 @@ static const per_choice_t TransportQOS_choice[] = { static int dissect_h225_TransportQOS(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_TransportQOS, TransportQOS_choice, "TransportQOS", + ett_h225_TransportQOS, TransportQOS_choice, NULL); return offset; @@ -8141,7 +8141,7 @@ dissect_h225_AdmissionRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_AdmissionRejectReason, AdmissionRejectReason_choice, "AdmissionRejectReason", + ett_h225_AdmissionRejectReason, AdmissionRejectReason_choice, &value); h225_pi->reason = value; @@ -8283,7 +8283,7 @@ dissect_h225_BandRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_BandRejectReason, BandRejectReason_choice, "BandRejectReason", + ett_h225_BandRejectReason, BandRejectReason_choice, &value); h225_pi->reason = value; @@ -8339,7 +8339,7 @@ dissect_h225_DisengageReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_DisengageReason, DisengageReason_choice, "DisengageReason", + ett_h225_DisengageReason, DisengageReason_choice, &value); h225_pi->reason = value; @@ -8432,7 +8432,7 @@ dissect_h225_DisengageRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_DisengageRejectReason, DisengageRejectReason_choice, "DisengageRejectReason", + ett_h225_DisengageRejectReason, DisengageRejectReason_choice, &value); h225_pi->reason = value; @@ -8587,7 +8587,7 @@ dissect_h225_LocationRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_LocationRejectReason, LocationRejectReason_choice, "LocationRejectReason", + ett_h225_LocationRejectReason, LocationRejectReason_choice, &value); h225_pi->reason = value; @@ -8812,7 +8812,7 @@ static const per_choice_t InfoRequestResponseStatus_choice[] = { static int dissect_h225_InfoRequestResponseStatus(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_InfoRequestResponseStatus, InfoRequestResponseStatus_choice, "InfoRequestResponseStatus", + ett_h225_InfoRequestResponseStatus, InfoRequestResponseStatus_choice, NULL); return offset; @@ -9012,7 +9012,7 @@ dissect_h225_InfoRequestNakReason(tvbuff_t *tvb, int offset, packet_info *pinfo guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_InfoRequestNakReason, InfoRequestNakReason_choice, "InfoRequestNakReason", + ett_h225_InfoRequestNakReason, InfoRequestNakReason_choice, &value); h225_pi->reason = value; @@ -9113,7 +9113,7 @@ static const per_choice_t T_result_choice[] = { static int dissect_h225_T_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_T_result, T_result_choice, "T_result", + ett_h225_T_result, T_result_choice, NULL); return offset; @@ -9242,7 +9242,7 @@ dissect_h225_RasMessage(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto guint32 rasmessage_value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_RasMessage, RasMessage_choice, "RasMessage", + ett_h225_RasMessage, RasMessage_choice, &rasmessage_value); if (check_col(pinfo->cinfo, COL_INFO)){ diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c index 22fc8c32ab..119325833c 100644 --- a/epan/dissectors/packet-h235.c +++ b/epan/dissectors/packet-h235.c @@ -469,7 +469,7 @@ static const per_choice_t ECKASDH_choice[] = { static int dissect_h235_ECKASDH(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h235_ECKASDH, ECKASDH_choice, "ECKASDH", + ett_h235_ECKASDH, ECKASDH_choice, NULL); return offset; @@ -545,7 +545,7 @@ static const per_choice_t AuthenticationBES_choice[] = { static int dissect_h235_AuthenticationBES(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h235_AuthenticationBES, AuthenticationBES_choice, "AuthenticationBES", + ett_h235_AuthenticationBES, AuthenticationBES_choice, NULL); return offset; @@ -582,7 +582,7 @@ static const per_choice_t AuthenticationMechanism_choice[] = { int dissect_h235_AuthenticationMechanism(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h235_AuthenticationMechanism, AuthenticationMechanism_choice, "AuthenticationMechanism", + ett_h235_AuthenticationMechanism, AuthenticationMechanism_choice, NULL); return offset; @@ -761,7 +761,7 @@ static const per_choice_t H235Key_choice[] = { static int dissect_h235_H235Key(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h235_H235Key, H235Key_choice, "H235Key", + ett_h235_H235Key, H235Key_choice, NULL); return offset; @@ -895,7 +895,7 @@ int dissect_h235_CryptoToken(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE); offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h235_CryptoToken, CryptoToken_choice, "CryptoToken", + ett_h235_CryptoToken, CryptoToken_choice, NULL); return offset; diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index f868b88ea2..d8c5465aa0 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* ./packet-h245.c */ +/* .\packet-h245.c */ /* ../../tools/asn2eth.py -X -e -p h245 -c h245.cnf -s packet-h245-template h245.asn */ /* Input file: packet-h245-template.c */ @@ -2252,7 +2252,7 @@ dissect_h245_NonStandardIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo h221NonStandard = 0; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_NonStandardIdentifier, NonStandardIdentifier_choice, "NonStandardIdentifier", + ett_h245_NonStandardIdentifier, NonStandardIdentifier_choice, &value); switch (value) { @@ -3380,7 +3380,7 @@ static const per_choice_t Avb_type_choice[] = { static int dissect_h245_Avb_type(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Avb_type, Avb_type_choice, "Avb_type", + ett_h245_Avb_type, Avb_type_choice, NULL); return offset; @@ -3454,7 +3454,7 @@ static const per_choice_t T_address_choice[] = { static int dissect_h245_T_address(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_address, T_address_choice, "T_address", + ett_h245_T_address, T_address_choice, NULL); return offset; @@ -4485,7 +4485,7 @@ static const per_choice_t T_h223MultiplexTableCapability_choice[] = { static int dissect_h245_T_h223MultiplexTableCapability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_h223MultiplexTableCapability, T_h223MultiplexTableCapability_choice, "T_h223MultiplexTableCapability", + ett_h245_T_h223MultiplexTableCapability, T_h223MultiplexTableCapability_choice, NULL); return offset; @@ -4815,7 +4815,7 @@ static const per_choice_t CompressionType_choice[] = { static int dissect_h245_CompressionType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_CompressionType, CompressionType_choice, "CompressionType", + ett_h245_CompressionType, CompressionType_choice, NULL); return offset; @@ -4848,7 +4848,7 @@ static const per_choice_t T_v76wCompression_choice[] = { static int dissect_h245_T_v76wCompression(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_v76wCompression, T_v76wCompression_choice, "T_v76wCompression", + ett_h245_T_v76wCompression, T_v76wCompression_choice, NULL); return offset; @@ -4897,7 +4897,7 @@ static const per_choice_t DataProtocolCapability_choice[] = { int dissect_h245_DataProtocolCapability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_DataProtocolCapability, DataProtocolCapability_choice, "DataProtocolCapability", + ett_h245_DataProtocolCapability, DataProtocolCapability_choice, NULL); return offset; @@ -4993,7 +4993,7 @@ static const per_choice_t T84Profile_choice[] = { static int dissect_h245_T84Profile(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T84Profile, T84Profile_choice, "T84Profile", + ett_h245_T84Profile, T84Profile_choice, NULL); return offset; @@ -5091,7 +5091,7 @@ static const per_choice_t T38FaxRateManagement_choice[] = { static int dissect_h245_T38FaxRateManagement(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T38FaxRateManagement, T38FaxRateManagement_choice, "T38FaxRateManagement", + ett_h245_T38FaxRateManagement, T38FaxRateManagement_choice, NULL); return offset; @@ -5132,7 +5132,7 @@ static const per_choice_t T_t38FaxUdpEC_choice[] = { static int dissect_h245_T_t38FaxUdpEC(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_t38FaxUdpEC, T_t38FaxUdpEC_choice, "T_t38FaxUdpEC", + ett_h245_T_t38FaxUdpEC, T_t38FaxUdpEC_choice, NULL); return offset; @@ -5289,7 +5289,7 @@ static const per_choice_t CapabilityIdentifier_choice[] = { static int dissect_h245_CapabilityIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_CapabilityIdentifier, CapabilityIdentifier_choice, "CapabilityIdentifier", + ett_h245_CapabilityIdentifier, CapabilityIdentifier_choice, NULL); return offset; @@ -5383,7 +5383,7 @@ static const per_choice_t ParameterIdentifier_choice[] = { static int dissect_h245_ParameterIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_ParameterIdentifier, ParameterIdentifier_choice, "ParameterIdentifier", + ett_h245_ParameterIdentifier, ParameterIdentifier_choice, NULL); return offset; @@ -5448,7 +5448,7 @@ static const per_choice_t ParameterValue_choice[] = { static int dissect_h245_ParameterValue(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_ParameterValue, ParameterValue_choice, "ParameterValue", + ett_h245_ParameterValue, ParameterValue_choice, NULL); return offset; @@ -5580,7 +5580,7 @@ dissect_h245_Application(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Application, Application_choice, "Application", + ett_h245_Application, Application_choice, &value); codec_type = val_to_str(value, h245_Application_vals, "<unknown>"); @@ -5758,7 +5758,7 @@ static const per_choice_t T_payloadDescriptor_choice[] = { static int dissect_h245_T_payloadDescriptor(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_payloadDescriptor, T_payloadDescriptor_choice, "T_payloadDescriptor", + ett_h245_T_payloadDescriptor, T_payloadDescriptor_choice, NULL); return offset; @@ -5839,7 +5839,7 @@ static const per_choice_t QOSMode_choice[] = { static int dissect_h245_QOSMode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_QOSMode, QOSMode_choice, "QOSMode", + ett_h245_QOSMode, QOSMode_choice, NULL); return offset; @@ -5998,7 +5998,7 @@ static const per_choice_t MediaTransportType_choice[] = { static int dissect_h245_MediaTransportType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_MediaTransportType, MediaTransportType_choice, "MediaTransportType", + ett_h245_MediaTransportType, MediaTransportType_choice, NULL); return offset; @@ -6166,7 +6166,7 @@ static const per_choice_t T_frameToThreadMapping_choice[] = { static int dissect_h245_T_frameToThreadMapping(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_frameToThreadMapping, T_frameToThreadMapping_choice, "T_frameToThreadMapping", + ett_h245_T_frameToThreadMapping, T_frameToThreadMapping_choice, NULL); return offset; @@ -6230,7 +6230,7 @@ static const per_choice_t RedundancyEncodingMethod_choice[] = { static int dissect_h245_RedundancyEncodingMethod(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_RedundancyEncodingMethod, RedundancyEncodingMethod_choice, "RedundancyEncodingMethod", + ett_h245_RedundancyEncodingMethod, RedundancyEncodingMethod_choice, NULL); return offset; @@ -6374,7 +6374,7 @@ static const per_choice_t MultiplexCapability_choice[] = { static int dissect_h245_MultiplexCapability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_MultiplexCapability, MultiplexCapability_choice, "MultiplexCapability", + ett_h245_MultiplexCapability, MultiplexCapability_choice, NULL); return offset; @@ -6657,7 +6657,7 @@ static const per_choice_t T_videoBackChannelSend_choice[] = { static int dissect_h245_T_videoBackChannelSend(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_videoBackChannelSend, T_videoBackChannelSend_choice, "T_videoBackChannelSend", + ett_h245_T_videoBackChannelSend, T_videoBackChannelSend_choice, NULL); return offset; @@ -6991,7 +6991,7 @@ static const per_choice_t T_pixelAspectInformation_choice[] = { static int dissect_h245_T_pixelAspectInformation(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_pixelAspectInformation, T_pixelAspectInformation_choice, "T_pixelAspectInformation", + ett_h245_T_pixelAspectInformation, T_pixelAspectInformation_choice, NULL); return offset; @@ -7469,7 +7469,7 @@ dissect_h245_VideoCapability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_VideoCapability, VideoCapability_choice, "VideoCapability", + ett_h245_VideoCapability, VideoCapability_choice, &value); codec_type = val_to_str(value, h245_VideoCapability_vals, "<unknown>"); @@ -7852,7 +7852,7 @@ dissect_h245_AudioCapability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_AudioCapability, AudioCapability_choice, "AudioCapability", + ett_h245_AudioCapability, AudioCapability_choice, &value); codec_type = val_to_str(value, h245_AudioCapability_short_vals, "<unknown>"); @@ -7931,7 +7931,7 @@ static const per_choice_t MediaEncryptionAlgorithm_choice[] = { static int dissect_h245_MediaEncryptionAlgorithm(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_MediaEncryptionAlgorithm, MediaEncryptionAlgorithm_choice, "MediaEncryptionAlgorithm", + ett_h245_MediaEncryptionAlgorithm, MediaEncryptionAlgorithm_choice, NULL); return offset; @@ -8080,7 +8080,7 @@ static const per_choice_t UserInputCapability_choice[] = { static int dissect_h245_UserInputCapability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_UserInputCapability, UserInputCapability_choice, "UserInputCapability", + ett_h245_UserInputCapability, UserInputCapability_choice, NULL); return offset; @@ -8113,7 +8113,7 @@ static const per_choice_t MultiplexFormat_choice[] = { static int dissect_h245_MultiplexFormat(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_MultiplexFormat, MultiplexFormat_choice, "MultiplexFormat", + ett_h245_MultiplexFormat, MultiplexFormat_choice, NULL); return offset; @@ -8291,7 +8291,7 @@ static const per_choice_t FECCapability_choice[] = { static int dissect_h245_FECCapability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_FECCapability, FECCapability_choice, "FECCapability", + ett_h245_FECCapability, FECCapability_choice, NULL); return offset; @@ -8381,7 +8381,7 @@ static const per_choice_t Capability_choice[] = { static int dissect_h245_Capability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Capability, Capability_choice, "Capability", + ett_h245_Capability, Capability_choice, NULL); return offset; @@ -8561,7 +8561,7 @@ static const per_choice_t EncryptionMode_choice[] = { static int dissect_h245_EncryptionMode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_EncryptionMode, EncryptionMode_choice, "EncryptionMode", + ett_h245_EncryptionMode, EncryptionMode_choice, NULL); return offset; @@ -8749,7 +8749,7 @@ static const per_choice_t SeparateStream_choice[] = { static int dissect_h245_SeparateStream(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_SeparateStream, SeparateStream_choice, "SeparateStream", + ett_h245_SeparateStream, SeparateStream_choice, NULL); return offset; @@ -8774,7 +8774,7 @@ static const per_choice_t FECdata_mode_choice[] = { static int dissect_h245_FECdata_mode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_FECdata_mode, FECdata_mode_choice, "FECdata_mode", + ett_h245_FECdata_mode, FECdata_mode_choice, NULL); return offset; @@ -8814,7 +8814,7 @@ static const per_choice_t FECData_choice[] = { static int dissect_h245_FECData(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_FECData, FECData_choice, "FECData", + ett_h245_FECData, FECData_choice, NULL); return offset; @@ -8849,7 +8849,7 @@ static const per_choice_t T_mediaType_choice[] = { static int dissect_h245_T_mediaType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_mediaType, T_mediaType_choice, "T_mediaType", + ett_h245_T_mediaType, T_mediaType_choice, NULL); return offset; @@ -8933,7 +8933,7 @@ static const per_choice_t DataType_choice[] = { static int dissect_h245_DataType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_DataType, DataType_choice, "DataType", + ett_h245_DataType, DataType_choice, NULL); return offset; @@ -9023,7 +9023,7 @@ static const per_choice_t T_transferMode_choice[] = { static int dissect_h245_T_transferMode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_transferMode, T_transferMode_choice, "T_transferMode", + ett_h245_T_transferMode, T_transferMode_choice, NULL); return offset; @@ -9048,7 +9048,7 @@ static const per_choice_t AL1HeaderFEC_choice[] = { static int dissect_h245_AL1HeaderFEC(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_AL1HeaderFEC, AL1HeaderFEC_choice, "AL1HeaderFEC", + ett_h245_AL1HeaderFEC, AL1HeaderFEC_choice, NULL); return offset; @@ -9085,7 +9085,7 @@ static const per_choice_t AL1CrcLength_choice[] = { static int dissect_h245_AL1CrcLength(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_AL1CrcLength, AL1CrcLength_choice, "AL1CrcLength", + ett_h245_AL1CrcLength, AL1CrcLength_choice, NULL); return offset; @@ -9136,7 +9136,7 @@ static const per_choice_t T_numberOfRetransmissions_choice[] = { static int dissect_h245_T_numberOfRetransmissions(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_numberOfRetransmissions, T_numberOfRetransmissions_choice, "T_numberOfRetransmissions", + ett_h245_T_numberOfRetransmissions, T_numberOfRetransmissions_choice, NULL); return offset; @@ -9184,7 +9184,7 @@ static const per_choice_t ArqType_choice[] = { static int dissect_h245_ArqType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_ArqType, ArqType_choice, "ArqType", + ett_h245_ArqType, ArqType_choice, NULL); return offset; @@ -9233,7 +9233,7 @@ static const per_choice_t AL2HeaderFEC_choice[] = { static int dissect_h245_AL2HeaderFEC(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_AL2HeaderFEC, AL2HeaderFEC_choice, "AL2HeaderFEC", + ett_h245_AL2HeaderFEC, AL2HeaderFEC_choice, NULL); return offset; @@ -9276,7 +9276,7 @@ static const per_choice_t T_headerFormat_choice[] = { static int dissect_h245_T_headerFormat(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_headerFormat, T_headerFormat_choice, "T_headerFormat", + ett_h245_T_headerFormat, T_headerFormat_choice, NULL); return offset; @@ -9313,7 +9313,7 @@ static const per_choice_t AL3CrcLength_choice[] = { static int dissect_h245_AL3CrcLength(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_AL3CrcLength, AL3CrcLength_choice, "AL3CrcLength", + ett_h245_AL3CrcLength, AL3CrcLength_choice, NULL); return offset; @@ -9374,7 +9374,7 @@ static const per_choice_t T_adaptationLayerType_choice[] = { static int dissect_h245_T_adaptationLayerType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_adaptationLayerType, T_adaptationLayerType_choice, "T_adaptationLayerType", + ett_h245_T_adaptationLayerType, T_adaptationLayerType_choice, NULL); return offset; @@ -9419,7 +9419,7 @@ static const per_choice_t CRCLength_choice[] = { static int dissect_h245_CRCLength(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_CRCLength, CRCLength_choice, "CRCLength", + ett_h245_CRCLength, CRCLength_choice, NULL); return offset; @@ -9465,7 +9465,7 @@ static const per_choice_t T_suspendResume_choice[] = { static int dissect_h245_T_suspendResume(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_suspendResume, T_suspendResume_choice, "T_suspendResume", + ett_h245_T_suspendResume, T_suspendResume_choice, NULL); return offset; @@ -9492,7 +9492,7 @@ static const per_choice_t T_recovery_choice[] = { static int dissect_h245_T_recovery(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_recovery, T_recovery_choice, "T_recovery", + ett_h245_T_recovery, T_recovery_choice, NULL); return offset; @@ -9535,7 +9535,7 @@ static const per_choice_t V76LCP_mode_choice[] = { static int dissect_h245_V76LCP_mode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_V76LCP_mode, V76LCP_mode_choice, "V76LCP_mode", + ett_h245_V76LCP_mode, V76LCP_mode_choice, NULL); return offset; @@ -9746,7 +9746,7 @@ static const per_choice_t T_routing_choice[] = { static int dissect_h245_T_routing(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_routing, T_routing_choice, "T_routing", + ett_h245_T_routing, T_routing_choice, NULL); return offset; @@ -9817,7 +9817,7 @@ static const per_choice_t UnicastAddress_choice[] = { static int dissect_h245_UnicastAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_UnicastAddress, UnicastAddress_choice, "UnicastAddress", + ett_h245_UnicastAddress, UnicastAddress_choice, NULL); return offset; @@ -9882,7 +9882,7 @@ static const per_choice_t MulticastAddress_choice[] = { static int dissect_h245_MulticastAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_MulticastAddress, MulticastAddress_choice, "MulticastAddress", + ett_h245_MulticastAddress, MulticastAddress_choice, NULL); return offset; @@ -9907,7 +9907,7 @@ static const per_choice_t TransportAddress_choice[] = { static int dissect_h245_TransportAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_TransportAddress, TransportAddress_choice, "TransportAddress", + ett_h245_TransportAddress, TransportAddress_choice, NULL); return offset; @@ -10054,7 +10054,7 @@ static const per_choice_t T_mediaPacketization_choice[] = { static int dissect_h245_T_mediaPacketization(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_mediaPacketization, T_mediaPacketization_choice, "T_mediaPacketization", + ett_h245_T_mediaPacketization, T_mediaPacketization_choice, NULL); return offset; @@ -10115,7 +10115,7 @@ static const per_choice_t OLC_forw_multiplexParameters_choice[] = { static int dissect_h245_OLC_forw_multiplexParameters(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_OLC_forw_multiplexParameters, OLC_forw_multiplexParameters_choice, "OLC_forw_multiplexParameters", + ett_h245_OLC_forw_multiplexParameters, OLC_forw_multiplexParameters_choice, NULL); return offset; @@ -10168,7 +10168,7 @@ dissect_h245_OLC_rev_multiplexParameters(tvbuff_t *tvb, int offset, packet_info media_control_channel = FALSE; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_OLC_rev_multiplexParameters, OLC_rev_multiplexParameters_choice, "OLC_rev_multiplexParameters", + ett_h245_OLC_rev_multiplexParameters, OLC_rev_multiplexParameters_choice, NULL); if((!pinfo->fd->flags.visited) && ipv4_address!=0 && ipv4_port!=0 && rtp_handle){ @@ -10232,7 +10232,7 @@ static const per_choice_t T_distribution_choice[] = { static int dissect_h245_T_distribution(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_distribution, T_distribution_choice, "T_distribution", + ett_h245_T_distribution, T_distribution_choice, NULL); return offset; @@ -10273,7 +10273,7 @@ static const per_choice_t T_networkAddress_choice[] = { static int dissect_h245_T_networkAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_networkAddress, T_networkAddress_choice, "T_networkAddress", + ett_h245_T_networkAddress, T_networkAddress_choice, NULL); return offset; @@ -10313,7 +10313,7 @@ static const per_choice_t T_t120SetupProcedure_choice[] = { static int dissect_h245_T_t120SetupProcedure(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_t120SetupProcedure, T_t120SetupProcedure_choice, "T_t120SetupProcedure", + ett_h245_T_t120SetupProcedure, T_t120SetupProcedure_choice, NULL); return offset; @@ -10472,7 +10472,7 @@ static const per_choice_t T_source_choice[] = { static int dissect_h245_T_source(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_source, T_source_choice, "T_source", + ett_h245_T_source, T_source_choice, NULL); return offset; @@ -10499,7 +10499,7 @@ static const per_choice_t Clc_reason_choice[] = { static int dissect_h245_Clc_reason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Clc_reason, Clc_reason_choice, "Clc_reason", + ett_h245_Clc_reason, Clc_reason_choice, NULL); return offset; @@ -10549,7 +10549,7 @@ static const per_choice_t T_reason_choice[] = { static int dissect_h245_T_reason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_reason, T_reason_choice, "T_reason", + ett_h245_T_reason, T_reason_choice, NULL); return offset; @@ -10629,7 +10629,7 @@ static const per_choice_t Me_type_choice[] = { static int dissect_h245_Me_type(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Me_type, Me_type_choice, "Me_type", + ett_h245_Me_type, Me_type_choice, NULL); return offset; @@ -10654,7 +10654,7 @@ static const per_choice_t ME_repeatCount_choice[] = { static int dissect_h245_ME_repeatCount(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_ME_repeatCount, ME_repeatCount_choice, "ME_repeatCount", + ett_h245_ME_repeatCount, ME_repeatCount_choice, NULL); return offset; @@ -10801,7 +10801,7 @@ static const per_choice_t H261Resolution_choice[] = { static int dissect_h245_H261Resolution(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_H261Resolution, H261Resolution_choice, "H261Resolution", + ett_h245_H261Resolution, H261Resolution_choice, NULL); return offset; @@ -10863,7 +10863,7 @@ static const per_choice_t T_profileAndLevel_choice[] = { static int dissect_h245_T_profileAndLevel(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_profileAndLevel, T_profileAndLevel_choice, "T_profileAndLevel", + ett_h245_T_profileAndLevel, T_profileAndLevel_choice, NULL); return offset; @@ -10919,7 +10919,7 @@ static const per_choice_t H263Resolution_choice[] = { static int dissect_h245_H263Resolution(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_H263Resolution, H263Resolution_choice, "H263Resolution", + ett_h245_H263Resolution, H263Resolution_choice, NULL); return offset; @@ -11002,7 +11002,7 @@ dissect_h245_VideoMode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_VideoMode, VideoMode_choice, "VideoMode", + ett_h245_VideoMode, VideoMode_choice, &value); codec_type = val_to_str(value, h245_VideoMode_vals, "<unknown>"); @@ -11034,7 +11034,7 @@ static const per_choice_t Mode_g7231_choice[] = { static int dissect_h245_Mode_g7231(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Mode_g7231, Mode_g7231_choice, "Mode_g7231", + ett_h245_Mode_g7231, Mode_g7231_choice, NULL); return offset; @@ -11061,7 +11061,7 @@ static const per_choice_t T_audioLayer_choice[] = { static int dissect_h245_T_audioLayer(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_audioLayer, T_audioLayer_choice, "T_audioLayer", + ett_h245_T_audioLayer, T_audioLayer_choice, NULL); return offset; @@ -11088,7 +11088,7 @@ static const per_choice_t T_audioSampling_choice[] = { static int dissect_h245_T_audioSampling(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_audioSampling, T_audioSampling_choice, "T_audioSampling", + ett_h245_T_audioSampling, T_audioSampling_choice, NULL); return offset; @@ -11115,7 +11115,7 @@ static const per_choice_t IS11172_multichannelType_choice[] = { static int dissect_h245_IS11172_multichannelType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_IS11172_multichannelType, IS11172_multichannelType_choice, "IS11172_multichannelType", + ett_h245_IS11172_multichannelType, IS11172_multichannelType_choice, NULL); return offset; @@ -11162,7 +11162,7 @@ static const per_choice_t IS13818AudioLayer_choice[] = { static int dissect_h245_IS13818AudioLayer(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_IS13818AudioLayer, IS13818AudioLayer_choice, "IS13818AudioLayer", + ett_h245_IS13818AudioLayer, IS13818AudioLayer_choice, NULL); return offset; @@ -11195,7 +11195,7 @@ static const per_choice_t IS13818AudioSampling_choice[] = { static int dissect_h245_IS13818AudioSampling(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_IS13818AudioSampling, IS13818AudioSampling_choice, "IS13818AudioSampling", + ett_h245_IS13818AudioSampling, IS13818AudioSampling_choice, NULL); return offset; @@ -11236,7 +11236,7 @@ static const per_choice_t IS13818MultichannelType_choice[] = { static int dissect_h245_IS13818MultichannelType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_IS13818MultichannelType, IS13818MultichannelType_choice, "IS13818MultichannelType", + ett_h245_IS13818MultichannelType, IS13818MultichannelType_choice, NULL); return offset; @@ -11363,7 +11363,7 @@ dissect_h245_AudioMode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_AudioMode, AudioMode_choice, "AudioMode", + ett_h245_AudioMode, AudioMode_choice, &value); codec_type = val_to_str(value, h245_AudioMode_vals, "<unknown>"); @@ -11432,7 +11432,7 @@ dissect_h245_DataModeApplication(tvbuff_t *tvb, int offset, packet_info *pinfo _ guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_DataModeApplication, DataModeApplication_choice, "DataModeApplication", + ett_h245_DataModeApplication, DataModeApplication_choice, &value); codec_type = val_to_str(value, h245_DataModeApplication_vals, "<unknown>"); @@ -11482,7 +11482,7 @@ static const per_choice_t T_mediaMode_choice[] = { static int dissect_h245_T_mediaMode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_mediaMode, T_mediaMode_choice, "T_mediaMode", + ett_h245_T_mediaMode, T_mediaMode_choice, NULL); return offset; @@ -11533,7 +11533,7 @@ static const per_choice_t Re_type_choice[] = { static int dissect_h245_Re_type(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Re_type, Re_type_choice, "Re_type", + ett_h245_Re_type, Re_type_choice, NULL); return offset; @@ -11663,7 +11663,7 @@ static const per_choice_t FEC_mode_choice[] = { static int dissect_h245_FEC_mode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_FEC_mode, FEC_mode_choice, "FEC_mode", + ett_h245_FEC_mode, FEC_mode_choice, NULL); return offset; @@ -11703,7 +11703,7 @@ static const per_choice_t FECMode_choice[] = { static int dissect_h245_FECMode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_FECMode, FECMode_choice, "FECMode", + ett_h245_FECMode, FECMode_choice, NULL); return offset; @@ -11744,7 +11744,7 @@ static const per_choice_t ModeElementType_choice[] = { static int dissect_h245_ModeElementType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_ModeElementType, ModeElementType_choice, "ModeElementType", + ett_h245_ModeElementType, ModeElementType_choice, NULL); return offset; @@ -11780,7 +11780,7 @@ static const per_choice_t AdaptationLayerType_choice[] = { static int dissect_h245_AdaptationLayerType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_AdaptationLayerType, AdaptationLayerType_choice, "AdaptationLayerType", + ett_h245_AdaptationLayerType, AdaptationLayerType_choice, NULL); return offset; @@ -11823,7 +11823,7 @@ static const per_choice_t V76ModeParameters_choice[] = { static int dissect_h245_V76ModeParameters(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_V76ModeParameters, V76ModeParameters_choice, "V76ModeParameters", + ett_h245_V76ModeParameters, V76ModeParameters_choice, NULL); return offset; @@ -11848,7 +11848,7 @@ static const per_choice_t T_secondaryEncoding_choice[] = { static int dissect_h245_T_secondaryEncoding(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_secondaryEncoding, T_secondaryEncoding_choice, "T_secondaryEncoding", + ett_h245_T_secondaryEncoding, T_secondaryEncoding_choice, NULL); return offset; @@ -12019,7 +12019,7 @@ static const per_choice_t Mlr_type_choice[] = { static int dissect_h245_Mlr_type(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Mlr_type, Mlr_type_choice, "Mlr_type", + ett_h245_Mlr_type, Mlr_type_choice, NULL); return offset; @@ -12133,7 +12133,7 @@ static const per_choice_t RemoteMCRequest_choice[] = { static int dissect_h245_RemoteMCRequest(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_RemoteMCRequest, RemoteMCRequest_choice, "RemoteMCRequest", + ett_h245_RemoteMCRequest, RemoteMCRequest_choice, NULL); return offset; @@ -12186,7 +12186,7 @@ static const per_choice_t ConferenceRequest_choice[] = { static int dissect_h245_ConferenceRequest(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_ConferenceRequest, ConferenceRequest_choice, "ConferenceRequest", + ett_h245_ConferenceRequest, ConferenceRequest_choice, NULL); return offset; @@ -12258,7 +12258,7 @@ static const per_choice_t DialingInformationNetworkType_choice[] = { static int dissect_h245_DialingInformationNetworkType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_DialingInformationNetworkType, DialingInformationNetworkType_choice, "DialingInformationNetworkType", + ett_h245_DialingInformationNetworkType, DialingInformationNetworkType_choice, NULL); return offset; @@ -12338,7 +12338,7 @@ static const per_choice_t DialingInformation_choice[] = { static int dissect_h245_DialingInformation(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_DialingInformation, DialingInformation_choice, "DialingInformation", + ett_h245_DialingInformation, DialingInformation_choice, NULL); return offset; @@ -12425,7 +12425,7 @@ static const per_choice_t T_requestType_choice[] = { static int dissect_h245_T_requestType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_requestType, T_requestType_choice, "T_requestType", + ett_h245_T_requestType, T_requestType_choice, NULL); return offset; @@ -12473,7 +12473,7 @@ static const per_choice_t MultilinkRequest_choice[] = { static int dissect_h245_MultilinkRequest(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_MultilinkRequest, MultilinkRequest_choice, "MultilinkRequest", + ett_h245_MultilinkRequest, MultilinkRequest_choice, NULL); return offset; @@ -12606,7 +12606,7 @@ dissect_h245_RequestMessage(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, p guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_RequestMessage, RequestMessage_choice, "RequestMessage", + ett_h245_RequestMessage, RequestMessage_choice, &value); if (check_col(pinfo->cinfo, COL_INFO)){ @@ -12664,7 +12664,7 @@ static const per_choice_t T_decision_choice[] = { static int dissect_h245_T_decision(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_decision, T_decision_choice, "T_decision", + ett_h245_T_decision, T_decision_choice, NULL); return offset; @@ -12706,7 +12706,7 @@ static const per_choice_t MasterSlaveDeterminationRejectCause_choice[] = { static int dissect_h245_MasterSlaveDeterminationRejectCause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_MasterSlaveDeterminationRejectCause, MasterSlaveDeterminationRejectCause_choice, "MasterSlaveDeterminationRejectCause", + ett_h245_MasterSlaveDeterminationRejectCause, MasterSlaveDeterminationRejectCause_choice, NULL); return offset; @@ -12769,7 +12769,7 @@ static const per_choice_t T_tableEntryCapacityExceeded_choice[] = { static int dissect_h245_T_tableEntryCapacityExceeded(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_tableEntryCapacityExceeded, T_tableEntryCapacityExceeded_choice, "T_tableEntryCapacityExceeded", + ett_h245_T_tableEntryCapacityExceeded, T_tableEntryCapacityExceeded_choice, NULL); return offset; @@ -12798,7 +12798,7 @@ static const per_choice_t TerminalCapabilitySetRejectCause_choice[] = { static int dissect_h245_TerminalCapabilitySetRejectCause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_TerminalCapabilitySetRejectCause, TerminalCapabilitySetRejectCause_choice, "TerminalCapabilitySetRejectCause", + ett_h245_TerminalCapabilitySetRejectCause, TerminalCapabilitySetRejectCause_choice, NULL); return offset; @@ -12843,7 +12843,7 @@ static const per_choice_t T_multiplexParameters_choice[] = { static int dissect_h245_T_multiplexParameters(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_multiplexParameters, T_multiplexParameters_choice, "T_multiplexParameters", + ett_h245_T_multiplexParameters, T_multiplexParameters_choice, NULL); return offset; @@ -12950,7 +12950,7 @@ dissect_h245_T_forwardMultiplexAckParameters(tvbuff_t *tvb, int offset, packet_i media_control_channel = FALSE; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_forwardMultiplexAckParameters, T_forwardMultiplexAckParameters_choice, "T_forwardMultiplexAckParameters", + ett_h245_T_forwardMultiplexAckParameters, T_forwardMultiplexAckParameters_choice, NULL); @@ -13042,7 +13042,7 @@ static const per_choice_t OpenLogicalChannelRejectCause_choice[] = { static int dissect_h245_OpenLogicalChannelRejectCause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_OpenLogicalChannelRejectCause, OpenLogicalChannelRejectCause_choice, "OpenLogicalChannelRejectCause", + ett_h245_OpenLogicalChannelRejectCause, OpenLogicalChannelRejectCause_choice, NULL); return offset; @@ -13121,7 +13121,7 @@ static const per_choice_t RequestChannelCloseRejectCause_choice[] = { static int dissect_h245_RequestChannelCloseRejectCause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_RequestChannelCloseRejectCause, RequestChannelCloseRejectCause_choice, "RequestChannelCloseRejectCause", + ett_h245_RequestChannelCloseRejectCause, RequestChannelCloseRejectCause_choice, NULL); return offset; @@ -13182,7 +13182,7 @@ static const per_choice_t MultiplexEntryRejectionDescriptionsCause_choice[] = { static int dissect_h245_MultiplexEntryRejectionDescriptionsCause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_MultiplexEntryRejectionDescriptionsCause, MultiplexEntryRejectionDescriptionsCause_choice, "MultiplexEntryRejectionDescriptionsCause", + ett_h245_MultiplexEntryRejectionDescriptionsCause, MultiplexEntryRejectionDescriptionsCause_choice, NULL); return offset; @@ -13275,7 +13275,7 @@ static const per_choice_t RequestMultiplexEntryRejectionDescriptionsCause_choice static int dissect_h245_RequestMultiplexEntryRejectionDescriptionsCause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_RequestMultiplexEntryRejectionDescriptionsCause, RequestMultiplexEntryRejectionDescriptionsCause_choice, "RequestMultiplexEntryRejectionDescriptionsCause", + ett_h245_RequestMultiplexEntryRejectionDescriptionsCause, RequestMultiplexEntryRejectionDescriptionsCause_choice, NULL); return offset; @@ -13353,7 +13353,7 @@ static const per_choice_t Req_mode_ack_response_choice[] = { static int dissect_h245_Req_mode_ack_response(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Req_mode_ack_response, Req_mode_ack_response_choice, "Req_mode_ack_response", + ett_h245_Req_mode_ack_response, Req_mode_ack_response_choice, NULL); return offset; @@ -13398,7 +13398,7 @@ static const per_choice_t RequestModeRejectCause_choice[] = { static int dissect_h245_RequestModeRejectCause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_RequestModeRejectCause, RequestModeRejectCause_choice, "RequestModeRejectCause", + ett_h245_RequestModeRejectCause, RequestModeRejectCause_choice, NULL); return offset; @@ -13460,7 +13460,7 @@ static const per_choice_t Mla_type_choice[] = { static int dissect_h245_Mla_type(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Mla_type, Mla_type_choice, "Mla_type", + ett_h245_Mla_type, Mla_type_choice, NULL); return offset; @@ -13504,7 +13504,7 @@ static const per_choice_t Mlrej_type_choice[] = { static int dissect_h245_Mlrej_type(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Mlrej_type, Mlrej_type_choice, "Mlrej_type", + ett_h245_Mlrej_type, Mlrej_type_choice, NULL); return offset; @@ -13527,7 +13527,7 @@ static const per_choice_t MaintenanceLoopRejectCause_choice[] = { static int dissect_h245_MaintenanceLoopRejectCause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_MaintenanceLoopRejectCause, MaintenanceLoopRejectCause_choice, "MaintenanceLoopRejectCause", + ett_h245_MaintenanceLoopRejectCause, MaintenanceLoopRejectCause_choice, NULL); return offset; @@ -13585,7 +13585,7 @@ static const per_choice_t T_dataType_choice[] = { static int dissect_h245_T_dataType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_dataType, T_dataType_choice, "T_dataType", + ett_h245_T_dataType, T_dataType_choice, NULL); return offset; @@ -13666,7 +13666,7 @@ static const per_choice_t CommunicationModeResponse_choice[] = { static int dissect_h245_CommunicationModeResponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_CommunicationModeResponse, CommunicationModeResponse_choice, "CommunicationModeResponse", + ett_h245_CommunicationModeResponse, CommunicationModeResponse_choice, NULL); return offset; @@ -13822,7 +13822,7 @@ static const per_choice_t T_makeMeChairResponse_choice[] = { static int dissect_h245_T_makeMeChairResponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_makeMeChairResponse, T_makeMeChairResponse_choice, "T_makeMeChairResponse", + ett_h245_T_makeMeChairResponse, T_makeMeChairResponse_choice, NULL); return offset; @@ -13900,7 +13900,7 @@ static const per_choice_t T_broadcastMyLogicalChannelResponse_choice[] = { static int dissect_h245_T_broadcastMyLogicalChannelResponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_broadcastMyLogicalChannelResponse, T_broadcastMyLogicalChannelResponse_choice, "T_broadcastMyLogicalChannelResponse", + ett_h245_T_broadcastMyLogicalChannelResponse, T_broadcastMyLogicalChannelResponse_choice, NULL); return offset; @@ -13925,7 +13925,7 @@ static const per_choice_t T_makeTerminalBroadcasterResponse_choice[] = { static int dissect_h245_T_makeTerminalBroadcasterResponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_makeTerminalBroadcasterResponse, T_makeTerminalBroadcasterResponse_choice, "T_makeTerminalBroadcasterResponse", + ett_h245_T_makeTerminalBroadcasterResponse, T_makeTerminalBroadcasterResponse_choice, NULL); return offset; @@ -13950,7 +13950,7 @@ static const per_choice_t T_sendThisSourceResponse_choice[] = { static int dissect_h245_T_sendThisSourceResponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_sendThisSourceResponse, T_sendThisSourceResponse_choice, "T_sendThisSourceResponse", + ett_h245_T_sendThisSourceResponse, T_sendThisSourceResponse_choice, NULL); return offset; @@ -14026,7 +14026,7 @@ static const per_choice_t T_reject_choice[] = { static int dissect_h245_T_reject(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_reject, T_reject_choice, "T_reject", + ett_h245_T_reject, T_reject_choice, NULL); return offset; @@ -14051,7 +14051,7 @@ static const per_choice_t RemoteMCResponse_choice[] = { static int dissect_h245_RemoteMCResponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_RemoteMCResponse, RemoteMCResponse_choice, "RemoteMCResponse", + ett_h245_RemoteMCResponse, RemoteMCResponse_choice, NULL); return offset; @@ -14104,7 +14104,7 @@ static const per_choice_t ConferenceResponse_choice[] = { static int dissect_h245_ConferenceResponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_ConferenceResponse, ConferenceResponse_choice, "ConferenceResponse", + ett_h245_ConferenceResponse, ConferenceResponse_choice, NULL); return offset; @@ -14147,7 +14147,7 @@ static const per_choice_t T_rejected_choice[] = { static int dissect_h245_T_rejected(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_rejected, T_rejected_choice, "T_rejected", + ett_h245_T_rejected, T_rejected_choice, NULL); return offset; @@ -14172,7 +14172,7 @@ static const per_choice_t T_responseCode_choice[] = { static int dissect_h245_T_responseCode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_responseCode, T_responseCode_choice, "T_responseCode", + ett_h245_T_responseCode, T_responseCode_choice, NULL); return offset; @@ -14250,7 +14250,7 @@ static const per_choice_t MultilinkResponse_choice[] = { static int dissect_h245_MultilinkResponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_MultilinkResponse, MultilinkResponse_choice, "MultilinkResponse", + ett_h245_MultilinkResponse, MultilinkResponse_choice, NULL); return offset; @@ -14294,7 +14294,7 @@ static const per_choice_t LogicalChannelRateRejectReason_choice[] = { static int dissect_h245_LogicalChannelRateRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_LogicalChannelRateRejectReason, LogicalChannelRateRejectReason_choice, "LogicalChannelRateRejectReason", + ett_h245_LogicalChannelRateRejectReason, LogicalChannelRateRejectReason_choice, NULL); return offset; @@ -14387,7 +14387,7 @@ dissect_h245_ResponseMessage(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_ResponseMessage, ResponseMessage_choice, "ResponseMessage", + ett_h245_ResponseMessage, ResponseMessage_choice, &value); if (check_col(pinfo->cinfo, COL_INFO)){ @@ -14500,7 +14500,7 @@ static const per_choice_t SendTerminalCapabilitySet_choice[] = { static int dissect_h245_SendTerminalCapabilitySet(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_SendTerminalCapabilitySet, SendTerminalCapabilitySet_choice, "SendTerminalCapabilitySet", + ett_h245_SendTerminalCapabilitySet, SendTerminalCapabilitySet_choice, NULL); return offset; @@ -14545,7 +14545,7 @@ static const per_choice_t EncryptionCommand_choice[] = { static int dissect_h245_EncryptionCommand(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_EncryptionCommand, EncryptionCommand_choice, "EncryptionCommand", + ett_h245_EncryptionCommand, EncryptionCommand_choice, NULL); return offset; @@ -14572,7 +14572,7 @@ static const per_choice_t Scope_choice[] = { static int dissect_h245_Scope(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Scope, Scope_choice, "Scope", + ett_h245_Scope, Scope_choice, NULL); return offset; @@ -14597,7 +14597,7 @@ static const per_choice_t Restriction_choice[] = { static int dissect_h245_Restriction(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Restriction, Restriction_choice, "Restriction", + ett_h245_Restriction, Restriction_choice, NULL); return offset; @@ -14646,7 +14646,7 @@ static const per_choice_t T_gstnOptions_choice[] = { static int dissect_h245_T_gstnOptions(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_gstnOptions, T_gstnOptions_choice, "T_gstnOptions", + ett_h245_T_gstnOptions, T_gstnOptions_choice, NULL); return offset; @@ -14673,7 +14673,7 @@ static const per_choice_t T_isdnOptions_choice[] = { static int dissect_h245_T_isdnOptions(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_isdnOptions, T_isdnOptions_choice, "T_isdnOptions", + ett_h245_T_isdnOptions, T_isdnOptions_choice, NULL); return offset; @@ -14702,7 +14702,7 @@ static const per_choice_t EndSessionCommand_choice[] = { static int dissect_h245_EndSessionCommand(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_EndSessionCommand, EndSessionCommand_choice, "EndSessionCommand", + ett_h245_EndSessionCommand, EndSessionCommand_choice, NULL); return offset; @@ -14860,7 +14860,7 @@ static const per_choice_t RepeatCount_choice[] = { static int dissect_h245_RepeatCount(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_RepeatCount, RepeatCount_choice, "RepeatCount", + ett_h245_RepeatCount, RepeatCount_choice, NULL); return offset; @@ -14937,7 +14937,7 @@ static const per_choice_t PictureReference_choice[] = { static int dissect_h245_PictureReference(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_PictureReference, PictureReference_choice, "PictureReference", + ett_h245_PictureReference, PictureReference_choice, NULL); return offset; @@ -15087,7 +15087,7 @@ static const per_choice_t Mc_type_choice[] = { static int dissect_h245_Mc_type(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Mc_type, Mc_type_choice, "Mc_type", + ett_h245_Mc_type, Mc_type_choice, NULL); return offset; @@ -15112,7 +15112,7 @@ static const per_choice_t EncryptionUpdateDirection_choice[] = { static int dissect_h245_EncryptionUpdateDirection(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_EncryptionUpdateDirection, EncryptionUpdateDirection_choice, "EncryptionUpdateDirection", + ett_h245_EncryptionUpdateDirection, EncryptionUpdateDirection_choice, NULL); return offset; @@ -15202,7 +15202,7 @@ static const per_choice_t ConferenceCommand_choice[] = { static int dissect_h245_ConferenceCommand(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_ConferenceCommand, ConferenceCommand_choice, "ConferenceCommand", + ett_h245_ConferenceCommand, ConferenceCommand_choice, NULL); return offset; @@ -15231,7 +15231,7 @@ static const per_choice_t T_h223ModeChange_choice[] = { static int dissect_h245_T_h223ModeChange(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_h223ModeChange, T_h223ModeChange_choice, "T_h223ModeChange", + ett_h245_T_h223ModeChange, T_h223ModeChange_choice, NULL); return offset; @@ -15256,7 +15256,7 @@ static const per_choice_t T_h223AnnexADoubleFlag_choice[] = { static int dissect_h245_T_h223AnnexADoubleFlag(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_h223AnnexADoubleFlag, T_h223AnnexADoubleFlag_choice, "T_h223AnnexADoubleFlag", + ett_h245_T_h223AnnexADoubleFlag, T_h223AnnexADoubleFlag_choice, NULL); return offset; @@ -15281,7 +15281,7 @@ static const per_choice_t H223MultiplexReconfiguration_choice[] = { static int dissect_h245_H223MultiplexReconfiguration(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_H223MultiplexReconfiguration, H223MultiplexReconfiguration_choice, "H223MultiplexReconfiguration", + ett_h245_H223MultiplexReconfiguration, H223MultiplexReconfiguration_choice, NULL); return offset; @@ -15308,7 +15308,7 @@ static const per_choice_t Cmd_clockRecovery_choice[] = { static int dissect_h245_Cmd_clockRecovery(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Cmd_clockRecovery, Cmd_clockRecovery_choice, "Cmd_clockRecovery", + ett_h245_Cmd_clockRecovery, Cmd_clockRecovery_choice, NULL); return offset; @@ -15337,7 +15337,7 @@ static const per_choice_t Cmd_errorCorrection_choice[] = { static int dissect_h245_Cmd_errorCorrection(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Cmd_errorCorrection, Cmd_errorCorrection_choice, "Cmd_errorCorrection", + ett_h245_Cmd_errorCorrection, Cmd_errorCorrection_choice, NULL); return offset; @@ -15400,7 +15400,7 @@ static const per_choice_t Cmd_aal_choice[] = { static int dissect_h245_Cmd_aal(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Cmd_aal, Cmd_aal_choice, "Cmd_aal", + ett_h245_Cmd_aal, Cmd_aal_choice, NULL); return offset; @@ -15427,7 +15427,7 @@ static const per_choice_t Cmd_multiplex_choice[] = { static int dissect_h245_Cmd_multiplex(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Cmd_multiplex, Cmd_multiplex_choice, "Cmd_multiplex", + ett_h245_Cmd_multiplex, Cmd_multiplex_choice, NULL); return offset; @@ -15454,7 +15454,7 @@ static const per_choice_t CmdR_multiplex_choice[] = { static int dissect_h245_CmdR_multiplex(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_CmdR_multiplex, CmdR_multiplex_choice, "CmdR_multiplex", + ett_h245_CmdR_multiplex, CmdR_multiplex_choice, NULL); return offset; @@ -15522,7 +15522,7 @@ static const per_choice_t T_status_choice[] = { static int dissect_h245_T_status(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_status, T_status_choice, "T_status", + ett_h245_T_status, T_status_choice, NULL); return offset; @@ -15590,7 +15590,7 @@ dissect_h245_CommandMessage(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, p guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_CommandMessage, CommandMessage_choice, "CommandMessage", + ett_h245_CommandMessage, CommandMessage_choice, &value); if (check_col(pinfo->cinfo, COL_INFO)){ @@ -15636,7 +15636,7 @@ static const per_choice_t FunctionNotUnderstood_choice[] = { static int dissect_h245_FunctionNotUnderstood(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_FunctionNotUnderstood, FunctionNotUnderstood_choice, "FunctionNotUnderstood", + ett_h245_FunctionNotUnderstood, FunctionNotUnderstood_choice, NULL); return offset; @@ -15822,7 +15822,7 @@ static const per_choice_t Mi_type_choice[] = { static int dissect_h245_Mi_type(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Mi_type, Mi_type_choice, "Mi_type", + ett_h245_Mi_type, Mi_type_choice, NULL); return offset; @@ -15949,7 +15949,7 @@ static const per_choice_t Ind_clockRecovery_choice[] = { static int dissect_h245_Ind_clockRecovery(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Ind_clockRecovery, Ind_clockRecovery_choice, "Ind_clockRecovery", + ett_h245_Ind_clockRecovery, Ind_clockRecovery_choice, NULL); return offset; @@ -15978,7 +15978,7 @@ static const per_choice_t Ind_errorCorrection_choice[] = { static int dissect_h245_Ind_errorCorrection(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Ind_errorCorrection, Ind_errorCorrection_choice, "Ind_errorCorrection", + ett_h245_Ind_errorCorrection, Ind_errorCorrection_choice, NULL); return offset; @@ -16041,7 +16041,7 @@ static const per_choice_t Ind_aal_choice[] = { static int dissect_h245_Ind_aal(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Ind_aal, Ind_aal_choice, "Ind_aal", + ett_h245_Ind_aal, Ind_aal_choice, NULL); return offset; @@ -16068,7 +16068,7 @@ static const per_choice_t Ind_multiplex_choice[] = { static int dissect_h245_Ind_multiplex(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Ind_multiplex, Ind_multiplex_choice, "Ind_multiplex", + ett_h245_Ind_multiplex, Ind_multiplex_choice, NULL); return offset; @@ -16095,7 +16095,7 @@ static const per_choice_t IndR_multiplex_choice[] = { static int dissect_h245_IndR_multiplex(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_IndR_multiplex, IndR_multiplex_choice, "IndR_multiplex", + ett_h245_IndR_multiplex, IndR_multiplex_choice, NULL); return offset; @@ -16173,7 +16173,7 @@ static const per_choice_t T_userInputSupportIndication_choice[] = { static int dissect_h245_T_userInputSupportIndication(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_userInputSupportIndication, T_userInputSupportIndication_choice, "T_userInputSupportIndication", + ett_h245_T_userInputSupportIndication, T_userInputSupportIndication_choice, NULL); return offset; @@ -16394,7 +16394,7 @@ static const per_choice_t UserInputIndication_choice[] = { static int dissect_h245_UserInputIndication(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_UserInputIndication, UserInputIndication_choice, "UserInputIndication", + ett_h245_UserInputIndication, UserInputIndication_choice, NULL); return offset; @@ -16527,7 +16527,7 @@ static const per_choice_t ConferenceIndication_choice[] = { static int dissect_h245_ConferenceIndication(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_ConferenceIndication, ConferenceIndication_choice, "ConferenceIndication", + ett_h245_ConferenceIndication, ConferenceIndication_choice, NULL); return offset; @@ -16589,7 +16589,7 @@ static const per_choice_t FunctionNotSupportedCause_choice[] = { static int dissect_h245_FunctionNotSupportedCause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_FunctionNotSupportedCause, FunctionNotSupportedCause_choice, "FunctionNotSupportedCause", + ett_h245_FunctionNotSupportedCause, FunctionNotSupportedCause_choice, NULL); return offset; @@ -16667,7 +16667,7 @@ static const per_choice_t MultilinkIndication_choice[] = { static int dissect_h245_MultilinkIndication(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_MultilinkIndication, MultilinkIndication_choice, "MultilinkIndication", + ett_h245_MultilinkIndication, MultilinkIndication_choice, NULL); return offset; @@ -16790,7 +16790,7 @@ dissect_h245_IndicationMessage(tvbuff_t *tvb, int offset, packet_info *pinfo _U_ guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_IndicationMessage, IndicationMessage_choice, "IndicationMessage", + ett_h245_IndicationMessage, IndicationMessage_choice, &value); if (check_col(pinfo->cinfo, COL_INFO)){ @@ -16837,7 +16837,7 @@ static const per_choice_t MultimediaSystemControlMessage_choice[] = { static int dissect_h245_MultimediaSystemControlMessage(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_MultimediaSystemControlMessage, MultimediaSystemControlMessage_choice, "MultimediaSystemControlMessage", + ett_h245_MultimediaSystemControlMessage, MultimediaSystemControlMessage_choice, NULL); return offset; @@ -16859,7 +16859,7 @@ static const per_choice_t Moderfc2733_choice[] = { static int dissect_h245_Moderfc2733(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h245_Moderfc2733, Moderfc2733_choice, "Moderfc2733", + ett_h245_Moderfc2733, Moderfc2733_choice, NULL); return offset; diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index d1c9372b7c..dbb8bcbe9e 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -853,7 +853,7 @@ static const per_choice_t EntityType_choice[] = { static int dissect_h450_EntityType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_EntityType, EntityType_choice, "EntityType", + ett_h450_EntityType, EntityType_choice, NULL); return offset; @@ -918,7 +918,7 @@ static const per_choice_t InterpretationApdu_choice[] = { static int dissect_h450_InterpretationApdu(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_InterpretationApdu, InterpretationApdu_choice, "InterpretationApdu", + ett_h450_InterpretationApdu, InterpretationApdu_choice, NULL); return offset; @@ -957,7 +957,7 @@ static const per_choice_t ServiceApdus_choice[] = { static int dissect_h450_ServiceApdus(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_ServiceApdus, ServiceApdus_choice, "ServiceApdus", + ett_h450_ServiceApdus, ServiceApdus_choice, NULL); return offset; @@ -1080,7 +1080,7 @@ static const per_choice_t PartySubaddress_choice[] = { static int dissect_h450_PartySubaddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_PartySubaddress, PartySubaddress_choice, "PartySubaddress", + ett_h450_PartySubaddress, PartySubaddress_choice, NULL); return offset; @@ -1137,7 +1137,7 @@ static const per_choice_t PresentedAddressScreened_choice[] = { static int dissect_h450_PresentedAddressScreened(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_PresentedAddressScreened, PresentedAddressScreened_choice, "PresentedAddressScreened", + ett_h450_PresentedAddressScreened, PresentedAddressScreened_choice, NULL); return offset; @@ -1184,7 +1184,7 @@ static const per_choice_t PresentedAddressUnscreened_choice[] = { static int dissect_h450_PresentedAddressUnscreened(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_PresentedAddressUnscreened, PresentedAddressUnscreened_choice, "PresentedAddressUnscreened", + ett_h450_PresentedAddressUnscreened, PresentedAddressUnscreened_choice, NULL); return offset; @@ -1231,7 +1231,7 @@ static const per_choice_t PresentedNumberScreened_choice[] = { static int dissect_h450_PresentedNumberScreened(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_PresentedNumberScreened, PresentedNumberScreened_choice, "PresentedNumberScreened", + ett_h450_PresentedNumberScreened, PresentedNumberScreened_choice, NULL); return offset; @@ -1257,7 +1257,7 @@ static const per_choice_t PresentedNumberUnscreened_choice[] = { static int dissect_h450_PresentedNumberUnscreened(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_PresentedNumberUnscreened, PresentedNumberUnscreened_choice, "PresentedNumberUnscreened", + ett_h450_PresentedNumberUnscreened, PresentedNumberUnscreened_choice, NULL); return offset; @@ -1483,7 +1483,7 @@ static const per_choice_t DummyArg_choice[] = { static int dissect_h450_DummyArg(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_DummyArg, DummyArg_choice, "DummyArg", + ett_h450_DummyArg, DummyArg_choice, NULL); return offset; @@ -1523,7 +1523,7 @@ static const per_choice_t DummyRes_choice[] = { static int dissect_h450_DummyRes(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_DummyRes, DummyRes_choice, "DummyRes", + ett_h450_DummyRes, DummyRes_choice, NULL); return offset; @@ -1607,7 +1607,7 @@ static const per_choice_t ArgumentExtension_choice[] = { static int dissect_h450_ArgumentExtension(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_ArgumentExtension, ArgumentExtension_choice, "ArgumentExtension", + ett_h450_ArgumentExtension, ArgumentExtension_choice, NULL); return offset; @@ -1834,7 +1834,7 @@ static const per_choice_t T_resultExtension_choice[] = { static int dissect_h450_T_resultExtension(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_T_resultExtension, T_resultExtension_choice, "T_resultExtension", + ett_h450_T_resultExtension, T_resultExtension_choice, NULL); return offset; @@ -1955,7 +1955,7 @@ static const per_choice_t ActivateDiversionQArg_extension_choice[] = { static int dissect_h450_ActivateDiversionQArg_extension(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_ActivateDiversionQArg_extension, ActivateDiversionQArg_extension_choice, "ActivateDiversionQArg_extension", + ett_h450_ActivateDiversionQArg_extension, ActivateDiversionQArg_extension_choice, NULL); return offset; @@ -1999,7 +1999,7 @@ static const per_choice_t ActivateDiversionQRes_choice[] = { static int dissect_h450_ActivateDiversionQRes(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_ActivateDiversionQRes, ActivateDiversionQRes_choice, "ActivateDiversionQRes", + ett_h450_ActivateDiversionQRes, ActivateDiversionQRes_choice, NULL); return offset; @@ -2021,7 +2021,7 @@ static const per_choice_t DeactivateDiversionQArg_extension_choice[] = { static int dissect_h450_DeactivateDiversionQArg_extension(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_DeactivateDiversionQArg_extension, DeactivateDiversionQArg_extension_choice, "DeactivateDiversionQArg_extension", + ett_h450_DeactivateDiversionQArg_extension, DeactivateDiversionQArg_extension_choice, NULL); return offset; @@ -2064,7 +2064,7 @@ static const per_choice_t DeactivateDiversionQRes_choice[] = { static int dissect_h450_DeactivateDiversionQRes(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_DeactivateDiversionQRes, DeactivateDiversionQRes_choice, "DeactivateDiversionQRes", + ett_h450_DeactivateDiversionQRes, DeactivateDiversionQRes_choice, NULL); return offset; @@ -2086,7 +2086,7 @@ static const per_choice_t InterrogateDiversionQ_extension_choice[] = { static int dissect_h450_InterrogateDiversionQ_extension(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_InterrogateDiversionQ_extension, InterrogateDiversionQ_extension_choice, "InterrogateDiversionQ_extension", + ett_h450_InterrogateDiversionQ_extension, InterrogateDiversionQ_extension_choice, NULL); return offset; @@ -2129,7 +2129,7 @@ static const per_choice_t IntResult_extension_choice[] = { static int dissect_h450_IntResult_extension(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_IntResult_extension, IntResult_extension_choice, "IntResult_extension", + ett_h450_IntResult_extension, IntResult_extension_choice, NULL); return offset; @@ -2199,7 +2199,7 @@ static const per_choice_t CheckRestrictionArg_extension_choice[] = { static int dissect_h450_CheckRestrictionArg_extension(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_CheckRestrictionArg_extension, CheckRestrictionArg_extension_choice, "CheckRestrictionArg_extension", + ett_h450_CheckRestrictionArg_extension, CheckRestrictionArg_extension_choice, NULL); return offset; @@ -2241,7 +2241,7 @@ static const per_choice_t CheckRestrictionRes_choice[] = { static int dissect_h450_CheckRestrictionRes(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_CheckRestrictionRes, CheckRestrictionRes_choice, "CheckRestrictionRes", + ett_h450_CheckRestrictionRes, CheckRestrictionRes_choice, NULL); return offset; @@ -2326,7 +2326,7 @@ static const per_choice_t CallReroutingArg_extension_choice[] = { static int dissect_h450_CallReroutingArg_extension(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_CallReroutingArg_extension, CallReroutingArg_extension_choice, "CallReroutingArg_extension", + ett_h450_CallReroutingArg_extension, CallReroutingArg_extension_choice, NULL); return offset; @@ -2378,7 +2378,7 @@ static const per_choice_t CallReroutingRes_choice[] = { static int dissect_h450_CallReroutingRes(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_CallReroutingRes, CallReroutingRes_choice, "CallReroutingRes", + ett_h450_CallReroutingRes, CallReroutingRes_choice, NULL); return offset; @@ -2400,7 +2400,7 @@ static const per_choice_t DivertingLegInformation1Arg_extension_choice[] = { static int dissect_h450_DivertingLegInformation1Arg_extension(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_DivertingLegInformation1Arg_extension, DivertingLegInformation1Arg_extension_choice, "DivertingLegInformation1Arg_extension", + ett_h450_DivertingLegInformation1Arg_extension, DivertingLegInformation1Arg_extension_choice, NULL); return offset; @@ -2445,7 +2445,7 @@ static const per_choice_t DivertingLegInformation2Arg_extension_choice[] = { static int dissect_h450_DivertingLegInformation2Arg_extension(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_DivertingLegInformation2Arg_extension, DivertingLegInformation2Arg_extension_choice, "DivertingLegInformation2Arg_extension", + ett_h450_DivertingLegInformation2Arg_extension, DivertingLegInformation2Arg_extension_choice, NULL); return offset; @@ -2491,7 +2491,7 @@ static const per_choice_t DivertingLegInformation3Arg_extension_choice[] = { static int dissect_h450_DivertingLegInformation3Arg_extension(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_DivertingLegInformation3Arg_extension, DivertingLegInformation3Arg_extension_choice, "DivertingLegInformation3Arg_extension", + ett_h450_DivertingLegInformation3Arg_extension, DivertingLegInformation3Arg_extension_choice, NULL); return offset; @@ -2533,7 +2533,7 @@ static const per_choice_t DivertingLegInformation4Arg_extension_choice[] = { static int dissect_h450_DivertingLegInformation4Arg_extension(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_DivertingLegInformation4Arg_extension, DivertingLegInformation4Arg_extension_choice, "DivertingLegInformation4Arg_extension", + ett_h450_DivertingLegInformation4Arg_extension, DivertingLegInformation4Arg_extension_choice, NULL); return offset; @@ -2578,7 +2578,7 @@ static const per_choice_t CfnrDivertedLegFailedArg_choice[] = { static int dissect_h450_CfnrDivertedLegFailedArg(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_CfnrDivertedLegFailedArg, CfnrDivertedLegFailedArg_choice, "CfnrDivertedLegFailedArg", + ett_h450_CfnrDivertedLegFailedArg, CfnrDivertedLegFailedArg_choice, NULL); return offset; @@ -2600,7 +2600,7 @@ static const per_choice_t MixedExtension_choice[] = { static int dissect_h450_MixedExtension(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_MixedExtension, MixedExtension_choice, "MixedExtension", + ett_h450_MixedExtension, MixedExtension_choice, NULL); return offset; @@ -3226,7 +3226,7 @@ static const per_choice_t MsgCentreId_choice[] = { static int dissect_h450_MsgCentreId(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_MsgCentreId, MsgCentreId_choice, "MsgCentreId", + ett_h450_MsgCentreId, MsgCentreId_choice, NULL); return offset; @@ -3477,7 +3477,7 @@ static const per_choice_t NamePresentationAllowed_choice[] = { static int dissect_h450_NamePresentationAllowed(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_NamePresentationAllowed, NamePresentationAllowed_choice, "NamePresentationAllowed", + ett_h450_NamePresentationAllowed, NamePresentationAllowed_choice, NULL); return offset; @@ -3504,7 +3504,7 @@ static const per_choice_t NamePresentationRestricted_choice[] = { static int dissect_h450_NamePresentationRestricted(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_NamePresentationRestricted, NamePresentationRestricted_choice, "NamePresentationRestricted", + ett_h450_NamePresentationRestricted, NamePresentationRestricted_choice, NULL); return offset; @@ -3531,7 +3531,7 @@ static const per_choice_t Name_choice[] = { static int dissect_h450_Name(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_Name, Name_choice, "Name", + ett_h450_Name, Name_choice, NULL); return offset; @@ -3645,7 +3645,7 @@ static const per_choice_t CcArg_choice[] = { static int dissect_h450_CcArg(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_CcArg, CcArg_choice, "CcArg", + ett_h450_CcArg, CcArg_choice, NULL); return offset; @@ -3752,7 +3752,7 @@ static const per_choice_t CIStatusInformation_choice[] = { static int dissect_h450_CIStatusInformation(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_CIStatusInformation, CIStatusInformation_choice, "CIStatusInformation", + ett_h450_CIStatusInformation, CIStatusInformation_choice, NULL); return offset; @@ -4105,7 +4105,7 @@ static const per_choice_t Unspecified_choice[] = { static int dissect_h450_Unspecified(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h450_Unspecified, Unspecified_choice, "Unspecified", + ett_h450_Unspecified, Unspecified_choice, NULL); return offset; @@ -4247,7 +4247,7 @@ static const per_choice_t opcode_choice[] = { static int dissect_h4501_opcode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h4501_opcode, ett_h4501_opcode, opcode_choice, "Opcode", NULL); + offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h4501_opcode, ett_h4501_opcode, opcode_choice, NULL); return offset; } @@ -4343,7 +4343,7 @@ static const per_choice_t errorCode_choice[] = { static int dissect_h4501_errorCode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h4501_errorCode, ett_h4501_errorCode, errorCode_choice, "errorCode", NULL); + offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h4501_errorCode, ett_h4501_errorCode, errorCode_choice, NULL); return offset; } @@ -4368,7 +4368,7 @@ static const per_choice_t problem_choice[] = { static int dissect_h4501_problem(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h4501_problem, ett_h4501_problem, problem_choice, "problem", NULL); + offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h4501_problem, ett_h4501_problem, problem_choice, NULL); return offset; } static int @@ -4469,7 +4469,7 @@ static const per_choice_t ROS_choice[] = { static int dissect_h4501_ROS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h4501_ROS, ett_h4501_ROS, ROS_choice, "ROS", NULL); + offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h4501_ROS, ett_h4501_ROS, ROS_choice, NULL); return offset; } diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index 04f4d266a4..bdc98a08e6 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -930,7 +930,7 @@ DEBUG_ENTRY("dissect_per_constrained_integer"); /* 22 Encoding the choice type */ guint32 -dissect_per_choice(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *tree, int hf_index, gint ett_index, const per_choice_t *choice, const char *name, guint32 *value) +dissect_per_choice(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *tree, int hf_index, gint ett_index, const per_choice_t *choice, guint32 *value) { gboolean extension_present, extension_flag; int extension_root_entries; diff --git a/epan/dissectors/packet-per.h b/epan/dissectors/packet-per.h index 30f54114fc..ba2a375f8b 100644 --- a/epan/dissectors/packet-per.h +++ b/epan/dissectors/packet-per.h @@ -96,7 +96,7 @@ extern guint32 dissect_per_integer(tvbuff_t *tvb, guint32 offset, packet_info *p extern guint32 dissect_per_constrained_integer(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *tree, int hf_index, guint32 min, guint32 max, guint32 *value, proto_item **item, gboolean has_extension); -extern guint32 dissect_per_choice(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *tree, int hf_index, gint ett_index, const per_choice_t *choice, const char *name, guint32 *value); +extern guint32 dissect_per_choice(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *tree, int hf_index, gint ett_index, const per_choice_t *choice, guint32 *value); extern guint32 dissect_per_sequence(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *parent_tree, int hf_index, gint ett_index, const per_sequence_t *sequence); diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index 1c5e40322f..512046f290 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -324,7 +324,7 @@ dissect_t38_t30_indicator(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t { offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_t38_t30_indicator, ett_t38_t30_indicator, - t30_indicator_choice, "T30 Indicator", &T30ind_value); + t30_indicator_choice, &T30ind_value); if (check_col(pinfo->cinfo, COL_INFO) && primary_part){ col_append_fstr(pinfo->cinfo, COL_INFO, " t30ind: %s", @@ -391,7 +391,7 @@ dissect_t38_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree { offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_t38_data, ett_t38_data, - data_choice, "data", &Data_value); + data_choice, &Data_value); if (check_col(pinfo->cinfo, COL_INFO) && primary_part){ col_append_fstr(pinfo->cinfo, COL_INFO, " data:%s:", @@ -416,7 +416,7 @@ static const value_string Type_of_msg_vals[] = { static int dissect_t38_Type_of_msg(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_t38_Type_of_msg, Type_of_msg_choice, "Type_of_msg", + ett_t38_Type_of_msg, Type_of_msg_choice, &Type_of_msg_value); return offset; @@ -498,12 +498,12 @@ dissect_t38_Data_Field_field_type(tvbuff_t *tvb, int offset, packet_info *pinfo, if(use_pre_corrigendum_asn1_specification){ offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_t38_Data_Field_field_type, ett_t38_Data_Field_field_type, - Data_Field_field_type_PreCorrigendum_choice, "Field Type", &Data_Field_field_type_value); + Data_Field_field_type_PreCorrigendum_choice, &Data_Field_field_type_value); } else{ offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_t38_Data_Field_field_type, ett_t38_Data_Field_field_type, - Data_Field_field_type_choice, "Field Type", &Data_Field_field_type_value); + Data_Field_field_type_choice, &Data_Field_field_type_value); } if (check_col(pinfo->cinfo, COL_INFO) && primary_part){ @@ -708,7 +708,7 @@ dissect_t38_error_recovery(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_ offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_t38_error_recovery, ett_t38_error_recovery, - error_recovery_choice, "Error recovery", NULL); + error_recovery_choice, NULL); primary_part = TRUE; diff --git a/tools/asn2eth.py b/tools/asn2eth.py index 1fb71fb15b..6beff7d5fb 100755 --- a/tools/asn2eth.py +++ b/tools/asn2eth.py @@ -2527,7 +2527,6 @@ class ChoiceType (Type): def eth_type_default_pars(self, ectx, tname): pars = Type.eth_type_default_pars(self, ectx, tname) pars['TABLE'] = '%(TNAME)s_choice' - pars['CHOICE_NAME'] = '"%(TNAME)s"' return pars def eth_type_default_table(self, ectx, tname): @@ -2606,12 +2605,12 @@ class ChoiceType (Type): elif (ectx.NPer()): body = ectx.eth_fn_call('dissect_%(ER)s_choice', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(PINFO)s', '%(TREE)s', '%(HF_INDEX)s', 'item', 'private_data'), - ('%(ETT_INDEX)s', '%(TABLE)s', '%(CHOICE_NAME)s',), + ('%(ETT_INDEX)s', '%(TABLE)s',), ('%(VAL_PTR)s',),)) elif (ectx.OPer()): body = ectx.eth_fn_call('dissect_%(ER)s_choice', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(PINFO)s', '%(TREE)s', '%(HF_INDEX)s'), - ('%(ETT_INDEX)s', '%(TABLE)s', '%(CHOICE_NAME)s',), + ('%(ETT_INDEX)s', '%(TABLE)s',), ('%(VAL_PTR)s',),)) else: body = '#error Can not decode %s' % (tname) @@ -4533,7 +4532,7 @@ asn2eth [-h|?] [-d dbg] [-b] [-p proto] [-c conform_file] [-e] input_file -O dir : output directory -c conform_file : conformation file -e : create conformation file for exported types - -s template : single file output (templete is input file without .c/.h extension) + -s template : single file output (template is input file without .c/.h extension) -k : keep intermediate files though single file output is used input_file : input ASN.1 file |