osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix duplicated filter names.

This commit is contained in:
Anders Broman 2020-12-16 15:13:31 +01:00
parent 4735eddfef
commit adb1b59495
14 changed files with 192 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
epan/dissectors/asn1/h245/h245.cnf
View File

@ -1302,7 +1302,7 @@ DataMode/bitRate bitRate_0_4294967295
H223Capability/bitRate bitRate_1_19200
H261VideoMode/bitRate bitRate_1_19200
H263VideoMode/bitRate bitRate_1_19200
DialingInformationNumber/networkAddress networkAddressNum
DialingInformationNumber/networkAddress din_networkAddress
NewATMVCCommand/aal/aal1/clockRecovery/adaptiveClockRecovery adaptiveClockRecoveryFlag
NewATMVCIndication/aal/aal1/clockRecovery/adaptiveClockRecovery adaptiveClockRecoveryFlag
NewATMVCCommand/aal/aal1/clockRecovery/nullClockRecovery nullClockRecoveryflag
@ -1403,6 +1403,23 @@ ParameterValue/octetString TYPE = FT_UINT32 DISPLAY = BASE_DEC
#----------------------------------------------------------------------------------------
#.FIELD_ATTR
AlternativeCapabilitySet/_item NAME = "alternativeCapability"
CapabilityIdentifier/standard ABBREV=standardOid
UnicastAddress/iPXAddress/tsapIdentifier ABBREV=ipx.tsapIdentifier
UnicastAddress/iP6Address/tsapIdentifier ABBREV=ipv6.tsapIdentifier
UnicastAddress/iPSourceRouteAddress/tsapIdentifier ABBREV=iPSrcRoute.tsapIdentifier
MulticastAddress/iPAddress/tsapIdentifier ABBREV=multicast.tsapIdentifier
MulticastAddress/iP6Address/tsapIdentifier ABBREV=multicast_IPv6.tsapIdentifier
UnicastAddress/iPAddress/network ABBREV=ip4_network
UnicastAddress/iP6Address/network ABBREV=ip6_network
MulticastAddress/iP6Address/network ABBREV=mip6_network
MulticastAddress/iPAddress ABBREV=mIPAddress
MulticastAddress/iP6Address ABBREV=mIP6Address
MulticastAddress/iPAddress/network ABBREV=mip4_network
Criteria/value ABBREV=criteriaValue
DialingInformationNumber/networkAddress ABBREV=din_networkAddress
SendTerminalCapabilitySet/specificRequest/multiplexCapability ABBREV=multiplexCapabilityBool
H263Version3Options/pictureNumber ABBREV=pictureNumberBoolean
H223Capability/mobileOperationTransmitCapability/h223AnnexADoubleFlag ABBREV=h223AnnexADoubleFlagFlag
#----------------------------------------------------------------------------------------
# vim:set ts=4 sts=2 sw=2:

12
epan/dissectors/asn1/h248/h248.cnf
View File

@ -90,6 +90,18 @@ EventParameterV1/value event_param_value
SigParameterV1/value sig_param_value
AuditReplyV1/auditResult audit_result
#.FIELD_ATTR
IP4Address/address ABBREV=iP4Address
IP6Address/address ABBREV=iP6Address
TransactionRequest/transactionId ABBREV=transactionRequest.transactionId
SegmentReply/transactionId ABBREV=segmentreply.transactionId
TransactionReply/transactionId ABBREV=transactionreply.transactionId
TransactionPending/transactionId ABBREV=transactionpending.transactionId
DomainName/name ABBREV=domainname
TerminationID/id ABBREV=terminationId
PropertyParm/value ABBREV=propertyParamValue
EventParameterV1/value ABBREV=event_param_value
SigParameterV1/value ABBREV=sig_param_value
#.FN_HDR Message
curr_info.msg = gcp_msg(actx->pinfo,tvb_raw_offset(tvb),keep_persistent_data);

6
epan/dissectors/asn1/h282/h282.cnf
View File

@ -16,6 +16,12 @@ RDCPDU
NonCollapsingCapabilities
#.END
#.FIELD_RENAME
CameraFilterCapability/filterTextLabel/_item/filterTextLabel filterTextLabel_deviceText
#.FIELD_ATTR
CameraFilterCapability/filterTextLabel/_item/filterTextLabel ABBREV=filterTextLabel.deviceText
#.FN_PARS RequestPDU
VAL_PTR = &msg_type
#.FN_HDR

10
epan/dissectors/asn1/h501/h501.cnf
View File

@ -14,6 +14,16 @@ ALIGNED
Message
#.END
#.FIELD_RENAME
DescriptorRejection/descriptorID descriptorRejection_descriptorID
UpdateInformation/descriptorInfo/descriptorID updateInformation_descriptorID
DescriptorInfo/descriptorID descriptorInfo_descriptorID
#.FIELD_ATTR
DescriptorRejection/descriptorID ABBREV=descriptorRejection_descriptorID
UpdateInformation/descriptorInfo/descriptorID ABBREV=updateInformation_descriptorID
DescriptorInfo/descriptorID ABBREV=descriptorInfo_descriptorID
#.FN_PARS MessageBody
VAL_PTR = &msg_type
#.FN_HDR

4
epan/dissectors/asn1/hnbap/hnbap.cnf
View File

@ -31,6 +31,10 @@ ProtocolIE-Field/id protocol_ie_field_id
PrivateIE-Field/id private_ie_field_id
GeographicalLocation/geographicalCoordinates geographical_location_geographical_coordinates
HNB-Location-Information/geographicalCoordinates hnb_location_information_geographical_coordinates
MacroCoverageInformation/cellIdentity macroCellID
#.FIELD_ATTR
acroCoverageInformation/cellIdentity ABBREV=cellIdentity.macroCellID
#.OMIT_ASSIGNMENT
Presence

3
epan/dissectors/asn1/idmp/idmp.cnf
View File

@ -23,6 +23,9 @@ IDM-PDU/result idm_result
IdmResult/invokeID idm_invokeID
#.FIELD_ATTR
IdmResult/invokeID ABBREV=idmResult.invokeID
#.FN_BODY IdmBind/argument
struct SESSION_DATA_STRUCTURE *session = (struct SESSION_DATA_STRUCTURE*)actx->private_data;

3
epan/dissectors/asn1/ieee1609dot2/ieee1609dot2.cnf
View File

@ -66,6 +66,9 @@ EncryptedDataEncryptionKey/eciesNistP256 edeEciesNistP256
EncryptedDataEncryptionKey/eciesBrainpoolP256r1 edekEciesBrainpoolP256r1
#.FIELD_ATTR
SspRange/opaque ABBREV=srRange.opaque
#.FN_HDR Ieee1609Dot2Data
actx->private_data = (void*)wmem_new0(wmem_packet_scope(), ieee1609_private_data_t);
#.END

40
epan/dissectors/packet-h245.c
View File

@ -1700,7 +1700,7 @@ static int hf_h245_excessiveError = -1; /* T_excessiveError */
static int hf_h245_differential = -1; /* SET_SIZE_1_65535_OF_DialingInformationNumber */
static int hf_h245_differential_item = -1; /* DialingInformationNumber */
static int hf_h245_infoNotAvailable = -1; /* INTEGER_1_65535 */
static int hf_h245_networkAddressNum = -1; /* NumericString_SIZE_0_40 */
static int hf_h245_din_networkAddress = -1; /* NumericString_SIZE_0_40 */
static int hf_h245_subAddress = -1; /* IA5String_SIZE_1_40 */
static int hf_h245_networkType = -1; /* SET_SIZE_1_255_OF_DialingInformationNetworkType */
static int hf_h245_networkType_item = -1; /* DialingInformationNetworkType */
@ -10480,7 +10480,7 @@ dissect_h245_SET_SIZE_1_255_OF_DialingInformationNetworkType(tvbuff_t *tvb _U_,
static const per_sequence_t DialingInformationNumber_sequence[] = {
{ &hf_h245_networkAddressNum, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h245_NumericString_SIZE_0_40 },
{ &hf_h245_din_networkAddress, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h245_NumericString_SIZE_0_40 },
{ &hf_h245_subAddress , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h245_IA5String_SIZE_1_40 },
{ &hf_h245_networkType , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h245_SET_SIZE_1_255_OF_DialingInformationNetworkType },
{ NULL, 0, 0, NULL }
@ -15427,7 +15427,7 @@ void proto_register_h245(void) {
FT_BOOLEAN, BASE_NONE, NULL, 0,
"BOOLEAN", HFILL }},
{ &hf_h245_h223AnnexADoubleFlagFlag,
{ "h223AnnexADoubleFlag", "h245.h223AnnexADoubleFlag",
{ "h223AnnexADoubleFlag", "h245.h223AnnexADoubleFlagFlag",
FT_BOOLEAN, BASE_NONE, NULL, 0,
"BOOLEAN", HFILL }},
{ &hf_h245_h223AnnexB,
@ -16591,7 +16591,7 @@ void proto_register_h245(void) {
FT_BOOLEAN, BASE_NONE, NULL, 0,
"BOOLEAN", HFILL }},
{ &hf_h245_pictureNumberBoolean,
{ "pictureNumber", "h245.pictureNumber",
{ "pictureNumber", "h245.pictureNumberBoolean",
FT_BOOLEAN, BASE_NONE, NULL, 0,
"BOOLEAN", HFILL }},
{ &hf_h245_spareReferencePictures,
@ -17307,7 +17307,7 @@ void proto_register_h245(void) {
FT_UINT32, BASE_DEC, VALS(DataProtocolCapability_vals), 0,
"DataProtocolCapability", HFILL }},
{ &hf_h245_standardOid,
{ "standard", "h245.standard",
{ "standard", "h245.standardOid",
FT_OID, BASE_NONE, NULL, 0,
"T_standardOid", HFILL }},
{ &hf_h245_h221NonStandard,
@ -18067,7 +18067,7 @@ void proto_register_h245(void) {
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_h245_ip4_network,
{ "network", "h245.network",
{ "network", "h245.ip4_network",
FT_IPv4, BASE_NONE, NULL, 0,
"Ipv4_network", HFILL }},
{ &hf_h245_tsapIdentifier,
@ -18087,7 +18087,7 @@ void proto_register_h245(void) {
FT_BYTES, BASE_NONE, NULL, 0,
"OCTET_STRING_SIZE_4", HFILL }},
{ &hf_h245_ipx_tsapIdentifier,
{ "tsapIdentifier", "h245.tsapIdentifier",
{ "tsapIdentifier", "h245.ipx.tsapIdentifier",
FT_BYTES, BASE_NONE, NULL, 0,
"OCTET_STRING_SIZE_2", HFILL }},
{ &hf_h245_iP6Address,
@ -18095,11 +18095,11 @@ void proto_register_h245(void) {
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_h245_ip6_network,
{ "network", "h245.network",
{ "network", "h245.ip6_network",
FT_IPv6, BASE_NONE, NULL, 0,
"T_ip6_network", HFILL }},
{ &hf_h245_ipv6_tsapIdentifier,
{ "tsapIdentifier", "h245.tsapIdentifier",
{ "tsapIdentifier", "h245.ipv6.tsapIdentifier",
FT_UINT32, BASE_DEC, NULL, 0,
"T_ipv6_tsapIdentifier", HFILL }},
{ &hf_h245_netBios,
@ -18127,7 +18127,7 @@ void proto_register_h245(void) {
FT_BYTES, BASE_NONE, NULL, 0,
"OCTET_STRING_SIZE_4", HFILL }},
{ &hf_h245_iPSrcRoute_tsapIdentifier,
{ "tsapIdentifier", "h245.tsapIdentifier",
{ "tsapIdentifier", "h245.iPSrcRoute.tsapIdentifier",
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER_0_65535", HFILL }},
{ &hf_h245_route,
@ -18147,27 +18147,27 @@ void proto_register_h245(void) {
FT_NONE, BASE_NONE, NULL, 0,
"NonStandardParameter", HFILL }},
{ &hf_h245_mIPAddress,
{ "iPAddress", "h245.iPAddress_element",
{ "iPAddress", "h245.mIPAddress_element",
FT_NONE, BASE_NONE, NULL, 0,
"MIPAddress", HFILL }},
{ &hf_h245_mip4_network,
{ "network", "h245.network",
{ "network", "h245.mip4_network",
FT_IPv4, BASE_NONE, NULL, 0,
"OCTET_STRING_SIZE_4", HFILL }},
{ &hf_h245_multicast_tsapIdentifier,
{ "tsapIdentifier", "h245.tsapIdentifier",
{ "tsapIdentifier", "h245.multicast.tsapIdentifier",
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER_0_65535", HFILL }},
{ &hf_h245_mIP6Address,
{ "iP6Address", "h245.iP6Address_element",
{ "iP6Address", "h245.mIP6Address_element",
FT_NONE, BASE_NONE, NULL, 0,
"MIP6Address", HFILL }},
{ &hf_h245_mip6_network,
{ "network", "h245.network",
{ "network", "h245.mip6_network",
FT_IPv6, BASE_NONE, NULL, 0,
"OCTET_STRING_SIZE_16", HFILL }},
{ &hf_h245_multicast_IPv6_tsapIdentifier,
{ "tsapIdentifier", "h245.tsapIdentifier",
{ "tsapIdentifier", "h245.multicast_IPv6.tsapIdentifier",
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER_0_65535", HFILL }},
{ &hf_h245_synchFlag,
@ -19099,7 +19099,7 @@ void proto_register_h245(void) {
FT_OID, BASE_NONE, NULL, 0,
"OBJECT_IDENTIFIER", HFILL }},
{ &hf_h245_criteriaValue,
{ "value", "h245.value",
{ "value", "h245.criteriaValue",
FT_BYTES, BASE_NONE, NULL, 0,
"OCTET_STRING_SIZE_1_65535", HFILL }},
{ &hf_h245_mcuNumber,
@ -19366,8 +19366,8 @@ void proto_register_h245(void) {
{ "infoNotAvailable", "h245.infoNotAvailable",
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER_1_65535", HFILL }},
{ &hf_h245_networkAddressNum,
{ "networkAddress", "h245.networkAddress",
{ &hf_h245_din_networkAddress,
{ "networkAddress", "h245.din_networkAddress",
FT_STRING, BASE_NONE, NULL, 0,
"NumericString_SIZE_0_40", HFILL }},
{ &hf_h245_subAddress,
@ -19427,7 +19427,7 @@ void proto_register_h245(void) {
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_h245_multiplexCapabilityBool,
{ "multiplexCapability", "h245.multiplexCapability",
{ "multiplexCapability", "h245.multiplexCapabilityBool",
FT_BOOLEAN, BASE_NONE, NULL, 0,
"BOOLEAN", HFILL }},
{ &hf_h245_capabilityTableEntryNumbers,

116
epan/dissectors/packet-h248.c
View File

@ -2680,7 +2680,7 @@ dissect_h248_AuthenticationHeader(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
static int
dissect_h248_T_version(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 106 "./asn1/h248/h248.cnf"
#line 118 "./asn1/h248/h248.cnf"
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
&h248_version);
@ -2820,7 +2820,7 @@ dissect_h248_MId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a
static int
dissect_h248_T_errorCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 300 "./asn1/h248/h248.cnf"
#line 312 "./asn1/h248/h248.cnf"
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &error_code);
expert_add_info(actx->pinfo, actx->created_item, &ei_h248_errored_command);
@ -2876,7 +2876,7 @@ dissect_h248_TransactionId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
static int
dissect_h248_T_transactionId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 110 "./asn1/h248/h248.cnf"
#line 122 "./asn1/h248/h248.cnf"
guint32 trx_id = 0;
offset = dissect_h248_trx_id(implicit_tag, actx->pinfo, tree, tvb, offset, &trx_id);
curr_info.trx = gcp_trx(curr_info.msg, trx_id, GCP_TRX_REQUEST, keep_persistent_data);
@ -2891,7 +2891,7 @@ dissect_h248_T_transactionId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
static int
dissect_h248_ContextId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 135 "./asn1/h248/h248.cnf"
#line 147 "./asn1/h248/h248.cnf"
guint32 ctx_id = 0;
offset = dissect_h248_ctx_id(implicit_tag, actx->pinfo, tree, tvb, offset, &ctx_id);
curr_info.ctx = gcp_ctx(curr_info.msg,curr_info.trx,ctx_id,keep_persistent_data);
@ -2925,7 +2925,7 @@ dissect_h248_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
static int
dissect_h248_WildcardField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 318 "./asn1/h248/h248.cnf"
#line 330 "./asn1/h248/h248.cnf"
tvbuff_t* new_tvb;
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb);
tree = proto_item_add_subtree(actx->created_item,ett_wildcard);
@ -2959,7 +2959,7 @@ dissect_h248_SEQUENCE_OF_WildcardField(gboolean implicit_tag _U_, tvbuff_t *tvb
static int
dissect_h248_T_terminationId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 332 "./asn1/h248/h248.cnf"
#line 344 "./asn1/h248/h248.cnf"
tvbuff_t* new_tvb;
h248_term_info_t term_info;
@ -3010,7 +3010,7 @@ static const ber_sequence_t TerminationID_sequence[] = {
static int
dissect_h248_TerminationID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 313 "./asn1/h248/h248.cnf"
#line 325 "./asn1/h248/h248.cnf"
curr_info.term = wmem_new0(wmem_packet_scope(), gcp_term_t);
wild_term = GCP_WILDCARD_NONE;
@ -3088,14 +3088,14 @@ static const ber_sequence_t T_topologyReq_sequence_of[1] = {
static int
dissect_h248_T_topologyReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 218 "./asn1/h248/h248.cnf"
#line 230 "./asn1/h248/h248.cnf"
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_TOPOLOGY_REQ,offset,keep_persistent_data);
H248_TAP();
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
T_topologyReq_sequence_of, hf_index, ett_h248_T_topologyReq);
#line 222 "./asn1/h248/h248.cnf"
#line 234 "./asn1/h248/h248.cnf"
curr_info.cmd = NULL;
return offset;
@ -3331,13 +3331,13 @@ dissect_h248_ContextAttrAuditRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U
static int
dissect_h248_T_contextAttrAuditReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 226 "./asn1/h248/h248.cnf"
#line 238 "./asn1/h248/h248.cnf"
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_CTX_ATTR_AUDIT_REQ,offset,keep_persistent_data);
H248_TAP();
offset = dissect_h248_ContextAttrAuditRequest(implicit_tag, tvb, offset, actx, tree, hf_index);
#line 230 "./asn1/h248/h248.cnf"
#line 242 "./asn1/h248/h248.cnf"
curr_info.cmd = NULL;
return offset;
@ -3984,7 +3984,7 @@ static const ber_sequence_t SigParameter_sequence[] = {
static int
dissect_h248_SigParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 390 "./asn1/h248/h248.cnf"
#line 402 "./asn1/h248/h248.cnf"
/* H248 v1 support */
if (h248_version > 1) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
@ -4220,7 +4220,7 @@ static const ber_sequence_t EventParameter_sequence[] = {
static int
dissect_h248_EventParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 381 "./asn1/h248/h248.cnf"
#line 393 "./asn1/h248/h248.cnf"
/* H248 v1 support */
if (h248_version > 1) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
@ -4824,13 +4824,13 @@ dissect_h248_AmmRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
static int
dissect_h248_T_addReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 151 "./asn1/h248/h248.cnf"
#line 163 "./asn1/h248/h248.cnf"
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_ADD_REQ,offset,keep_persistent_data);
H248_TAP();
offset = dissect_h248_AmmRequest(implicit_tag, tvb, offset, actx, tree, hf_index);
#line 156 "./asn1/h248/h248.cnf"
#line 168 "./asn1/h248/h248.cnf"
curr_info.cmd = NULL;
return offset;
@ -4840,14 +4840,14 @@ dissect_h248_T_addReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
static int
dissect_h248_T_moveReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 160 "./asn1/h248/h248.cnf"
#line 172 "./asn1/h248/h248.cnf"
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_MOVE_REQ,offset,keep_persistent_data);
H248_TAP();
offset = dissect_h248_AmmRequest(implicit_tag, tvb, offset, actx, tree, hf_index);
#line 166 "./asn1/h248/h248.cnf"
#line 178 "./asn1/h248/h248.cnf"
curr_info.cmd = NULL;
return offset;
@ -4857,13 +4857,13 @@ dissect_h248_T_moveReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
static int
dissect_h248_T_modReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 170 "./asn1/h248/h248.cnf"
#line 182 "./asn1/h248/h248.cnf"
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_MOD_REQ,offset,keep_persistent_data);
H248_TAP();
offset = dissect_h248_AmmRequest(implicit_tag, tvb, offset, actx, tree, hf_index);
#line 174 "./asn1/h248/h248.cnf"
#line 186 "./asn1/h248/h248.cnf"
curr_info.cmd = NULL;
return offset;
@ -4888,13 +4888,13 @@ dissect_h248_SubtractRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
static int
dissect_h248_T_subtractReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 178 "./asn1/h248/h248.cnf"
#line 190 "./asn1/h248/h248.cnf"
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_SUB_REQ,offset,keep_persistent_data);
H248_TAP();
offset = dissect_h248_SubtractRequest(implicit_tag, tvb, offset, actx, tree, hf_index);
#line 182 "./asn1/h248/h248.cnf"
#line 194 "./asn1/h248/h248.cnf"
curr_info.cmd = NULL;
return offset;
@ -4920,13 +4920,13 @@ dissect_h248_AuditRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
static int
dissect_h248_T_auditCapRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 186 "./asn1/h248/h248.cnf"
#line 198 "./asn1/h248/h248.cnf"
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_AUDITCAP_REQ,offset,keep_persistent_data);
H248_TAP();
offset = dissect_h248_AuditRequest(implicit_tag, tvb, offset, actx, tree, hf_index);
#line 190 "./asn1/h248/h248.cnf"
#line 202 "./asn1/h248/h248.cnf"
curr_info.cmd = NULL;
return offset;
@ -4936,13 +4936,13 @@ dissect_h248_T_auditCapRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
static int
dissect_h248_T_auditValueRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 194 "./asn1/h248/h248.cnf"
#line 206 "./asn1/h248/h248.cnf"
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_AUDITVAL_REQ,offset,keep_persistent_data);
H248_TAP();
offset = dissect_h248_AuditRequest(implicit_tag, tvb, offset, actx, tree, hf_index);
#line 198 "./asn1/h248/h248.cnf"
#line 210 "./asn1/h248/h248.cnf"
curr_info.cmd = NULL;
return offset;
@ -5028,13 +5028,13 @@ dissect_h248_NotifyRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
static int
dissect_h248_T_notifyReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 202 "./asn1/h248/h248.cnf"
#line 214 "./asn1/h248/h248.cnf"
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_NOTIFY_REQ,offset,keep_persistent_data);
H248_TAP();
offset = dissect_h248_NotifyRequest(implicit_tag, tvb, offset, actx, tree, hf_index);
#line 206 "./asn1/h248/h248.cnf"
#line 218 "./asn1/h248/h248.cnf"
curr_info.cmd = NULL;
return offset;
@ -5119,7 +5119,7 @@ dissect_h248_ServiceChangeProfile(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
static int
dissect_h248_SCreasonValueOctetStr(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 371 "./asn1/h248/h248.cnf"
#line 383 "./asn1/h248/h248.cnf"
tvbuff_t *parameter_tvb;
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
&parameter_tvb);
@ -5190,14 +5190,14 @@ static const ber_sequence_t ServiceChangeRequest_sequence[] = {
static int
dissect_h248_ServiceChangeRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 210 "./asn1/h248/h248.cnf"
#line 222 "./asn1/h248/h248.cnf"
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_SVCCHG_REQ,offset,keep_persistent_data);
H248_TAP();
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
ServiceChangeRequest_sequence, hf_index, ett_h248_ServiceChangeRequest);
#line 214 "./asn1/h248/h248.cnf"
#line 226 "./asn1/h248/h248.cnf"
curr_info.cmd = NULL;
return offset;
@ -5315,7 +5315,7 @@ dissect_h248_TransactionRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
static int
dissect_h248_T_tpend_transactionId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 117 "./asn1/h248/h248.cnf"
#line 129 "./asn1/h248/h248.cnf"
guint32 trx_id = 0;
offset = dissect_h248_trx_id(implicit_tag, actx->pinfo, tree, tvb, offset, &trx_id);
curr_info.trx = gcp_trx(curr_info.msg, trx_id, GCP_TRX_PENDING, keep_persistent_data);
@ -5344,7 +5344,7 @@ dissect_h248_TransactionPending(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
static int
dissect_h248_T_trep_transactionId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 123 "./asn1/h248/h248.cnf"
#line 135 "./asn1/h248/h248.cnf"
guint32 trx_id = 0;
offset = dissect_h248_trx_id(implicit_tag, actx->pinfo, tree, tvb, offset, &trx_id);
curr_info.trx = gcp_trx(curr_info.msg, trx_id, GCP_TRX_REPLY, keep_persistent_data);
@ -5457,7 +5457,7 @@ dissect_h248_AmmsReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
static int
dissect_h248_T_addReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 234 "./asn1/h248/h248.cnf"
#line 246 "./asn1/h248/h248.cnf"
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_ADD_REPLY,offset,keep_persistent_data);
H248_TAP();
@ -5470,7 +5470,7 @@ dissect_h248_T_addReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
static int
dissect_h248_T_moveReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 239 "./asn1/h248/h248.cnf"
#line 251 "./asn1/h248/h248.cnf"
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_MOVE_REPLY,offset,keep_persistent_data);
H248_TAP();
@ -5483,7 +5483,7 @@ dissect_h248_T_moveReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
static int
dissect_h248_T_modReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 244 "./asn1/h248/h248.cnf"
#line 256 "./asn1/h248/h248.cnf"
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_MOD_REPLY,offset,keep_persistent_data);
H248_TAP();
@ -5496,7 +5496,7 @@ dissect_h248_T_modReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
static int
dissect_h248_T_subtractReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 249 "./asn1/h248/h248.cnf"
#line 261 "./asn1/h248/h248.cnf"
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_SUB_REPLY,offset,keep_persistent_data);
H248_TAP();
@ -5565,11 +5565,11 @@ dissect_h248_AuditReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
static int
dissect_h248_T_auditCapReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 264 "./asn1/h248/h248.cnf"
#line 276 "./asn1/h248/h248.cnf"
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_AUDITCAP_REPLY,offset,keep_persistent_data);
H248_TAP();
#line 269 "./asn1/h248/h248.cnf"
#line 281 "./asn1/h248/h248.cnf"
/* h248v1 support */
if(h248_version > 1) {
offset = dissect_h248_AuditReply(implicit_tag, tvb, offset, actx, tree, hf_index);
@ -5587,11 +5587,11 @@ dissect_h248_T_auditCapReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
static int
dissect_h248_T_auditValueReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 279 "./asn1/h248/h248.cnf"
#line 291 "./asn1/h248/h248.cnf"
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_AUDITVAL_REPLY,offset,keep_persistent_data);
H248_TAP();
#line 284 "./asn1/h248/h248.cnf"
#line 296 "./asn1/h248/h248.cnf"
/* h248v1 support */
if(h248_version > 1) {
offset = dissect_h248_AuditReply(implicit_tag, tvb, offset, actx, tree, hf_index);
@ -5624,7 +5624,7 @@ dissect_h248_NotifyReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
static int
dissect_h248_T_notifyReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 254 "./asn1/h248/h248.cnf"
#line 266 "./asn1/h248/h248.cnf"
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_NOTIFY_REPLY,offset,keep_persistent_data);
H248_TAP();
@ -5682,7 +5682,7 @@ static const ber_sequence_t ServiceChangeReply_sequence[] = {
static int
dissect_h248_ServiceChangeReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 259 "./asn1/h248/h248.cnf"
#line 271 "./asn1/h248/h248.cnf"
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_SVCCHG_REPLY,offset,keep_persistent_data);
H248_TAP();
@ -5753,7 +5753,7 @@ dissect_h248_ActionReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
ActionReply_sequence, hf_index, ett_h248_ActionReply);
#line 144 "./asn1/h248/h248.cnf"
#line 156 "./asn1/h248/h248.cnf"
if (!curr_info.cmd) {
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_REPLY,offset,keep_persistent_data);
H248_TAP();
@ -5857,7 +5857,7 @@ dissect_h248_TransactionResponseAck(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
static int
dissect_h248_T_seg_rep_transactionId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 129 "./asn1/h248/h248.cnf"
#line 141 "./asn1/h248/h248.cnf"
guint32 trx_id = 0;
offset = dissect_h248_trx_id(implicit_tag, actx->pinfo, tree, tvb, offset, &trx_id);
curr_info.trx = gcp_trx(curr_info.msg, trx_id, GCP_TRX_ACK, keep_persistent_data);
@ -5957,13 +5957,13 @@ static const ber_sequence_t Message_sequence[] = {
static int
dissect_h248_Message(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 95 "./asn1/h248/h248.cnf"
#line 107 "./asn1/h248/h248.cnf"
curr_info.msg = gcp_msg(actx->pinfo,tvb_raw_offset(tvb),keep_persistent_data);
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
Message_sequence, hf_index, ett_h248_Message);
#line 99 "./asn1/h248/h248.cnf"
#line 111 "./asn1/h248/h248.cnf"
col_add_str(actx->pinfo->cinfo, COL_INFO, gcp_msg_to_str(curr_info.msg,keep_persistent_data));
if (keep_persistent_data)
@ -6029,7 +6029,7 @@ static const ber_sequence_t AuditReplyV1_sequence[] = {
static int
dissect_h248_AuditReplyV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 294 "./asn1/h248/h248.cnf"
#line 306 "./asn1/h248/h248.cnf"
/* h248v1 support */
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
AuditReplyV1_sequence, hf_h248_auditValueReplyV1, ett_h248_AuditReplyV1);
@ -6308,7 +6308,7 @@ void proto_register_h248(void) {
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_h248_domName,
{ "name", "h248.name",
{ "name", "h248.domainname",
FT_STRING, BASE_NONE, NULL, 0,
"IA5String", HFILL }},
{ &hf_h248_portNumber,
@ -6316,11 +6316,11 @@ void proto_register_h248(void) {
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER_0_65535", HFILL }},
{ &hf_h248_iP4Address,
{ "address", "h248.address",
{ "address", "h248.iP4Address",
FT_IPv4, BASE_NONE, NULL, 0,
"OCTET_STRING_SIZE_4", HFILL }},
{ &hf_h248_iP6Address,
{ "address", "h248.address",
{ "address", "h248.iP6Address",
FT_IPv6, BASE_NONE, NULL, 0,
"OCTET_STRING_SIZE_16", HFILL }},
{ &hf_h248_transactionRequest,
@ -6344,7 +6344,7 @@ void proto_register_h248(void) {
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_h248_transactionId,
{ "transactionId", "h248.transactionId",
{ "transactionId", "h248.transactionRequest.transactionId",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_h248_actions,
@ -6356,11 +6356,11 @@ void proto_register_h248(void) {
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_h248_tpend_transactionId,
{ "transactionId", "h248.transactionId",
{ "transactionId", "h248.transactionpending.transactionId",
FT_UINT32, BASE_DEC, NULL, 0,
"T_tpend_transactionId", HFILL }},
{ &hf_h248_trep_transactionId,
{ "transactionId", "h248.transactionId",
{ "transactionId", "h248.transactionreply.transactionId",
FT_UINT32, BASE_DEC, NULL, 0,
"T_trep_transactionId", HFILL }},
{ &hf_h248_immAckRequired,
@ -6392,7 +6392,7 @@ void proto_register_h248(void) {
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_h248_seg_rep_transactionId,
{ "transactionId", "h248.transactionId",
{ "transactionId", "h248.segmentreply.transactionId",
FT_UINT32, BASE_DEC, NULL, 0,
"T_seg_rep_transactionId", HFILL }},
{ &hf_h248_TransactionResponseAck_item,
@ -6992,7 +6992,7 @@ void proto_register_h248(void) {
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_h248_terminationId,
{ "id", "h248.id",
{ "id", "h248.terminationId",
FT_BYTES, BASE_NONE, NULL, 0,
"T_terminationId", HFILL }},
{ &hf_h248_TerminationIDList_item,
@ -7064,7 +7064,7 @@ void proto_register_h248(void) {
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_h248_propertyParamValue,
{ "value", "h248.value",
{ "value", "h248.propertyParamValue",
FT_UINT32, BASE_DEC, NULL, 0,
"SEQUENCE_OF_PropertyID", HFILL }},
{ &hf_h248_propertyParamValue_item,
@ -7428,11 +7428,11 @@ void proto_register_h248(void) {
FT_BYTES, BASE_NONE, NULL, 0,
"EventParameterName", HFILL }},
{ &hf_h248_event_param_value,
{ "value", "h248.value",
{ "value", "h248.event_param_value",
FT_BYTES, BASE_NONE, NULL, 0,
"EventParamValueV1", HFILL }},
{ &hf_h248_sig_param_value,
{ "value", "h248.value",
{ "value", "h248.sig_param_value",
FT_BYTES, BASE_NONE, NULL, 0,
"SigParamValueV1", HFILL }},
{ &hf_h248_T_auditToken_muxToken,

20
epan/dissectors/packet-h282.c
View File

@ -92,7 +92,7 @@ static int hf_h282_maxNumberOfFilters = -1; /* INTEGER_2_255 */
static int hf_h282_filterTextLabel = -1; /* T_filterTextLabel */
static int hf_h282_filterTextLabel_item = -1; /* T_filterTextLabel_item */
static int hf_h282_filterNumber = -1; /* INTEGER_1_255 */
static int hf_h282_filterTextLabel_01 = -1; /* DeviceText */
static int hf_h282_filterTextLabel_deviceText = -1; /* DeviceText */
static int hf_h282_maxNumberOfLens = -1; /* INTEGER_2_255 */
static int hf_h282_accessoryTextLabel = -1; /* T_accessoryTextLabel */
static int hf_h282_accessoryTextLabel_item = -1; /* T_accessoryTextLabel_item */
@ -1235,7 +1235,7 @@ dissect_h282_INTEGER_1_255(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
static const per_sequence_t T_filterTextLabel_item_sequence[] = {
{ &hf_h282_filterNumber , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h282_INTEGER_1_255 },
{ &hf_h282_filterTextLabel_01, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h282_DeviceText },
{ &hf_h282_filterTextLabel_deviceText, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h282_DeviceText },
{ NULL, 0, 0, NULL }
};
@ -4244,7 +4244,7 @@ static const per_choice_t RequestPDU_choice[] = {
static int
dissect_h282_RequestPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 22 "./asn1/h282/h282.cnf"
#line 28 "./asn1/h282/h282.cnf"
gint32 msg_type = -1;
const gchar *p = NULL;
@ -4252,7 +4252,7 @@ dissect_h282_RequestPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
ett_h282_RequestPDU, RequestPDU_choice,
&msg_type);
#line 25 "./asn1/h282/h282.cnf"
#line 31 "./asn1/h282/h282.cnf"
p = try_val_to_str(msg_type, VALS(h282_RequestPDU_vals));
if (p)
col_add_fstr(actx->pinfo->cinfo, COL_INFO, "RequestPDU/%s", p);
@ -4287,7 +4287,7 @@ static const per_choice_t ResponsePDU_choice[] = {
static int
dissect_h282_ResponsePDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 33 "./asn1/h282/h282.cnf"
#line 39 "./asn1/h282/h282.cnf"
gint32 msg_type = -1;
const gchar *p = NULL;
@ -4295,7 +4295,7 @@ dissect_h282_ResponsePDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
ett_h282_ResponsePDU, ResponsePDU_choice,
&msg_type);
#line 36 "./asn1/h282/h282.cnf"
#line 42 "./asn1/h282/h282.cnf"
p = try_val_to_str(msg_type, VALS(h282_ResponsePDU_vals));
if (p)
col_add_fstr(actx->pinfo->cinfo, COL_INFO, "ResponsePDU/%s", p);
@ -4322,7 +4322,7 @@ static const per_choice_t IndicationPDU_choice[] = {
static int
dissect_h282_IndicationPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 44 "./asn1/h282/h282.cnf"
#line 50 "./asn1/h282/h282.cnf"
gint32 msg_type = -1;
const gchar *p = NULL;
@ -4330,7 +4330,7 @@ dissect_h282_IndicationPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
ett_h282_IndicationPDU, IndicationPDU_choice,
&msg_type);
#line 47 "./asn1/h282/h282.cnf"
#line 53 "./asn1/h282/h282.cnf"
p = try_val_to_str(msg_type, VALS(h282_IndicationPDU_vals));
if (p)
col_add_fstr(actx->pinfo->cinfo, COL_INFO, "IndicationPDU/%s", p);
@ -4627,8 +4627,8 @@ void proto_register_h282(void) {
{ "filterNumber", "h282.filterNumber",
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER_1_255", HFILL }},
{ &hf_h282_filterTextLabel_01,
{ "filterTextLabel", "h282.filterTextLabel",
{ &hf_h282_filterTextLabel_deviceText,
{ "filterTextLabel", "h282.filterTextLabel.deviceText",
FT_BYTES, BASE_NONE, NULL, 0,
"DeviceText", HFILL }},
{ &hf_h282_maxNumberOfLens,

26
epan/dissectors/packet-h501.c
View File

@ -126,7 +126,7 @@ static int hf_h501_descriptorID_item = -1; /* DescriptorID */
static int hf_h501_descriptor = -1; /* SEQUENCE_OF_Descriptor */
static int hf_h501_descriptor_item = -1; /* Descriptor */
static int hf_h501_reason_02 = -1; /* DescriptorRejectionReason */
static int hf_h501_descriptorID_01 = -1; /* DescriptorID */
static int hf_h501_descriptorRejection_descriptorID = -1; /* DescriptorID */
static int hf_h501_packetSizeExceeded = -1; /* NULL */
static int hf_h501_illegalID = -1; /* NULL */
static int hf_h501_hopCountExceeded = -1; /* NULL */
@ -139,6 +139,7 @@ static int hf_h501_sender = -1; /* AliasAddress */
static int hf_h501_updateInfo = -1; /* SEQUENCE_OF_UpdateInformation */
static int hf_h501_updateInfo_item = -1; /* UpdateInformation */
static int hf_h501_descriptorInfo_01 = -1; /* T_descriptorInfo */
static int hf_h501_updateInformation_descriptorID = -1; /* DescriptorID */
static int hf_h501_descriptor_01 = -1; /* Descriptor */
static int hf_h501_updateType = -1; /* T_updateType */
static int hf_h501_added = -1; /* NULL */
@ -250,6 +251,7 @@ static int hf_h501_minimum = -1; /* NULL */
static int hf_h501_maximum = -1; /* NULL */
static int hf_h501_descriptorInfo_02 = -1; /* DescriptorInfo */
static int hf_h501_gatekeeperID = -1; /* GatekeeperIdentifier */
static int hf_h501_descriptorInfo_descriptorID = -1; /* DescriptorID */
static int hf_h501_lastChanged = -1; /* GlobalTimeStamp */
static int hf_h501_alternatePE = -1; /* SEQUENCE_OF_AlternatePE */
static int hf_h501_alternatePE_item = -1; /* AlternatePE */
@ -810,7 +812,7 @@ dissect_h501_GlobalTimeStamp(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
static const per_sequence_t DescriptorInfo_sequence[] = {
{ &hf_h501_descriptorID_01, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h501_DescriptorID },
{ &hf_h501_descriptorInfo_descriptorID, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h501_DescriptorID },
{ &hf_h501_lastChanged , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h501_GlobalTimeStamp },
{ NULL, 0, 0, NULL }
};
@ -1298,7 +1300,7 @@ dissect_h501_DescriptorRejectionReason(tvbuff_t *tvb _U_, int offset _U_, asn1_c
static const per_sequence_t DescriptorRejection_sequence[] = {
{ &hf_h501_reason_02 , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h501_DescriptorRejectionReason },
{ &hf_h501_descriptorID_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h501_DescriptorID },
{ &hf_h501_descriptorRejection_descriptorID, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h501_DescriptorID },
{ NULL, 0, 0, NULL }
};
@ -1406,7 +1408,7 @@ static const value_string h501_T_descriptorInfo_vals[] = {
};
static const per_choice_t T_descriptorInfo_choice[] = {
{ 0, &hf_h501_descriptorID_01, ASN1_EXTENSION_ROOT , dissect_h501_DescriptorID },
{ 0, &hf_h501_updateInformation_descriptorID, ASN1_EXTENSION_ROOT , dissect_h501_DescriptorID },
{ 1, &hf_h501_descriptor_01 , ASN1_EXTENSION_ROOT , dissect_h501_Descriptor },
{ 0, NULL, 0, NULL }
};
@ -2342,7 +2344,7 @@ static const per_choice_t MessageBody_choice[] = {
static int
dissect_h501_MessageBody(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 20 "./asn1/h501/h501.cnf"
#line 30 "./asn1/h501/h501.cnf"
gint32 msg_type = -1;
const gchar *p = NULL;
@ -2350,7 +2352,7 @@ dissect_h501_MessageBody(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
ett_h501_MessageBody, MessageBody_choice,
&msg_type);
#line 23 "./asn1/h501/h501.cnf"
#line 33 "./asn1/h501/h501.cnf"
p = try_val_to_str(msg_type, VALS(h501_MessageBody_vals));
if (p )
col_set_str(actx->pinfo->cinfo, COL_INFO, p);
@ -2884,8 +2886,8 @@ void proto_register_h501(void) {
{ "reason", "h501.reason",
FT_UINT32, BASE_DEC, VALS(h501_DescriptorRejectionReason_vals), 0,
"DescriptorRejectionReason", HFILL }},
{ &hf_h501_descriptorID_01,
{ "descriptorID", "h501.descriptorID",
{ &hf_h501_descriptorRejection_descriptorID,
{ "descriptorID", "h501.descriptorRejection_descriptorID",
FT_GUID, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_h501_packetSizeExceeded,
@ -2936,6 +2938,10 @@ void proto_register_h501(void) {
{ "descriptorInfo", "h501.descriptorInfo",
FT_UINT32, BASE_DEC, VALS(h501_T_descriptorInfo_vals), 0,
NULL, HFILL }},
{ &hf_h501_updateInformation_descriptorID,
{ "descriptorID", "h501.updateInformation_descriptorID",
FT_GUID, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_h501_descriptor_01,
{ "descriptor", "h501.descriptor_element",
FT_NONE, BASE_NONE, NULL, 0,
@ -3380,6 +3386,10 @@ void proto_register_h501(void) {
{ "gatekeeperID", "h501.gatekeeperID",
FT_STRING, BASE_NONE, NULL, 0,
"GatekeeperIdentifier", HFILL }},
{ &hf_h501_descriptorInfo_descriptorID,
{ "descriptorID", "h501.descriptorInfo_descriptorID",
FT_GUID, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_h501_lastChanged,
{ "lastChanged", "h501.lastChanged",
FT_STRING, BASE_NONE, NULL, 0,

46
epan/dissectors/packet-hnbap.c
View File

@ -207,7 +207,7 @@ static int hf_hnbap_ipv4info = -1; /* Ipv4Address */
static int hf_hnbap_ipv6info = -1; /* Ipv6Address */
static int hf_hnbap_Iurh_Signalling_TNL_AddressList_item = -1; /* IP_Address */
static int hf_hnbap_pLMNID = -1; /* PLMNidentity */
static int hf_hnbap_cellIdentity_01 = -1; /* MacroCellID */
static int hf_hnbap_macroCellID = -1; /* MacroCellID */
static int hf_hnbap_uTRANCellID = -1; /* UTRANCellID */
static int hf_hnbap_gERANCellID = -1; /* CGI */
static int hf_hnbap_NeighbourInfoList_item = -1; /* HNBConfigInfo */
@ -425,7 +425,7 @@ dissect_hnbap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, 255U, &ProcedureCode, FALSE);
#line 58 "./asn1/hnbap/hnbap.cnf"
#line 62 "./asn1/hnbap/hnbap.cnf"
if (strcmp(val_to_str(ProcedureCode, hnbap_ProcedureCode_vals, "Unknown"), "Unknown") == 0) {
col_set_str(actx->pinfo->cinfo, COL_INFO,
"Unknown Message");
@ -476,7 +476,7 @@ dissect_hnbap_ProtocolIE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, maxProtocolIEs, &ProtocolIE_ID, FALSE);
#line 47 "./asn1/hnbap/hnbap.cnf"
#line 51 "./asn1/hnbap/hnbap.cnf"
if (tree) {
proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str(ProtocolIE_ID, VALS(hnbap_ProtocolIE_ID_vals), "unknown (%d)"));
}
@ -1345,7 +1345,7 @@ dissect_hnbap_MacroCellID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
static const per_sequence_t MacroCoverageInformation_sequence[] = {
{ &hf_hnbap_cellIdentity_01, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_hnbap_MacroCellID },
{ &hf_hnbap_macroCellID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_hnbap_MacroCellID },
{ &hf_hnbap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_hnbap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@ -1413,7 +1413,7 @@ dissect_hnbap_IMEI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot
static int
dissect_hnbap_IMSI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 154 "./asn1/hnbap/hnbap.cnf"
#line 158 "./asn1/hnbap/hnbap.cnf"
tvbuff_t *parameter_tvb;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
3, 8, FALSE, &parameter_tvb);
@ -1797,7 +1797,7 @@ static const per_sequence_t HNBRegisterRequest_sequence[] = {
static int
dissect_hnbap_HNBRegisterRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 71 "./asn1/hnbap/hnbap.cnf"
#line 75 "./asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"HNB_REGISTER_REQUEST ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -1818,7 +1818,7 @@ static const per_sequence_t HNBRegisterAccept_sequence[] = {
static int
dissect_hnbap_HNBRegisterAccept(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 76 "./asn1/hnbap/hnbap.cnf"
#line 80 "./asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"HNB_REGISTER_ACCEPT ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -1839,7 +1839,7 @@ static const per_sequence_t HNBRegisterReject_sequence[] = {
static int
dissect_hnbap_HNBRegisterReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 81 "./asn1/hnbap/hnbap.cnf"
#line 85 "./asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"HNB_REGISTER_REJECT ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -1860,7 +1860,7 @@ static const per_sequence_t HNBDe_Register_sequence[] = {
static int
dissect_hnbap_HNBDe_Register(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 106 "./asn1/hnbap/hnbap.cnf"
#line 110 "./asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"HNB_DE-REGISTER ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -1881,7 +1881,7 @@ static const per_sequence_t UERegisterRequest_sequence[] = {
static int
dissect_hnbap_UERegisterRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 86 "./asn1/hnbap/hnbap.cnf"
#line 90 "./asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"UE_REGISTER_REQUEST ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -1902,7 +1902,7 @@ static const per_sequence_t UERegisterAccept_sequence[] = {
static int
dissect_hnbap_UERegisterAccept(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 91 "./asn1/hnbap/hnbap.cnf"
#line 95 "./asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"UE_REGISTER_ACCEPT ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -1923,7 +1923,7 @@ static const per_sequence_t UERegisterReject_sequence[] = {
static int
dissect_hnbap_UERegisterReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 96 "./asn1/hnbap/hnbap.cnf"
#line 100 "./asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"UE_REGISTER_REJECT ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -1944,7 +1944,7 @@ static const per_sequence_t UEDe_Register_sequence[] = {
static int
dissect_hnbap_UEDe_Register(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 101 "./asn1/hnbap/hnbap.cnf"
#line 105 "./asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"UE_DE-REGISTER ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -1965,7 +1965,7 @@ static const per_sequence_t CSGMembershipUpdate_sequence[] = {
static int
dissect_hnbap_CSGMembershipUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 117 "./asn1/hnbap/hnbap.cnf"
#line 121 "./asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"CSG_MEMBERSHIP_UPDATE_MESSAGE ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -1986,7 +1986,7 @@ static const per_sequence_t TNLUpdateRequest_sequence[] = {
static int
dissect_hnbap_TNLUpdateRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 127 "./asn1/hnbap/hnbap.cnf"
#line 131 "./asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"TNL_UPDATE_REQUEST_MESSAGE ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2006,7 +2006,7 @@ static const per_sequence_t TNLUpdateResponse_sequence[] = {
static int
dissect_hnbap_TNLUpdateResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 131 "./asn1/hnbap/hnbap.cnf"
#line 135 "./asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"TNL_UPDATE_RESPONSE_MESSAGE ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2026,7 +2026,7 @@ static const per_sequence_t TNLUpdateFailure_sequence[] = {
static int
dissect_hnbap_TNLUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 135 "./asn1/hnbap/hnbap.cnf"
#line 139 "./asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"TNL_UPDATE_FAILURE_MESSAGE ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2046,7 +2046,7 @@ static const per_sequence_t HNBConfigTransferRequest_sequence[] = {
static int
dissect_hnbap_HNBConfigTransferRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 139 "./asn1/hnbap/hnbap.cnf"
#line 143 "./asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"HNB_CONFIG_TRANSFER_REQUEST_MESSAGE ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2066,7 +2066,7 @@ static const per_sequence_t HNBConfigTransferResponse_sequence[] = {
static int
dissect_hnbap_HNBConfigTransferResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 143 "./asn1/hnbap/hnbap.cnf"
#line 147 "./asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"HNB_CONFIG_TRANSFER_RESPONSE_MESSAGE ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2086,7 +2086,7 @@ static const per_sequence_t RelocationComplete_sequence[] = {
static int
dissect_hnbap_RelocationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 147 "./asn1/hnbap/hnbap.cnf"
#line 151 "./asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"RELOCATION_COMPLETE_MESSAGE ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -2107,7 +2107,7 @@ static const per_sequence_t ErrorIndication_sequence[] = {
static int
dissect_hnbap_ErrorIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 111 "./asn1/hnbap/hnbap.cnf"
#line 115 "./asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"ERROR_INDICATION ");
col_set_fence(actx->pinfo->cinfo, COL_INFO); /* Protect info from CriticalityDiagnostics decodes */
@ -2128,7 +2128,7 @@ static const per_sequence_t PrivateMessage_sequence[] = {
static int
dissect_hnbap_PrivateMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 122 "./asn1/hnbap/hnbap.cnf"
#line 126 "./asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"PRIVATE_MESSAGE ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -3057,7 +3057,7 @@ module_t *hnbap_module;
{ "pLMNID", "hnbap.pLMNID",
FT_BYTES, BASE_NONE, NULL, 0,
"PLMNidentity", HFILL }},
{ &hf_hnbap_cellIdentity_01,
{ &hf_hnbap_macroCellID,
{ "cellIdentity", "hnbap.cellIdentity",
FT_UINT32, BASE_DEC, VALS(hnbap_MacroCellID_vals), 0,
"MacroCellID", HFILL }},

2
epan/dissectors/packet-idmp.c
View File

@ -879,7 +879,7 @@ void proto_register_idmp(void)
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_idmp_idm_invokeID,
{ "invokeID", "idmp.invokeID",
{ "invokeID", "idmp.idmResult.invokeID",
FT_UINT32, BASE_DEC, VALS(idmp_InvokeId_vals), 0,
NULL, HFILL }},
{ &hf_idmp_result,

12
epan/dissectors/packet-ieee1609dot2.c
View File

@ -1191,7 +1191,7 @@ dissect_ieee1609dot2_Psid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
static int
dissect_ieee1609dot2_T_psPsid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 108 "./asn1/ieee1609dot2/ieee1609dot2.cnf"
#line 111 "./asn1/ieee1609dot2/ieee1609dot2.cnf"
offset = dissect_oer_constrained_integer_64b_no_ub(tvb, offset, actx, tree, hf_index,
0U, NO_BOUND, &((ieee1609_private_data_t*)actx->private_data)->psidssp, FALSE);
@ -1204,7 +1204,7 @@ dissect_ieee1609dot2_T_psPsid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
static int
dissect_ieee1609dot2_T_opaque(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 112 "./asn1/ieee1609dot2/ieee1609dot2.cnf"
#line 115 "./asn1/ieee1609dot2/ieee1609dot2.cnf"
tvbuff_t *ssp;
ieee1609_private_data_t *my_private_data = (ieee1609_private_data_t*)actx->private_data;
@ -1469,7 +1469,7 @@ dissect_ieee1609dot2_GroupLinkageValue(tvbuff_t *tvb _U_, int offset _U_, asn1_c
static int
dissect_ieee1609dot2_T_unsecuredData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 74 "./asn1/ieee1609dot2/ieee1609dot2.cnf"
#line 77 "./asn1/ieee1609dot2/ieee1609dot2.cnf"
ieee1609_private_data_t *my_private_data = (ieee1609_private_data_t*)actx->private_data;
offset = dissect_oer_octet_string(tvb, offset, actx, tree, hf_index,
@ -1495,7 +1495,7 @@ dissect_ieee1609dot2_T_unsecuredData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
static int
dissect_ieee1609dot2_T_hiPsid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 93 "./asn1/ieee1609dot2/ieee1609dot2.cnf"
#line 96 "./asn1/ieee1609dot2/ieee1609dot2.cnf"
guint64 psid;
ieee1609_private_data_t *my_private_data = (ieee1609_private_data_t*)actx->private_data;
@ -2058,7 +2058,7 @@ static const oer_sequence_t Ieee1609Dot2Data_sequence[] = {
static int
dissect_ieee1609dot2_Ieee1609Dot2Data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 70 "./asn1/ieee1609dot2/ieee1609dot2.cnf"
#line 73 "./asn1/ieee1609dot2/ieee1609dot2.cnf"
actx->private_data = (void*)wmem_new0(wmem_packet_scope(), ieee1609_private_data_t);
offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index,
@ -2434,7 +2434,7 @@ void proto_register_ieee1609dot2(void) {
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_ieee1609dot2_srRange,
{ "opaque", "ieee1609dot2.opaque",
{ "opaque", "ieee1609dot2.srRange.opaque",
FT_UINT32, BASE_DEC, NULL, 0,
"SequenceOfOctetString", HFILL }},
{ &hf_ieee1609dot2_all,