diff options
52 files changed, 2316 insertions, 1794 deletions
diff --git a/epan/dissectors/asn1/x509af/x509af.cnf b/epan/dissectors/asn1/x509af/x509af.cnf index 72401c0bc3..ef077bd1ca 100644 --- a/epan/dissectors/asn1/x509af/x509af.cnf +++ b/epan/dissectors/asn1/x509af/x509af.cnf @@ -100,7 +100,7 @@ CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate # proto_tree *subtree; dissect_ber_bitstring(FALSE, actx, NULL, tvb, offset, - NULL, -1, -1, &bs_tvb); + NULL, 0, -1, -1, &bs_tvb); /* See RFC 3279 for possible subjectPublicKey values given an Algorithm ID. * The contents of subjectPublicKey are always explicitly tagged. */ @@ -118,7 +118,7 @@ CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate # } else { offset = dissect_ber_bitstring(FALSE, actx, tree, tvb, offset, - NULL, hf_index, -1, NULL); + NULL, 0, hf_index, -1, NULL); } #.FN_PARS Extension/extnId diff --git a/epan/dissectors/packet-HI2Operations.c b/epan/dissectors/packet-HI2Operations.c index 2bb97bcd8d..a4a888ff87 100644 --- a/epan/dissectors/packet-HI2Operations.c +++ b/epan/dissectors/packet-HI2Operations.c @@ -2121,7 +2121,7 @@ dissect_HI2Operations_LIIDType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_HI2Operations_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -3123,7 +3123,7 @@ dissect_HI2Operations_CorrelationValues(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_HI2Operations_TLIIdType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -3134,7 +3134,7 @@ dissect_HI2Operations_TLIIdType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_HI2Operations_MCCType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -3145,7 +3145,7 @@ dissect_HI2Operations_MCCType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_HI2Operations_MNCType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -3156,7 +3156,7 @@ dissect_HI2Operations_MNCType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_HI2Operations_LocationAreaType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -3167,7 +3167,7 @@ dissect_HI2Operations_LocationAreaType(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_HI2Operations_CellIdType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -3195,7 +3195,7 @@ dissect_HI2Operations_TETRACGIType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_HI2Operations_SSIType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -3233,7 +3233,7 @@ dissect_HI2Operations_NumericString_SIZE_20(gboolean implicit_tag _U_, tvbuff_t static int dissect_HI2Operations_BIT_STRING_SIZE_32(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -3244,7 +3244,7 @@ dissect_HI2Operations_BIT_STRING_SIZE_32(gboolean implicit_tag _U_, tvbuff_t *tv static int dissect_HI2Operations_BIT_STRING_SIZE_128(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -3255,7 +3255,7 @@ dissect_HI2Operations_BIT_STRING_SIZE_128(gboolean implicit_tag _U_, tvbuff_t *t static int dissect_HI2Operations_TEIType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c index 6735248009..66c8e5fec2 100644 --- a/epan/dissectors/packet-acp133.c +++ b/epan/dissectors/packet-acp133.c @@ -224,17 +224,17 @@ dissect_acp133_Community(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse } -static const asn_namedbit OnSupported_bits[] = { - { 0, &hf_acp133_OnSupported_acp127_nn, -1, -1, "acp127-nn", NULL }, - { 1, &hf_acp133_OnSupported_acp127_pn, -1, -1, "acp127-pn", NULL }, - { 2, &hf_acp133_OnSupported_acp127_tn, -1, -1, "acp127-tn", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * OnSupported_bits[] = { + &hf_acp133_OnSupported_acp127_nn, + &hf_acp133_OnSupported_acp127_pn, + &hf_acp133_OnSupported_acp127_tn, + NULL }; static int dissect_acp133_OnSupported(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - OnSupported_bits, hf_index, ett_acp133_OnSupported, + OnSupported_bits, 3, hf_index, ett_acp133_OnSupported, NULL); return offset; @@ -486,7 +486,7 @@ dissect_acp133_SEQUENCE_OF_UKMEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_acp133_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index 4ed0c78fcb..c780f5a2da 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -370,7 +370,7 @@ dissect_acse_T_octet_aligned(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_acse_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -428,15 +428,15 @@ dissect_acse_EXTERNALt(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const asn_namedbit T_AARQ_protocol_version_bits[] = { - { 0, &hf_acse_T_AARQ_protocol_version_version1, -1, -1, "version1", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_AARQ_protocol_version_bits[] = { + &hf_acse_T_AARQ_protocol_version_version1, + NULL }; static int dissect_acse_T_AARQ_protocol_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_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_AARQ_protocol_version_bits, hf_index, ett_acse_T_AARQ_protocol_version, + T_AARQ_protocol_version_bits, 1, hf_index, ett_acse_T_AARQ_protocol_version, NULL); return offset; @@ -614,18 +614,18 @@ dissect_acse_AE_invocation_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _ } -static const asn_namedbit ACSE_requirements_bits[] = { - { 0, &hf_acse_ACSE_requirements_authentication, -1, -1, "authentication", NULL }, - { 1, &hf_acse_ACSE_requirements_aSO_context_negotiation, -1, -1, "aSO-context-negotiation", NULL }, - { 2, &hf_acse_ACSE_requirements_higher_level_association, -1, -1, "higher-level-association", NULL }, - { 3, &hf_acse_ACSE_requirements_nested_association, -1, -1, "nested-association", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * ACSE_requirements_bits[] = { + &hf_acse_ACSE_requirements_authentication, + &hf_acse_ACSE_requirements_aSO_context_negotiation, + &hf_acse_ACSE_requirements_higher_level_association, + &hf_acse_ACSE_requirements_nested_association, + NULL }; static int dissect_acse_ACSE_requirements(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - ACSE_requirements_bits, hf_index, ett_acse_ACSE_requirements, + ACSE_requirements_bits, 4, hf_index, ett_acse_ACSE_requirements, NULL); return offset; @@ -964,15 +964,15 @@ dissect_acse_AARQ_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const asn_namedbit T_AARE_protocol_version_bits[] = { - { 0, &hf_acse_T_AARE_protocol_version_version1, -1, -1, "version1", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_AARE_protocol_version_bits[] = { + &hf_acse_T_AARE_protocol_version_version1, + NULL }; static int dissect_acse_T_AARE_protocol_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_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_AARE_protocol_version_bits, hf_index, ett_acse_T_AARE_protocol_version, + T_AARE_protocol_version_bits, 1, hf_index, ett_acse_T_AARE_protocol_version, NULL); return offset; diff --git a/epan/dissectors/packet-ain.c b/epan/dissectors/packet-ain.c index e2bca1e1ee..e80f26a8d9 100644 --- a/epan/dissectors/packet-ain.c +++ b/epan/dissectors/packet-ain.c @@ -3421,16 +3421,16 @@ dissect_ain_GenericDigitsList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const asn_namedbit ApplyRestrictions_U_bits[] = { - { 0, &hf_ain_ApplyRestrictions_U_code, -1, -1, "code", NULL }, - { 1, &hf_ain_ApplyRestrictions_U_toll, -1, -1, "toll", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * ApplyRestrictions_U_bits[] = { + &hf_ain_ApplyRestrictions_U_code, + &hf_ain_ApplyRestrictions_U_toll, + NULL }; static int dissect_ain_ApplyRestrictions_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - ApplyRestrictions_U_bits, hf_index, ett_ain_ApplyRestrictions_U, + ApplyRestrictions_U_bits, 2, hf_index, ett_ain_ApplyRestrictions_U, NULL); return offset; @@ -5627,18 +5627,18 @@ dissect_ain_DelayInterval(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs } -static const asn_namedbit Empty_bits[] = { - { 0, &hf_ain_Empty_entireList, -1, -1, "entireList", NULL }, - { 1, &hf_ain_Empty_outgoingmemorySlot, -1, -1, "outgoingmemorySlot", NULL }, - { 2, &hf_ain_Empty_incomingmemorySlot, -1, -1, "incomingmemorySlot", NULL }, - { 3, &hf_ain_Empty_forwardToDn, -1, -1, "forwardToDn", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Empty_bits[] = { + &hf_ain_Empty_entireList, + &hf_ain_Empty_outgoingmemorySlot, + &hf_ain_Empty_incomingmemorySlot, + &hf_ain_Empty_forwardToDn, + NULL }; static int dissect_ain_Empty(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Empty_bits, hf_index, ett_ain_Empty, + Empty_bits, 4, hf_index, ett_ain_Empty, NULL); return offset; @@ -5715,15 +5715,15 @@ dissect_ain_Service1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const asn_namedbit Request1_bits[] = { - { 0, &hf_ain_Request1_activationStatus, -1, -1, "activationStatus", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Request1_bits[] = { + &hf_ain_Request1_activationStatus, + NULL }; static int dissect_ain_Request1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Request1_bits, hf_index, ett_ain_Request1, + Request1_bits, 1, hf_index, ett_ain_Request1, NULL); return offset; @@ -5760,16 +5760,16 @@ dissect_ain_Service2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const asn_namedbit Request2_bits[] = { - { 0, &hf_ain_Request2_activationStatus, -1, -1, "activationStatus", NULL }, - { 1, &hf_ain_Request2_delayInterval, -1, -1, "delayInterval", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Request2_bits[] = { + &hf_ain_Request2_activationStatus, + &hf_ain_Request2_delayInterval, + NULL }; static int dissect_ain_Request2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Request2_bits, hf_index, ett_ain_Request2, + Request2_bits, 2, hf_index, ett_ain_Request2, NULL); return offset; @@ -5807,17 +5807,17 @@ dissect_ain_Service3(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const asn_namedbit Request3_bits[] = { - { 0, &hf_ain_Request3_activationStatus, -1, -1, "activationStatus", NULL }, - { 1, &hf_ain_Request3_entireList, -1, -1, "entireList", NULL }, - { 2, &hf_ain_Request3_listSize, -1, -1, "listSize", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Request3_bits[] = { + &hf_ain_Request3_activationStatus, + &hf_ain_Request3_entireList, + &hf_ain_Request3_listSize, + NULL }; static int dissect_ain_Request3(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Request3_bits, hf_index, ett_ain_Request3, + Request3_bits, 3, hf_index, ett_ain_Request3, NULL); return offset; @@ -5856,16 +5856,16 @@ dissect_ain_Service4(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const asn_namedbit Request4_bits[] = { - { 0, &hf_ain_Request4_activationStatus, -1, -1, "activationStatus", NULL }, - { 1, &hf_ain_Request4_forwardingDn, -1, -1, "forwardingDn", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Request4_bits[] = { + &hf_ain_Request4_activationStatus, + &hf_ain_Request4_forwardingDn, + NULL }; static int dissect_ain_Request4(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Request4_bits, hf_index, ett_ain_Request4, + Request4_bits, 2, hf_index, ett_ain_Request4, NULL); return offset; @@ -5903,18 +5903,18 @@ dissect_ain_Service5(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const asn_namedbit Request5_bits[] = { - { 0, &hf_ain_Request5_activationStatus, -1, -1, "activationStatus", NULL }, - { 1, &hf_ain_Request5_forwardingDn, -1, -1, "forwardingDn", NULL }, - { 2, &hf_ain_Request5_entireList, -1, -1, "entireList", NULL }, - { 3, &hf_ain_Request5_listSize, -1, -1, "listSize", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Request5_bits[] = { + &hf_ain_Request5_activationStatus, + &hf_ain_Request5_forwardingDn, + &hf_ain_Request5_entireList, + &hf_ain_Request5_listSize, + NULL }; static int dissect_ain_Request5(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Request5_bits, hf_index, ett_ain_Request5, + Request5_bits, 4, hf_index, ett_ain_Request5, NULL); return offset; @@ -5951,15 +5951,15 @@ dissect_ain_Service6(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const asn_namedbit Request6_bits[] = { - { 0, &hf_ain_Request6_delayInterval, -1, -1, "delayInterval", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Request6_bits[] = { + &hf_ain_Request6_delayInterval, + NULL }; static int dissect_ain_Request6(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Request6_bits, hf_index, ett_ain_Request6, + Request6_bits, 1, hf_index, ett_ain_Request6, NULL); return offset; @@ -6011,16 +6011,16 @@ dissect_ain_RequestGroups(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs } -static const asn_namedbit RequestMemorySlot_bits[] = { - { 0, &hf_ain_RequestMemorySlot_incoming, -1, -1, "incoming", NULL }, - { 1, &hf_ain_RequestMemorySlot_outgoing, -1, -1, "outgoing", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * RequestMemorySlot_bits[] = { + &hf_ain_RequestMemorySlot_incoming, + &hf_ain_RequestMemorySlot_outgoing, + NULL }; static int dissect_ain_RequestMemorySlot(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - RequestMemorySlot_bits, hf_index, ett_ain_RequestMemorySlot, + RequestMemorySlot_bits, 2, hf_index, ett_ain_RequestMemorySlot, NULL); return offset; @@ -6071,35 +6071,35 @@ dissect_ain_QueryRequestArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of } -static const asn_namedbit EDPRequest_U_bits[] = { - { 0, &hf_ain_EDPRequest_U_oCalledPartyBusy, -1, -1, "oCalledPartyBusy", NULL }, - { 1, &hf_ain_EDPRequest_U_oNoAnswer, -1, -1, "oNoAnswer", NULL }, - { 2, &hf_ain_EDPRequest_U_oTermSeized, -1, -1, "oTermSeized", NULL }, - { 3, &hf_ain_EDPRequest_U_oAnswer, -1, -1, "oAnswer", NULL }, - { 4, &hf_ain_EDPRequest_U_tBusy, -1, -1, "tBusy", NULL }, - { 5, &hf_ain_EDPRequest_U_tNoAnswer, -1, -1, "tNoAnswer", NULL }, - { 6, &hf_ain_EDPRequest_U_termResourceAvailable, -1, -1, "termResourceAvailable", NULL }, - { 7, &hf_ain_EDPRequest_U_tAnswer, -1, -1, "tAnswer", NULL }, - { 8, &hf_ain_EDPRequest_U_networkBusy, -1, -1, "networkBusy", NULL }, - { 9, &hf_ain_EDPRequest_U_oSuspended, -1, -1, "oSuspended", NULL }, - { 10, &hf_ain_EDPRequest_U_oDisconnectCalled, -1, -1, "oDisconnectCalled", NULL }, - { 11, &hf_ain_EDPRequest_U_oDisconnect, -1, -1, "oDisconnect", NULL }, - { 12, &hf_ain_EDPRequest_U_oAbandon, -1, -1, "oAbandon", NULL }, - { 13, &hf_ain_EDPRequest_U_featureActivator, -1, -1, "featureActivator", NULL }, - { 14, &hf_ain_EDPRequest_U_switchHookFlash, -1, -1, "switchHookFlash", NULL }, - { 15, &hf_ain_EDPRequest_U_success, -1, -1, "success", NULL }, - { 16, &hf_ain_EDPRequest_U_tDisconnect, -1, -1, "tDisconnect", NULL }, - { 17, &hf_ain_EDPRequest_U_timeout, -1, -1, "timeout", NULL }, - { 18, &hf_ain_EDPRequest_U_originationAttempt, -1, -1, "originationAttempt", NULL }, - { 19, &hf_ain_EDPRequest_U_oDTMFEntered, -1, -1, "oDTMFEntered", NULL }, - { 20, &hf_ain_EDPRequest_U_tDTMFEntered, -1, -1, "tDTMFEntered", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * EDPRequest_U_bits[] = { + &hf_ain_EDPRequest_U_oCalledPartyBusy, + &hf_ain_EDPRequest_U_oNoAnswer, + &hf_ain_EDPRequest_U_oTermSeized, + &hf_ain_EDPRequest_U_oAnswer, + &hf_ain_EDPRequest_U_tBusy, + &hf_ain_EDPRequest_U_tNoAnswer, + &hf_ain_EDPRequest_U_termResourceAvailable, + &hf_ain_EDPRequest_U_tAnswer, + &hf_ain_EDPRequest_U_networkBusy, + &hf_ain_EDPRequest_U_oSuspended, + &hf_ain_EDPRequest_U_oDisconnectCalled, + &hf_ain_EDPRequest_U_oDisconnect, + &hf_ain_EDPRequest_U_oAbandon, + &hf_ain_EDPRequest_U_featureActivator, + &hf_ain_EDPRequest_U_switchHookFlash, + &hf_ain_EDPRequest_U_success, + &hf_ain_EDPRequest_U_tDisconnect, + &hf_ain_EDPRequest_U_timeout, + &hf_ain_EDPRequest_U_originationAttempt, + &hf_ain_EDPRequest_U_oDTMFEntered, + &hf_ain_EDPRequest_U_tDTMFEntered, + NULL }; static int dissect_ain_EDPRequest_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - EDPRequest_U_bits, hf_index, ett_ain_EDPRequest_U, + EDPRequest_U_bits, 21, hf_index, ett_ain_EDPRequest_U, NULL); return offset; @@ -6116,35 +6116,35 @@ dissect_ain_EDPRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const asn_namedbit EDPNotification_U_bits[] = { - { 0, &hf_ain_EDPNotification_U_oCalledPartyBusy, -1, -1, "oCalledPartyBusy", NULL }, - { 1, &hf_ain_EDPNotification_U_oNoAnswer, -1, -1, "oNoAnswer", NULL }, - { 2, &hf_ain_EDPNotification_U_oTermSeized, -1, -1, "oTermSeized", NULL }, - { 3, &hf_ain_EDPNotification_U_oAnswer, -1, -1, "oAnswer", NULL }, - { 4, &hf_ain_EDPNotification_U_tBusy, -1, -1, "tBusy", NULL }, - { 5, &hf_ain_EDPNotification_U_tNoAnswer, -1, -1, "tNoAnswer", NULL }, - { 6, &hf_ain_EDPNotification_U_termResourceAvailable, -1, -1, "termResourceAvailable", NULL }, - { 7, &hf_ain_EDPNotification_U_tAnswer, -1, -1, "tAnswer", NULL }, - { 8, &hf_ain_EDPNotification_U_networkBusy, -1, -1, "networkBusy", NULL }, - { 9, &hf_ain_EDPNotification_U_oSuspended, -1, -1, "oSuspended", NULL }, - { 10, &hf_ain_EDPNotification_U_oDisconnectCalled, -1, -1, "oDisconnectCalled", NULL }, - { 11, &hf_ain_EDPNotification_U_oDisconnect, -1, -1, "oDisconnect", NULL }, - { 12, &hf_ain_EDPNotification_U_oAbandon, -1, -1, "oAbandon", NULL }, - { 13, &hf_ain_EDPNotification_U_featureActivator, -1, -1, "featureActivator", NULL }, - { 14, &hf_ain_EDPNotification_U_switchHookFlash, -1, -1, "switchHookFlash", NULL }, - { 15, &hf_ain_EDPNotification_U_success, -1, -1, "success", NULL }, - { 16, &hf_ain_EDPNotification_U_tDisconnect, -1, -1, "tDisconnect", NULL }, - { 17, &hf_ain_EDPNotification_U_timeout, -1, -1, "timeout", NULL }, - { 18, &hf_ain_EDPNotification_U_originationAttempt, -1, -1, "originationAttempt", NULL }, - { 19, &hf_ain_EDPNotification_U_oDTMFEntered, -1, -1, "oDTMFEntered", NULL }, - { 20, &hf_ain_EDPNotification_U_tDTMFEntered, -1, -1, "tDTMFEntered", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * EDPNotification_U_bits[] = { + &hf_ain_EDPNotification_U_oCalledPartyBusy, + &hf_ain_EDPNotification_U_oNoAnswer, + &hf_ain_EDPNotification_U_oTermSeized, + &hf_ain_EDPNotification_U_oAnswer, + &hf_ain_EDPNotification_U_tBusy, + &hf_ain_EDPNotification_U_tNoAnswer, + &hf_ain_EDPNotification_U_termResourceAvailable, + &hf_ain_EDPNotification_U_tAnswer, + &hf_ain_EDPNotification_U_networkBusy, + &hf_ain_EDPNotification_U_oSuspended, + &hf_ain_EDPNotification_U_oDisconnectCalled, + &hf_ain_EDPNotification_U_oDisconnect, + &hf_ain_EDPNotification_U_oAbandon, + &hf_ain_EDPNotification_U_featureActivator, + &hf_ain_EDPNotification_U_switchHookFlash, + &hf_ain_EDPNotification_U_success, + &hf_ain_EDPNotification_U_tDisconnect, + &hf_ain_EDPNotification_U_timeout, + &hf_ain_EDPNotification_U_originationAttempt, + &hf_ain_EDPNotification_U_oDTMFEntered, + &hf_ain_EDPNotification_U_tDTMFEntered, + NULL }; static int dissect_ain_EDPNotification_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - EDPNotification_U_bits, hf_index, ett_ain_EDPNotification_U, + EDPNotification_U_bits, 21, hf_index, ett_ain_EDPNotification_U, NULL); return offset; diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 8fbbf9a8d2..ea8b4e96c5 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -173,7 +173,7 @@ static expert_field ei_ber_unknown_field_set = EI_INIT; static expert_field ei_ber_missing_field_set = EI_INIT; static expert_field ei_ber_empty_choice = EI_INIT; static expert_field ei_ber_choice_not_found = EI_INIT; -static expert_field ei_ber_bits_unknown = EI_INIT; +//static expert_field ei_ber_bits_unknown = EI_INIT; static expert_field ei_ber_bits_set_padded = EI_INIT; static expert_field ei_ber_illegal_padding = EI_INIT; static expert_field ei_ber_invalid_format_generalized_time = EI_INIT; @@ -888,7 +888,7 @@ try_dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, volatile int offset, offset = dissect_ber_real(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_REAL, NULL); break; case BER_UNI_TAG_BITSTRING: - offset = dissect_ber_bitstring(FALSE, &asn1_ctx, tree, tvb, start_offset, NULL, hf_ber_unknown_BITSTRING, -1, NULL); + offset = dissect_ber_bitstring(FALSE, &asn1_ctx, tree, tvb, start_offset, NULL, 0, hf_ber_unknown_BITSTRING, -1, NULL); break; case BER_UNI_TAG_ENUMERATED: offset = dissect_ber_integer(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_ENUMERATED, NULL); @@ -3919,24 +3919,24 @@ malformed: /* 8.6 Encoding of a bitstring value */ + int -dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, gint32 min_len, gint32 max_len, const asn_namedbit *named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb) +dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, gint32 min_len, gint32 max_len, const int **named_bits, int num_named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb) { gint8 ber_class; gboolean pc, ind; gint32 tag; int identifier_offset; int identifier_len; - guint32 len, byteno; - guint8 pad = 0, b0, b1, val, *bitstring; + guint32 len; + guint8 pad = 0; int end_offset; int hoffset; proto_item *item = NULL; proto_item *cause; proto_tree *tree = NULL; - const char *sep; - gboolean term; - const asn_namedbit *nb; + /*const char *sep;*/ + /*const int **nb;*/ if (!implicit_tag) { hoffset = offset; @@ -3956,8 +3956,8 @@ dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto still cause a problem. */ if (!implicit_tag && (ber_class != BER_CLASS_APP)) { - if ( (ber_class != BER_CLASS_UNI) - || (tag != BER_UNI_TAG_BITSTRING) ) { + if ((ber_class != BER_CLASS_UNI) + || (tag != BER_UNI_TAG_BITSTRING)) { tvb_ensure_bytes_exist(tvb, hoffset, 2); cause = proto_tree_add_expert_format( parent_tree, actx->pinfo, &ei_ber_expected_bitstring, @@ -3974,9 +3974,9 @@ dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto } } } else { - pc=0; + pc = 0; len = tvb_reported_length_remaining(tvb, offset); - end_offset = offset+len; + end_offset = offset + len; } if ((int)len <= 0) { proto_tree_add_expert_format( @@ -3993,9 +3993,20 @@ dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto } else { /* primitive */ pad = tvb_get_guint8(tvb, offset); + /* 8.6.2.4 If a bitstring value has no 1 bits, then an encoder (as a sender's option) + * may encode the value with a length of 1 and with an initial octet set to 0 + * or may encode it as a bit string with one or more 0 bits following the initial octet. + */ if ((pad == 0) && (len == 1)) { /* empty */ + item = proto_tree_add_item(parent_tree, hf_id, tvb, offset, len, ENC_BIG_ENDIAN); + actx->created_item = item; proto_tree_add_item(parent_tree, hf_ber_bitstring_empty, tvb, offset, 1, ENC_BIG_ENDIAN); + if (out_tvb) { + *out_tvb = ber_tvb_new_subset_length(tvb, offset, len); + } + ber_check_length(8 * len - pad, min_len, max_len, actx, item, TRUE); + return end_offset; } else { /* padding */ proto_item *pad_item = proto_tree_add_item(parent_tree, hf_ber_bitstring_padding, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -4008,10 +4019,43 @@ dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto offset++; len--; if (hf_id >= 0) { - item = proto_tree_add_item(parent_tree, hf_id, tvb, offset, len, ENC_BIG_ENDIAN); - actx->created_item = item; - if (ett_id != -1) { - tree = proto_item_add_subtree(item, ett_id); + if (named_bits) { + if (num_named_bits < 65) { + item = proto_tree_add_item(parent_tree, hf_id, tvb, offset, len, ENC_BIG_ENDIAN); + actx->created_item = item; + if (ett_id != -1) { + tree = proto_item_add_subtree(item, ett_id); + } + proto_tree_add_bitmask_list(tree, tvb, offset, len, named_bits, ENC_BIG_ENDIAN); + } else { + item = proto_tree_add_item(parent_tree, hf_id, tvb, offset, len, ENC_BIG_ENDIAN); + actx->created_item = item; + if (ett_id != -1) { + tree = proto_item_add_subtree(item, ett_id); + } + int * flags[65]; + int i = 0; + int j = 0; + int bits_to_load = 64; + guint32 section_len = 8; + int temp_offset = offset; + + while (j < num_named_bits){ + for (i = 0; i < bits_to_load; i++) { + flags[i] = (int *)named_bits[j]; + j++; + } + bits_to_load = num_named_bits - j; + if (bits_to_load > 64) { + bits_to_load = 64; + } + /* TODO: Add pad bits ?*/ + flags[i] = NULL; + proto_tree_add_bitmask_list(tree, tvb, temp_offset, section_len, (const int **)flags, ENC_BIG_ENDIAN); + temp_offset += section_len; + section_len = (bits_to_load + 7) / 8; + } + } } } if (out_tvb) { @@ -4019,56 +4063,9 @@ dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto } } - if (named_bits) { - sep = " ("; - term = FALSE; - nb = named_bits; - bitstring = (guint8 *)tvb_memdup(wmem_packet_scope(), tvb, offset, len); - - while (nb->p_id) { - if ((len > 0) && (pad < 8*len) && (nb->bit < (8*len-pad))) { - val = tvb_get_guint8(tvb, offset + nb->bit/8); - bitstring[(nb->bit/8)] &= ~(0x80 >> (nb->bit%8)); - val &= 0x80 >> (nb->bit%8); - b0 = (nb->gb0 == -1) ? nb->bit/8 : - ((guint32)nb->gb0)/8; - b1 = (nb->gb1 == -1) ? nb->bit/8 : - ((guint32)nb->gb1)/8; - proto_tree_add_item(tree, *(nb->p_id), tvb, offset + b0, b1 - b0 + 1, ENC_BIG_ENDIAN); - } else { /* 8.6.2.4 */ - val = 0; - proto_tree_add_boolean(tree, *(nb->p_id), tvb, offset + len, 0, 0x00); - } - if (val) { - if (item && nb->tstr) { - proto_item_append_text(item, "%s%s", sep, nb->tstr); - sep = ", "; - term = TRUE; - } - } else { - if (item && nb->fstr) { - proto_item_append_text(item, "%s%s", sep, nb->fstr); - sep = ", "; - term = TRUE; - } - } - nb++; - } - if (term) - proto_item_append_text(item, ")"); - - for (byteno = 0; byteno < len; byteno++) { - if (bitstring[byteno]) { - expert_add_info_format( - actx->pinfo, item, &ei_ber_bits_unknown, - "Unknown bit(s): 0x%s", bytes_to_str(wmem_packet_scope(), bitstring, len)); - break; - } - } - } if ((pad > 0) && (pad < 8) && (len > 0)) { - guint8 bits_in_pad = tvb_get_guint8(tvb, offset + len - 1) & (0xFF >> (8-pad)); + guint8 bits_in_pad = tvb_get_guint8(tvb, offset + len - 1) & (0xFF >> (8 - pad)); if (bits_in_pad) { expert_add_info_format( actx->pinfo, item, &ei_ber_bits_set_padded, @@ -4076,68 +4073,16 @@ dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto } } - ber_check_length(8*len-pad, min_len, max_len, actx, item, TRUE); + ber_check_length(8 * len - pad, min_len, max_len, actx, item, TRUE); return end_offset; } -int -dissect_ber_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const asn_namedbit *named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb) -{ - return dissect_ber_constrained_bitstring(implicit_tag, actx, parent_tree, tvb, offset, -1, -1, named_bits, hf_id, ett_id, out_tvb); -} int -dissect_ber_bitstring32(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, int **bit_fields, gint hf_id, gint ett_id, tvbuff_t **out_tvb) +dissect_ber_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const int **named_bits, gint num_named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb) { - tvbuff_t *tmp_tvb = NULL; - proto_tree *tree; - guint32 val; - int **bf; - header_field_info *hfi; - const char *sep; - gboolean term; - unsigned int i, tvb_len; - - offset = dissect_ber_bitstring(implicit_tag, actx, parent_tree, tvb, offset, NULL, hf_id, ett_id, &tmp_tvb); - - tree = proto_item_get_subtree(actx->created_item); - if (bit_fields && tree && tmp_tvb) { - /* tmp_tvb points to the actual bitstring (including any pad bits at the end. - * note that this bitstring is not necessarily always encoded as 4 bytes - * so we have to read it byte by byte. - */ - val = 0; - tvb_len = tvb_reported_length(tmp_tvb); - for (i=0; i<4; i++) { - val <<= 8; - if (i < tvb_len) { - val |= tvb_get_guint8(tmp_tvb, i); - } - } - bf = bit_fields; - sep = " ("; - term = FALSE; - while (*bf) { - if (**bf >= 0) { - proto_tree_add_boolean(tree, **bf, tmp_tvb, 0, tvb_len, val); - hfi = proto_registrar_get_nth(**bf); - if (val & hfi->bitmask) { - proto_item_append_text(actx->created_item, "%s%s", sep, hfi->name); - sep = ", "; - term = TRUE; - } - } - bf++; - } - if (term) - proto_item_append_text(actx->created_item, ")"); - } - - if (out_tvb) - *out_tvb = tmp_tvb; - - return offset; + return dissect_ber_constrained_bitstring(implicit_tag, actx, parent_tree, tvb, offset, -1, -1, named_bits, num_named_bits, hf_id, ett_id, out_tvb); } /* @@ -4220,7 +4165,7 @@ dissect_ber_T_arbitrary(gboolean implicit_tag, tvbuff_t *tvb, int offset, asn1_c offset = actx->external.u.ber.ber_callback(FALSE, tvb, offset, actx, tree, hf_index); } else { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, &actx->external.arbitrary); + NULL, 0, hf_index, -1, &actx->external.arbitrary); } return offset; @@ -4555,7 +4500,7 @@ proto_register_ber(void) { &ei_ber_missing_field_set, { "ber.error.missing_field.set", PI_MALFORMED, PI_WARN, "BER Error: Missing field in SET", EXPFILL }}, { &ei_ber_empty_choice, { "ber.error.empty_choice", PI_MALFORMED, PI_WARN, "BER Error: Empty choice was found", EXPFILL }}, { &ei_ber_choice_not_found, { "ber.error.choice_not_found", PI_MALFORMED, PI_WARN, "BER Error: This choice field was not found", EXPFILL }}, - { &ei_ber_bits_unknown, { "ber.error.bits_unknown", PI_UNDECODED, PI_WARN, "BER Error: Bits unknown", EXPFILL }}, + /*{ &ei_ber_bits_unknown, { "ber.error.bits_unknown", PI_UNDECODED, PI_WARN, "BER Error: Bits unknown", EXPFILL }},*/ { &ei_ber_bits_set_padded, { "ber.error.bits_set_padded", PI_UNDECODED, PI_WARN, "BER Error: Bits set in padded area", EXPFILL }}, { &ei_ber_illegal_padding, { "ber.error.illegal_padding", PI_UNDECODED, PI_WARN, "Illegal padding", EXPFILL }}, { &ei_ber_invalid_format_generalized_time, { "ber.error.invalid_format.generalized_time", PI_MALFORMED, PI_WARN, "BER Error: GeneralizedTime invalid format", EXPFILL }}, diff --git a/epan/dissectors/packet-ber.h b/epan/dissectors/packet-ber.h index cf9c7dbfa8..27aba03888 100644 --- a/epan/dissectors/packet-ber.h +++ b/epan/dissectors/packet-ber.h @@ -168,19 +168,9 @@ WS_DLL_PUBLIC int dissect_ber_GeneralizedTime(gboolean implicit_tag, asn1_ctx_t WS_DLL_PUBLIC int dissect_ber_UTCTime(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id); -typedef struct _asn_namedbit { - guint32 bit; - int *p_id; - gint32 gb0; /* the 1st bit of "bit group", -1 = the 1st bit of current byte */ - gint32 gb1; /* last bit of "bit group", -1 = last bit of current byte */ - const gchar *tstr; /* true string */ - const gchar *fstr; /* false string */ -} asn_namedbit; -/* this function dissects a BER BIT-STRING - */ -extern int dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, gint32 min_len, gint32 max_len, const asn_namedbit *named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb); -WS_DLL_PUBLIC int dissect_ber_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const asn_namedbit *named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb); -extern int dissect_ber_bitstring32(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, int **bit_fields, gint hf_id, gint ett_id, tvbuff_t **out_tvb); + +extern int dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, gint32 min_len, gint32 max_len, const int **named_bits, int num_named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb); +WS_DLL_PUBLIC int dissect_ber_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const int **named_bits, gint num_named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb); WS_DLL_PUBLIC int call_ber_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data); diff --git a/epan/dissectors/packet-charging_ase.c b/epan/dissectors/packet-charging_ase.c index d811d667a4..1982555b8a 100644 --- a/epan/dissectors/packet-charging_ase.c +++ b/epan/dissectors/packet-charging_ase.c @@ -151,17 +151,17 @@ static dissector_handle_t charging_ase_handle; /*--- Included file: packet-charging_ase-fn.c ---*/ #line 1 "./asn1/charging_ase/packet-charging_ase-fn.c" -static const asn_namedbit ChargingControlIndicators_bits[] = { - { 0, &hf_charging_ase_ChargingControlIndicators_subscriberCharge, -1, -1, "subscriberCharge", NULL }, - { 1, &hf_charging_ase_ChargingControlIndicators_immediateChangeOfActuallyAppliedTariff, -1, -1, "immediateChangeOfActuallyAppliedTariff", NULL }, - { 2, &hf_charging_ase_ChargingControlIndicators_delayUntilStart, -1, -1, "delayUntilStart", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * ChargingControlIndicators_bits[] = { + &hf_charging_ase_ChargingControlIndicators_subscriberCharge, + &hf_charging_ase_ChargingControlIndicators_immediateChangeOfActuallyAppliedTariff, + &hf_charging_ase_ChargingControlIndicators_delayUntilStart, + NULL }; static int dissect_charging_ase_ChargingControlIndicators(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - ChargingControlIndicators_bits, hf_index, ett_charging_ase_ChargingControlIndicators, + ChargingControlIndicators_bits, 3, hf_index, ett_charging_ase_ChargingControlIndicators, NULL); return offset; @@ -213,15 +213,15 @@ dissect_charging_ase_TariffDuration(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ } -static const asn_namedbit SubTariffControl_bits[] = { - { 0, &hf_charging_ase_SubTariffControl_oneTimeCharge, -1, -1, "oneTimeCharge", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * SubTariffControl_bits[] = { + &hf_charging_ase_SubTariffControl_oneTimeCharge, + NULL }; static int dissect_charging_ase_SubTariffControl(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - SubTariffControl_bits, hf_index, ett_charging_ase_SubTariffControl, + SubTariffControl_bits, 1, hf_index, ett_charging_ase_SubTariffControl, NULL); return offset; @@ -257,15 +257,15 @@ dissect_charging_ase_SEQUENCE_SIZE_minCommunicationTariffNum_maxCommunicationTar } -static const asn_namedbit T_tariffControlIndicators_bits[] = { - { 0, &hf_charging_ase_T_tariffControlIndicators_non_cyclicTariff, -1, -1, "non-cyclicTariff", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_tariffControlIndicators_bits[] = { + &hf_charging_ase_T_tariffControlIndicators_non_cyclicTariff, + NULL }; static int dissect_charging_ase_T_tariffControlIndicators(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_tariffControlIndicators_bits, hf_index, ett_charging_ase_T_tariffControlIndicators, + T_tariffControlIndicators_bits, 1, hf_index, ett_charging_ase_T_tariffControlIndicators, NULL); return offset; @@ -378,15 +378,15 @@ dissect_charging_ase_SEQUENCE_SIZE_minCommunicationTariffNum_maxCommunicationTar } -static const asn_namedbit T_tariffControlIndicators_01_bits[] = { - { 0, &hf_charging_ase_T_tariffControlIndicators_01_non_cyclicTariff, -1, -1, "non-cyclicTariff", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_tariffControlIndicators_01_bits[] = { + &hf_charging_ase_T_tariffControlIndicators_01_non_cyclicTariff, + NULL }; static int dissect_charging_ase_T_tariffControlIndicators_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_tariffControlIndicators_01_bits, hf_index, ett_charging_ase_T_tariffControlIndicators_01, + T_tariffControlIndicators_01_bits, 1, hf_index, ett_charging_ase_T_tariffControlIndicators_01, NULL); return offset; @@ -697,15 +697,15 @@ dissect_charging_ase_AddOnChargingInformation(gboolean implicit_tag _U_, tvbuff_ } -static const asn_namedbit T_acknowledgementIndicators_bits[] = { - { 0, &hf_charging_ase_T_acknowledgementIndicators_accepted, -1, -1, "accepted", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_acknowledgementIndicators_bits[] = { + &hf_charging_ase_T_acknowledgementIndicators_accepted, + NULL }; static int dissect_charging_ase_T_acknowledgementIndicators(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_acknowledgementIndicators_bits, hf_index, ett_charging_ase_T_acknowledgementIndicators, + T_acknowledgementIndicators_bits, 1, hf_index, ett_charging_ase_T_acknowledgementIndicators, NULL); return offset; @@ -758,15 +758,15 @@ dissect_charging_ase_StartCharging(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const asn_namedbit T_stopIndicators_bits[] = { - { 0, &hf_charging_ase_T_stopIndicators_callAttemptChargesApplicable, -1, -1, "callAttemptChargesApplicable", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_stopIndicators_bits[] = { + &hf_charging_ase_T_stopIndicators_callAttemptChargesApplicable, + NULL }; static int dissect_charging_ase_T_stopIndicators(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_stopIndicators_bits, hf_index, ett_charging_ase_T_stopIndicators, + T_stopIndicators_bits, 1, hf_index, ett_charging_ase_T_stopIndicators, NULL); return offset; diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index 588e8a23e2..74cd56df8f 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -2171,35 +2171,35 @@ dissect_cmip_CMIPAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off } -static const asn_namedbit FunctionalUnits_bits[] = { - { 0, &hf_cmip_FunctionalUnits_multipleObjectSelection, -1, -1, "multipleObjectSelection", NULL }, - { 1, &hf_cmip_FunctionalUnits_filter, -1, -1, "filter", NULL }, - { 2, &hf_cmip_FunctionalUnits_multipleReply, -1, -1, "multipleReply", NULL }, - { 3, &hf_cmip_FunctionalUnits_extendedService, -1, -1, "extendedService", NULL }, - { 4, &hf_cmip_FunctionalUnits_cancelGet, -1, -1, "cancelGet", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * FunctionalUnits_bits[] = { + &hf_cmip_FunctionalUnits_multipleObjectSelection, + &hf_cmip_FunctionalUnits_filter, + &hf_cmip_FunctionalUnits_multipleReply, + &hf_cmip_FunctionalUnits_extendedService, + &hf_cmip_FunctionalUnits_cancelGet, + NULL }; static int dissect_cmip_FunctionalUnits(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - FunctionalUnits_bits, hf_index, ett_cmip_FunctionalUnits, + FunctionalUnits_bits, 5, hf_index, ett_cmip_FunctionalUnits, NULL); return offset; } -static const asn_namedbit ProtocolVersion_bits[] = { - { 0, &hf_cmip_ProtocolVersion_version1, -1, -1, "version1", NULL }, - { 1, &hf_cmip_ProtocolVersion_version2, -1, -1, "version2", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * ProtocolVersion_bits[] = { + &hf_cmip_ProtocolVersion_version1, + &hf_cmip_ProtocolVersion_version2, + NULL }; static int dissect_cmip_ProtocolVersion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - ProtocolVersion_bits, hf_index, ett_cmip_ProtocolVersion, + ProtocolVersion_bits, 2, hf_index, ett_cmip_ProtocolVersion, NULL); return offset; @@ -3508,21 +3508,21 @@ dissect_cmip_UsageState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const asn_namedbit T_daysOfWeek_bits[] = { - { 0, &hf_cmip_T_daysOfWeek_sunday, -1, -1, "sunday", NULL }, - { 1, &hf_cmip_T_daysOfWeek_monday, -1, -1, "monday", NULL }, - { 2, &hf_cmip_T_daysOfWeek_tuesday, -1, -1, "tuesday", NULL }, - { 3, &hf_cmip_T_daysOfWeek_wednesday, -1, -1, "wednesday", NULL }, - { 4, &hf_cmip_T_daysOfWeek_thursday, -1, -1, "thursday", NULL }, - { 5, &hf_cmip_T_daysOfWeek_friday, -1, -1, "friday", NULL }, - { 6, &hf_cmip_T_daysOfWeek_saturday, -1, -1, "saturday", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_daysOfWeek_bits[] = { + &hf_cmip_T_daysOfWeek_sunday, + &hf_cmip_T_daysOfWeek_monday, + &hf_cmip_T_daysOfWeek_tuesday, + &hf_cmip_T_daysOfWeek_wednesday, + &hf_cmip_T_daysOfWeek_thursday, + &hf_cmip_T_daysOfWeek_friday, + &hf_cmip_T_daysOfWeek_saturday, + NULL }; static int dissect_cmip_T_daysOfWeek(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_daysOfWeek_bits, hf_index, ett_cmip_T_daysOfWeek, + T_daysOfWeek_bits, 7, hf_index, ett_cmip_T_daysOfWeek, NULL); return offset; diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index bb4caf6f23..73c313c92e 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -495,41 +495,41 @@ dissect_cmp_PKIStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ } -static const asn_namedbit PKIFailureInfo_bits[] = { - { 0, &hf_cmp_PKIFailureInfo_badAlg, -1, -1, "badAlg", NULL }, - { 1, &hf_cmp_PKIFailureInfo_badMessageCheck, -1, -1, "badMessageCheck", NULL }, - { 2, &hf_cmp_PKIFailureInfo_badRequest, -1, -1, "badRequest", NULL }, - { 3, &hf_cmp_PKIFailureInfo_badTime, -1, -1, "badTime", NULL }, - { 4, &hf_cmp_PKIFailureInfo_badCertId, -1, -1, "badCertId", NULL }, - { 5, &hf_cmp_PKIFailureInfo_badDataFormat, -1, -1, "badDataFormat", NULL }, - { 6, &hf_cmp_PKIFailureInfo_wrongAuthority, -1, -1, "wrongAuthority", NULL }, - { 7, &hf_cmp_PKIFailureInfo_incorrectData, -1, -1, "incorrectData", NULL }, - { 8, &hf_cmp_PKIFailureInfo_missingTimeStamp, -1, -1, "missingTimeStamp", NULL }, - { 9, &hf_cmp_PKIFailureInfo_badPOP, -1, -1, "badPOP", NULL }, - { 10, &hf_cmp_PKIFailureInfo_certRevoked, -1, -1, "certRevoked", NULL }, - { 11, &hf_cmp_PKIFailureInfo_certConfirmed, -1, -1, "certConfirmed", NULL }, - { 12, &hf_cmp_PKIFailureInfo_wrongIntegrity, -1, -1, "wrongIntegrity", NULL }, - { 13, &hf_cmp_PKIFailureInfo_badRecipientNonce, -1, -1, "badRecipientNonce", NULL }, - { 14, &hf_cmp_PKIFailureInfo_timeNotAvailable, -1, -1, "timeNotAvailable", NULL }, - { 15, &hf_cmp_PKIFailureInfo_unacceptedPolicy, -1, -1, "unacceptedPolicy", NULL }, - { 16, &hf_cmp_PKIFailureInfo_unacceptedExtension, -1, -1, "unacceptedExtension", NULL }, - { 17, &hf_cmp_PKIFailureInfo_addInfoNotAvailable, -1, -1, "addInfoNotAvailable", NULL }, - { 18, &hf_cmp_PKIFailureInfo_badSenderNonce, -1, -1, "badSenderNonce", NULL }, - { 19, &hf_cmp_PKIFailureInfo_badCertTemplate, -1, -1, "badCertTemplate", NULL }, - { 20, &hf_cmp_PKIFailureInfo_signerNotTrusted, -1, -1, "signerNotTrusted", NULL }, - { 21, &hf_cmp_PKIFailureInfo_transactionIdInUse, -1, -1, "transactionIdInUse", NULL }, - { 22, &hf_cmp_PKIFailureInfo_unsupportedVersion, -1, -1, "unsupportedVersion", NULL }, - { 23, &hf_cmp_PKIFailureInfo_notAuthorized, -1, -1, "notAuthorized", NULL }, - { 24, &hf_cmp_PKIFailureInfo_systemUnavail, -1, -1, "systemUnavail", NULL }, - { 25, &hf_cmp_PKIFailureInfo_systemFailure, -1, -1, "systemFailure", NULL }, - { 26, &hf_cmp_PKIFailureInfo_duplicateCertReq, -1, -1, "duplicateCertReq", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * PKIFailureInfo_bits[] = { + &hf_cmp_PKIFailureInfo_badAlg, + &hf_cmp_PKIFailureInfo_badMessageCheck, + &hf_cmp_PKIFailureInfo_badRequest, + &hf_cmp_PKIFailureInfo_badTime, + &hf_cmp_PKIFailureInfo_badCertId, + &hf_cmp_PKIFailureInfo_badDataFormat, + &hf_cmp_PKIFailureInfo_wrongAuthority, + &hf_cmp_PKIFailureInfo_incorrectData, + &hf_cmp_PKIFailureInfo_missingTimeStamp, + &hf_cmp_PKIFailureInfo_badPOP, + &hf_cmp_PKIFailureInfo_certRevoked, + &hf_cmp_PKIFailureInfo_certConfirmed, + &hf_cmp_PKIFailureInfo_wrongIntegrity, + &hf_cmp_PKIFailureInfo_badRecipientNonce, + &hf_cmp_PKIFailureInfo_timeNotAvailable, + &hf_cmp_PKIFailureInfo_unacceptedPolicy, + &hf_cmp_PKIFailureInfo_unacceptedExtension, + &hf_cmp_PKIFailureInfo_addInfoNotAvailable, + &hf_cmp_PKIFailureInfo_badSenderNonce, + &hf_cmp_PKIFailureInfo_badCertTemplate, + &hf_cmp_PKIFailureInfo_signerNotTrusted, + &hf_cmp_PKIFailureInfo_transactionIdInUse, + &hf_cmp_PKIFailureInfo_unsupportedVersion, + &hf_cmp_PKIFailureInfo_notAuthorized, + &hf_cmp_PKIFailureInfo_systemUnavail, + &hf_cmp_PKIFailureInfo_systemFailure, + &hf_cmp_PKIFailureInfo_duplicateCertReq, + NULL }; static int dissect_cmp_PKIFailureInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - PKIFailureInfo_bits, hf_index, ett_cmp_PKIFailureInfo, + PKIFailureInfo_bits, 27, hf_index, ett_cmp_PKIFailureInfo, NULL); return offset; @@ -1088,7 +1088,7 @@ dissect_cmp_PKIBody(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ static int dissect_cmp_PKIProtection(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -1172,7 +1172,7 @@ dissect_cmp_OOBCert(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ static int dissect_cmp_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 690513de7f..83be4ff99e 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -604,7 +604,7 @@ dissect_cms_SignatureAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tv static int dissect_cms_Signature(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -703,7 +703,7 @@ dissect_cms_AttributeCertificateInfoV1(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_cms_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c index c3972ad160..99bfb28608 100644 --- a/epan/dissectors/packet-crmf.c +++ b/epan/dissectors/packet-crmf.c @@ -289,7 +289,7 @@ dissect_crmf_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_crmf_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c index b46f34fd04..ed8c55d420 100644 --- a/epan/dissectors/packet-dap.c +++ b/epan/dissectors/packet-dap.c @@ -749,28 +749,28 @@ dissect_dap_FamilyGrouping(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off } -static const asn_namedbit ServiceControlOptions_bits[] = { - { 0, &hf_dap_ServiceControlOptions_preferChaining, -1, -1, "preferChaining", NULL }, - { 1, &hf_dap_ServiceControlOptions_chainingProhibited, -1, -1, "chainingProhibited", NULL }, - { 2, &hf_dap_ServiceControlOptions_localScope, -1, -1, "localScope", NULL }, - { 3, &hf_dap_ServiceControlOptions_dontUseCopy, -1, -1, "dontUseCopy", NULL }, - { 4, &hf_dap_ServiceControlOptions_dontDereferenceAliases, -1, -1, "dontDereferenceAliases", NULL }, - { 5, &hf_dap_ServiceControlOptions_subentries, -1, -1, "subentries", NULL }, - { 6, &hf_dap_ServiceControlOptions_copyShallDo, -1, -1, "copyShallDo", NULL }, - { 7, &hf_dap_ServiceControlOptions_partialNameResolution, -1, -1, "partialNameResolution", NULL }, - { 8, &hf_dap_ServiceControlOptions_manageDSAIT, -1, -1, "manageDSAIT", NULL }, - { 9, &hf_dap_ServiceControlOptions_noSubtypeMatch, -1, -1, "noSubtypeMatch", NULL }, - { 10, &hf_dap_ServiceControlOptions_noSubtypeSelection, -1, -1, "noSubtypeSelection", NULL }, - { 11, &hf_dap_ServiceControlOptions_countFamily, -1, -1, "countFamily", NULL }, - { 12, &hf_dap_ServiceControlOptions_dontSelectFriends, -1, -1, "dontSelectFriends", NULL }, - { 13, &hf_dap_ServiceControlOptions_dontMatchFriends, -1, -1, "dontMatchFriends", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * ServiceControlOptions_bits[] = { + &hf_dap_ServiceControlOptions_preferChaining, + &hf_dap_ServiceControlOptions_chainingProhibited, + &hf_dap_ServiceControlOptions_localScope, + &hf_dap_ServiceControlOptions_dontUseCopy, + &hf_dap_ServiceControlOptions_dontDereferenceAliases, + &hf_dap_ServiceControlOptions_subentries, + &hf_dap_ServiceControlOptions_copyShallDo, + &hf_dap_ServiceControlOptions_partialNameResolution, + &hf_dap_ServiceControlOptions_manageDSAIT, + &hf_dap_ServiceControlOptions_noSubtypeMatch, + &hf_dap_ServiceControlOptions_noSubtypeSelection, + &hf_dap_ServiceControlOptions_countFamily, + &hf_dap_ServiceControlOptions_dontSelectFriends, + &hf_dap_ServiceControlOptions_dontMatchFriends, + NULL }; int dissect_dap_ServiceControlOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - ServiceControlOptions_bits, hf_index, ett_dap_ServiceControlOptions, + ServiceControlOptions_bits, 14, hf_index, ett_dap_ServiceControlOptions, NULL); return offset; @@ -1640,7 +1640,7 @@ dissect_dap_Time(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a static int dissect_dap_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -1856,7 +1856,7 @@ dissect_dap_SEQUENCE_SIZE_1_MAX_OF_AlgorithmIdentifier(gboolean implicit_tag _U_ static int dissect_dap_BindKeyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -2013,16 +2013,16 @@ dissect_dap_Credentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const asn_namedbit Versions_bits[] = { - { 0, &hf_dap_Versions_v1, -1, -1, "v1", NULL }, - { 1, &hf_dap_Versions_v2, -1, -1, "v2", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Versions_bits[] = { + &hf_dap_Versions_v1, + &hf_dap_Versions_v2, + NULL }; static int dissect_dap_Versions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Versions_bits, hf_index, ett_dap_Versions, + Versions_bits, 2, hf_index, ett_dap_Versions, NULL); return offset; @@ -2302,18 +2302,18 @@ dissect_dap_T_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, } -static const asn_namedbit T_permission_bits[] = { - { 0, &hf_dap_T_permission_add, -1, -1, "add", NULL }, - { 1, &hf_dap_T_permission_remove, -1, -1, "remove", NULL }, - { 2, &hf_dap_T_permission_rename, -1, -1, "rename", NULL }, - { 3, &hf_dap_T_permission_move, -1, -1, "move", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_permission_bits[] = { + &hf_dap_T_permission_add, + &hf_dap_T_permission_remove, + &hf_dap_T_permission_rename, + &hf_dap_T_permission_move, + NULL }; static int dissect_dap_T_permission(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_permission_bits, hf_index, ett_dap_T_permission, + T_permission_bits, 4, hf_index, ett_dap_T_permission, NULL); return offset; @@ -2979,50 +2979,50 @@ dissect_dap_T_subset(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const asn_namedbit HierarchySelections_bits[] = { - { 0, &hf_dap_HierarchySelections_self, -1, -1, "self", NULL }, - { 1, &hf_dap_HierarchySelections_children, -1, -1, "children", NULL }, - { 2, &hf_dap_HierarchySelections_parent, -1, -1, "parent", NULL }, - { 3, &hf_dap_HierarchySelections_hierarchy, -1, -1, "hierarchy", NULL }, - { 4, &hf_dap_HierarchySelections_top, -1, -1, "top", NULL }, - { 5, &hf_dap_HierarchySelections_subtree, -1, -1, "subtree", NULL }, - { 6, &hf_dap_HierarchySelections_siblings, -1, -1, "siblings", NULL }, - { 7, &hf_dap_HierarchySelections_siblingChildren, -1, -1, "siblingChildren", NULL }, - { 8, &hf_dap_HierarchySelections_siblingSubtree, -1, -1, "siblingSubtree", NULL }, - { 9, &hf_dap_HierarchySelections_all, -1, -1, "all", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * HierarchySelections_bits[] = { + &hf_dap_HierarchySelections_self, + &hf_dap_HierarchySelections_children, + &hf_dap_HierarchySelections_parent, + &hf_dap_HierarchySelections_hierarchy, + &hf_dap_HierarchySelections_top, + &hf_dap_HierarchySelections_subtree, + &hf_dap_HierarchySelections_siblings, + &hf_dap_HierarchySelections_siblingChildren, + &hf_dap_HierarchySelections_siblingSubtree, + &hf_dap_HierarchySelections_all, + NULL }; int dissect_dap_HierarchySelections(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - HierarchySelections_bits, hf_index, ett_dap_HierarchySelections, + HierarchySelections_bits, 10, hf_index, ett_dap_HierarchySelections, NULL); return offset; } -static const asn_namedbit SearchControlOptions_bits[] = { - { 0, &hf_dap_SearchControlOptions_searchAliases, -1, -1, "searchAliases", NULL }, - { 1, &hf_dap_SearchControlOptions_matchedValuesOnly, -1, -1, "matchedValuesOnly", NULL }, - { 2, &hf_dap_SearchControlOptions_checkOverspecified, -1, -1, "checkOverspecified", NULL }, - { 3, &hf_dap_SearchControlOptions_performExactly, -1, -1, "performExactly", NULL }, - { 4, &hf_dap_SearchControlOptions_includeAllAreas, -1, -1, "includeAllAreas", NULL }, - { 5, &hf_dap_SearchControlOptions_noSystemRelaxation, -1, -1, "noSystemRelaxation", NULL }, - { 6, &hf_dap_SearchControlOptions_dnAttribute, -1, -1, "dnAttribute", NULL }, - { 7, &hf_dap_SearchControlOptions_matchOnResidualName, -1, -1, "matchOnResidualName", NULL }, - { 8, &hf_dap_SearchControlOptions_entryCount, -1, -1, "entryCount", NULL }, - { 9, &hf_dap_SearchControlOptions_useSubset, -1, -1, "useSubset", NULL }, - { 10, &hf_dap_SearchControlOptions_separateFamilyMembers, -1, -1, "separateFamilyMembers", NULL }, - { 11, &hf_dap_SearchControlOptions_searchFamily, -1, -1, "searchFamily", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * SearchControlOptions_bits[] = { + &hf_dap_SearchControlOptions_searchAliases, + &hf_dap_SearchControlOptions_matchedValuesOnly, + &hf_dap_SearchControlOptions_checkOverspecified, + &hf_dap_SearchControlOptions_performExactly, + &hf_dap_SearchControlOptions_includeAllAreas, + &hf_dap_SearchControlOptions_noSystemRelaxation, + &hf_dap_SearchControlOptions_dnAttribute, + &hf_dap_SearchControlOptions_matchOnResidualName, + &hf_dap_SearchControlOptions_entryCount, + &hf_dap_SearchControlOptions_useSubset, + &hf_dap_SearchControlOptions_separateFamilyMembers, + &hf_dap_SearchControlOptions_searchFamily, + NULL }; int dissect_dap_SearchControlOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - SearchControlOptions_bits, hf_index, ett_dap_SearchControlOptions, + SearchControlOptions_bits, 12, hf_index, ett_dap_SearchControlOptions, NULL); return offset; diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c index e13d54fe8c..2d80320980 100644 --- a/epan/dissectors/packet-disp.c +++ b/epan/dissectors/packet-disp.c @@ -712,7 +712,7 @@ dissect_disp_CoordinateShadowUpdateArgumentData(gboolean implicit_tag _U_, tvbuf static int dissect_disp_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index 63e2babbda..b80892e6bb 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -214,6 +214,7 @@ static int hf_dop_DSEType_xr = -1; static int hf_dop_DSEType_admPoint = -1; static int hf_dop_DSEType_subentry = -1; static int hf_dop_DSEType_shadow = -1; +static int hf_dop_DSEType_spare_bit_12 = -1; static int hf_dop_DSEType_immSupr = -1; static int hf_dop_DSEType_rhob = -1; static int hf_dop_DSEType_sa = -1; @@ -351,33 +352,34 @@ static void append_oid(packet_info *pinfo, const char *oid) /*--- Included file: packet-dop-fn.c ---*/ #line 1 "./asn1/dop/packet-dop-fn.c" -static const asn_namedbit DSEType_bits[] = { - { 0, &hf_dop_DSEType_root, -1, -1, "root", NULL }, - { 1, &hf_dop_DSEType_glue, -1, -1, "glue", NULL }, - { 2, &hf_dop_DSEType_cp, -1, -1, "cp", NULL }, - { 3, &hf_dop_DSEType_entry, -1, -1, "entry", NULL }, - { 4, &hf_dop_DSEType_alias, -1, -1, "alias", NULL }, - { 5, &hf_dop_DSEType_subr, -1, -1, "subr", NULL }, - { 6, &hf_dop_DSEType_nssr, -1, -1, "nssr", NULL }, - { 7, &hf_dop_DSEType_supr, -1, -1, "supr", NULL }, - { 8, &hf_dop_DSEType_xr, -1, -1, "xr", NULL }, - { 9, &hf_dop_DSEType_admPoint, -1, -1, "admPoint", NULL }, - { 10, &hf_dop_DSEType_subentry, -1, -1, "subentry", NULL }, - { 11, &hf_dop_DSEType_shadow, -1, -1, "shadow", NULL }, - { 13, &hf_dop_DSEType_immSupr, -1, -1, "immSupr", NULL }, - { 14, &hf_dop_DSEType_rhob, -1, -1, "rhob", NULL }, - { 15, &hf_dop_DSEType_sa, -1, -1, "sa", NULL }, - { 16, &hf_dop_DSEType_dsSubentry, -1, -1, "dsSubentry", NULL }, - { 17, &hf_dop_DSEType_familyMember, -1, -1, "familyMember", NULL }, - { 18, &hf_dop_DSEType_ditBridge, -1, -1, "ditBridge", NULL }, - { 19, &hf_dop_DSEType_writeableCopy, -1, -1, "writeableCopy", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * DSEType_bits[] = { + &hf_dop_DSEType_root, + &hf_dop_DSEType_glue, + &hf_dop_DSEType_cp, + &hf_dop_DSEType_entry, + &hf_dop_DSEType_alias, + &hf_dop_DSEType_subr, + &hf_dop_DSEType_nssr, + &hf_dop_DSEType_supr, + &hf_dop_DSEType_xr, + &hf_dop_DSEType_admPoint, + &hf_dop_DSEType_subentry, + &hf_dop_DSEType_shadow, + &hf_dop_DSEType_spare_bit_12, + &hf_dop_DSEType_immSupr, + &hf_dop_DSEType_rhob, + &hf_dop_DSEType_sa, + &hf_dop_DSEType_dsSubentry, + &hf_dop_DSEType_familyMember, + &hf_dop_DSEType_ditBridge, + &hf_dop_DSEType_writeableCopy, + NULL }; int dissect_dop_DSEType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - DSEType_bits, hf_index, ett_dop_DSEType, + DSEType_bits, 20, hf_index, ett_dop_DSEType, NULL); return offset; @@ -781,7 +783,7 @@ dissect_dop_EstablishOperationalBindingArgumentData(gboolean implicit_tag _U_, t static int dissect_dop_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -1772,40 +1774,40 @@ dissect_dop_UserClasses(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const asn_namedbit GrantsAndDenials_bits[] = { - { 0, &hf_dop_GrantsAndDenials_grantAdd, -1, -1, "grantAdd", NULL }, - { 1, &hf_dop_GrantsAndDenials_denyAdd, -1, -1, "denyAdd", NULL }, - { 2, &hf_dop_GrantsAndDenials_grantDiscloseOnError, -1, -1, "grantDiscloseOnError", NULL }, - { 3, &hf_dop_GrantsAndDenials_denyDiscloseOnError, -1, -1, "denyDiscloseOnError", NULL }, - { 4, &hf_dop_GrantsAndDenials_grantRead, -1, -1, "grantRead", NULL }, - { 5, &hf_dop_GrantsAndDenials_denyRead, -1, -1, "denyRead", NULL }, - { 6, &hf_dop_GrantsAndDenials_grantRemove, -1, -1, "grantRemove", NULL }, - { 7, &hf_dop_GrantsAndDenials_denyRemove, -1, -1, "denyRemove", NULL }, - { 8, &hf_dop_GrantsAndDenials_grantBrowse, -1, -1, "grantBrowse", NULL }, - { 9, &hf_dop_GrantsAndDenials_denyBrowse, -1, -1, "denyBrowse", NULL }, - { 10, &hf_dop_GrantsAndDenials_grantExport, -1, -1, "grantExport", NULL }, - { 11, &hf_dop_GrantsAndDenials_denyExport, -1, -1, "denyExport", NULL }, - { 12, &hf_dop_GrantsAndDenials_grantImport, -1, -1, "grantImport", NULL }, - { 13, &hf_dop_GrantsAndDenials_denyImport, -1, -1, "denyImport", NULL }, - { 14, &hf_dop_GrantsAndDenials_grantModify, -1, -1, "grantModify", NULL }, - { 15, &hf_dop_GrantsAndDenials_denyModify, -1, -1, "denyModify", NULL }, - { 16, &hf_dop_GrantsAndDenials_grantRename, -1, -1, "grantRename", NULL }, - { 17, &hf_dop_GrantsAndDenials_denyRename, -1, -1, "denyRename", NULL }, - { 18, &hf_dop_GrantsAndDenials_grantReturnDN, -1, -1, "grantReturnDN", NULL }, - { 19, &hf_dop_GrantsAndDenials_denyReturnDN, -1, -1, "denyReturnDN", NULL }, - { 20, &hf_dop_GrantsAndDenials_grantCompare, -1, -1, "grantCompare", NULL }, - { 21, &hf_dop_GrantsAndDenials_denyCompare, -1, -1, "denyCompare", NULL }, - { 22, &hf_dop_GrantsAndDenials_grantFilterMatch, -1, -1, "grantFilterMatch", NULL }, - { 23, &hf_dop_GrantsAndDenials_denyFilterMatch, -1, -1, "denyFilterMatch", NULL }, - { 24, &hf_dop_GrantsAndDenials_grantInvoke, -1, -1, "grantInvoke", NULL }, - { 25, &hf_dop_GrantsAndDenials_denyInvoke, -1, -1, "denyInvoke", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * GrantsAndDenials_bits[] = { + &hf_dop_GrantsAndDenials_grantAdd, + &hf_dop_GrantsAndDenials_denyAdd, + &hf_dop_GrantsAndDenials_grantDiscloseOnError, + &hf_dop_GrantsAndDenials_denyDiscloseOnError, + &hf_dop_GrantsAndDenials_grantRead, + &hf_dop_GrantsAndDenials_denyRead, + &hf_dop_GrantsAndDenials_grantRemove, + &hf_dop_GrantsAndDenials_denyRemove, + &hf_dop_GrantsAndDenials_grantBrowse, + &hf_dop_GrantsAndDenials_denyBrowse, + &hf_dop_GrantsAndDenials_grantExport, + &hf_dop_GrantsAndDenials_denyExport, + &hf_dop_GrantsAndDenials_grantImport, + &hf_dop_GrantsAndDenials_denyImport, + &hf_dop_GrantsAndDenials_grantModify, + &hf_dop_GrantsAndDenials_denyModify, + &hf_dop_GrantsAndDenials_grantRename, + &hf_dop_GrantsAndDenials_denyRename, + &hf_dop_GrantsAndDenials_grantReturnDN, + &hf_dop_GrantsAndDenials_denyReturnDN, + &hf_dop_GrantsAndDenials_grantCompare, + &hf_dop_GrantsAndDenials_denyCompare, + &hf_dop_GrantsAndDenials_grantFilterMatch, + &hf_dop_GrantsAndDenials_denyFilterMatch, + &hf_dop_GrantsAndDenials_grantInvoke, + &hf_dop_GrantsAndDenials_denyInvoke, + NULL }; static int dissect_dop_GrantsAndDenials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - GrantsAndDenials_bits, hf_index, ett_dop_GrantsAndDenials, + GrantsAndDenials_bits, 26, hf_index, ett_dop_GrantsAndDenials, NULL); return offset; @@ -2810,6 +2812,10 @@ void proto_register_dop(void) { { "shadow", "dop.shadow", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, + { &hf_dop_DSEType_spare_bit_12, + { "spare_bit_12", "dop.spare_bit_12", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, { &hf_dop_DSEType_immSupr, { "immSupr", "dop.immSupr", FT_BOOLEAN, 8, NULL, 0x04, diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c index 7501207a13..a0b79521b7 100644 --- a/epan/dissectors/packet-dsp.c +++ b/epan/dissectors/packet-dsp.c @@ -608,7 +608,7 @@ dissect_dsp_ChainedReadArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_dsp_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c index 6fe8c85923..25149aeca9 100644 --- a/epan/dissectors/packet-ess.c +++ b/epan/dissectors/packet-ess.c @@ -602,7 +602,7 @@ dissect_ess_T_restrictiveAttributeFlags(gboolean implicit_tag _U_, tvbuff_t *tvb tvbuff_t *attributes; offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, &attributes); ess_dissect_attribute_flags (attributes, actx); @@ -698,7 +698,7 @@ dissect_ess_T_permissiveAttributeFlags(gboolean implicit_tag _U_, tvbuff_t *tvb tvbuff_t *attributes; offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, &attributes); ess_dissect_attribute_flags (attributes, actx); @@ -740,7 +740,7 @@ dissect_ess_T_informativeAttributeFlags(gboolean implicit_tag _U_, tvbuff_t *tvb tvbuff_t *attributes; offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, &attributes); ess_dissect_attribute_flags (attributes, actx); diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index 2c11394021..bf45aa8d00 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -388,6 +388,8 @@ static int hf_ftam_Service_Class_U_management_class = -1; static int hf_ftam_Service_Class_U_transfer_class = -1; static int hf_ftam_Service_Class_U_transfer_and_management_class = -1; static int hf_ftam_Service_Class_U_access_class = -1; +static int hf_ftam_Functional_Units_U_spare_bit_0 = -1; +static int hf_ftam_Functional_Units_U_spare_bit_1 = -1; static int hf_ftam_Functional_Units_U_read = -1; static int hf_ftam_Functional_Units_U_write = -1; static int hf_ftam_Functional_Units_U_file_access = -1; @@ -432,11 +434,11 @@ static int hf_ftam_Permitted_Actions_Attribute_erase = -1; static int hf_ftam_Permitted_Actions_Attribute_read_attribute = -1; static int hf_ftam_Permitted_Actions_Attribute_change_attribute = -1; static int hf_ftam_Permitted_Actions_Attribute_delete_Object = -1; -static int hf_ftam_Permitted_Actions_Attribute_pass = -1; -static int hf_ftam_Permitted_Actions_Attribute_link = -1; static int hf_ftam_Permitted_Actions_Attribute_traversal = -1; static int hf_ftam_Permitted_Actions_Attribute_reverse_traversal = -1; static int hf_ftam_Permitted_Actions_Attribute_random_Order = -1; +static int hf_ftam_Permitted_Actions_Attribute_pass = -1; +static int hf_ftam_Permitted_Actions_Attribute_link = -1; static int hf_ftam_Equality_Comparision_no_value_available_matches = -1; static int hf_ftam_Equality_Comparision_equals_matches = -1; static int hf_ftam_Relational_Comparision_no_value_available_matches = -1; @@ -444,12 +446,8 @@ static int hf_ftam_Relational_Comparision_equals_matches = -1; static int hf_ftam_Relational_Comparision_less_than_matches = -1; static int hf_ftam_Relational_Comparision_greater_than_matches = -1; static int hf_ftam_Attribute_Names_read_pathname = -1; -static int hf_ftam_Attribute_Names_read_Object_type = -1; static int hf_ftam_Attribute_Names_read_permitted_actions = -1; static int hf_ftam_Attribute_Names_read_contents_type = -1; -static int hf_ftam_Attribute_Names_read_linked_Object = -1; -static int hf_ftam_Attribute_Names_read_Child_objects = -1; -static int hf_ftam_Attribute_Names_read_primary_pathname = -1; static int hf_ftam_Attribute_Names_read_storage_account = -1; static int hf_ftam_Attribute_Names_read_date_and_time_of_creation = -1; static int hf_ftam_Attribute_Names_read_date_and_time_of_last_modification = -1; @@ -463,9 +461,14 @@ static int hf_ftam_Attribute_Names_read_Object_availability = -1; static int hf_ftam_Attribute_Names_read_Object_size = -1; static int hf_ftam_Attribute_Names_read_future_Object_size = -1; static int hf_ftam_Attribute_Names_read_access_control = -1; -static int hf_ftam_Attribute_Names_read_path_access_control = -1; static int hf_ftam_Attribute_Names_read_l8gal_qualifiCatiOnS = -1; static int hf_ftam_Attribute_Names_read_private_use = -1; +static int hf_ftam_Attribute_Names_read_Object_type = -1; +static int hf_ftam_Attribute_Names_read_linked_Object = -1; +static int hf_ftam_Attribute_Names_read_primary_pathname = -1; +static int hf_ftam_Attribute_Names_read_path_access_control = -1; +static int hf_ftam_Attribute_Names_spare_bit_22 = -1; +static int hf_ftam_Attribute_Names_read_Child_objects = -1; /*--- End of included file: packet-ftam-hf.c ---*/ #line 44 "./asn1/ftam/packet-ftam-template.c" @@ -647,16 +650,16 @@ static expert_field ei_ftam_zero_pdu = EI_INIT; /*--- Included file: packet-ftam-fn.c ---*/ #line 1 "./asn1/ftam/packet-ftam-fn.c" -static const asn_namedbit Protocol_Version_U_bits[] = { - { 0, &hf_ftam_Protocol_Version_U_version_1, -1, -1, "version-1", NULL }, - { 1, &hf_ftam_Protocol_Version_U_version_2, -1, -1, "version-2", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Protocol_Version_U_bits[] = { + &hf_ftam_Protocol_Version_U_version_1, + &hf_ftam_Protocol_Version_U_version_2, + NULL }; static int dissect_ftam_Protocol_Version_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Protocol_Version_U_bits, hf_index, ett_ftam_Protocol_Version_U, + Protocol_Version_U_bits, 2, hf_index, ett_ftam_Protocol_Version_U, NULL); return offset; @@ -703,19 +706,19 @@ dissect_ftam_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const asn_namedbit Service_Class_U_bits[] = { - { 0, &hf_ftam_Service_Class_U_unconstrained_class, -1, -1, "unconstrained-class", NULL }, - { 1, &hf_ftam_Service_Class_U_management_class, -1, -1, "management-class", NULL }, - { 2, &hf_ftam_Service_Class_U_transfer_class, -1, -1, "transfer-class", NULL }, - { 3, &hf_ftam_Service_Class_U_transfer_and_management_class, -1, -1, "transfer-and-management-class", NULL }, - { 4, &hf_ftam_Service_Class_U_access_class, -1, -1, "access-class", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Service_Class_U_bits[] = { + &hf_ftam_Service_Class_U_unconstrained_class, + &hf_ftam_Service_Class_U_management_class, + &hf_ftam_Service_Class_U_transfer_class, + &hf_ftam_Service_Class_U_transfer_and_management_class, + &hf_ftam_Service_Class_U_access_class, + NULL }; static int dissect_ftam_Service_Class_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Service_Class_U_bits, hf_index, ett_ftam_Service_Class_U, + Service_Class_U_bits, 5, hf_index, ett_ftam_Service_Class_U, NULL); return offset; @@ -732,29 +735,31 @@ dissect_ftam_Service_Class(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off } -static const asn_namedbit Functional_Units_U_bits[] = { - { 2, &hf_ftam_Functional_Units_U_read, -1, -1, "read", NULL }, - { 3, &hf_ftam_Functional_Units_U_write, -1, -1, "write", NULL }, - { 4, &hf_ftam_Functional_Units_U_file_access, -1, -1, "file-access", NULL }, - { 5, &hf_ftam_Functional_Units_U_limited_file_management, -1, -1, "limited-file-management", NULL }, - { 6, &hf_ftam_Functional_Units_U_enhanced_file_management, -1, -1, "enhanced-file-management", NULL }, - { 7, &hf_ftam_Functional_Units_U_grouping, -1, -1, "grouping", NULL }, - { 8, &hf_ftam_Functional_Units_U_fadu_locking, -1, -1, "fadu-locking", NULL }, - { 9, &hf_ftam_Functional_Units_U_recovery, -1, -1, "recovery", NULL }, - { 10, &hf_ftam_Functional_Units_U_restart_data_transfer, -1, -1, "restart-data-transfer", NULL }, - { 11, &hf_ftam_Functional_Units_U_limited_filestore_management, -1, -1, "limited-filestore-management", NULL }, - { 12, &hf_ftam_Functional_Units_U_enhanced_filestore_management, -1, -1, "enhanced-filestore-management", NULL }, - { 13, &hf_ftam_Functional_Units_U_object_manipulation, -1, -1, "object-manipulation", NULL }, - { 14, &hf_ftam_Functional_Units_U_group_manipulation, -1, -1, "group-manipulation", NULL }, - { 15, &hf_ftam_Functional_Units_U_consecutive_access, -1, -1, "consecutive-access", NULL }, - { 16, &hf_ftam_Functional_Units_U_concurrent_access, -1, -1, "concurrent-access", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Functional_Units_U_bits[] = { + &hf_ftam_Functional_Units_U_spare_bit_0, + &hf_ftam_Functional_Units_U_spare_bit_1, + &hf_ftam_Functional_Units_U_read, + &hf_ftam_Functional_Units_U_write, + &hf_ftam_Functional_Units_U_file_access, + &hf_ftam_Functional_Units_U_limited_file_management, + &hf_ftam_Functional_Units_U_enhanced_file_management, + &hf_ftam_Functional_Units_U_grouping, + &hf_ftam_Functional_Units_U_fadu_locking, + &hf_ftam_Functional_Units_U_recovery, + &hf_ftam_Functional_Units_U_restart_data_transfer, + &hf_ftam_Functional_Units_U_limited_filestore_management, + &hf_ftam_Functional_Units_U_enhanced_filestore_management, + &hf_ftam_Functional_Units_U_object_manipulation, + &hf_ftam_Functional_Units_U_group_manipulation, + &hf_ftam_Functional_Units_U_consecutive_access, + &hf_ftam_Functional_Units_U_concurrent_access, + NULL }; static int dissect_ftam_Functional_Units_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Functional_Units_U_bits, hf_index, ett_ftam_Functional_Units_U, + Functional_Units_U_bits, 17, hf_index, ett_ftam_Functional_Units_U, NULL); return offset; @@ -771,18 +776,18 @@ dissect_ftam_Functional_Units(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const asn_namedbit Attribute_Groups_U_bits[] = { - { 0, &hf_ftam_Attribute_Groups_U_storage, -1, -1, "storage", NULL }, - { 1, &hf_ftam_Attribute_Groups_U_security, -1, -1, "security", NULL }, - { 2, &hf_ftam_Attribute_Groups_U_private, -1, -1, "private", NULL }, - { 3, &hf_ftam_Attribute_Groups_U_extension, -1, -1, "extension", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Attribute_Groups_U_bits[] = { + &hf_ftam_Attribute_Groups_U_storage, + &hf_ftam_Attribute_Groups_U_security, + &hf_ftam_Attribute_Groups_U_private, + &hf_ftam_Attribute_Groups_U_extension, + NULL }; static int dissect_ftam_Attribute_Groups_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Attribute_Groups_U_bits, hf_index, ett_ftam_Attribute_Groups_U, + Attribute_Groups_U_bits, 4, hf_index, ett_ftam_Attribute_Groups_U, NULL); return offset; @@ -1373,22 +1378,22 @@ dissect_ftam_Select_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const asn_namedbit Access_Request_U_bits[] = { - { 0, &hf_ftam_Access_Request_U_read, -1, -1, "read", NULL }, - { 1, &hf_ftam_Access_Request_U_insert, -1, -1, "insert", NULL }, - { 2, &hf_ftam_Access_Request_U_replace, -1, -1, "replace", NULL }, - { 3, &hf_ftam_Access_Request_U_extend, -1, -1, "extend", NULL }, - { 4, &hf_ftam_Access_Request_U_erase, -1, -1, "erase", NULL }, - { 5, &hf_ftam_Access_Request_U_read_attribute, -1, -1, "read-attribute", NULL }, - { 6, &hf_ftam_Access_Request_U_change_attribute, -1, -1, "change-attribute", NULL }, - { 7, &hf_ftam_Access_Request_U_delete_Object, -1, -1, "delete-Object", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Access_Request_U_bits[] = { + &hf_ftam_Access_Request_U_read, + &hf_ftam_Access_Request_U_insert, + &hf_ftam_Access_Request_U_replace, + &hf_ftam_Access_Request_U_extend, + &hf_ftam_Access_Request_U_erase, + &hf_ftam_Access_Request_U_read_attribute, + &hf_ftam_Access_Request_U_change_attribute, + &hf_ftam_Access_Request_U_delete_Object, + NULL }; static int dissect_ftam_Access_Request_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Access_Request_U_bits, hf_index, ett_ftam_Access_Request_U, + Access_Request_U_bits, 8, hf_index, ett_ftam_Access_Request_U, NULL); return offset; @@ -1661,27 +1666,27 @@ dissect_ftam_Object_Type_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const asn_namedbit Permitted_Actions_Attribute_bits[] = { - { 0, &hf_ftam_Permitted_Actions_Attribute_read, -1, -1, "read", NULL }, - { 1, &hf_ftam_Permitted_Actions_Attribute_insert, -1, -1, "insert", NULL }, - { 2, &hf_ftam_Permitted_Actions_Attribute_replace, -1, -1, "replace", NULL }, - { 3, &hf_ftam_Permitted_Actions_Attribute_extend, -1, -1, "extend", NULL }, - { 4, &hf_ftam_Permitted_Actions_Attribute_erase, -1, -1, "erase", NULL }, - { 5, &hf_ftam_Permitted_Actions_Attribute_read_attribute, -1, -1, "read-attribute", NULL }, - { 6, &hf_ftam_Permitted_Actions_Attribute_change_attribute, -1, -1, "change-attribute", NULL }, - { 7, &hf_ftam_Permitted_Actions_Attribute_delete_Object, -1, -1, "delete-Object", NULL }, - { 11, &hf_ftam_Permitted_Actions_Attribute_pass, -1, -1, "pass", NULL }, - { 12, &hf_ftam_Permitted_Actions_Attribute_link, -1, -1, "link", NULL }, - { 8, &hf_ftam_Permitted_Actions_Attribute_traversal, -1, -1, "traversal", NULL }, - { 9, &hf_ftam_Permitted_Actions_Attribute_reverse_traversal, -1, -1, "reverse-traversal", NULL }, - { 10, &hf_ftam_Permitted_Actions_Attribute_random_Order, -1, -1, "random-Order", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Permitted_Actions_Attribute_bits[] = { + &hf_ftam_Permitted_Actions_Attribute_read, + &hf_ftam_Permitted_Actions_Attribute_insert, + &hf_ftam_Permitted_Actions_Attribute_replace, + &hf_ftam_Permitted_Actions_Attribute_extend, + &hf_ftam_Permitted_Actions_Attribute_erase, + &hf_ftam_Permitted_Actions_Attribute_read_attribute, + &hf_ftam_Permitted_Actions_Attribute_change_attribute, + &hf_ftam_Permitted_Actions_Attribute_delete_Object, + &hf_ftam_Permitted_Actions_Attribute_traversal, + &hf_ftam_Permitted_Actions_Attribute_reverse_traversal, + &hf_ftam_Permitted_Actions_Attribute_random_Order, + &hf_ftam_Permitted_Actions_Attribute_pass, + &hf_ftam_Permitted_Actions_Attribute_link, + NULL }; int dissect_ftam_Permitted_Actions_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Permitted_Actions_Attribute_bits, hf_index, ett_ftam_Permitted_Actions_Attribute, + Permitted_Actions_Attribute_bits, 13, hf_index, ett_ftam_Permitted_Actions_Attribute, NULL); return offset; @@ -1855,18 +1860,18 @@ dissect_ftam_Object_Size_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const asn_namedbit Concurrency_Key_bits[] = { - { 0, &hf_ftam_Concurrency_Key_not_required, -1, -1, "not-required", NULL }, - { 1, &hf_ftam_Concurrency_Key_shared, -1, -1, "shared", NULL }, - { 2, &hf_ftam_Concurrency_Key_exclusive, -1, -1, "exclusive", NULL }, - { 3, &hf_ftam_Concurrency_Key_no_access, -1, -1, "no-access", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Concurrency_Key_bits[] = { + &hf_ftam_Concurrency_Key_not_required, + &hf_ftam_Concurrency_Key_shared, + &hf_ftam_Concurrency_Key_exclusive, + &hf_ftam_Concurrency_Key_no_access, + NULL }; static int dissect_ftam_Concurrency_Key(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Concurrency_Key_bits, hf_index, ett_ftam_Concurrency_Key, + Concurrency_Key_bits, 4, hf_index, ett_ftam_Concurrency_Key, NULL); return offset; @@ -2235,37 +2240,38 @@ dissect_ftam_F_DELETE_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const asn_namedbit Attribute_Names_bits[] = { - { 0, &hf_ftam_Attribute_Names_read_pathname, -1, -1, "read-pathname", NULL }, - { 18, &hf_ftam_Attribute_Names_read_Object_type, -1, -1, "read-Object-type", NULL }, - { 1, &hf_ftam_Attribute_Names_read_permitted_actions, -1, -1, "read-permitted-actions", NULL }, - { 2, &hf_ftam_Attribute_Names_read_contents_type, -1, -1, "read-contents-type", NULL }, - { 19, &hf_ftam_Attribute_Names_read_linked_Object, -1, -1, "read-linked-Object", NULL }, - { 23, &hf_ftam_Attribute_Names_read_Child_objects, -1, -1, "read-Child-objects", NULL }, - { 20, &hf_ftam_Attribute_Names_read_primary_pathname, -1, -1, "read-primary-pathname", NULL }, - { 3, &hf_ftam_Attribute_Names_read_storage_account, -1, -1, "read-storage-account", NULL }, - { 4, &hf_ftam_Attribute_Names_read_date_and_time_of_creation, -1, -1, "read-date-and-time-of-creation", NULL }, - { 5, &hf_ftam_Attribute_Names_read_date_and_time_of_last_modification, -1, -1, "read-date-and-time-of-last-modification", NULL }, - { 6, &hf_ftam_Attribute_Names_read_date_and_time_of_last_read_access, -1, -1, "read-date-and-time-of-last-read-access", NULL }, - { 7, &hf_ftam_Attribute_Names_read_date_and_time_of_last_attribute_modification, -1, -1, "read-date-and-time-of-last-attribute-modification", NULL }, - { 8, &hf_ftam_Attribute_Names_read_identity_of_creator, -1, -1, "read-identity-of-creator", NULL }, - { 9, &hf_ftam_Attribute_Names_read_identity_of_last_modifier, -1, -1, "read-identity-of-last-modifier", NULL }, - { 10, &hf_ftam_Attribute_Names_read_identity_of_last_reader, -1, -1, "read-identity-of-last-reader", NULL }, - { 11, &hf_ftam_Attribute_Names_read_identity_of_last_attribute_modifier, -1, -1, "read-identity-of-last-attribute-modifier", NULL }, - { 12, &hf_ftam_Attribute_Names_read_Object_availability, -1, -1, "read-Object-availability", NULL }, - { 13, &hf_ftam_Attribute_Names_read_Object_size, -1, -1, "read-Object-size", NULL }, - { 14, &hf_ftam_Attribute_Names_read_future_Object_size, -1, -1, "read-future-Object-size", NULL }, - { 15, &hf_ftam_Attribute_Names_read_access_control, -1, -1, "read-access-control", NULL }, - { 21, &hf_ftam_Attribute_Names_read_path_access_control, -1, -1, "read-path-access-control", NULL }, - { 16, &hf_ftam_Attribute_Names_read_l8gal_qualifiCatiOnS, -1, -1, "read-l8gal-qualifiCatiOnS", NULL }, - { 17, &hf_ftam_Attribute_Names_read_private_use, -1, -1, "read-private-use", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Attribute_Names_bits[] = { + &hf_ftam_Attribute_Names_read_pathname, + &hf_ftam_Attribute_Names_read_permitted_actions, + &hf_ftam_Attribute_Names_read_contents_type, + &hf_ftam_Attribute_Names_read_storage_account, + &hf_ftam_Attribute_Names_read_date_and_time_of_creation, + &hf_ftam_Attribute_Names_read_date_and_time_of_last_modification, + &hf_ftam_Attribute_Names_read_date_and_time_of_last_read_access, + &hf_ftam_Attribute_Names_read_date_and_time_of_last_attribute_modification, + &hf_ftam_Attribute_Names_read_identity_of_creator, + &hf_ftam_Attribute_Names_read_identity_of_last_modifier, + &hf_ftam_Attribute_Names_read_identity_of_last_reader, + &hf_ftam_Attribute_Names_read_identity_of_last_attribute_modifier, + &hf_ftam_Attribute_Names_read_Object_availability, + &hf_ftam_Attribute_Names_read_Object_size, + &hf_ftam_Attribute_Names_read_future_Object_size, + &hf_ftam_Attribute_Names_read_access_control, + &hf_ftam_Attribute_Names_read_l8gal_qualifiCatiOnS, + &hf_ftam_Attribute_Names_read_private_use, + &hf_ftam_Attribute_Names_read_Object_type, + &hf_ftam_Attribute_Names_read_linked_Object, + &hf_ftam_Attribute_Names_read_primary_pathname, + &hf_ftam_Attribute_Names_read_path_access_control, + &hf_ftam_Attribute_Names_spare_bit_22, + &hf_ftam_Attribute_Names_read_Child_objects, + NULL }; static int dissect_ftam_Attribute_Names(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Attribute_Names_bits, hf_index, ett_ftam_Attribute_Names, + Attribute_Names_bits, 24, hf_index, ett_ftam_Attribute_Names, NULL); return offset; @@ -2565,19 +2571,19 @@ dissect_ftam_F_CHANGE_ATTRIB_response(gboolean implicit_tag _U_, tvbuff_t *tvb _ } -static const asn_namedbit T_processing_mode_bits[] = { - { 0, &hf_ftam_T_processing_mode_f_read, -1, -1, "f-read", NULL }, - { 1, &hf_ftam_T_processing_mode_f_insert, -1, -1, "f-insert", NULL }, - { 2, &hf_ftam_T_processing_mode_f_replace, -1, -1, "f-replace", NULL }, - { 3, &hf_ftam_T_processing_mode_f_extend, -1, -1, "f-extend", NULL }, - { 4, &hf_ftam_T_processing_mode_f_erase, -1, -1, "f-erase", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_processing_mode_bits[] = { + &hf_ftam_T_processing_mode_f_read, + &hf_ftam_T_processing_mode_f_insert, + &hf_ftam_T_processing_mode_f_replace, + &hf_ftam_T_processing_mode_f_extend, + &hf_ftam_T_processing_mode_f_erase, + NULL }; static int dissect_ftam_T_processing_mode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_processing_mode_bits, hf_index, ett_ftam_T_processing_mode, + T_processing_mode_bits, 5, hf_index, ett_ftam_T_processing_mode, NULL); return offset; @@ -3492,16 +3498,16 @@ dissect_ftam_F_CHANGE_PREFIX_response(gboolean implicit_tag _U_, tvbuff_t *tvb _ } -static const asn_namedbit Equality_Comparision_bits[] = { - { 0, &hf_ftam_Equality_Comparision_no_value_available_matches, -1, -1, "no-value-available-matches", NULL }, - { 1, &hf_ftam_Equality_Comparision_equals_matches, -1, -1, "equals-matches", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Equality_Comparision_bits[] = { + &hf_ftam_Equality_Comparision_no_value_available_matches, + &hf_ftam_Equality_Comparision_equals_matches, + NULL }; static int dissect_ftam_Equality_Comparision(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Equality_Comparision_bits, hf_index, ett_ftam_Equality_Comparision, + Equality_Comparision_bits, 2, hf_index, ett_ftam_Equality_Comparision, NULL); return offset; @@ -3610,18 +3616,18 @@ dissect_ftam_Pathname_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const asn_namedbit Relational_Comparision_bits[] = { - { 0, &hf_ftam_Relational_Comparision_no_value_available_matches, -1, -1, "no-value-available-matches", NULL }, - { 1, &hf_ftam_Relational_Comparision_equals_matches, -1, -1, "equals-matches", NULL }, - { 2, &hf_ftam_Relational_Comparision_less_than_matches, -1, -1, "less-than-matches", NULL }, - { 3, &hf_ftam_Relational_Comparision_greater_than_matches, -1, -1, "greater-than-matches", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Relational_Comparision_bits[] = { + &hf_ftam_Relational_Comparision_no_value_available_matches, + &hf_ftam_Relational_Comparision_equals_matches, + &hf_ftam_Relational_Comparision_less_than_matches, + &hf_ftam_Relational_Comparision_greater_than_matches, + NULL }; static int dissect_ftam_Relational_Comparision(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Relational_Comparision_bits, hf_index, ett_ftam_Relational_Comparision, + Relational_Comparision_bits, 4, hf_index, ett_ftam_Relational_Comparision, NULL); return offset; @@ -3647,7 +3653,7 @@ dissect_ftam_Integer_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_ftam_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -6145,6 +6151,14 @@ void proto_register_ftam(void) { { "access-class", "ftam.access-class", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, + { &hf_ftam_Functional_Units_U_spare_bit_0, + { "spare_bit_0", "ftam.spare_bit_0", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_ftam_Functional_Units_U_spare_bit_1, + { "spare_bit_1", "ftam.spare_bit_1", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, { &hf_ftam_Functional_Units_U_read, { "read", "ftam.read", FT_BOOLEAN, 8, NULL, 0x20, @@ -6321,14 +6335,6 @@ void proto_register_ftam(void) { { "delete-Object", "ftam.delete-Object", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, - { &hf_ftam_Permitted_Actions_Attribute_pass, - { "pass", "ftam.pass", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL }}, - { &hf_ftam_Permitted_Actions_Attribute_link, - { "link", "ftam.link", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL }}, { &hf_ftam_Permitted_Actions_Attribute_traversal, { "traversal", "ftam.traversal", FT_BOOLEAN, 8, NULL, 0x80, @@ -6341,6 +6347,14 @@ void proto_register_ftam(void) { { "random-Order", "ftam.random-Order", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, + { &hf_ftam_Permitted_Actions_Attribute_pass, + { "pass", "ftam.pass", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, + { &hf_ftam_Permitted_Actions_Attribute_link, + { "link", "ftam.link", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, { &hf_ftam_Equality_Comparision_no_value_available_matches, { "no-value-available-matches", "ftam.no-value-available-matches", FT_BOOLEAN, 8, NULL, 0x80, @@ -6369,10 +6383,6 @@ void proto_register_ftam(void) { { "read-pathname", "ftam.read-pathname", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, - { &hf_ftam_Attribute_Names_read_Object_type, - { "read-Object-type", "ftam.read-Object-type", - FT_BOOLEAN, 8, NULL, 0x20, - NULL, HFILL }}, { &hf_ftam_Attribute_Names_read_permitted_actions, { "read-permitted-actions", "ftam.read-permitted-actions", FT_BOOLEAN, 8, NULL, 0x40, @@ -6381,18 +6391,6 @@ void proto_register_ftam(void) { { "read-contents-type", "ftam.read-contents-type", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, - { &hf_ftam_Attribute_Names_read_linked_Object, - { "read-linked-Object", "ftam.read-linked-Object", - FT_BOOLEAN, 8, NULL, 0x10, - NULL, HFILL }}, - { &hf_ftam_Attribute_Names_read_Child_objects, - { "read-Child-objects", "ftam.read-Child-objects", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL }}, - { &hf_ftam_Attribute_Names_read_primary_pathname, - { "read-primary-pathname", "ftam.read-primary-pathname", - FT_BOOLEAN, 8, NULL, 0x08, - NULL, HFILL }}, { &hf_ftam_Attribute_Names_read_storage_account, { "read-storage-account", "ftam.read-storage-account", FT_BOOLEAN, 8, NULL, 0x10, @@ -6445,10 +6443,6 @@ void proto_register_ftam(void) { { "read-access-control", "ftam.read-access-control", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, - { &hf_ftam_Attribute_Names_read_path_access_control, - { "read-path-access-control", "ftam.read-path-access-control", - FT_BOOLEAN, 8, NULL, 0x04, - NULL, HFILL }}, { &hf_ftam_Attribute_Names_read_l8gal_qualifiCatiOnS, { "read-l8gal-qualifiCatiOnS", "ftam.read-l8gal-qualifiCatiOnS", FT_BOOLEAN, 8, NULL, 0x80, @@ -6457,6 +6451,30 @@ void proto_register_ftam(void) { { "read-private-use", "ftam.read-private-use", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, + { &hf_ftam_Attribute_Names_read_Object_type, + { "read-Object-type", "ftam.read-Object-type", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_ftam_Attribute_Names_read_linked_Object, + { "read-linked-Object", "ftam.read-linked-Object", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, + { &hf_ftam_Attribute_Names_read_primary_pathname, + { "read-primary-pathname", "ftam.read-primary-pathname", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, + { &hf_ftam_Attribute_Names_read_path_access_control, + { "read-path-access-control", "ftam.read-path-access-control", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, + { &hf_ftam_Attribute_Names_spare_bit_22, + { "spare_bit_22", "ftam.spare_bit_22", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL }}, + { &hf_ftam_Attribute_Names_read_Child_objects, + { "read-Child-objects", "ftam.read-Child-objects", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL }}, /*--- End of included file: packet-ftam-hfarr.c ---*/ #line 119 "./asn1/ftam/packet-ftam-template.c" diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c index 58e3e387c2..d69700e4a1 100644 --- a/epan/dissectors/packet-goose.c +++ b/epan/dissectors/packet-goose.c @@ -533,7 +533,7 @@ dissect_goose_SEQUENCE_OF_Data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_goose_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-gprscdr.c b/epan/dissectors/packet-gprscdr.c index 566f0d7517..0c36f4b862 100644 --- a/epan/dissectors/packet-gprscdr.c +++ b/epan/dissectors/packet-gprscdr.c @@ -429,6 +429,7 @@ static int hf_gprscdr_ServiceConditionChangeV651_configurationChange = -1; static int hf_gprscdr_ServiceConditionChangeV651_serviceStop = -1; static int hf_gprscdr_ServiceConditionChangeV651_timeThresholdReached = -1; static int hf_gprscdr_ServiceConditionChangeV651_volumeThresholdReached = -1; +static int hf_gprscdr_ServiceConditionChangeV651_spare_bit_12 = -1; static int hf_gprscdr_ServiceConditionChangeV651_timeExhausted = -1; static int hf_gprscdr_ServiceConditionChangeV651_volumeExhausted = -1; static int hf_gprscdr_ServiceConditionChangeV651_timeout = -1; @@ -1222,17 +1223,17 @@ dissect_gprscdr_LCSQoSInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off } -static const asn_namedbit LevelOfCAMELService_bits[] = { - { 0, &hf_gprscdr_LevelOfCAMELService_basic, -1, -1, "basic", NULL }, - { 1, &hf_gprscdr_LevelOfCAMELService_callDurationSupervision, -1, -1, "callDurationSupervision", NULL }, - { 2, &hf_gprscdr_LevelOfCAMELService_onlineCharging, -1, -1, "onlineCharging", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * LevelOfCAMELService_bits[] = { + &hf_gprscdr_LevelOfCAMELService_basic, + &hf_gprscdr_LevelOfCAMELService_callDurationSupervision, + &hf_gprscdr_LevelOfCAMELService_onlineCharging, + NULL }; static int dissect_gprscdr_LevelOfCAMELService(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - LevelOfCAMELService_bits, hf_index, ett_gprscdr_LevelOfCAMELService, + LevelOfCAMELService_bits, 3, hf_index, ett_gprscdr_LevelOfCAMELService, NULL); return offset; @@ -2628,34 +2629,35 @@ dissect_gprscdr_ResultCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off } -static const asn_namedbit ServiceConditionChangeV651_bits[] = { - { 0, &hf_gprscdr_ServiceConditionChangeV651_qoSChange, -1, -1, "qoSChange", NULL }, - { 1, &hf_gprscdr_ServiceConditionChangeV651_sGSNChange, -1, -1, "sGSNChange", NULL }, - { 2, &hf_gprscdr_ServiceConditionChangeV651_sGSNPLMNIDChange, -1, -1, "sGSNPLMNIDChange", NULL }, - { 3, &hf_gprscdr_ServiceConditionChangeV651_tariffTimeSwitch, -1, -1, "tariffTimeSwitch", NULL }, - { 4, &hf_gprscdr_ServiceConditionChangeV651_pDPContextRelease, -1, -1, "pDPContextRelease", NULL }, - { 5, &hf_gprscdr_ServiceConditionChangeV651_rATChange, -1, -1, "rATChange", NULL }, - { 6, &hf_gprscdr_ServiceConditionChangeV651_serviceIdledOut, -1, -1, "serviceIdledOut", NULL }, - { 7, &hf_gprscdr_ServiceConditionChangeV651_qCTExpiry, -1, -1, "qCTExpiry", NULL }, - { 8, &hf_gprscdr_ServiceConditionChangeV651_configurationChange, -1, -1, "configurationChange", NULL }, - { 9, &hf_gprscdr_ServiceConditionChangeV651_serviceStop, -1, -1, "serviceStop", NULL }, - { 10, &hf_gprscdr_ServiceConditionChangeV651_timeThresholdReached, -1, -1, "timeThresholdReached", NULL }, - { 11, &hf_gprscdr_ServiceConditionChangeV651_volumeThresholdReached, -1, -1, "volumeThresholdReached", NULL }, - { 13, &hf_gprscdr_ServiceConditionChangeV651_timeExhausted, -1, -1, "timeExhausted", NULL }, - { 14, &hf_gprscdr_ServiceConditionChangeV651_volumeExhausted, -1, -1, "volumeExhausted", NULL }, - { 15, &hf_gprscdr_ServiceConditionChangeV651_timeout, -1, -1, "timeout", NULL }, - { 16, &hf_gprscdr_ServiceConditionChangeV651_returnRequested, -1, -1, "returnRequested", NULL }, - { 17, &hf_gprscdr_ServiceConditionChangeV651_reauthorisationRequest, -1, -1, "reauthorisationRequest", NULL }, - { 18, &hf_gprscdr_ServiceConditionChangeV651_continueOngoingSession, -1, -1, "continueOngoingSession", NULL }, - { 19, &hf_gprscdr_ServiceConditionChangeV651_retryAndTerminateOngoingSession, -1, -1, "retryAndTerminateOngoingSession", NULL }, - { 20, &hf_gprscdr_ServiceConditionChangeV651_terminateOngoingSession, -1, -1, "terminateOngoingSession", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * ServiceConditionChangeV651_bits[] = { + &hf_gprscdr_ServiceConditionChangeV651_qoSChange, + &hf_gprscdr_ServiceConditionChangeV651_sGSNChange, + &hf_gprscdr_ServiceConditionChangeV651_sGSNPLMNIDChange, + &hf_gprscdr_ServiceConditionChangeV651_tariffTimeSwitch, + &hf_gprscdr_ServiceConditionChangeV651_pDPContextRelease, + &hf_gprscdr_ServiceConditionChangeV651_rATChange, + &hf_gprscdr_ServiceConditionChangeV651_serviceIdledOut, + &hf_gprscdr_ServiceConditionChangeV651_qCTExpiry, + &hf_gprscdr_ServiceConditionChangeV651_configurationChange, + &hf_gprscdr_ServiceConditionChangeV651_serviceStop, + &hf_gprscdr_ServiceConditionChangeV651_timeThresholdReached, + &hf_gprscdr_ServiceConditionChangeV651_volumeThresholdReached, + &hf_gprscdr_ServiceConditionChangeV651_spare_bit_12, + &hf_gprscdr_ServiceConditionChangeV651_timeExhausted, + &hf_gprscdr_ServiceConditionChangeV651_volumeExhausted, + &hf_gprscdr_ServiceConditionChangeV651_timeout, + &hf_gprscdr_ServiceConditionChangeV651_returnRequested, + &hf_gprscdr_ServiceConditionChangeV651_reauthorisationRequest, + &hf_gprscdr_ServiceConditionChangeV651_continueOngoingSession, + &hf_gprscdr_ServiceConditionChangeV651_retryAndTerminateOngoingSession, + &hf_gprscdr_ServiceConditionChangeV651_terminateOngoingSession, + NULL }; static int dissect_gprscdr_ServiceConditionChangeV651(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - ServiceConditionChangeV651_bits, hf_index, ett_gprscdr_ServiceConditionChangeV651, + ServiceConditionChangeV651_bits, 21, hf_index, ett_gprscdr_ServiceConditionChangeV651, NULL); return offset; @@ -2862,43 +2864,43 @@ dissect_gprscdr_T_userLocationInformation_03(gboolean implicit_tag _U_, tvbuff_t } -static const asn_namedbit ServiceConditionChangeV750_bits[] = { - { 0, &hf_gprscdr_ServiceConditionChangeV750_qoSChange, -1, -1, "qoSChange", NULL }, - { 1, &hf_gprscdr_ServiceConditionChangeV750_sGSNChange, -1, -1, "sGSNChange", NULL }, - { 2, &hf_gprscdr_ServiceConditionChangeV750_sGSNPLMNIDChange, -1, -1, "sGSNPLMNIDChange", NULL }, - { 3, &hf_gprscdr_ServiceConditionChangeV750_tariffTimeSwitch, -1, -1, "tariffTimeSwitch", NULL }, - { 4, &hf_gprscdr_ServiceConditionChangeV750_pDPContextRelease, -1, -1, "pDPContextRelease", NULL }, - { 5, &hf_gprscdr_ServiceConditionChangeV750_rATChange, -1, -1, "rATChange", NULL }, - { 6, &hf_gprscdr_ServiceConditionChangeV750_serviceIdledOut, -1, -1, "serviceIdledOut", NULL }, - { 7, &hf_gprscdr_ServiceConditionChangeV750_reserved, -1, -1, "reserved", NULL }, - { 8, &hf_gprscdr_ServiceConditionChangeV750_configurationChange, -1, -1, "configurationChange", NULL }, - { 9, &hf_gprscdr_ServiceConditionChangeV750_serviceStop, -1, -1, "serviceStop", NULL }, - { 10, &hf_gprscdr_ServiceConditionChangeV750_dCCATimeThresholdReached, -1, -1, "dCCATimeThresholdReached", NULL }, - { 11, &hf_gprscdr_ServiceConditionChangeV750_dCCAVolumeThresholdReached, -1, -1, "dCCAVolumeThresholdReached", NULL }, - { 12, &hf_gprscdr_ServiceConditionChangeV750_dCCAServiceSpecificUnitThresholdReached, -1, -1, "dCCAServiceSpecificUnitThresholdReached", NULL }, - { 13, &hf_gprscdr_ServiceConditionChangeV750_dCCATimeExhausted, -1, -1, "dCCATimeExhausted", NULL }, - { 14, &hf_gprscdr_ServiceConditionChangeV750_dCCAVolumeExhausted, -1, -1, "dCCAVolumeExhausted", NULL }, - { 15, &hf_gprscdr_ServiceConditionChangeV750_dCCAValidityTimeout, -1, -1, "dCCAValidityTimeout", NULL }, - { 16, &hf_gprscdr_ServiceConditionChangeV750_reserved2, -1, -1, "reserved2", NULL }, - { 17, &hf_gprscdr_ServiceConditionChangeV750_dCCAReauthorisationRequest, -1, -1, "dCCAReauthorisationRequest", NULL }, - { 18, &hf_gprscdr_ServiceConditionChangeV750_dCCAContinueOngoingSession, -1, -1, "dCCAContinueOngoingSession", NULL }, - { 19, &hf_gprscdr_ServiceConditionChangeV750_dCCARetryAndTerminateOngoingSession, -1, -1, "dCCARetryAndTerminateOngoingSession", NULL }, - { 20, &hf_gprscdr_ServiceConditionChangeV750_dCCATerminateOngoingSession, -1, -1, "dCCATerminateOngoingSession", NULL }, - { 21, &hf_gprscdr_ServiceConditionChangeV750_cGI_SAIChange, -1, -1, "cGI-SAIChange", NULL }, - { 22, &hf_gprscdr_ServiceConditionChangeV750_rAIChange, -1, -1, "rAIChange", NULL }, - { 23, &hf_gprscdr_ServiceConditionChangeV750_dCCAServiceSpecificUnitExhausted, -1, -1, "dCCAServiceSpecificUnitExhausted", NULL }, - { 24, &hf_gprscdr_ServiceConditionChangeV750_recordClosure, -1, -1, "recordClosure", NULL }, - { 25, &hf_gprscdr_ServiceConditionChangeV750_timeLimit, -1, -1, "timeLimit", NULL }, - { 26, &hf_gprscdr_ServiceConditionChangeV750_volumeLimit, -1, -1, "volumeLimit", NULL }, - { 27, &hf_gprscdr_ServiceConditionChangeV750_serviceSpecificUnitLimit, -1, -1, "serviceSpecificUnitLimit", NULL }, - { 28, &hf_gprscdr_ServiceConditionChangeV750_envelopeClosure, -1, -1, "envelopeClosure", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * ServiceConditionChangeV750_bits[] = { + &hf_gprscdr_ServiceConditionChangeV750_qoSChange, + &hf_gprscdr_ServiceConditionChangeV750_sGSNChange, + &hf_gprscdr_ServiceConditionChangeV750_sGSNPLMNIDChange, + &hf_gprscdr_ServiceConditionChangeV750_tariffTimeSwitch, + &hf_gprscdr_ServiceConditionChangeV750_pDPContextRelease, + &hf_gprscdr_ServiceConditionChangeV750_rATChange, + &hf_gprscdr_ServiceConditionChangeV750_serviceIdledOut, + &hf_gprscdr_ServiceConditionChangeV750_reserved, + &hf_gprscdr_ServiceConditionChangeV750_configurationChange, + &hf_gprscdr_ServiceConditionChangeV750_serviceStop, + &hf_gprscdr_ServiceConditionChangeV750_dCCATimeThresholdReached, + &hf_gprscdr_ServiceConditionChangeV750_dCCAVolumeThresholdReached, + &hf_gprscdr_ServiceConditionChangeV750_dCCAServiceSpecificUnitThresholdReached, + &hf_gprscdr_ServiceConditionChangeV750_dCCATimeExhausted, + &hf_gprscdr_ServiceConditionChangeV750_dCCAVolumeExhausted, + &hf_gprscdr_ServiceConditionChangeV750_dCCAValidityTimeout, + &hf_gprscdr_ServiceConditionChangeV750_reserved2, + &hf_gprscdr_ServiceConditionChangeV750_dCCAReauthorisationRequest, + &hf_gprscdr_ServiceConditionChangeV750_dCCAContinueOngoingSession, + &hf_gprscdr_ServiceConditionChangeV750_dCCARetryAndTerminateOngoingSession, + &hf_gprscdr_ServiceConditionChangeV750_dCCATerminateOngoingSession, + &hf_gprscdr_ServiceConditionChangeV750_cGI_SAIChange, + &hf_gprscdr_ServiceConditionChangeV750_rAIChange, + &hf_gprscdr_ServiceConditionChangeV750_dCCAServiceSpecificUnitExhausted, + &hf_gprscdr_ServiceConditionChangeV750_recordClosure, + &hf_gprscdr_ServiceConditionChangeV750_timeLimit, + &hf_gprscdr_ServiceConditionChangeV750_volumeLimit, + &hf_gprscdr_ServiceConditionChangeV750_serviceSpecificUnitLimit, + &hf_gprscdr_ServiceConditionChangeV750_envelopeClosure, + NULL }; static int dissect_gprscdr_ServiceConditionChangeV750(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - ServiceConditionChangeV750_bits, hf_index, ett_gprscdr_ServiceConditionChangeV750, + ServiceConditionChangeV750_bits, 29, hf_index, ett_gprscdr_ServiceConditionChangeV750, NULL); return offset; @@ -4126,52 +4128,52 @@ dissect_gprscdr_T_userLocationInformation_07(gboolean implicit_tag _U_, tvbuff_t } -static const asn_namedbit ServiceConditionChange_bits[] = { - { 0, &hf_gprscdr_ServiceConditionChange_qoSChange, -1, -1, "qoSChange", NULL }, - { 1, &hf_gprscdr_ServiceConditionChange_sGSNChange, -1, -1, "sGSNChange", NULL }, - { 2, &hf_gprscdr_ServiceConditionChange_sGSNPLMNIDChange, -1, -1, "sGSNPLMNIDChange", NULL }, - { 3, &hf_gprscdr_ServiceConditionChange_tariffTimeSwitch, -1, -1, "tariffTimeSwitch", NULL }, - { 4, &hf_gprscdr_ServiceConditionChange_pDPContextRelease, -1, -1, "pDPContextRelease", NULL }, - { 5, &hf_gprscdr_ServiceConditionChange_rATChange, -1, -1, "rATChange", NULL }, - { 6, &hf_gprscdr_ServiceConditionChange_serviceIdledOut, -1, -1, "serviceIdledOut", NULL }, - { 7, &hf_gprscdr_ServiceConditionChange_reserved, -1, -1, "reserved", NULL }, - { 8, &hf_gprscdr_ServiceConditionChange_configurationChange, -1, -1, "configurationChange", NULL }, - { 9, &hf_gprscdr_ServiceConditionChange_serviceStop, -1, -1, "serviceStop", NULL }, - { 10, &hf_gprscdr_ServiceConditionChange_dCCATimeThresholdReached, -1, -1, "dCCATimeThresholdReached", NULL }, - { 11, &hf_gprscdr_ServiceConditionChange_dCCAVolumeThresholdReached, -1, -1, "dCCAVolumeThresholdReached", NULL }, - { 12, &hf_gprscdr_ServiceConditionChange_dCCAServiceSpecificUnitThresholdReached, -1, -1, "dCCAServiceSpecificUnitThresholdReached", NULL }, - { 13, &hf_gprscdr_ServiceConditionChange_dCCATimeExhausted, -1, -1, "dCCATimeExhausted", NULL }, - { 14, &hf_gprscdr_ServiceConditionChange_dCCAVolumeExhausted, -1, -1, "dCCAVolumeExhausted", NULL }, - { 15, &hf_gprscdr_ServiceConditionChange_dCCAValidityTimeout, -1, -1, "dCCAValidityTimeout", NULL }, - { 16, &hf_gprscdr_ServiceConditionChange_reserved1, -1, -1, "reserved1", NULL }, - { 17, &hf_gprscdr_ServiceConditionChange_dCCAReauthorisationRequest, -1, -1, "dCCAReauthorisationRequest", NULL }, - { 18, &hf_gprscdr_ServiceConditionChange_dCCAContinueOngoingSession, -1, -1, "dCCAContinueOngoingSession", NULL }, - { 19, &hf_gprscdr_ServiceConditionChange_dCCARetryAndTerminateOngoingSession, -1, -1, "dCCARetryAndTerminateOngoingSession", NULL }, - { 20, &hf_gprscdr_ServiceConditionChange_dCCATerminateOngoingSession, -1, -1, "dCCATerminateOngoingSession", NULL }, - { 21, &hf_gprscdr_ServiceConditionChange_cGI_SAIChange, -1, -1, "cGI-SAIChange", NULL }, - { 22, &hf_gprscdr_ServiceConditionChange_rAIChange, -1, -1, "rAIChange", NULL }, - { 23, &hf_gprscdr_ServiceConditionChange_dCCAServiceSpecificUnitExhausted, -1, -1, "dCCAServiceSpecificUnitExhausted", NULL }, - { 24, &hf_gprscdr_ServiceConditionChange_recordClosure, -1, -1, "recordClosure", NULL }, - { 25, &hf_gprscdr_ServiceConditionChange_timeLimit, -1, -1, "timeLimit", NULL }, - { 26, &hf_gprscdr_ServiceConditionChange_volumeLimit, -1, -1, "volumeLimit", NULL }, - { 27, &hf_gprscdr_ServiceConditionChange_serviceSpecificUnitLimit, -1, -1, "serviceSpecificUnitLimit", NULL }, - { 28, &hf_gprscdr_ServiceConditionChange_envelopeClosure, -1, -1, "envelopeClosure", NULL }, - { 29, &hf_gprscdr_ServiceConditionChange_eCGIChange, -1, -1, "eCGIChange", NULL }, - { 30, &hf_gprscdr_ServiceConditionChange_tAIChange, -1, -1, "tAIChange", NULL }, - { 31, &hf_gprscdr_ServiceConditionChange_userLocationChange, -1, -1, "userLocationChange", NULL }, - { 32, &hf_gprscdr_ServiceConditionChange_userCSGInformationChange, -1, -1, "userCSGInformationChange", NULL }, - { 33, &hf_gprscdr_ServiceConditionChange_presenceInPRAChange, -1, -1, "presenceInPRAChange", NULL }, - { 34, &hf_gprscdr_ServiceConditionChange_accessChangeOfSDF, -1, -1, "accessChangeOfSDF", NULL }, - { 35, &hf_gprscdr_ServiceConditionChange_indirectServiceConditionChange, -1, -1, "indirectServiceConditionChange", NULL }, - { 36, &hf_gprscdr_ServiceConditionChange_servingPLMNRateControlChange, -1, -1, "servingPLMNRateControlChange", NULL }, - { 37, &hf_gprscdr_ServiceConditionChange_aPNRateControlChange, -1, -1, "aPNRateControlChange", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * ServiceConditionChange_bits[] = { + &hf_gprscdr_ServiceConditionChange_qoSChange, + &hf_gprscdr_ServiceConditionChange_sGSNChange, + &hf_gprscdr_ServiceConditionChange_sGSNPLMNIDChange, + &hf_gprscdr_ServiceConditionChange_tariffTimeSwitch, + &hf_gprscdr_ServiceConditionChange_pDPContextRelease, + &hf_gprscdr_ServiceConditionChange_rATChange, + &hf_gprscdr_ServiceConditionChange_serviceIdledOut, + &hf_gprscdr_ServiceConditionChange_reserved, + &hf_gprscdr_ServiceConditionChange_configurationChange, + &hf_gprscdr_ServiceConditionChange_serviceStop, + &hf_gprscdr_ServiceConditionChange_dCCATimeThresholdReached, + &hf_gprscdr_ServiceConditionChange_dCCAVolumeThresholdReached, + &hf_gprscdr_ServiceConditionChange_dCCAServiceSpecificUnitThresholdReached, + &hf_gprscdr_ServiceConditionChange_dCCATimeExhausted, + &hf_gprscdr_ServiceConditionChange_dCCAVolumeExhausted, + &hf_gprscdr_ServiceConditionChange_dCCAValidityTimeout, + &hf_gprscdr_ServiceConditionChange_reserved1, + &hf_gprscdr_ServiceConditionChange_dCCAReauthorisationRequest, + &hf_gprscdr_ServiceConditionChange_dCCAContinueOngoingSession, + &hf_gprscdr_ServiceConditionChange_dCCARetryAndTerminateOngoingSession, + &hf_gprscdr_ServiceConditionChange_dCCATerminateOngoingSession, + &hf_gprscdr_ServiceConditionChange_cGI_SAIChange, + &hf_gprscdr_ServiceConditionChange_rAIChange, + &hf_gprscdr_ServiceConditionChange_dCCAServiceSpecificUnitExhausted, + &hf_gprscdr_ServiceConditionChange_recordClosure, + &hf_gprscdr_ServiceConditionChange_timeLimit, + &hf_gprscdr_ServiceConditionChange_volumeLimit, + &hf_gprscdr_ServiceConditionChange_serviceSpecificUnitLimit, + &hf_gprscdr_ServiceConditionChange_envelopeClosure, + &hf_gprscdr_ServiceConditionChange_eCGIChange, + &hf_gprscdr_ServiceConditionChange_tAIChange, + &hf_gprscdr_ServiceConditionChange_userLocationChange, + &hf_gprscdr_ServiceConditionChange_userCSGInformationChange, + &hf_gprscdr_ServiceConditionChange_presenceInPRAChange, + &hf_gprscdr_ServiceConditionChange_accessChangeOfSDF, + &hf_gprscdr_ServiceConditionChange_indirectServiceConditionChange, + &hf_gprscdr_ServiceConditionChange_servingPLMNRateControlChange, + &hf_gprscdr_ServiceConditionChange_aPNRateControlChange, + NULL }; static int dissect_gprscdr_ServiceConditionChange(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - ServiceConditionChange_bits, hf_index, ett_gprscdr_ServiceConditionChange, + ServiceConditionChange_bits, 38, hf_index, ett_gprscdr_ServiceConditionChange, NULL); return offset; @@ -6507,6 +6509,10 @@ proto_register_gprscdr(void) { "volumeThresholdReached", "gprscdr.volumeThresholdReached", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, + { &hf_gprscdr_ServiceConditionChangeV651_spare_bit_12, + { "spare_bit_12", "gprscdr.spare_bit_12", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, { &hf_gprscdr_ServiceConditionChangeV651_timeExhausted, { "timeExhausted", "gprscdr.timeExhausted", FT_BOOLEAN, 8, NULL, 0x04, diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 509a98ade1..1b3277d421 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -1284,12 +1284,12 @@ static int hf_gsm_map_ms_AccessRestrictionData_enhancedCoverageNotAllowed = -1; static int hf_gsm_map_ms_ODB_GeneralData_allOG_CallsBarred = -1; static int hf_gsm_map_ms_ODB_GeneralData_internationalOGCallsBarred = -1; static int hf_gsm_map_ms_ODB_GeneralData_internationalOGCallsNotToHPLMN_CountryBarred = -1; -static int hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsBarred = -1; -static int hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsNotToHPLMN_CountryBarred = -1; -static int hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsAndInternationalOGCallsNotToHPLMN_CountryBarred = -1; static int hf_gsm_map_ms_ODB_GeneralData_premiumRateInformationOGCallsBarred = -1; static int hf_gsm_map_ms_ODB_GeneralData_premiumRateEntertainementOGCallsBarred = -1; static int hf_gsm_map_ms_ODB_GeneralData_ss_AccessBarred = -1; +static int hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsBarred = -1; +static int hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsNotToHPLMN_CountryBarred = -1; +static int hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsAndInternationalOGCallsNotToHPLMN_CountryBarred = -1; static int hf_gsm_map_ms_ODB_GeneralData_allECT_Barred = -1; static int hf_gsm_map_ms_ODB_GeneralData_chargeableECT_Barred = -1; static int hf_gsm_map_ms_ODB_GeneralData_internationalECT_Barred = -1; @@ -5523,16 +5523,16 @@ dissect_gsm_map_ss_SS_InvocationNotificationRes(gboolean implicit_tag _U_, tvbuf } -static const asn_namedbit gsm_map_ss_ServiceIndicator_bits[] = { - { 0, &hf_gsm_map_ss_ServiceIndicator_clir_invoked, -1, -1, "clir-invoked", NULL }, - { 1, &hf_gsm_map_ss_ServiceIndicator_camel_invoked, -1, -1, "camel-invoked", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ss_ServiceIndicator_bits[] = { + &hf_gsm_map_ss_ServiceIndicator_clir_invoked, + &hf_gsm_map_ss_ServiceIndicator_camel_invoked, + NULL }; static int dissect_gsm_map_ss_ServiceIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ss_ServiceIndicator_bits, hf_index, ett_gsm_map_ss_ServiceIndicator, + gsm_map_ss_ServiceIndicator_bits, 2, hf_index, ett_gsm_map_ss_ServiceIndicator, NULL); return offset; @@ -7179,18 +7179,18 @@ dissect_gsm_map_sm_AlertServiceCentreArg(gboolean implicit_tag _U_, tvbuff_t *tv } -static const asn_namedbit gsm_map_sm_MW_Status_bits[] = { - { 0, &hf_gsm_map_sm_MW_Status_sc_AddressNotIncluded, -1, -1, "sc-AddressNotIncluded", NULL }, - { 1, &hf_gsm_map_sm_MW_Status_mnrf_Set, -1, -1, "mnrf-Set", NULL }, - { 2, &hf_gsm_map_sm_MW_Status_mcef_Set, -1, -1, "mcef-Set", NULL }, - { 3, &hf_gsm_map_sm_MW_Status_mnrg_Set, -1, -1, "mnrg-Set", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_sm_MW_Status_bits[] = { + &hf_gsm_map_sm_MW_Status_sc_AddressNotIncluded, + &hf_gsm_map_sm_MW_Status_mnrf_Set, + &hf_gsm_map_sm_MW_Status_mcef_Set, + &hf_gsm_map_sm_MW_Status_mnrg_Set, + NULL }; static int dissect_gsm_map_sm_MW_Status(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_sm_MW_Status_bits, hf_index, ett_gsm_map_sm_MW_Status, + gsm_map_sm_MW_Status_bits, 4, hf_index, ett_gsm_map_sm_MW_Status, NULL); return offset; @@ -7451,217 +7451,217 @@ dissect_gsm_map_om_TraceDepthList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const asn_namedbit gsm_map_om_TraceNE_TypeList_bits[] = { - { 0, &hf_gsm_map_om_TraceNE_TypeList_msc_s, -1, -1, "msc-s", NULL }, - { 1, &hf_gsm_map_om_TraceNE_TypeList_mgw, -1, -1, "mgw", NULL }, - { 2, &hf_gsm_map_om_TraceNE_TypeList_sgsn, -1, -1, "sgsn", NULL }, - { 3, &hf_gsm_map_om_TraceNE_TypeList_ggsn, -1, -1, "ggsn", NULL }, - { 4, &hf_gsm_map_om_TraceNE_TypeList_rnc, -1, -1, "rnc", NULL }, - { 5, &hf_gsm_map_om_TraceNE_TypeList_bm_sc, -1, -1, "bm-sc", NULL }, - { 6, &hf_gsm_map_om_TraceNE_TypeList_mme, -1, -1, "mme", NULL }, - { 7, &hf_gsm_map_om_TraceNE_TypeList_sgw, -1, -1, "sgw", NULL }, - { 8, &hf_gsm_map_om_TraceNE_TypeList_pgw, -1, -1, "pgw", NULL }, - { 9, &hf_gsm_map_om_TraceNE_TypeList_eNB, -1, -1, "eNB", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_TraceNE_TypeList_bits[] = { + &hf_gsm_map_om_TraceNE_TypeList_msc_s, + &hf_gsm_map_om_TraceNE_TypeList_mgw, + &hf_gsm_map_om_TraceNE_TypeList_sgsn, + &hf_gsm_map_om_TraceNE_TypeList_ggsn, + &hf_gsm_map_om_TraceNE_TypeList_rnc, + &hf_gsm_map_om_TraceNE_TypeList_bm_sc, + &hf_gsm_map_om_TraceNE_TypeList_mme, + &hf_gsm_map_om_TraceNE_TypeList_sgw, + &hf_gsm_map_om_TraceNE_TypeList_pgw, + &hf_gsm_map_om_TraceNE_TypeList_eNB, + NULL }; static int dissect_gsm_map_om_TraceNE_TypeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_TraceNE_TypeList_bits, hf_index, ett_gsm_map_om_TraceNE_TypeList, + gsm_map_om_TraceNE_TypeList_bits, 10, hf_index, ett_gsm_map_om_TraceNE_TypeList, NULL); return offset; } -static const asn_namedbit gsm_map_om_MSC_S_InterfaceList_bits[] = { - { 0, &hf_gsm_map_om_MSC_S_InterfaceList_a, -1, -1, "a", NULL }, - { 1, &hf_gsm_map_om_MSC_S_InterfaceList_iu, -1, -1, "iu", NULL }, - { 2, &hf_gsm_map_om_MSC_S_InterfaceList_mc, -1, -1, "mc", NULL }, - { 3, &hf_gsm_map_om_MSC_S_InterfaceList_map_g, -1, -1, "map-g", NULL }, - { 4, &hf_gsm_map_om_MSC_S_InterfaceList_map_b, -1, -1, "map-b", NULL }, - { 5, &hf_gsm_map_om_MSC_S_InterfaceList_map_e, -1, -1, "map-e", NULL }, - { 6, &hf_gsm_map_om_MSC_S_InterfaceList_map_f, -1, -1, "map-f", NULL }, - { 7, &hf_gsm_map_om_MSC_S_InterfaceList_cap, -1, -1, "cap", NULL }, - { 8, &hf_gsm_map_om_MSC_S_InterfaceList_map_d, -1, -1, "map-d", NULL }, - { 9, &hf_gsm_map_om_MSC_S_InterfaceList_map_c, -1, -1, "map-c", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_MSC_S_InterfaceList_bits[] = { + &hf_gsm_map_om_MSC_S_InterfaceList_a, + &hf_gsm_map_om_MSC_S_InterfaceList_iu, + &hf_gsm_map_om_MSC_S_InterfaceList_mc, + &hf_gsm_map_om_MSC_S_InterfaceList_map_g, + &hf_gsm_map_om_MSC_S_InterfaceList_map_b, + &hf_gsm_map_om_MSC_S_InterfaceList_map_e, + &hf_gsm_map_om_MSC_S_InterfaceList_map_f, + &hf_gsm_map_om_MSC_S_InterfaceList_cap, + &hf_gsm_map_om_MSC_S_InterfaceList_map_d, + &hf_gsm_map_om_MSC_S_InterfaceList_map_c, + NULL }; static int dissect_gsm_map_om_MSC_S_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_MSC_S_InterfaceList_bits, hf_index, ett_gsm_map_om_MSC_S_InterfaceList, + gsm_map_om_MSC_S_InterfaceList_bits, 10, hf_index, ett_gsm_map_om_MSC_S_InterfaceList, NULL); return offset; } -static const asn_namedbit gsm_map_om_MGW_InterfaceList_bits[] = { - { 0, &hf_gsm_map_om_MGW_InterfaceList_mc, -1, -1, "mc", NULL }, - { 1, &hf_gsm_map_om_MGW_InterfaceList_nb_up, -1, -1, "nb-up", NULL }, - { 2, &hf_gsm_map_om_MGW_InterfaceList_iu_up, -1, -1, "iu-up", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_MGW_InterfaceList_bits[] = { + &hf_gsm_map_om_MGW_InterfaceList_mc, + &hf_gsm_map_om_MGW_InterfaceList_nb_up, + &hf_gsm_map_om_MGW_InterfaceList_iu_up, + NULL }; static int dissect_gsm_map_om_MGW_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_MGW_InterfaceList_bits, hf_index, ett_gsm_map_om_MGW_InterfaceList, + gsm_map_om_MGW_InterfaceList_bits, 3, hf_index, ett_gsm_map_om_MGW_InterfaceList, NULL); return offset; } -static const asn_namedbit gsm_map_om_SGSN_InterfaceList_bits[] = { - { 0, &hf_gsm_map_om_SGSN_InterfaceList_gb, -1, -1, "gb", NULL }, - { 1, &hf_gsm_map_om_SGSN_InterfaceList_iu, -1, -1, "iu", NULL }, - { 2, &hf_gsm_map_om_SGSN_InterfaceList_gn, -1, -1, "gn", NULL }, - { 3, &hf_gsm_map_om_SGSN_InterfaceList_map_gr, -1, -1, "map-gr", NULL }, - { 4, &hf_gsm_map_om_SGSN_InterfaceList_map_gd, -1, -1, "map-gd", NULL }, - { 5, &hf_gsm_map_om_SGSN_InterfaceList_map_gf, -1, -1, "map-gf", NULL }, - { 6, &hf_gsm_map_om_SGSN_InterfaceList_gs, -1, -1, "gs", NULL }, - { 7, &hf_gsm_map_om_SGSN_InterfaceList_ge, -1, -1, "ge", NULL }, - { 8, &hf_gsm_map_om_SGSN_InterfaceList_s3, -1, -1, "s3", NULL }, - { 9, &hf_gsm_map_om_SGSN_InterfaceList_s4, -1, -1, "s4", NULL }, - { 10, &hf_gsm_map_om_SGSN_InterfaceList_s6d, -1, -1, "s6d", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_SGSN_InterfaceList_bits[] = { + &hf_gsm_map_om_SGSN_InterfaceList_gb, + &hf_gsm_map_om_SGSN_InterfaceList_iu, + &hf_gsm_map_om_SGSN_InterfaceList_gn, + &hf_gsm_map_om_SGSN_InterfaceList_map_gr, + &hf_gsm_map_om_SGSN_InterfaceList_map_gd, + &hf_gsm_map_om_SGSN_InterfaceList_map_gf, + &hf_gsm_map_om_SGSN_InterfaceList_gs, + &hf_gsm_map_om_SGSN_InterfaceList_ge, + &hf_gsm_map_om_SGSN_InterfaceList_s3, + &hf_gsm_map_om_SGSN_InterfaceList_s4, + &hf_gsm_map_om_SGSN_InterfaceList_s6d, + NULL }; static int dissect_gsm_map_om_SGSN_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_SGSN_InterfaceList_bits, hf_index, ett_gsm_map_om_SGSN_InterfaceList, + gsm_map_om_SGSN_InterfaceList_bits, 11, hf_index, ett_gsm_map_om_SGSN_InterfaceList, NULL); return offset; } -static const asn_namedbit gsm_map_om_GGSN_InterfaceList_bits[] = { - { 0, &hf_gsm_map_om_GGSN_InterfaceList_gn, -1, -1, "gn", NULL }, - { 1, &hf_gsm_map_om_GGSN_InterfaceList_gi, -1, -1, "gi", NULL }, - { 2, &hf_gsm_map_om_GGSN_InterfaceList_gmb, -1, -1, "gmb", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_GGSN_InterfaceList_bits[] = { + &hf_gsm_map_om_GGSN_InterfaceList_gn, + &hf_gsm_map_om_GGSN_InterfaceList_gi, + &hf_gsm_map_om_GGSN_InterfaceList_gmb, + NULL }; static int dissect_gsm_map_om_GGSN_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_GGSN_InterfaceList_bits, hf_index, ett_gsm_map_om_GGSN_InterfaceList, + gsm_map_om_GGSN_InterfaceList_bits, 3, hf_index, ett_gsm_map_om_GGSN_InterfaceList, NULL); return offset; } -static const asn_namedbit gsm_map_om_RNC_InterfaceList_bits[] = { - { 0, &hf_gsm_map_om_RNC_InterfaceList_iu, -1, -1, "iu", NULL }, - { 1, &hf_gsm_map_om_RNC_InterfaceList_iur, -1, -1, "iur", NULL }, - { 2, &hf_gsm_map_om_RNC_InterfaceList_iub, -1, -1, "iub", NULL }, - { 3, &hf_gsm_map_om_RNC_InterfaceList_uu, -1, -1, "uu", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_RNC_InterfaceList_bits[] = { + &hf_gsm_map_om_RNC_InterfaceList_iu, + &hf_gsm_map_om_RNC_InterfaceList_iur, + &hf_gsm_map_om_RNC_InterfaceList_iub, + &hf_gsm_map_om_RNC_InterfaceList_uu, + NULL }; static int dissect_gsm_map_om_RNC_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_RNC_InterfaceList_bits, hf_index, ett_gsm_map_om_RNC_InterfaceList, + gsm_map_om_RNC_InterfaceList_bits, 4, hf_index, ett_gsm_map_om_RNC_InterfaceList, NULL); return offset; } -static const asn_namedbit gsm_map_om_BMSC_InterfaceList_bits[] = { - { 0, &hf_gsm_map_om_BMSC_InterfaceList_gmb, -1, -1, "gmb", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_BMSC_InterfaceList_bits[] = { + &hf_gsm_map_om_BMSC_InterfaceList_gmb, + NULL }; static int dissect_gsm_map_om_BMSC_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_BMSC_InterfaceList_bits, hf_index, ett_gsm_map_om_BMSC_InterfaceList, + gsm_map_om_BMSC_InterfaceList_bits, 1, hf_index, ett_gsm_map_om_BMSC_InterfaceList, NULL); return offset; } -static const asn_namedbit gsm_map_om_MME_InterfaceList_bits[] = { - { 0, &hf_gsm_map_om_MME_InterfaceList_s1_mme, -1, -1, "s1-mme", NULL }, - { 1, &hf_gsm_map_om_MME_InterfaceList_s3, -1, -1, "s3", NULL }, - { 2, &hf_gsm_map_om_MME_InterfaceList_s6a, -1, -1, "s6a", NULL }, - { 3, &hf_gsm_map_om_MME_InterfaceList_s10, -1, -1, "s10", NULL }, - { 4, &hf_gsm_map_om_MME_InterfaceList_s11, -1, -1, "s11", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_MME_InterfaceList_bits[] = { + &hf_gsm_map_om_MME_InterfaceList_s1_mme, + &hf_gsm_map_om_MME_InterfaceList_s3, + &hf_gsm_map_om_MME_InterfaceList_s6a, + &hf_gsm_map_om_MME_InterfaceList_s10, + &hf_gsm_map_om_MME_InterfaceList_s11, + NULL }; static int dissect_gsm_map_om_MME_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_MME_InterfaceList_bits, hf_index, ett_gsm_map_om_MME_InterfaceList, + gsm_map_om_MME_InterfaceList_bits, 5, hf_index, ett_gsm_map_om_MME_InterfaceList, NULL); return offset; } -static const asn_namedbit gsm_map_om_SGW_InterfaceList_bits[] = { - { 0, &hf_gsm_map_om_SGW_InterfaceList_s4, -1, -1, "s4", NULL }, - { 1, &hf_gsm_map_om_SGW_InterfaceList_s5, -1, -1, "s5", NULL }, - { 2, &hf_gsm_map_om_SGW_InterfaceList_s8b, -1, -1, "s8b", NULL }, - { 3, &hf_gsm_map_om_SGW_InterfaceList_s11, -1, -1, "s11", NULL }, - { 4, &hf_gsm_map_om_SGW_InterfaceList_gxc, -1, -1, "gxc", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_SGW_InterfaceList_bits[] = { + &hf_gsm_map_om_SGW_InterfaceList_s4, + &hf_gsm_map_om_SGW_InterfaceList_s5, + &hf_gsm_map_om_SGW_InterfaceList_s8b, + &hf_gsm_map_om_SGW_InterfaceList_s11, + &hf_gsm_map_om_SGW_InterfaceList_gxc, + NULL }; static int dissect_gsm_map_om_SGW_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_SGW_InterfaceList_bits, hf_index, ett_gsm_map_om_SGW_InterfaceList, + gsm_map_om_SGW_InterfaceList_bits, 5, hf_index, ett_gsm_map_om_SGW_InterfaceList, NULL); return offset; } -static const asn_namedbit gsm_map_om_PGW_InterfaceList_bits[] = { - { 0, &hf_gsm_map_om_PGW_InterfaceList_s2a, -1, -1, "s2a", NULL }, - { 1, &hf_gsm_map_om_PGW_InterfaceList_s2b, -1, -1, "s2b", NULL }, - { 2, &hf_gsm_map_om_PGW_InterfaceList_s2c, -1, -1, "s2c", NULL }, - { 3, &hf_gsm_map_om_PGW_InterfaceList_s5, -1, -1, "s5", NULL }, - { 4, &hf_gsm_map_om_PGW_InterfaceList_s6b, -1, -1, "s6b", NULL }, - { 5, &hf_gsm_map_om_PGW_InterfaceList_gx, -1, -1, "gx", NULL }, - { 6, &hf_gsm_map_om_PGW_InterfaceList_s8b, -1, -1, "s8b", NULL }, - { 7, &hf_gsm_map_om_PGW_InterfaceList_sgi, -1, -1, "sgi", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_PGW_InterfaceList_bits[] = { + &hf_gsm_map_om_PGW_InterfaceList_s2a, + &hf_gsm_map_om_PGW_InterfaceList_s2b, + &hf_gsm_map_om_PGW_InterfaceList_s2c, + &hf_gsm_map_om_PGW_InterfaceList_s5, + &hf_gsm_map_om_PGW_InterfaceList_s6b, + &hf_gsm_map_om_PGW_InterfaceList_gx, + &hf_gsm_map_om_PGW_InterfaceList_s8b, + &hf_gsm_map_om_PGW_InterfaceList_sgi, + NULL }; static int dissect_gsm_map_om_PGW_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_PGW_InterfaceList_bits, hf_index, ett_gsm_map_om_PGW_InterfaceList, + gsm_map_om_PGW_InterfaceList_bits, 8, hf_index, ett_gsm_map_om_PGW_InterfaceList, NULL); return offset; } -static const asn_namedbit gsm_map_om_ENB_InterfaceList_bits[] = { - { 0, &hf_gsm_map_om_ENB_InterfaceList_s1_mme, -1, -1, "s1-mme", NULL }, - { 1, &hf_gsm_map_om_ENB_InterfaceList_x2, -1, -1, "x2", NULL }, - { 2, &hf_gsm_map_om_ENB_InterfaceList_uu, -1, -1, "uu", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_ENB_InterfaceList_bits[] = { + &hf_gsm_map_om_ENB_InterfaceList_s1_mme, + &hf_gsm_map_om_ENB_InterfaceList_x2, + &hf_gsm_map_om_ENB_InterfaceList_uu, + NULL }; static int dissect_gsm_map_om_ENB_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_ENB_InterfaceList_bits, hf_index, ett_gsm_map_om_ENB_InterfaceList, + gsm_map_om_ENB_InterfaceList_bits, 3, hf_index, ett_gsm_map_om_ENB_InterfaceList, NULL); return offset; @@ -7691,137 +7691,137 @@ dissect_gsm_map_om_TraceInterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _ } -static const asn_namedbit gsm_map_om_MSC_S_EventList_bits[] = { - { 0, &hf_gsm_map_om_MSC_S_EventList_mo_mtCall, -1, -1, "mo-mtCall", NULL }, - { 1, &hf_gsm_map_om_MSC_S_EventList_mo_mt_sms, -1, -1, "mo-mt-sms", NULL }, - { 2, &hf_gsm_map_om_MSC_S_EventList_lu_imsiAttach_imsiDetach, -1, -1, "lu-imsiAttach-imsiDetach", NULL }, - { 3, &hf_gsm_map_om_MSC_S_EventList_handovers, -1, -1, "handovers", NULL }, - { 4, &hf_gsm_map_om_MSC_S_EventList_ss, -1, -1, "ss", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_MSC_S_EventList_bits[] = { + &hf_gsm_map_om_MSC_S_EventList_mo_mtCall, + &hf_gsm_map_om_MSC_S_EventList_mo_mt_sms, + &hf_gsm_map_om_MSC_S_EventList_lu_imsiAttach_imsiDetach, + &hf_gsm_map_om_MSC_S_EventList_handovers, + &hf_gsm_map_om_MSC_S_EventList_ss, + NULL }; static int dissect_gsm_map_om_MSC_S_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_MSC_S_EventList_bits, hf_index, ett_gsm_map_om_MSC_S_EventList, + gsm_map_om_MSC_S_EventList_bits, 5, hf_index, ett_gsm_map_om_MSC_S_EventList, NULL); return offset; } -static const asn_namedbit gsm_map_om_MGW_EventList_bits[] = { - { 0, &hf_gsm_map_om_MGW_EventList_context, -1, -1, "context", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_MGW_EventList_bits[] = { + &hf_gsm_map_om_MGW_EventList_context, + NULL }; static int dissect_gsm_map_om_MGW_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_MGW_EventList_bits, hf_index, ett_gsm_map_om_MGW_EventList, + gsm_map_om_MGW_EventList_bits, 1, hf_index, ett_gsm_map_om_MGW_EventList, NULL); return offset; } -static const asn_namedbit gsm_map_om_SGSN_EventList_bits[] = { - { 0, &hf_gsm_map_om_SGSN_EventList_pdpContext, -1, -1, "pdpContext", NULL }, - { 1, &hf_gsm_map_om_SGSN_EventList_mo_mt_sms, -1, -1, "mo-mt-sms", NULL }, - { 2, &hf_gsm_map_om_SGSN_EventList_rau_gprsAttach_gprsDetach, -1, -1, "rau-gprsAttach-gprsDetach", NULL }, - { 3, &hf_gsm_map_om_SGSN_EventList_mbmsContext, -1, -1, "mbmsContext", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_SGSN_EventList_bits[] = { + &hf_gsm_map_om_SGSN_EventList_pdpContext, + &hf_gsm_map_om_SGSN_EventList_mo_mt_sms, + &hf_gsm_map_om_SGSN_EventList_rau_gprsAttach_gprsDetach, + &hf_gsm_map_om_SGSN_EventList_mbmsContext, + NULL }; static int dissect_gsm_map_om_SGSN_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_SGSN_EventList_bits, hf_index, ett_gsm_map_om_SGSN_EventList, + gsm_map_om_SGSN_EventList_bits, 4, hf_index, ett_gsm_map_om_SGSN_EventList, NULL); return offset; } -static const asn_namedbit gsm_map_om_GGSN_EventList_bits[] = { - { 0, &hf_gsm_map_om_GGSN_EventList_pdpContext, -1, -1, "pdpContext", NULL }, - { 1, &hf_gsm_map_om_GGSN_EventList_mbmsContext, -1, -1, "mbmsContext", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_GGSN_EventList_bits[] = { + &hf_gsm_map_om_GGSN_EventList_pdpContext, + &hf_gsm_map_om_GGSN_EventList_mbmsContext, + NULL }; static int dissect_gsm_map_om_GGSN_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_GGSN_EventList_bits, hf_index, ett_gsm_map_om_GGSN_EventList, + gsm_map_om_GGSN_EventList_bits, 2, hf_index, ett_gsm_map_om_GGSN_EventList, NULL); return offset; } -static const asn_namedbit gsm_map_om_BMSC_EventList_bits[] = { - { 0, &hf_gsm_map_om_BMSC_EventList_mbmsMulticastServiceActivation, -1, -1, "mbmsMulticastServiceActivation", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_BMSC_EventList_bits[] = { + &hf_gsm_map_om_BMSC_EventList_mbmsMulticastServiceActivation, + NULL }; static int dissect_gsm_map_om_BMSC_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_BMSC_EventList_bits, hf_index, ett_gsm_map_om_BMSC_EventList, + gsm_map_om_BMSC_EventList_bits, 1, hf_index, ett_gsm_map_om_BMSC_EventList, NULL); return offset; } -static const asn_namedbit gsm_map_om_MME_EventList_bits[] = { - { 0, &hf_gsm_map_om_MME_EventList_ue_initiatedPDNconectivityRequest, -1, -1, "ue-initiatedPDNconectivityRequest", NULL }, - { 1, &hf_gsm_map_om_MME_EventList_serviceRequestts, -1, -1, "serviceRequestts", NULL }, - { 2, &hf_gsm_map_om_MME_EventList_initialAttachTrackingAreaUpdateDetach, -1, -1, "initialAttachTrackingAreaUpdateDetach", NULL }, - { 3, &hf_gsm_map_om_MME_EventList_ue_initiatedPDNdisconnection, -1, -1, "ue-initiatedPDNdisconnection", NULL }, - { 4, &hf_gsm_map_om_MME_EventList_bearerActivationModificationDeletion, -1, -1, "bearerActivationModificationDeletion", NULL }, - { 5, &hf_gsm_map_om_MME_EventList_handover, -1, -1, "handover", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_MME_EventList_bits[] = { + &hf_gsm_map_om_MME_EventList_ue_initiatedPDNconectivityRequest, + &hf_gsm_map_om_MME_EventList_serviceRequestts, + &hf_gsm_map_om_MME_EventList_initialAttachTrackingAreaUpdateDetach, + &hf_gsm_map_om_MME_EventList_ue_initiatedPDNdisconnection, + &hf_gsm_map_om_MME_EventList_bearerActivationModificationDeletion, + &hf_gsm_map_om_MME_EventList_handover, + NULL }; static int dissect_gsm_map_om_MME_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_MME_EventList_bits, hf_index, ett_gsm_map_om_MME_EventList, + gsm_map_om_MME_EventList_bits, 6, hf_index, ett_gsm_map_om_MME_EventList, NULL); return offset; } -static const asn_namedbit gsm_map_om_SGW_EventList_bits[] = { - { 0, &hf_gsm_map_om_SGW_EventList_pdn_connectionCreation, -1, -1, "pdn-connectionCreation", NULL }, - { 1, &hf_gsm_map_om_SGW_EventList_pdn_connectionTermination, -1, -1, "pdn-connectionTermination", NULL }, - { 2, &hf_gsm_map_om_SGW_EventList_bearerActivationModificationDeletion, -1, -1, "bearerActivationModificationDeletion", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_SGW_EventList_bits[] = { + &hf_gsm_map_om_SGW_EventList_pdn_connectionCreation, + &hf_gsm_map_om_SGW_EventList_pdn_connectionTermination, + &hf_gsm_map_om_SGW_EventList_bearerActivationModificationDeletion, + NULL }; static int dissect_gsm_map_om_SGW_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_SGW_EventList_bits, hf_index, ett_gsm_map_om_SGW_EventList, + gsm_map_om_SGW_EventList_bits, 3, hf_index, ett_gsm_map_om_SGW_EventList, NULL); return offset; } -static const asn_namedbit gsm_map_om_PGW_EventList_bits[] = { - { 0, &hf_gsm_map_om_PGW_EventList_pdn_connectionCreation, -1, -1, "pdn-connectionCreation", NULL }, - { 1, &hf_gsm_map_om_PGW_EventList_pdn_connectionTermination, -1, -1, "pdn-connectionTermination", NULL }, - { 2, &hf_gsm_map_om_PGW_EventList_bearerActivationModificationDeletion, -1, -1, "bearerActivationModificationDeletion", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_om_PGW_EventList_bits[] = { + &hf_gsm_map_om_PGW_EventList_pdn_connectionCreation, + &hf_gsm_map_om_PGW_EventList_pdn_connectionTermination, + &hf_gsm_map_om_PGW_EventList_bearerActivationModificationDeletion, + NULL }; static int dissect_gsm_map_om_PGW_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_om_PGW_EventList_bits, hf_index, ett_gsm_map_om_PGW_EventList, + gsm_map_om_PGW_EventList_bits, 3, hf_index, ett_gsm_map_om_PGW_EventList, NULL); return offset; @@ -8354,18 +8354,18 @@ dissect_gsm_map_om_DeactivateTraceModeRes(gboolean implicit_tag _U_, tvbuff_t *t /* --- Module MAP-MS-DataTypes --- --- --- */ -static const asn_namedbit gsm_map_ms_SupportedCamelPhases_bits[] = { - { 0, &hf_gsm_map_ms_SupportedCamelPhases_phase1, -1, -1, "phase1", NULL }, - { 1, &hf_gsm_map_ms_SupportedCamelPhases_phase2, -1, -1, "phase2", NULL }, - { 2, &hf_gsm_map_ms_SupportedCamelPhases_phase3, -1, -1, "phase3", NULL }, - { 3, &hf_gsm_map_ms_SupportedCamelPhases_phase4, -1, -1, "phase4", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ms_SupportedCamelPhases_bits[] = { + &hf_gsm_map_ms_SupportedCamelPhases_phase1, + &hf_gsm_map_ms_SupportedCamelPhases_phase2, + &hf_gsm_map_ms_SupportedCamelPhases_phase3, + &hf_gsm_map_ms_SupportedCamelPhases_phase4, + NULL }; int dissect_gsm_map_ms_SupportedCamelPhases(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_SupportedCamelPhases_bits, hf_index, ett_gsm_map_ms_SupportedCamelPhases, + gsm_map_ms_SupportedCamelPhases_bits, 4, hf_index, ett_gsm_map_ms_SupportedCamelPhases, NULL); return offset; @@ -8429,60 +8429,60 @@ dissect_gsm_map_ms_SuperChargerInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ } -static const asn_namedbit gsm_map_ms_SupportedLCS_CapabilitySets_bits[] = { - { 0, &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet1, -1, -1, "lcsCapabilitySet1", NULL }, - { 1, &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet2, -1, -1, "lcsCapabilitySet2", NULL }, - { 2, &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet3, -1, -1, "lcsCapabilitySet3", NULL }, - { 3, &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet4, -1, -1, "lcsCapabilitySet4", NULL }, - { 4, &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet5, -1, -1, "lcsCapabilitySet5", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ms_SupportedLCS_CapabilitySets_bits[] = { + &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet1, + &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet2, + &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet3, + &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet4, + &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet5, + NULL }; static int dissect_gsm_map_ms_SupportedLCS_CapabilitySets(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_SupportedLCS_CapabilitySets_bits, hf_index, ett_gsm_map_ms_SupportedLCS_CapabilitySets, + gsm_map_ms_SupportedLCS_CapabilitySets_bits, 5, hf_index, ett_gsm_map_ms_SupportedLCS_CapabilitySets, NULL); return offset; } -static const asn_namedbit gsm_map_ms_OfferedCamel4CSIs_bits[] = { - { 0, &hf_gsm_map_ms_OfferedCamel4CSIs_o_csi, -1, -1, "o-csi", NULL }, - { 1, &hf_gsm_map_ms_OfferedCamel4CSIs_d_csi, -1, -1, "d-csi", NULL }, - { 2, &hf_gsm_map_ms_OfferedCamel4CSIs_vt_csi, -1, -1, "vt-csi", NULL }, - { 3, &hf_gsm_map_ms_OfferedCamel4CSIs_t_csi, -1, -1, "t-csi", NULL }, - { 4, &hf_gsm_map_ms_OfferedCamel4CSIs_mt_sms_csi, -1, -1, "mt-sms-csi", NULL }, - { 5, &hf_gsm_map_ms_OfferedCamel4CSIs_mg_csi, -1, -1, "mg-csi", NULL }, - { 6, &hf_gsm_map_ms_OfferedCamel4CSIs_psi_enhancements, -1, -1, "psi-enhancements", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ms_OfferedCamel4CSIs_bits[] = { + &hf_gsm_map_ms_OfferedCamel4CSIs_o_csi, + &hf_gsm_map_ms_OfferedCamel4CSIs_d_csi, + &hf_gsm_map_ms_OfferedCamel4CSIs_vt_csi, + &hf_gsm_map_ms_OfferedCamel4CSIs_t_csi, + &hf_gsm_map_ms_OfferedCamel4CSIs_mt_sms_csi, + &hf_gsm_map_ms_OfferedCamel4CSIs_mg_csi, + &hf_gsm_map_ms_OfferedCamel4CSIs_psi_enhancements, + NULL }; static int dissect_gsm_map_ms_OfferedCamel4CSIs(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_OfferedCamel4CSIs_bits, hf_index, ett_gsm_map_ms_OfferedCamel4CSIs, + gsm_map_ms_OfferedCamel4CSIs_bits, 7, hf_index, ett_gsm_map_ms_OfferedCamel4CSIs, NULL); return offset; } -static const asn_namedbit gsm_map_ms_SupportedRAT_Types_bits[] = { - { 0, &hf_gsm_map_ms_SupportedRAT_Types_utran, -1, -1, "utran", NULL }, - { 1, &hf_gsm_map_ms_SupportedRAT_Types_geran, -1, -1, "geran", NULL }, - { 2, &hf_gsm_map_ms_SupportedRAT_Types_gan, -1, -1, "gan", NULL }, - { 3, &hf_gsm_map_ms_SupportedRAT_Types_i_hspa_evolution, -1, -1, "i-hspa-evolution", NULL }, - { 4, &hf_gsm_map_ms_SupportedRAT_Types_e_utran, -1, -1, "e-utran", NULL }, - { 5, &hf_gsm_map_ms_SupportedRAT_Types_nb_iot, -1, -1, "nb-iot", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ms_SupportedRAT_Types_bits[] = { + &hf_gsm_map_ms_SupportedRAT_Types_utran, + &hf_gsm_map_ms_SupportedRAT_Types_geran, + &hf_gsm_map_ms_SupportedRAT_Types_gan, + &hf_gsm_map_ms_SupportedRAT_Types_i_hspa_evolution, + &hf_gsm_map_ms_SupportedRAT_Types_e_utran, + &hf_gsm_map_ms_SupportedRAT_Types_nb_iot, + NULL }; static int dissect_gsm_map_ms_SupportedRAT_Types(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_SupportedRAT_Types_bits, hf_index, ett_gsm_map_ms_SupportedRAT_Types, + gsm_map_ms_SupportedRAT_Types_bits, 6, hf_index, ett_gsm_map_ms_SupportedRAT_Types, NULL); return offset; @@ -8830,7 +8830,7 @@ dissect_gsm_map_ms_LocationInformationEPS(gboolean implicit_tag _U_, tvbuff_t *t static int dissect_gsm_map_ms_CSG_Id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -9353,53 +9353,53 @@ dissect_gsm_map_ms_AuthenticationFailureReportRes(gboolean implicit_tag _U_, tvb } -static const asn_namedbit gsm_map_ms_SupportedFeatures_bits[] = { - { 0, &hf_gsm_map_ms_SupportedFeatures_odb_all_apn, -1, -1, "odb-all-apn", NULL }, - { 1, &hf_gsm_map_ms_SupportedFeatures_odb_HPLMN_APN, -1, -1, "odb-HPLMN-APN", NULL }, - { 2, &hf_gsm_map_ms_SupportedFeatures_odb_VPLMN_APN, -1, -1, "odb-VPLMN-APN", NULL }, - { 3, &hf_gsm_map_ms_SupportedFeatures_odb_all_og, -1, -1, "odb-all-og", NULL }, - { 4, &hf_gsm_map_ms_SupportedFeatures_odb_all_international_og, -1, -1, "odb-all-international-og", NULL }, - { 5, &hf_gsm_map_ms_SupportedFeatures_odb_all_int_og_not_to_HPLMN_country, -1, -1, "odb-all-int-og-not-to-HPLMN-country", NULL }, - { 6, &hf_gsm_map_ms_SupportedFeatures_odb_all_interzonal_og, -1, -1, "odb-all-interzonal-og", NULL }, - { 7, &hf_gsm_map_ms_SupportedFeatures_odb_all_interzonal_og_not_to_HPLMN_country, -1, -1, "odb-all-interzonal-og-not-to-HPLMN-country", NULL }, - { 8, &hf_gsm_map_ms_SupportedFeatures_odb_all_interzonal_og_and_internat_og_not_to_HPLMN_country, -1, -1, "odb-all-interzonal-og-and-internat-og-not-to-HPLMN-country", NULL }, - { 9, &hf_gsm_map_ms_SupportedFeatures_regSub, -1, -1, "regSub", NULL }, - { 10, &hf_gsm_map_ms_SupportedFeatures_trace, -1, -1, "trace", NULL }, - { 11, &hf_gsm_map_ms_SupportedFeatures_lcs_all_PrivExcep, -1, -1, "lcs-all-PrivExcep", NULL }, - { 12, &hf_gsm_map_ms_SupportedFeatures_lcs_universal, -1, -1, "lcs-universal", NULL }, - { 13, &hf_gsm_map_ms_SupportedFeatures_lcs_CallSessionRelated, -1, -1, "lcs-CallSessionRelated", NULL }, - { 14, &hf_gsm_map_ms_SupportedFeatures_lcs_CallSessionUnrelated, -1, -1, "lcs-CallSessionUnrelated", NULL }, - { 15, &hf_gsm_map_ms_SupportedFeatures_lcs_PLMN_operator, -1, -1, "lcs-PLMN-operator", NULL }, - { 16, &hf_gsm_map_ms_SupportedFeatures_lcs_ServiceType, -1, -1, "lcs-ServiceType", NULL }, - { 17, &hf_gsm_map_ms_SupportedFeatures_lcs_all_MOLR_SS, -1, -1, "lcs-all-MOLR-SS", NULL }, - { 18, &hf_gsm_map_ms_SupportedFeatures_lcs_basicSelfLocation, -1, -1, "lcs-basicSelfLocation", NULL }, - { 19, &hf_gsm_map_ms_SupportedFeatures_lcs_autonomousSelfLocation, -1, -1, "lcs-autonomousSelfLocation", NULL }, - { 20, &hf_gsm_map_ms_SupportedFeatures_lcs_transferToThirdParty, -1, -1, "lcs-transferToThirdParty", NULL }, - { 21, &hf_gsm_map_ms_SupportedFeatures_sm_mo_pp, -1, -1, "sm-mo-pp", NULL }, - { 22, &hf_gsm_map_ms_SupportedFeatures_barring_OutgoingCalls, -1, -1, "barring-OutgoingCalls", NULL }, - { 23, &hf_gsm_map_ms_SupportedFeatures_baoc, -1, -1, "baoc", NULL }, - { 24, &hf_gsm_map_ms_SupportedFeatures_boic, -1, -1, "boic", NULL }, - { 25, &hf_gsm_map_ms_SupportedFeatures_boicExHC, -1, -1, "boicExHC", NULL }, - { 26, &hf_gsm_map_ms_SupportedFeatures_localTimeZoneRetrieval, -1, -1, "localTimeZoneRetrieval", NULL }, - { 27, &hf_gsm_map_ms_SupportedFeatures_additionalMsisdn, -1, -1, "additionalMsisdn", NULL }, - { 28, &hf_gsm_map_ms_SupportedFeatures_smsInMME, -1, -1, "smsInMME", NULL }, - { 29, &hf_gsm_map_ms_SupportedFeatures_smsInSGSN, -1, -1, "smsInSGSN", NULL }, - { 30, &hf_gsm_map_ms_SupportedFeatures_ue_Reachability_Notification, -1, -1, "ue-Reachability-Notification", NULL }, - { 31, &hf_gsm_map_ms_SupportedFeatures_state_Location_Information_Retrieval, -1, -1, "state-Location-Information-Retrieval", NULL }, - { 32, &hf_gsm_map_ms_SupportedFeatures_partialPurge, -1, -1, "partialPurge", NULL }, - { 33, &hf_gsm_map_ms_SupportedFeatures_gddInSGSN, -1, -1, "gddInSGSN", NULL }, - { 34, &hf_gsm_map_ms_SupportedFeatures_sgsnCAMELCapability, -1, -1, "sgsnCAMELCapability", NULL }, - { 35, &hf_gsm_map_ms_SupportedFeatures_pcscf_Restoration, -1, -1, "pcscf-Restoration", NULL }, - { 36, &hf_gsm_map_ms_SupportedFeatures_dedicatedCoreNetworks, -1, -1, "dedicatedCoreNetworks", NULL }, - { 37, &hf_gsm_map_ms_SupportedFeatures_non_IP_PDN_Type_APNs, -1, -1, "non-IP-PDN-Type-APNs", NULL }, - { 38, &hf_gsm_map_ms_SupportedFeatures_non_IP_PDP_Type_APNs, -1, -1, "non-IP-PDP-Type-APNs", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ms_SupportedFeatures_bits[] = { + &hf_gsm_map_ms_SupportedFeatures_odb_all_apn, + &hf_gsm_map_ms_SupportedFeatures_odb_HPLMN_APN, + &hf_gsm_map_ms_SupportedFeatures_odb_VPLMN_APN, + &hf_gsm_map_ms_SupportedFeatures_odb_all_og, + &hf_gsm_map_ms_SupportedFeatures_odb_all_international_og, + &hf_gsm_map_ms_SupportedFeatures_odb_all_int_og_not_to_HPLMN_country, + &hf_gsm_map_ms_SupportedFeatures_odb_all_interzonal_og, + &hf_gsm_map_ms_SupportedFeatures_odb_all_interzonal_og_not_to_HPLMN_country, + &hf_gsm_map_ms_SupportedFeatures_odb_all_interzonal_og_and_internat_og_not_to_HPLMN_country, + &hf_gsm_map_ms_SupportedFeatures_regSub, + &hf_gsm_map_ms_SupportedFeatures_trace, + &hf_gsm_map_ms_SupportedFeatures_lcs_all_PrivExcep, + &hf_gsm_map_ms_SupportedFeatures_lcs_universal, + &hf_gsm_map_ms_SupportedFeatures_lcs_CallSessionRelated, + &hf_gsm_map_ms_SupportedFeatures_lcs_CallSessionUnrelated, + &hf_gsm_map_ms_SupportedFeatures_lcs_PLMN_operator, + &hf_gsm_map_ms_SupportedFeatures_lcs_ServiceType, + &hf_gsm_map_ms_SupportedFeatures_lcs_all_MOLR_SS, + &hf_gsm_map_ms_SupportedFeatures_lcs_basicSelfLocation, + &hf_gsm_map_ms_SupportedFeatures_lcs_autonomousSelfLocation, + &hf_gsm_map_ms_SupportedFeatures_lcs_transferToThirdParty, + &hf_gsm_map_ms_SupportedFeatures_sm_mo_pp, + &hf_gsm_map_ms_SupportedFeatures_barring_OutgoingCalls, + &hf_gsm_map_ms_SupportedFeatures_baoc, + &hf_gsm_map_ms_SupportedFeatures_boic, + &hf_gsm_map_ms_SupportedFeatures_boicExHC, + &hf_gsm_map_ms_SupportedFeatures_localTimeZoneRetrieval, + &hf_gsm_map_ms_SupportedFeatures_additionalMsisdn, + &hf_gsm_map_ms_SupportedFeatures_smsInMME, + &hf_gsm_map_ms_SupportedFeatures_smsInSGSN, + &hf_gsm_map_ms_SupportedFeatures_ue_Reachability_Notification, + &hf_gsm_map_ms_SupportedFeatures_state_Location_Information_Retrieval, + &hf_gsm_map_ms_SupportedFeatures_partialPurge, + &hf_gsm_map_ms_SupportedFeatures_gddInSGSN, + &hf_gsm_map_ms_SupportedFeatures_sgsnCAMELCapability, + &hf_gsm_map_ms_SupportedFeatures_pcscf_Restoration, + &hf_gsm_map_ms_SupportedFeatures_dedicatedCoreNetworks, + &hf_gsm_map_ms_SupportedFeatures_non_IP_PDN_Type_APNs, + &hf_gsm_map_ms_SupportedFeatures_non_IP_PDP_Type_APNs, + NULL }; static int dissect_gsm_map_ms_SupportedFeatures(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_SupportedFeatures_bits, hf_index, ett_gsm_map_ms_SupportedFeatures, + gsm_map_ms_SupportedFeatures_bits, 39, hf_index, ett_gsm_map_ms_SupportedFeatures, NULL); return offset; @@ -9537,17 +9537,17 @@ dissect_gsm_map_ms_PDN_GW_Update(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i } -static const asn_namedbit gsm_map_ms_ISR_Information_bits[] = { - { 0, &hf_gsm_map_ms_ISR_Information_updateLocation, -1, -1, "updateLocation", NULL }, - { 1, &hf_gsm_map_ms_ISR_Information_cancelSGSN, -1, -1, "cancelSGSN", NULL }, - { 2, &hf_gsm_map_ms_ISR_Information_initialAttachIndicator, -1, -1, "initialAttachIndicator", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ms_ISR_Information_bits[] = { + &hf_gsm_map_ms_ISR_Information_updateLocation, + &hf_gsm_map_ms_ISR_Information_cancelSGSN, + &hf_gsm_map_ms_ISR_Information_initialAttachIndicator, + NULL }; static int dissect_gsm_map_ms_ISR_Information(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_ISR_Information_bits, hf_index, ett_gsm_map_ms_ISR_Information, + gsm_map_ms_ISR_Information_bits, 3, hf_index, ett_gsm_map_ms_ISR_Information, NULL); return offset; @@ -10015,7 +10015,7 @@ dissect_gsm_map_ms_AoIPCodecsList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_gsm_map_ms_UESBI_IuA(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -10026,7 +10026,7 @@ dissect_gsm_map_ms_UESBI_IuA(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_gsm_map_ms_UESBI_IuB(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -10146,34 +10146,34 @@ dissect_gsm_map_ms_LCLS_GlobalCallReference(gboolean implicit_tag _U_, tvbuff_t } -static const asn_namedbit gsm_map_ms_LCLS_Negotiation_bits[] = { - { 0, &hf_gsm_map_ms_LCLS_Negotiation_permission_indicator_not_allowed_bit, -1, -1, "permission-indicator-not-allowed-bit", NULL }, - { 1, &hf_gsm_map_ms_LCLS_Negotiation_permission_indicator_spare_bit, -1, -1, "permission-indicator-spare-bit", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ms_LCLS_Negotiation_bits[] = { + &hf_gsm_map_ms_LCLS_Negotiation_permission_indicator_not_allowed_bit, + &hf_gsm_map_ms_LCLS_Negotiation_permission_indicator_spare_bit, + NULL }; static int dissect_gsm_map_ms_LCLS_Negotiation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_LCLS_Negotiation_bits, hf_index, ett_gsm_map_ms_LCLS_Negotiation, + gsm_map_ms_LCLS_Negotiation_bits, 2, hf_index, ett_gsm_map_ms_LCLS_Negotiation, NULL); return offset; } -static const asn_namedbit gsm_map_ms_LCLS_ConfigurationPreference_bits[] = { - { 0, &hf_gsm_map_ms_LCLS_ConfigurationPreference_forward_data_sending_indicator, -1, -1, "forward-data-sending-indicator", NULL }, - { 1, &hf_gsm_map_ms_LCLS_ConfigurationPreference_backward_data_sending_indicator, -1, -1, "backward-data-sending-indicator", NULL }, - { 2, &hf_gsm_map_ms_LCLS_ConfigurationPreference_forward_data_reception_indicator, -1, -1, "forward-data-reception-indicator", NULL }, - { 3, &hf_gsm_map_ms_LCLS_ConfigurationPreference_backward_data_reception_indicator, -1, -1, "backward-data-reception-indicator", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ms_LCLS_ConfigurationPreference_bits[] = { + &hf_gsm_map_ms_LCLS_ConfigurationPreference_forward_data_sending_indicator, + &hf_gsm_map_ms_LCLS_ConfigurationPreference_backward_data_sending_indicator, + &hf_gsm_map_ms_LCLS_ConfigurationPreference_forward_data_reception_indicator, + &hf_gsm_map_ms_LCLS_ConfigurationPreference_backward_data_reception_indicator, + NULL }; static int dissect_gsm_map_ms_LCLS_ConfigurationPreference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_LCLS_ConfigurationPreference_bits, hf_index, ett_gsm_map_ms_LCLS_ConfigurationPreference, + gsm_map_ms_LCLS_ConfigurationPreference_bits, 4, hf_index, ett_gsm_map_ms_LCLS_ConfigurationPreference, NULL); return offset; @@ -10700,16 +10700,16 @@ dissect_gsm_map_ms_SendAuthenticationInfoRes(gboolean implicit_tag _U_, tvbuff_t } -static const asn_namedbit gsm_map_ms_RequestedEquipmentInfo_bits[] = { - { 0, &hf_gsm_map_ms_RequestedEquipmentInfo_equipmentStatus, -1, -1, "equipmentStatus", NULL }, - { 1, &hf_gsm_map_ms_RequestedEquipmentInfo_bmuef, -1, -1, "bmuef", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ms_RequestedEquipmentInfo_bits[] = { + &hf_gsm_map_ms_RequestedEquipmentInfo_equipmentStatus, + &hf_gsm_map_ms_RequestedEquipmentInfo_bmuef, + NULL }; static int dissect_gsm_map_ms_RequestedEquipmentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_RequestedEquipmentInfo_bits, hf_index, ett_gsm_map_ms_RequestedEquipmentInfo, + gsm_map_ms_RequestedEquipmentInfo_bits, 2, hf_index, ett_gsm_map_ms_RequestedEquipmentInfo, NULL); return offset; @@ -11146,61 +11146,61 @@ dissect_gsm_map_ms_Ext_SS_InfoList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const asn_namedbit gsm_map_ms_ODB_GeneralData_bits[] = { - { 0, &hf_gsm_map_ms_ODB_GeneralData_allOG_CallsBarred, -1, -1, "allOG-CallsBarred", NULL }, - { 1, &hf_gsm_map_ms_ODB_GeneralData_internationalOGCallsBarred, -1, -1, "internationalOGCallsBarred", NULL }, - { 2, &hf_gsm_map_ms_ODB_GeneralData_internationalOGCallsNotToHPLMN_CountryBarred, -1, -1, "internationalOGCallsNotToHPLMN-CountryBarred", NULL }, - { 6, &hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsBarred, -1, -1, "interzonalOGCallsBarred", NULL }, - { 7, &hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsNotToHPLMN_CountryBarred, -1, -1, "interzonalOGCallsNotToHPLMN-CountryBarred", NULL }, - { 8, &hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsAndInternationalOGCallsNotToHPLMN_CountryBarred, -1, -1, "interzonalOGCallsAndInternationalOGCallsNotToHPLMN-CountryBarred", NULL }, - { 3, &hf_gsm_map_ms_ODB_GeneralData_premiumRateInformationOGCallsBarred, -1, -1, "premiumRateInformationOGCallsBarred", NULL }, - { 4, &hf_gsm_map_ms_ODB_GeneralData_premiumRateEntertainementOGCallsBarred, -1, -1, "premiumRateEntertainementOGCallsBarred", NULL }, - { 5, &hf_gsm_map_ms_ODB_GeneralData_ss_AccessBarred, -1, -1, "ss-AccessBarred", NULL }, - { 9, &hf_gsm_map_ms_ODB_GeneralData_allECT_Barred, -1, -1, "allECT-Barred", NULL }, - { 10, &hf_gsm_map_ms_ODB_GeneralData_chargeableECT_Barred, -1, -1, "chargeableECT-Barred", NULL }, - { 11, &hf_gsm_map_ms_ODB_GeneralData_internationalECT_Barred, -1, -1, "internationalECT-Barred", NULL }, - { 12, &hf_gsm_map_ms_ODB_GeneralData_interzonalECT_Barred, -1, -1, "interzonalECT-Barred", NULL }, - { 13, &hf_gsm_map_ms_ODB_GeneralData_doublyChargeableECT_Barred, -1, -1, "doublyChargeableECT-Barred", NULL }, - { 14, &hf_gsm_map_ms_ODB_GeneralData_multipleECT_Barred, -1, -1, "multipleECT-Barred", NULL }, - { 15, &hf_gsm_map_ms_ODB_GeneralData_allPacketOrientedServicesBarred, -1, -1, "allPacketOrientedServicesBarred", NULL }, - { 16, &hf_gsm_map_ms_ODB_GeneralData_roamerAccessToHPLMN_AP_Barred, -1, -1, "roamerAccessToHPLMN-AP-Barred", NULL }, - { 17, &hf_gsm_map_ms_ODB_GeneralData_roamerAccessToVPLMN_AP_Barred, -1, -1, "roamerAccessToVPLMN-AP-Barred", NULL }, - { 18, &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMNOG_CallsBarred, -1, -1, "roamingOutsidePLMNOG-CallsBarred", NULL }, - { 19, &hf_gsm_map_ms_ODB_GeneralData_allIC_CallsBarred, -1, -1, "allIC-CallsBarred", NULL }, - { 20, &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMNIC_CallsBarred, -1, -1, "roamingOutsidePLMNIC-CallsBarred", NULL }, - { 21, &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMNICountryIC_CallsBarred, -1, -1, "roamingOutsidePLMNICountryIC-CallsBarred", NULL }, - { 22, &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMN_Barred, -1, -1, "roamingOutsidePLMN-Barred", NULL }, - { 23, &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMN_CountryBarred, -1, -1, "roamingOutsidePLMN-CountryBarred", NULL }, - { 24, &hf_gsm_map_ms_ODB_GeneralData_registrationAllCF_Barred, -1, -1, "registrationAllCF-Barred", NULL }, - { 25, &hf_gsm_map_ms_ODB_GeneralData_registrationCFNotToHPLMN_Barred, -1, -1, "registrationCFNotToHPLMN-Barred", NULL }, - { 26, &hf_gsm_map_ms_ODB_GeneralData_registrationInterzonalCF_Barred, -1, -1, "registrationInterzonalCF-Barred", NULL }, - { 27, &hf_gsm_map_ms_ODB_GeneralData_registrationInterzonalCFNotToHPLMN_Barred, -1, -1, "registrationInterzonalCFNotToHPLMN-Barred", NULL }, - { 28, &hf_gsm_map_ms_ODB_GeneralData_registrationInternationalCF_Barred, -1, -1, "registrationInternationalCF-Barred", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ms_ODB_GeneralData_bits[] = { + &hf_gsm_map_ms_ODB_GeneralData_allOG_CallsBarred, + &hf_gsm_map_ms_ODB_GeneralData_internationalOGCallsBarred, + &hf_gsm_map_ms_ODB_GeneralData_internationalOGCallsNotToHPLMN_CountryBarred, + &hf_gsm_map_ms_ODB_GeneralData_premiumRateInformationOGCallsBarred, + &hf_gsm_map_ms_ODB_GeneralData_premiumRateEntertainementOGCallsBarred, + &hf_gsm_map_ms_ODB_GeneralData_ss_AccessBarred, + &hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsBarred, + &hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsNotToHPLMN_CountryBarred, + &hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsAndInternationalOGCallsNotToHPLMN_CountryBarred, + &hf_gsm_map_ms_ODB_GeneralData_allECT_Barred, + &hf_gsm_map_ms_ODB_GeneralData_chargeableECT_Barred, + &hf_gsm_map_ms_ODB_GeneralData_internationalECT_Barred, + &hf_gsm_map_ms_ODB_GeneralData_interzonalECT_Barred, + &hf_gsm_map_ms_ODB_GeneralData_doublyChargeableECT_Barred, + &hf_gsm_map_ms_ODB_GeneralData_multipleECT_Barred, + &hf_gsm_map_ms_ODB_GeneralData_allPacketOrientedServicesBarred, + &hf_gsm_map_ms_ODB_GeneralData_roamerAccessToHPLMN_AP_Barred, + &hf_gsm_map_ms_ODB_GeneralData_roamerAccessToVPLMN_AP_Barred, + &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMNOG_CallsBarred, + &hf_gsm_map_ms_ODB_GeneralData_allIC_CallsBarred, + &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMNIC_CallsBarred, + &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMNICountryIC_CallsBarred, + &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMN_Barred, + &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMN_CountryBarred, + &hf_gsm_map_ms_ODB_GeneralData_registrationAllCF_Barred, + &hf_gsm_map_ms_ODB_GeneralData_registrationCFNotToHPLMN_Barred, + &hf_gsm_map_ms_ODB_GeneralData_registrationInterzonalCF_Barred, + &hf_gsm_map_ms_ODB_GeneralData_registrationInterzonalCFNotToHPLMN_Barred, + &hf_gsm_map_ms_ODB_GeneralData_registrationInternationalCF_Barred, + NULL }; static int dissect_gsm_map_ms_ODB_GeneralData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_ODB_GeneralData_bits, hf_index, ett_gsm_map_ms_ODB_GeneralData, + gsm_map_ms_ODB_GeneralData_bits, 29, hf_index, ett_gsm_map_ms_ODB_GeneralData, NULL); return offset; } -static const asn_namedbit gsm_map_ms_ODB_HPLMN_Data_bits[] = { - { 0, &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType1, -1, -1, "plmn-SpecificBarringType1", NULL }, - { 1, &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType2, -1, -1, "plmn-SpecificBarringType2", NULL }, - { 2, &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType3, -1, -1, "plmn-SpecificBarringType3", NULL }, - { 3, &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType4, -1, -1, "plmn-SpecificBarringType4", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ms_ODB_HPLMN_Data_bits[] = { + &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType1, + &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType2, + &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType3, + &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType4, + NULL }; static int dissect_gsm_map_ms_ODB_HPLMN_Data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_ODB_HPLMN_Data_bits, hf_index, ett_gsm_map_ms_ODB_HPLMN_Data, + gsm_map_ms_ODB_HPLMN_Data_bits, 4, hf_index, ett_gsm_map_ms_ODB_HPLMN_Data, NULL); return offset; @@ -11271,17 +11271,17 @@ dissect_gsm_map_ms_VBSDataList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const asn_namedbit gsm_map_ms_AdditionalSubscriptions_bits[] = { - { 0, &hf_gsm_map_ms_AdditionalSubscriptions_privilegedUplinkRequest, -1, -1, "privilegedUplinkRequest", NULL }, - { 1, &hf_gsm_map_ms_AdditionalSubscriptions_emergencyUplinkRequest, -1, -1, "emergencyUplinkRequest", NULL }, - { 2, &hf_gsm_map_ms_AdditionalSubscriptions_emergencyReset, -1, -1, "emergencyReset", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ms_AdditionalSubscriptions_bits[] = { + &hf_gsm_map_ms_AdditionalSubscriptions_privilegedUplinkRequest, + &hf_gsm_map_ms_AdditionalSubscriptions_emergencyUplinkRequest, + &hf_gsm_map_ms_AdditionalSubscriptions_emergencyReset, + NULL }; static int dissect_gsm_map_ms_AdditionalSubscriptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_AdditionalSubscriptions_bits, hf_index, ett_gsm_map_ms_AdditionalSubscriptions, + gsm_map_ms_AdditionalSubscriptions_bits, 3, hf_index, ett_gsm_map_ms_AdditionalSubscriptions, NULL); return offset; @@ -11292,7 +11292,7 @@ dissect_gsm_map_ms_AdditionalSubscriptions(gboolean implicit_tag _U_, tvbuff_t * static int dissect_gsm_map_ms_AdditionalInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -12772,22 +12772,22 @@ dissect_gsm_map_ms_SGSN_CAMEL_SubscriptionInfo(gboolean implicit_tag _U_, tvbuff } -static const asn_namedbit gsm_map_ms_AccessRestrictionData_bits[] = { - { 0, &hf_gsm_map_ms_AccessRestrictionData_utranNotAllowed, -1, -1, "utranNotAllowed", NULL }, - { 1, &hf_gsm_map_ms_AccessRestrictionData_geranNotAllowed, -1, -1, "geranNotAllowed", NULL }, - { 2, &hf_gsm_map_ms_AccessRestrictionData_ganNotAllowed, -1, -1, "ganNotAllowed", NULL }, - { 3, &hf_gsm_map_ms_AccessRestrictionData_i_hspa_evolutionNotAllowed, -1, -1, "i-hspa-evolutionNotAllowed", NULL }, - { 4, &hf_gsm_map_ms_AccessRestrictionData_wb_e_utranNotAllowed, -1, -1, "wb-e-utranNotAllowed", NULL }, - { 5, &hf_gsm_map_ms_AccessRestrictionData_ho_toNon3GPP_AccessNotAllowed, -1, -1, "ho-toNon3GPP-AccessNotAllowed", NULL }, - { 6, &hf_gsm_map_ms_AccessRestrictionData_nb_iotNotAllowed, -1, -1, "nb-iotNotAllowed", NULL }, - { 7, &hf_gsm_map_ms_AccessRestrictionData_enhancedCoverageNotAllowed, -1, -1, "enhancedCoverageNotAllowed", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ms_AccessRestrictionData_bits[] = { + &hf_gsm_map_ms_AccessRestrictionData_utranNotAllowed, + &hf_gsm_map_ms_AccessRestrictionData_geranNotAllowed, + &hf_gsm_map_ms_AccessRestrictionData_ganNotAllowed, + &hf_gsm_map_ms_AccessRestrictionData_i_hspa_evolutionNotAllowed, + &hf_gsm_map_ms_AccessRestrictionData_wb_e_utranNotAllowed, + &hf_gsm_map_ms_AccessRestrictionData_ho_toNon3GPP_AccessNotAllowed, + &hf_gsm_map_ms_AccessRestrictionData_nb_iotNotAllowed, + &hf_gsm_map_ms_AccessRestrictionData_enhancedCoverageNotAllowed, + NULL }; static int dissect_gsm_map_ms_AccessRestrictionData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_AccessRestrictionData_bits, hf_index, ett_gsm_map_ms_AccessRestrictionData, + gsm_map_ms_AccessRestrictionData_bits, 8, hf_index, ett_gsm_map_ms_AccessRestrictionData, NULL); return offset; @@ -13404,28 +13404,28 @@ dissect_gsm_map_ms_LSAInformationWithdraw(gboolean implicit_tag _U_, tvbuff_t *t } -static const asn_namedbit gsm_map_ms_SpecificCSI_Withdraw_bits[] = { - { 0, &hf_gsm_map_ms_SpecificCSI_Withdraw_o_csi, -1, -1, "o-csi", NULL }, - { 1, &hf_gsm_map_ms_SpecificCSI_Withdraw_ss_csi, -1, -1, "ss-csi", NULL }, - { 2, &hf_gsm_map_ms_SpecificCSI_Withdraw_tif_csi, -1, -1, "tif-csi", NULL }, - { 3, &hf_gsm_map_ms_SpecificCSI_Withdraw_d_csi, -1, -1, "d-csi", NULL }, - { 4, &hf_gsm_map_ms_SpecificCSI_Withdraw_vt_csi, -1, -1, "vt-csi", NULL }, - { 5, &hf_gsm_map_ms_SpecificCSI_Withdraw_mo_sms_csi, -1, -1, "mo-sms-csi", NULL }, - { 6, &hf_gsm_map_ms_SpecificCSI_Withdraw_m_csi, -1, -1, "m-csi", NULL }, - { 7, &hf_gsm_map_ms_SpecificCSI_Withdraw_gprs_csi, -1, -1, "gprs-csi", NULL }, - { 8, &hf_gsm_map_ms_SpecificCSI_Withdraw_t_csi, -1, -1, "t-csi", NULL }, - { 9, &hf_gsm_map_ms_SpecificCSI_Withdraw_mt_sms_csi, -1, -1, "mt-sms-csi", NULL }, - { 10, &hf_gsm_map_ms_SpecificCSI_Withdraw_mg_csi, -1, -1, "mg-csi", NULL }, - { 11, &hf_gsm_map_ms_SpecificCSI_Withdraw_o_IM_CSI, -1, -1, "o-IM-CSI", NULL }, - { 12, &hf_gsm_map_ms_SpecificCSI_Withdraw_d_IM_CSI, -1, -1, "d-IM-CSI", NULL }, - { 13, &hf_gsm_map_ms_SpecificCSI_Withdraw_vt_IM_CSI, -1, -1, "vt-IM-CSI", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ms_SpecificCSI_Withdraw_bits[] = { + &hf_gsm_map_ms_SpecificCSI_Withdraw_o_csi, + &hf_gsm_map_ms_SpecificCSI_Withdraw_ss_csi, + &hf_gsm_map_ms_SpecificCSI_Withdraw_tif_csi, + &hf_gsm_map_ms_SpecificCSI_Withdraw_d_csi, + &hf_gsm_map_ms_SpecificCSI_Withdraw_vt_csi, + &hf_gsm_map_ms_SpecificCSI_Withdraw_mo_sms_csi, + &hf_gsm_map_ms_SpecificCSI_Withdraw_m_csi, + &hf_gsm_map_ms_SpecificCSI_Withdraw_gprs_csi, + &hf_gsm_map_ms_SpecificCSI_Withdraw_t_csi, + &hf_gsm_map_ms_SpecificCSI_Withdraw_mt_sms_csi, + &hf_gsm_map_ms_SpecificCSI_Withdraw_mg_csi, + &hf_gsm_map_ms_SpecificCSI_Withdraw_o_IM_CSI, + &hf_gsm_map_ms_SpecificCSI_Withdraw_d_IM_CSI, + &hf_gsm_map_ms_SpecificCSI_Withdraw_vt_IM_CSI, + NULL }; static int dissect_gsm_map_ms_SpecificCSI_Withdraw(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_SpecificCSI_Withdraw_bits, hf_index, ett_gsm_map_ms_SpecificCSI_Withdraw, + gsm_map_ms_SpecificCSI_Withdraw_bits, 14, hf_index, ett_gsm_map_ms_SpecificCSI_Withdraw, NULL); return offset; @@ -13513,34 +13513,34 @@ dissect_gsm_map_ms_DeleteSubscriberDataRes(gboolean implicit_tag _U_, tvbuff_t * } -static const asn_namedbit gsm_map_ms_OfferedCamel4Functionalities_bits[] = { - { 0, &hf_gsm_map_ms_OfferedCamel4Functionalities_initiateCallAttempt, -1, -1, "initiateCallAttempt", NULL }, - { 1, &hf_gsm_map_ms_OfferedCamel4Functionalities_splitLeg, -1, -1, "splitLeg", NULL }, - { 2, &hf_gsm_map_ms_OfferedCamel4Functionalities_moveLeg, -1, -1, "moveLeg", NULL }, - { 3, &hf_gsm_map_ms_OfferedCamel4Functionalities_disconnectLeg, -1, -1, "disconnectLeg", NULL }, - { 4, &hf_gsm_map_ms_OfferedCamel4Functionalities_entityReleased, -1, -1, "entityReleased", NULL }, - { 5, &hf_gsm_map_ms_OfferedCamel4Functionalities_dfc_WithArgument, -1, -1, "dfc-WithArgument", NULL }, - { 6, &hf_gsm_map_ms_OfferedCamel4Functionalities_playTone, -1, -1, "playTone", NULL }, - { 7, &hf_gsm_map_ms_OfferedCamel4Functionalities_dtmf_MidCall, -1, -1, "dtmf-MidCall", NULL }, - { 8, &hf_gsm_map_ms_OfferedCamel4Functionalities_chargingIndicator, -1, -1, "chargingIndicator", NULL }, - { 9, &hf_gsm_map_ms_OfferedCamel4Functionalities_alertingDP, -1, -1, "alertingDP", NULL }, - { 10, &hf_gsm_map_ms_OfferedCamel4Functionalities_locationAtAlerting, -1, -1, "locationAtAlerting", NULL }, - { 11, &hf_gsm_map_ms_OfferedCamel4Functionalities_changeOfPositionDP, -1, -1, "changeOfPositionDP", NULL }, - { 12, &hf_gsm_map_ms_OfferedCamel4Functionalities_or_Interactions, -1, -1, "or-Interactions", NULL }, - { 13, &hf_gsm_map_ms_OfferedCamel4Functionalities_warningToneEnhancements, -1, -1, "warningToneEnhancements", NULL }, - { 14, &hf_gsm_map_ms_OfferedCamel4Functionalities_cf_Enhancements, -1, -1, "cf-Enhancements", NULL }, - { 15, &hf_gsm_map_ms_OfferedCamel4Functionalities_subscribedEnhancedDialledServices, -1, -1, "subscribedEnhancedDialledServices", NULL }, - { 16, &hf_gsm_map_ms_OfferedCamel4Functionalities_servingNetworkEnhancedDialledServices, -1, -1, "servingNetworkEnhancedDialledServices", NULL }, - { 17, &hf_gsm_map_ms_OfferedCamel4Functionalities_criteriaForChangeOfPositionDP, -1, -1, "criteriaForChangeOfPositionDP", NULL }, - { 18, &hf_gsm_map_ms_OfferedCamel4Functionalities_serviceChangeDP, -1, -1, "serviceChangeDP", NULL }, - { 19, &hf_gsm_map_ms_OfferedCamel4Functionalities_collectInformation, -1, -1, "collectInformation", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ms_OfferedCamel4Functionalities_bits[] = { + &hf_gsm_map_ms_OfferedCamel4Functionalities_initiateCallAttempt, + &hf_gsm_map_ms_OfferedCamel4Functionalities_splitLeg, + &hf_gsm_map_ms_OfferedCamel4Functionalities_moveLeg, + &hf_gsm_map_ms_OfferedCamel4Functionalities_disconnectLeg, + &hf_gsm_map_ms_OfferedCamel4Functionalities_entityReleased, + &hf_gsm_map_ms_OfferedCamel4Functionalities_dfc_WithArgument, + &hf_gsm_map_ms_OfferedCamel4Functionalities_playTone, + &hf_gsm_map_ms_OfferedCamel4Functionalities_dtmf_MidCall, + &hf_gsm_map_ms_OfferedCamel4Functionalities_chargingIndicator, + &hf_gsm_map_ms_OfferedCamel4Functionalities_alertingDP, + &hf_gsm_map_ms_OfferedCamel4Functionalities_locationAtAlerting, + &hf_gsm_map_ms_OfferedCamel4Functionalities_changeOfPositionDP, + &hf_gsm_map_ms_OfferedCamel4Functionalities_or_Interactions, + &hf_gsm_map_ms_OfferedCamel4Functionalities_warningToneEnhancements, + &hf_gsm_map_ms_OfferedCamel4Functionalities_cf_Enhancements, + &hf_gsm_map_ms_OfferedCamel4Functionalities_subscribedEnhancedDialledServices, + &hf_gsm_map_ms_OfferedCamel4Functionalities_servingNetworkEnhancedDialledServices, + &hf_gsm_map_ms_OfferedCamel4Functionalities_criteriaForChangeOfPositionDP, + &hf_gsm_map_ms_OfferedCamel4Functionalities_serviceChangeDP, + &hf_gsm_map_ms_OfferedCamel4Functionalities_collectInformation, + NULL }; int dissect_gsm_map_ms_OfferedCamel4Functionalities(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_OfferedCamel4Functionalities_bits, hf_index, ett_gsm_map_ms_OfferedCamel4Functionalities, + gsm_map_ms_OfferedCamel4Functionalities_bits, 20, hf_index, ett_gsm_map_ms_OfferedCamel4Functionalities, NULL); return offset; @@ -13735,16 +13735,16 @@ dissect_gsm_map_ms_DomainType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const asn_namedbit gsm_map_ms_RequestedNodes_bits[] = { - { 0, &hf_gsm_map_ms_RequestedNodes_mme, -1, -1, "mme", NULL }, - { 1, &hf_gsm_map_ms_RequestedNodes_sgsn, -1, -1, "sgsn", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ms_RequestedNodes_bits[] = { + &hf_gsm_map_ms_RequestedNodes_mme, + &hf_gsm_map_ms_RequestedNodes_sgsn, + NULL }; static int dissect_gsm_map_ms_RequestedNodes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_RequestedNodes_bits, hf_index, ett_gsm_map_ms_RequestedNodes, + gsm_map_ms_RequestedNodes_bits, 2, hf_index, ett_gsm_map_ms_RequestedNodes, NULL); return offset; @@ -14630,15 +14630,15 @@ dissect_gsm_map_ms_ModificationRequestFor_IP_SM_GW_Data(gboolean implicit_tag _U } -static const asn_namedbit gsm_map_ms_RequestedServingNode_bits[] = { - { 0, &hf_gsm_map_ms_RequestedServingNode_mmeAndSgsn, -1, -1, "mmeAndSgsn", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ms_RequestedServingNode_bits[] = { + &hf_gsm_map_ms_RequestedServingNode_mmeAndSgsn, + NULL }; static int dissect_gsm_map_ms_RequestedServingNode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_RequestedServingNode_bits, hf_index, ett_gsm_map_ms_RequestedServingNode, + gsm_map_ms_RequestedServingNode_bits, 1, hf_index, ett_gsm_map_ms_RequestedServingNode, NULL); return offset; @@ -14772,16 +14772,16 @@ dissect_gsm_map_ms_AnyTimeModificationArg(gboolean implicit_tag _U_, tvbuff_t *t } -static const asn_namedbit gsm_map_ms_ServingNode_bits[] = { - { 0, &hf_gsm_map_ms_ServingNode_mme, -1, -1, "mme", NULL }, - { 1, &hf_gsm_map_ms_ServingNode_sgsn, -1, -1, "sgsn", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ms_ServingNode_bits[] = { + &hf_gsm_map_ms_ServingNode_mme, + &hf_gsm_map_ms_ServingNode_sgsn, + NULL }; static int dissect_gsm_map_ms_ServingNode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_ServingNode_bits, hf_index, ett_gsm_map_ms_ServingNode, + gsm_map_ms_ServingNode_bits, 2, hf_index, ett_gsm_map_ms_ServingNode, NULL); return offset; @@ -15163,16 +15163,16 @@ dissect_gsm_map_ch_CallDiversionTreatmentIndicator(gboolean implicit_tag _U_, tv } -static const asn_namedbit gsm_map_ch_SuppressMTSS_bits[] = { - { 0, &hf_gsm_map_ch_SuppressMTSS_suppressCUG, -1, -1, "suppressCUG", NULL }, - { 1, &hf_gsm_map_ch_SuppressMTSS_suppressCCBS, -1, -1, "suppressCCBS", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ch_SuppressMTSS_bits[] = { + &hf_gsm_map_ch_SuppressMTSS_suppressCUG, + &hf_gsm_map_ch_SuppressMTSS_suppressCCBS, + NULL }; static int dissect_gsm_map_ch_SuppressMTSS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ch_SuppressMTSS_bits, hf_index, ett_gsm_map_ch_SuppressMTSS, + gsm_map_ch_SuppressMTSS_bits, 2, hf_index, ett_gsm_map_ch_SuppressMTSS, NULL); return offset; @@ -15335,16 +15335,16 @@ dissect_gsm_map_ch_CCBS_Indicators(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const asn_namedbit gsm_map_ch_AllowedServices_bits[] = { - { 0, &hf_gsm_map_ch_AllowedServices_firstServiceAllowed, -1, -1, "firstServiceAllowed", NULL }, - { 1, &hf_gsm_map_ch_AllowedServices_secondServiceAllowed, -1, -1, "secondServiceAllowed", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_ch_AllowedServices_bits[] = { + &hf_gsm_map_ch_AllowedServices_firstServiceAllowed, + &hf_gsm_map_ch_AllowedServices_secondServiceAllowed, + NULL }; static int dissect_gsm_map_ch_AllowedServices(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ch_AllowedServices_bits, hf_index, ett_gsm_map_ch_AllowedServices, + gsm_map_ch_AllowedServices_bits, 2, hf_index, ett_gsm_map_ch_AllowedServices, NULL); return offset; @@ -15966,19 +15966,19 @@ dissect_gsm_map_lcs_LocationEstimateType(gboolean implicit_tag _U_, tvbuff_t *tv } -static const asn_namedbit gsm_map_lcs_DeferredLocationEventType_bits[] = { - { 0, &hf_gsm_map_lcs_DeferredLocationEventType_msAvailable, -1, -1, "msAvailable", NULL }, - { 1, &hf_gsm_map_lcs_DeferredLocationEventType_enteringIntoArea, -1, -1, "enteringIntoArea", NULL }, - { 2, &hf_gsm_map_lcs_DeferredLocationEventType_leavingFromArea, -1, -1, "leavingFromArea", NULL }, - { 3, &hf_gsm_map_lcs_DeferredLocationEventType_beingInsideArea, -1, -1, "beingInsideArea", NULL }, - { 4, &hf_gsm_map_lcs_DeferredLocationEventType_periodicLDR, -1, -1, "periodicLDR", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_lcs_DeferredLocationEventType_bits[] = { + &hf_gsm_map_lcs_DeferredLocationEventType_msAvailable, + &hf_gsm_map_lcs_DeferredLocationEventType_enteringIntoArea, + &hf_gsm_map_lcs_DeferredLocationEventType_leavingFromArea, + &hf_gsm_map_lcs_DeferredLocationEventType_beingInsideArea, + &hf_gsm_map_lcs_DeferredLocationEventType_periodicLDR, + NULL }; int dissect_gsm_map_lcs_DeferredLocationEventType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_lcs_DeferredLocationEventType_bits, hf_index, ett_gsm_map_lcs_DeferredLocationEventType, + gsm_map_lcs_DeferredLocationEventType_bits, 5, hf_index, ett_gsm_map_lcs_DeferredLocationEventType, NULL); return offset; @@ -16186,21 +16186,21 @@ dissect_gsm_map_lcs_LCS_QoS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of } -static const asn_namedbit gsm_map_lcs_SupportedGADShapes_bits[] = { - { 0, &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPoint, -1, -1, "ellipsoidPoint", NULL }, - { 1, &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPointWithUncertaintyCircle, -1, -1, "ellipsoidPointWithUncertaintyCircle", NULL }, - { 2, &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPointWithUncertaintyEllipse, -1, -1, "ellipsoidPointWithUncertaintyEllipse", NULL }, - { 3, &hf_gsm_map_lcs_SupportedGADShapes_polygon, -1, -1, "polygon", NULL }, - { 4, &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPointWithAltitude, -1, -1, "ellipsoidPointWithAltitude", NULL }, - { 5, &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPointWithAltitudeAndUncertaintyElipsoid, -1, -1, "ellipsoidPointWithAltitudeAndUncertaintyElipsoid", NULL }, - { 6, &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidArc, -1, -1, "ellipsoidArc", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * gsm_map_lcs_SupportedGADShapes_bits[] = { + &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPoint, + &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPointWithUncertaintyCircle, + &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPointWithUncertaintyEllipse, + &hf_gsm_map_lcs_SupportedGADShapes_polygon, + &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPointWithAltitude, + &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPointWithAltitudeAndUncertaintyElipsoid, + &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidArc, + NULL }; int dissect_gsm_map_lcs_SupportedGADShapes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_lcs_SupportedGADShapes_bits, hf_index, ett_gsm_map_lcs_SupportedGADShapes, + gsm_map_lcs_SupportedGADShapes_bits, 7, hf_index, ett_gsm_map_lcs_SupportedGADShapes, NULL); return offset; @@ -21599,15 +21599,15 @@ dissect_NokiaMAP_Extensions_AccessSubscriptionListExt(gboolean implicit_tag _U_, } -static const asn_namedbit NokiaMAP_Extensions_AllowedServiceData_bits[] = { - { 0, &hf_NokiaMAP_Extensions_AllowedServiceData_amr_wb_allowed, -1, -1, "amr-wb-allowed", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * NokiaMAP_Extensions_AllowedServiceData_bits[] = { + &hf_NokiaMAP_Extensions_AllowedServiceData_amr_wb_allowed, + NULL }; static int dissect_NokiaMAP_Extensions_AllowedServiceData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NokiaMAP_Extensions_AllowedServiceData_bits, hf_index, ett_NokiaMAP_Extensions_AllowedServiceData, + NokiaMAP_Extensions_AllowedServiceData_bits, 1, hf_index, ett_NokiaMAP_Extensions_AllowedServiceData, NULL); return offset; @@ -28731,18 +28731,6 @@ void proto_register_gsm_map(void) { { "internationalOGCallsNotToHPLMN-CountryBarred", "gsm_map.ms.internationalOGCallsNotToHPLMN-CountryBarred", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, - { &hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsBarred, - { "interzonalOGCallsBarred", "gsm_map.ms.interzonalOGCallsBarred", - FT_BOOLEAN, 8, NULL, 0x02, - NULL, HFILL }}, - { &hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsNotToHPLMN_CountryBarred, - { "interzonalOGCallsNotToHPLMN-CountryBarred", "gsm_map.ms.interzonalOGCallsNotToHPLMN-CountryBarred", - FT_BOOLEAN, 8, NULL, 0x01, - NULL, HFILL }}, - { &hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsAndInternationalOGCallsNotToHPLMN_CountryBarred, - { "interzonalOGCallsAndInternationalOGCallsNotToHPLMN-CountryBarred", "gsm_map.ms.interzonalOGCallsAndInternationalOGCallsNotToHPLMN-CountryBarred", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL }}, { &hf_gsm_map_ms_ODB_GeneralData_premiumRateInformationOGCallsBarred, { "premiumRateInformationOGCallsBarred", "gsm_map.ms.premiumRateInformationOGCallsBarred", FT_BOOLEAN, 8, NULL, 0x10, @@ -28755,6 +28743,18 @@ void proto_register_gsm_map(void) { { "ss-AccessBarred", "gsm_map.ms.ss-AccessBarred", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, + { &hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsBarred, + { "interzonalOGCallsBarred", "gsm_map.ms.interzonalOGCallsBarred", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL }}, + { &hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsNotToHPLMN_CountryBarred, + { "interzonalOGCallsNotToHPLMN-CountryBarred", "gsm_map.ms.interzonalOGCallsNotToHPLMN-CountryBarred", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL }}, + { &hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsAndInternationalOGCallsNotToHPLMN_CountryBarred, + { "interzonalOGCallsAndInternationalOGCallsNotToHPLMN-CountryBarred", "gsm_map.ms.interzonalOGCallsAndInternationalOGCallsNotToHPLMN-CountryBarred", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, { &hf_gsm_map_ms_ODB_GeneralData_allECT_Barred, { "allECT-Barred", "gsm_map.ms.allECT-Barred", FT_BOOLEAN, 8, NULL, 0x40, diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 0f2c2da102..809970fcae 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -3917,19 +3917,19 @@ dissect_h248_SignalType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const asn_namedbit NotifyCompletion_bits[] = { - { 0, &hf_h248_NotifyCompletion_onTimeOut, -1, -1, "onTimeOut", NULL }, - { 1, &hf_h248_NotifyCompletion_onInterruptByEvent, -1, -1, "onInterruptByEvent", NULL }, - { 2, &hf_h248_NotifyCompletion_onInterruptByNewSignalDescr, -1, -1, "onInterruptByNewSignalDescr", NULL }, - { 3, &hf_h248_NotifyCompletion_otherReason, -1, -1, "otherReason", NULL }, - { 4, &hf_h248_NotifyCompletion_onIteration, -1, -1, "onIteration", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * NotifyCompletion_bits[] = { + &hf_h248_NotifyCompletion_onTimeOut, + &hf_h248_NotifyCompletion_onInterruptByEvent, + &hf_h248_NotifyCompletion_onInterruptByNewSignalDescr, + &hf_h248_NotifyCompletion_otherReason, + &hf_h248_NotifyCompletion_onIteration, + NULL }; static int dissect_h248_NotifyCompletion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NotifyCompletion_bits, hf_index, ett_h248_NotifyCompletion, + NotifyCompletion_bits, 5, hf_index, ett_h248_NotifyCompletion, NULL); return offset; @@ -4401,24 +4401,24 @@ dissect_h248_DigitMapDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in } -static const asn_namedbit T_auditToken_bits[] = { - { 0, &hf_h248_T_auditToken_muxToken, -1, -1, "muxToken", NULL }, - { 1, &hf_h248_T_auditToken_modemToken, -1, -1, "modemToken", NULL }, - { 2, &hf_h248_T_auditToken_mediaToken, -1, -1, "mediaToken", NULL }, - { 3, &hf_h248_T_auditToken_eventsToken, -1, -1, "eventsToken", NULL }, - { 4, &hf_h248_T_auditToken_signalsToken, -1, -1, "signalsToken", NULL }, - { 5, &hf_h248_T_auditToken_digitMapToken, -1, -1, "digitMapToken", NULL }, - { 6, &hf_h248_T_auditToken_statsToken, -1, -1, "statsToken", NULL }, - { 7, &hf_h248_T_auditToken_observedEventsToken, -1, -1, "observedEventsToken", NULL }, - { 8, &hf_h248_T_auditToken_packagesToken, -1, -1, "packagesToken", NULL }, - { 9, &hf_h248_T_auditToken_eventBufferToken, -1, -1, "eventBufferToken", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_auditToken_bits[] = { + &hf_h248_T_auditToken_muxToken, + &hf_h248_T_auditToken_modemToken, + &hf_h248_T_auditToken_mediaToken, + &hf_h248_T_auditToken_eventsToken, + &hf_h248_T_auditToken_signalsToken, + &hf_h248_T_auditToken_digitMapToken, + &hf_h248_T_auditToken_statsToken, + &hf_h248_T_auditToken_observedEventsToken, + &hf_h248_T_auditToken_packagesToken, + &hf_h248_T_auditToken_eventBufferToken, + NULL }; static int dissect_h248_T_auditToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_auditToken_bits, hf_index, ett_h248_T_auditToken, + T_auditToken_bits, 10, hf_index, ett_h248_T_auditToken, NULL); return offset; diff --git a/epan/dissectors/packet-its.c b/epan/dissectors/packet-its.c index 85059b538a..043ec3c4e4 100644 --- a/epan/dissectors/packet-its.c +++ b/epan/dissectors/packet-its.c @@ -1336,8 +1336,16 @@ static int hf_evcsn_ChargingSpotType_standardChargeMode1 = -1; static int hf_evcsn_ChargingSpotType_standardChargeMode2 = -1; static int hf_evcsn_ChargingSpotType_standardOrFastChargeMode3 = -1; static int hf_evcsn_ChargingSpotType_fastChargeWithExternalCharger = -1; +static int hf_evcsn_ChargingSpotType_spare_bit_4 = -1; +static int hf_evcsn_ChargingSpotType_spare_bit_5 = -1; +static int hf_evcsn_ChargingSpotType_spare_bit_6 = -1; +static int hf_evcsn_ChargingSpotType_spare_bit_7 = -1; static int hf_evcsn_ChargingSpotType_quickDrop = -1; +static int hf_evcsn_ChargingSpotType_spare_bit_9 = -1; +static int hf_evcsn_ChargingSpotType_spare_bit_10 = -1; +static int hf_evcsn_ChargingSpotType_spare_bit_11 = -1; static int hf_evcsn_ChargingSpotType_inductiveChargeWhileStationary = -1; +static int hf_evcsn_ChargingSpotType_spare_bit_13 = -1; static int hf_evcsn_ChargingSpotType_inductiveChargeWhileDriving = -1; /* --- Module EV-RechargingSpotReservation-PDU-Descriptions --- --- --- */ @@ -17083,14 +17091,46 @@ void proto_register_its(void) { "fastChargeWithExternalCharger", "evcsn.fastChargeWithExternalCharger", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, + { &hf_evcsn_ChargingSpotType_spare_bit_4, + { "spare_bit_4", "evcsn.spare_bit_4", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, + { &hf_evcsn_ChargingSpotType_spare_bit_5, + { "spare_bit_5", "evcsn.spare_bit_5", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, + { &hf_evcsn_ChargingSpotType_spare_bit_6, + { "spare_bit_6", "evcsn.spare_bit_6", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL }}, + { &hf_evcsn_ChargingSpotType_spare_bit_7, + { "spare_bit_7", "evcsn.spare_bit_7", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL }}, { &hf_evcsn_ChargingSpotType_quickDrop, { "quickDrop", "evcsn.quickDrop", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, + { &hf_evcsn_ChargingSpotType_spare_bit_9, + { "spare_bit_9", "evcsn.spare_bit_9", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_evcsn_ChargingSpotType_spare_bit_10, + { "spare_bit_10", "evcsn.spare_bit_10", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_evcsn_ChargingSpotType_spare_bit_11, + { "spare_bit_11", "evcsn.spare_bit_11", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, { &hf_evcsn_ChargingSpotType_inductiveChargeWhileStationary, { "inductiveChargeWhileStationary", "evcsn.inductiveChargeWhileStationary", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, + { &hf_evcsn_ChargingSpotType_spare_bit_13, + { "spare_bit_13", "evcsn.spare_bit_13", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, { &hf_evcsn_ChargingSpotType_inductiveChargeWhileDriving, { "inductiveChargeWhileDriving", "evcsn.inductiveChargeWhileDriving", FT_BOOLEAN, 8, NULL, 0x02, diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index fb177afd40..528988298e 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -2729,31 +2729,31 @@ dissect_kerberos_Authenticator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const asn_namedbit TicketFlags_bits[] = { - { 0, &hf_kerberos_TicketFlags_reserved, -1, -1, "reserved", NULL }, - { 1, &hf_kerberos_TicketFlags_forwardable, -1, -1, "forwardable", NULL }, - { 2, &hf_kerberos_TicketFlags_forwarded, -1, -1, "forwarded", NULL }, - { 3, &hf_kerberos_TicketFlags_proxiable, -1, -1, "proxiable", NULL }, - { 4, &hf_kerberos_TicketFlags_proxy, -1, -1, "proxy", NULL }, - { 5, &hf_kerberos_TicketFlags_may_postdate, -1, -1, "may-postdate", NULL }, - { 6, &hf_kerberos_TicketFlags_postdated, -1, -1, "postdated", NULL }, - { 7, &hf_kerberos_TicketFlags_invalid, -1, -1, "invalid", NULL }, - { 8, &hf_kerberos_TicketFlags_renewable, -1, -1, "renewable", NULL }, - { 9, &hf_kerberos_TicketFlags_initial, -1, -1, "initial", NULL }, - { 10, &hf_kerberos_TicketFlags_pre_authent, -1, -1, "pre-authent", NULL }, - { 11, &hf_kerberos_TicketFlags_hw_authent, -1, -1, "hw-authent", NULL }, - { 12, &hf_kerberos_TicketFlags_transited_policy_checked, -1, -1, "transited-policy-checked", NULL }, - { 13, &hf_kerberos_TicketFlags_ok_as_delegate, -1, -1, "ok-as-delegate", NULL }, - { 14, &hf_kerberos_TicketFlags_unused, -1, -1, "unused", NULL }, - { 15, &hf_kerberos_TicketFlags_enc_pa_rep, -1, -1, "enc-pa-rep", NULL }, - { 16, &hf_kerberos_TicketFlags_anonymous, -1, -1, "anonymous", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * TicketFlags_bits[] = { + &hf_kerberos_TicketFlags_reserved, + &hf_kerberos_TicketFlags_forwardable, + &hf_kerberos_TicketFlags_forwarded, + &hf_kerberos_TicketFlags_proxiable, + &hf_kerberos_TicketFlags_proxy, + &hf_kerberos_TicketFlags_may_postdate, + &hf_kerberos_TicketFlags_postdated, + &hf_kerberos_TicketFlags_invalid, + &hf_kerberos_TicketFlags_renewable, + &hf_kerberos_TicketFlags_initial, + &hf_kerberos_TicketFlags_pre_authent, + &hf_kerberos_TicketFlags_hw_authent, + &hf_kerberos_TicketFlags_transited_policy_checked, + &hf_kerberos_TicketFlags_ok_as_delegate, + &hf_kerberos_TicketFlags_unused, + &hf_kerberos_TicketFlags_enc_pa_rep, + &hf_kerberos_TicketFlags_anonymous, + NULL }; static int dissect_kerberos_TicketFlags(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - TicketFlags_bits, hf_index, ett_kerberos_TicketFlags, + TicketFlags_bits, 17, hf_index, ett_kerberos_TicketFlags, NULL); return offset; @@ -3163,46 +3163,46 @@ dissect_kerberos_SEQUENCE_OF_PA_DATA(gboolean implicit_tag _U_, tvbuff_t *tvb _U } -static const asn_namedbit KDCOptions_bits[] = { - { 0, &hf_kerberos_KDCOptions_reserved, -1, -1, "reserved", NULL }, - { 1, &hf_kerberos_KDCOptions_forwardable, -1, -1, "forwardable", NULL }, - { 2, &hf_kerberos_KDCOptions_forwarded, -1, -1, "forwarded", NULL }, - { 3, &hf_kerberos_KDCOptions_proxiable, -1, -1, "proxiable", NULL }, - { 4, &hf_kerberos_KDCOptions_proxy, -1, -1, "proxy", NULL }, - { 5, &hf_kerberos_KDCOptions_allow_postdate, -1, -1, "allow-postdate", NULL }, - { 6, &hf_kerberos_KDCOptions_postdated, -1, -1, "postdated", NULL }, - { 7, &hf_kerberos_KDCOptions_unused7, -1, -1, "unused7", NULL }, - { 8, &hf_kerberos_KDCOptions_renewable, -1, -1, "renewable", NULL }, - { 9, &hf_kerberos_KDCOptions_unused9, -1, -1, "unused9", NULL }, - { 10, &hf_kerberos_KDCOptions_unused10, -1, -1, "unused10", NULL }, - { 11, &hf_kerberos_KDCOptions_opt_hardware_auth, -1, -1, "opt-hardware-auth", NULL }, - { 12, &hf_kerberos_KDCOptions_unused12, -1, -1, "unused12", NULL }, - { 13, &hf_kerberos_KDCOptions_unused13, -1, -1, "unused13", NULL }, - { 14, &hf_kerberos_KDCOptions_constrained_delegation, -1, -1, "constrained-delegation", NULL }, - { 15, &hf_kerberos_KDCOptions_canonicalize, -1, -1, "canonicalize", NULL }, - { 16, &hf_kerberos_KDCOptions_request_anonymous, -1, -1, "request-anonymous", NULL }, - { 17, &hf_kerberos_KDCOptions_unused17, -1, -1, "unused17", NULL }, - { 18, &hf_kerberos_KDCOptions_unused18, -1, -1, "unused18", NULL }, - { 19, &hf_kerberos_KDCOptions_unused19, -1, -1, "unused19", NULL }, - { 20, &hf_kerberos_KDCOptions_unused20, -1, -1, "unused20", NULL }, - { 21, &hf_kerberos_KDCOptions_unused21, -1, -1, "unused21", NULL }, - { 22, &hf_kerberos_KDCOptions_unused22, -1, -1, "unused22", NULL }, - { 23, &hf_kerberos_KDCOptions_unused23, -1, -1, "unused23", NULL }, - { 24, &hf_kerberos_KDCOptions_unused24, -1, -1, "unused24", NULL }, - { 25, &hf_kerberos_KDCOptions_unused25, -1, -1, "unused25", NULL }, - { 26, &hf_kerberos_KDCOptions_disable_transited_check, -1, -1, "disable-transited-check", NULL }, - { 27, &hf_kerberos_KDCOptions_renewable_ok, -1, -1, "renewable-ok", NULL }, - { 28, &hf_kerberos_KDCOptions_enc_tkt_in_skey, -1, -1, "enc-tkt-in-skey", NULL }, - { 29, &hf_kerberos_KDCOptions_unused29, -1, -1, "unused29", NULL }, - { 30, &hf_kerberos_KDCOptions_renew, -1, -1, "renew", NULL }, - { 31, &hf_kerberos_KDCOptions_validate, -1, -1, "validate", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * KDCOptions_bits[] = { + &hf_kerberos_KDCOptions_reserved, + &hf_kerberos_KDCOptions_forwardable, + &hf_kerberos_KDCOptions_forwarded, + &hf_kerberos_KDCOptions_proxiable, + &hf_kerberos_KDCOptions_proxy, + &hf_kerberos_KDCOptions_allow_postdate, + &hf_kerberos_KDCOptions_postdated, + &hf_kerberos_KDCOptions_unused7, + &hf_kerberos_KDCOptions_renewable, + &hf_kerberos_KDCOptions_unused9, + &hf_kerberos_KDCOptions_unused10, + &hf_kerberos_KDCOptions_opt_hardware_auth, + &hf_kerberos_KDCOptions_unused12, + &hf_kerberos_KDCOptions_unused13, + &hf_kerberos_KDCOptions_constrained_delegation, + &hf_kerberos_KDCOptions_canonicalize, + &hf_kerberos_KDCOptions_request_anonymous, + &hf_kerberos_KDCOptions_unused17, + &hf_kerberos_KDCOptions_unused18, + &hf_kerberos_KDCOptions_unused19, + &hf_kerberos_KDCOptions_unused20, + &hf_kerberos_KDCOptions_unused21, + &hf_kerberos_KDCOptions_unused22, + &hf_kerberos_KDCOptions_unused23, + &hf_kerberos_KDCOptions_unused24, + &hf_kerberos_KDCOptions_unused25, + &hf_kerberos_KDCOptions_disable_transited_check, + &hf_kerberos_KDCOptions_renewable_ok, + &hf_kerberos_KDCOptions_enc_tkt_in_skey, + &hf_kerberos_KDCOptions_unused29, + &hf_kerberos_KDCOptions_renew, + &hf_kerberos_KDCOptions_validate, + NULL }; static int dissect_kerberos_KDCOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - KDCOptions_bits, hf_index, ett_kerberos_KDCOptions, + KDCOptions_bits, 32, hf_index, ett_kerberos_KDCOptions, NULL); return offset; @@ -3450,17 +3450,17 @@ dissect_kerberos_TGS_REP(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse } -static const asn_namedbit APOptions_bits[] = { - { 0, &hf_kerberos_APOptions_reserved, -1, -1, "reserved", NULL }, - { 1, &hf_kerberos_APOptions_use_session_key, -1, -1, "use-session-key", NULL }, - { 2, &hf_kerberos_APOptions_mutual_required, -1, -1, "mutual-required", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * APOptions_bits[] = { + &hf_kerberos_APOptions_reserved, + &hf_kerberos_APOptions_use_session_key, + &hf_kerberos_APOptions_mutual_required, + NULL }; static int dissect_kerberos_APOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - APOptions_bits, hf_index, ett_kerberos_APOptions, + APOptions_bits, 3, hf_index, ett_kerberos_APOptions, NULL); return offset; @@ -4398,7 +4398,7 @@ dissect_kerberos_T_subject_certificate(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_kerberos_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -4461,18 +4461,18 @@ dissect_kerberos_KERB_PA_PAC_REQUEST(gboolean implicit_tag _U_, tvbuff_t *tvb _U } -static const asn_namedbit PAC_OPTIONS_FLAGS_bits[] = { - { 0, &hf_kerberos_PAC_OPTIONS_FLAGS_claims, -1, -1, "claims", NULL }, - { 1, &hf_kerberos_PAC_OPTIONS_FLAGS_branch_aware, -1, -1, "branch-aware", NULL }, - { 2, &hf_kerberos_PAC_OPTIONS_FLAGS_forward_to_full_dc, -1, -1, "forward-to-full-dc", NULL }, - { 3, &hf_kerberos_PAC_OPTIONS_FLAGS_resource_based_constrained_delegation, -1, -1, "resource-based-constrained-delegation", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * PAC_OPTIONS_FLAGS_bits[] = { + &hf_kerberos_PAC_OPTIONS_FLAGS_claims, + &hf_kerberos_PAC_OPTIONS_FLAGS_branch_aware, + &hf_kerberos_PAC_OPTIONS_FLAGS_forward_to_full_dc, + &hf_kerberos_PAC_OPTIONS_FLAGS_resource_based_constrained_delegation, + NULL }; static int dissect_kerberos_PAC_OPTIONS_FLAGS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - PAC_OPTIONS_FLAGS_bits, hf_index, ett_kerberos_PAC_OPTIONS_FLAGS, + PAC_OPTIONS_FLAGS_bits, 4, hf_index, ett_kerberos_PAC_OPTIONS_FLAGS, NULL); return offset; diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index d36b151e60..e4017452fa 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -619,6 +619,7 @@ static int hf_mms_ParameterSupportOptions_vsca = -1; static int hf_mms_ParameterSupportOptions_tpy = -1; static int hf_mms_ParameterSupportOptions_vlis = -1; static int hf_mms_ParameterSupportOptions_real = -1; +static int hf_mms_ParameterSupportOptions_spare_bit_9 = -1; static int hf_mms_ParameterSupportOptions_cei = -1; static int hf_mms_ServiceSupportOptions_status = -1; static int hf_mms_ServiceSupportOptions_getNameList = -1; @@ -1111,21 +1112,21 @@ dissect_mms_ObjectName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const asn_namedbit Transitions_bits[] = { - { 0, &hf_mms_Transitions_idle_to_disabled, -1, -1, "idle-to-disabled", NULL }, - { 1, &hf_mms_Transitions_active_to_disabled, -1, -1, "active-to-disabled", NULL }, - { 2, &hf_mms_Transitions_disabled_to_idle, -1, -1, "disabled-to-idle", NULL }, - { 3, &hf_mms_Transitions_active_to_idle, -1, -1, "active-to-idle", NULL }, - { 4, &hf_mms_Transitions_disabled_to_active, -1, -1, "disabled-to-active", NULL }, - { 5, &hf_mms_Transitions_idle_to_active, -1, -1, "idle-to-active", NULL }, - { 6, &hf_mms_Transitions_any_to_deleted, -1, -1, "any-to-deleted", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Transitions_bits[] = { + &hf_mms_Transitions_idle_to_disabled, + &hf_mms_Transitions_active_to_disabled, + &hf_mms_Transitions_disabled_to_idle, + &hf_mms_Transitions_active_to_idle, + &hf_mms_Transitions_disabled_to_active, + &hf_mms_Transitions_idle_to_active, + &hf_mms_Transitions_any_to_deleted, + NULL }; static int dissect_mms_Transitions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Transitions_bits, hf_index, ett_mms_Transitions, + Transitions_bits, 7, hf_index, ett_mms_Transitions, NULL); return offset; @@ -1888,7 +1889,7 @@ dissect_mms_SEQUENCE_OF_Data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_mms_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -4541,7 +4542,7 @@ dissect_mms_T_vmdPhysicalStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_mms_BIT_STRING_SIZE_0_128(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -6853,123 +6854,124 @@ dissect_mms_Integer16(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ } -static const asn_namedbit ParameterSupportOptions_bits[] = { - { 0, &hf_mms_ParameterSupportOptions_str1, -1, -1, "str1", NULL }, - { 1, &hf_mms_ParameterSupportOptions_str2, -1, -1, "str2", NULL }, - { 2, &hf_mms_ParameterSupportOptions_vnam, -1, -1, "vnam", NULL }, - { 3, &hf_mms_ParameterSupportOptions_valt, -1, -1, "valt", NULL }, - { 4, &hf_mms_ParameterSupportOptions_vadr, -1, -1, "vadr", NULL }, - { 5, &hf_mms_ParameterSupportOptions_vsca, -1, -1, "vsca", NULL }, - { 6, &hf_mms_ParameterSupportOptions_tpy, -1, -1, "tpy", NULL }, - { 7, &hf_mms_ParameterSupportOptions_vlis, -1, -1, "vlis", NULL }, - { 8, &hf_mms_ParameterSupportOptions_real, -1, -1, "real", NULL }, - { 10, &hf_mms_ParameterSupportOptions_cei, -1, -1, "cei", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * ParameterSupportOptions_bits[] = { + &hf_mms_ParameterSupportOptions_str1, + &hf_mms_ParameterSupportOptions_str2, + &hf_mms_ParameterSupportOptions_vnam, + &hf_mms_ParameterSupportOptions_valt, + &hf_mms_ParameterSupportOptions_vadr, + &hf_mms_ParameterSupportOptions_vsca, + &hf_mms_ParameterSupportOptions_tpy, + &hf_mms_ParameterSupportOptions_vlis, + &hf_mms_ParameterSupportOptions_real, + &hf_mms_ParameterSupportOptions_spare_bit_9, + &hf_mms_ParameterSupportOptions_cei, + NULL }; static int dissect_mms_ParameterSupportOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - ParameterSupportOptions_bits, hf_index, ett_mms_ParameterSupportOptions, + ParameterSupportOptions_bits, 11, hf_index, ett_mms_ParameterSupportOptions, NULL); return offset; } -static const asn_namedbit ServiceSupportOptions_bits[] = { - { 0, &hf_mms_ServiceSupportOptions_status, -1, -1, "status", NULL }, - { 1, &hf_mms_ServiceSupportOptions_getNameList, -1, -1, "getNameList", NULL }, - { 2, &hf_mms_ServiceSupportOptions_identify, -1, -1, "identify", NULL }, - { 3, &hf_mms_ServiceSupportOptions_rename, -1, -1, "rename", NULL }, - { 4, &hf_mms_ServiceSupportOptions_read, -1, -1, "read", NULL }, - { 5, &hf_mms_ServiceSupportOptions_write, -1, -1, "write", NULL }, - { 6, &hf_mms_ServiceSupportOptions_getVariableAccessAttributes, -1, -1, "getVariableAccessAttributes", NULL }, - { 7, &hf_mms_ServiceSupportOptions_defineNamedVariable, -1, -1, "defineNamedVariable", NULL }, - { 8, &hf_mms_ServiceSupportOptions_defineScatteredAccess, -1, -1, "defineScatteredAccess", NULL }, - { 9, &hf_mms_ServiceSupportOptions_getScatteredAccessAttributes, -1, -1, "getScatteredAccessAttributes", NULL }, - { 10, &hf_mms_ServiceSupportOptions_deleteVariableAccess, -1, -1, "deleteVariableAccess", NULL }, - { 11, &hf_mms_ServiceSupportOptions_defineNamedVariableList, -1, -1, "defineNamedVariableList", NULL }, - { 12, &hf_mms_ServiceSupportOptions_getNamedVariableListAttributes, -1, -1, "getNamedVariableListAttributes", NULL }, - { 13, &hf_mms_ServiceSupportOptions_deleteNamedVariableList, -1, -1, "deleteNamedVariableList", NULL }, - { 14, &hf_mms_ServiceSupportOptions_defineNamedType, -1, -1, "defineNamedType", NULL }, - { 15, &hf_mms_ServiceSupportOptions_getNamedTypeAttributes, -1, -1, "getNamedTypeAttributes", NULL }, - { 16, &hf_mms_ServiceSupportOptions_deleteNamedType, -1, -1, "deleteNamedType", NULL }, - { 17, &hf_mms_ServiceSupportOptions_input, -1, -1, "input", NULL }, - { 18, &hf_mms_ServiceSupportOptions_output, -1, -1, "output", NULL }, - { 19, &hf_mms_ServiceSupportOptions_takeControl, -1, -1, "takeControl", NULL }, - { 20, &hf_mms_ServiceSupportOptions_relinquishControl, -1, -1, "relinquishControl", NULL }, - { 21, &hf_mms_ServiceSupportOptions_defineSemaphore, -1, -1, "defineSemaphore", NULL }, - { 22, &hf_mms_ServiceSupportOptions_deleteSemaphore, -1, -1, "deleteSemaphore", NULL }, - { 23, &hf_mms_ServiceSupportOptions_reportSemaphoreStatus, -1, -1, "reportSemaphoreStatus", NULL }, - { 24, &hf_mms_ServiceSupportOptions_reportPoolSemaphoreStatus, -1, -1, "reportPoolSemaphoreStatus", NULL }, - { 25, &hf_mms_ServiceSupportOptions_reportSemaphoreEntryStatus, -1, -1, "reportSemaphoreEntryStatus", NULL }, - { 26, &hf_mms_ServiceSupportOptions_initiateDownloadSequence, -1, -1, "initiateDownloadSequence", NULL }, - { 27, &hf_mms_ServiceSupportOptions_downloadSegment, -1, -1, "downloadSegment", NULL }, - { 28, &hf_mms_ServiceSupportOptions_terminateDownloadSequence, -1, -1, "terminateDownloadSequence", NULL }, - { 29, &hf_mms_ServiceSupportOptions_initiateUploadSequence, -1, -1, "initiateUploadSequence", NULL }, - { 30, &hf_mms_ServiceSupportOptions_uploadSegment, -1, -1, "uploadSegment", NULL }, - { 31, &hf_mms_ServiceSupportOptions_terminateUploadSequence, -1, -1, "terminateUploadSequence", NULL }, - { 32, &hf_mms_ServiceSupportOptions_requestDomainDownload, -1, -1, "requestDomainDownload", NULL }, - { 33, &hf_mms_ServiceSupportOptions_requestDomainUpload, -1, -1, "requestDomainUpload", NULL }, - { 34, &hf_mms_ServiceSupportOptions_loadDomainContent, -1, -1, "loadDomainContent", NULL }, - { 35, &hf_mms_ServiceSupportOptions_storeDomainContent, -1, -1, "storeDomainContent", NULL }, - { 36, &hf_mms_ServiceSupportOptions_deleteDomain, -1, -1, "deleteDomain", NULL }, - { 37, &hf_mms_ServiceSupportOptions_getDomainAttributes, -1, -1, "getDomainAttributes", NULL }, - { 38, &hf_mms_ServiceSupportOptions_createProgramInvocation, -1, -1, "createProgramInvocation", NULL }, - { 39, &hf_mms_ServiceSupportOptions_deleteProgramInvocation, -1, -1, "deleteProgramInvocation", NULL }, - { 40, &hf_mms_ServiceSupportOptions_start, -1, -1, "start", NULL }, - { 41, &hf_mms_ServiceSupportOptions_stop, -1, -1, "stop", NULL }, - { 42, &hf_mms_ServiceSupportOptions_resume, -1, -1, "resume", NULL }, - { 43, &hf_mms_ServiceSupportOptions_reset, -1, -1, "reset", NULL }, - { 44, &hf_mms_ServiceSupportOptions_kill, -1, -1, "kill", NULL }, - { 45, &hf_mms_ServiceSupportOptions_getProgramInvocationAttributes, -1, -1, "getProgramInvocationAttributes", NULL }, - { 46, &hf_mms_ServiceSupportOptions_obtainFile, -1, -1, "obtainFile", NULL }, - { 47, &hf_mms_ServiceSupportOptions_defineEventCondition, -1, -1, "defineEventCondition", NULL }, - { 48, &hf_mms_ServiceSupportOptions_deleteEventCondition, -1, -1, "deleteEventCondition", NULL }, - { 49, &hf_mms_ServiceSupportOptions_getEventConditionAttributes, -1, -1, "getEventConditionAttributes", NULL }, - { 50, &hf_mms_ServiceSupportOptions_reportEventConditionStatus, -1, -1, "reportEventConditionStatus", NULL }, - { 51, &hf_mms_ServiceSupportOptions_alterEventConditionMonitoring, -1, -1, "alterEventConditionMonitoring", NULL }, - { 52, &hf_mms_ServiceSupportOptions_triggerEvent, -1, -1, "triggerEvent", NULL }, - { 53, &hf_mms_ServiceSupportOptions_defineEventAction, -1, -1, "defineEventAction", NULL }, - { 54, &hf_mms_ServiceSupportOptions_deleteEventAction, -1, -1, "deleteEventAction", NULL }, - { 55, &hf_mms_ServiceSupportOptions_getEventActionAttributes, -1, -1, "getEventActionAttributes", NULL }, - { 56, &hf_mms_ServiceSupportOptions_reportActionStatus, -1, -1, "reportActionStatus", NULL }, - { 57, &hf_mms_ServiceSupportOptions_defineEventEnrollment, -1, -1, "defineEventEnrollment", NULL }, - { 58, &hf_mms_ServiceSupportOptions_deleteEventEnrollment, -1, -1, "deleteEventEnrollment", NULL }, - { 59, &hf_mms_ServiceSupportOptions_alterEventEnrollment, -1, -1, "alterEventEnrollment", NULL }, - { 60, &hf_mms_ServiceSupportOptions_reportEventEnrollmentStatus, -1, -1, "reportEventEnrollmentStatus", NULL }, - { 61, &hf_mms_ServiceSupportOptions_getEventEnrollmentAttributes, -1, -1, "getEventEnrollmentAttributes", NULL }, - { 62, &hf_mms_ServiceSupportOptions_acknowledgeEventNotification, -1, -1, "acknowledgeEventNotification", NULL }, - { 63, &hf_mms_ServiceSupportOptions_getAlarmSummary, -1, -1, "getAlarmSummary", NULL }, - { 64, &hf_mms_ServiceSupportOptions_getAlarmEnrollmentSummary, -1, -1, "getAlarmEnrollmentSummary", NULL }, - { 65, &hf_mms_ServiceSupportOptions_readJournal, -1, -1, "readJournal", NULL }, - { 66, &hf_mms_ServiceSupportOptions_writeJournal, -1, -1, "writeJournal", NULL }, - { 67, &hf_mms_ServiceSupportOptions_initializeJournal, -1, -1, "initializeJournal", NULL }, - { 68, &hf_mms_ServiceSupportOptions_reportJournalStatus, -1, -1, "reportJournalStatus", NULL }, - { 69, &hf_mms_ServiceSupportOptions_createJournal, -1, -1, "createJournal", NULL }, - { 70, &hf_mms_ServiceSupportOptions_deleteJournal, -1, -1, "deleteJournal", NULL }, - { 71, &hf_mms_ServiceSupportOptions_getCapabilityList, -1, -1, "getCapabilityList", NULL }, - { 72, &hf_mms_ServiceSupportOptions_fileOpen, -1, -1, "fileOpen", NULL }, - { 73, &hf_mms_ServiceSupportOptions_fileRead, -1, -1, "fileRead", NULL }, - { 74, &hf_mms_ServiceSupportOptions_fileClose, -1, -1, "fileClose", NULL }, - { 75, &hf_mms_ServiceSupportOptions_fileRename, -1, -1, "fileRename", NULL }, - { 76, &hf_mms_ServiceSupportOptions_fileDelete, -1, -1, "fileDelete", NULL }, - { 77, &hf_mms_ServiceSupportOptions_fileDirectory, -1, -1, "fileDirectory", NULL }, - { 78, &hf_mms_ServiceSupportOptions_unsolicitedStatus, -1, -1, "unsolicitedStatus", NULL }, - { 79, &hf_mms_ServiceSupportOptions_informationReport, -1, -1, "informationReport", NULL }, - { 80, &hf_mms_ServiceSupportOptions_eventNotification, -1, -1, "eventNotification", NULL }, - { 81, &hf_mms_ServiceSupportOptions_attachToEventCondition, -1, -1, "attachToEventCondition", NULL }, - { 82, &hf_mms_ServiceSupportOptions_attachToSemaphore, -1, -1, "attachToSemaphore", NULL }, - { 83, &hf_mms_ServiceSupportOptions_conclude, -1, -1, "conclude", NULL }, - { 84, &hf_mms_ServiceSupportOptions_cancel, -1, -1, "cancel", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * ServiceSupportOptions_bits[] = { + &hf_mms_ServiceSupportOptions_status, + &hf_mms_ServiceSupportOptions_getNameList, + &hf_mms_ServiceSupportOptions_identify, + &hf_mms_ServiceSupportOptions_rename, + &hf_mms_ServiceSupportOptions_read, + &hf_mms_ServiceSupportOptions_write, + &hf_mms_ServiceSupportOptions_getVariableAccessAttributes, + &hf_mms_ServiceSupportOptions_defineNamedVariable, + &hf_mms_ServiceSupportOptions_defineScatteredAccess, + &hf_mms_ServiceSupportOptions_getScatteredAccessAttributes, + &hf_mms_ServiceSupportOptions_deleteVariableAccess, + &hf_mms_ServiceSupportOptions_defineNamedVariableList, + &hf_mms_ServiceSupportOptions_getNamedVariableListAttributes, + &hf_mms_ServiceSupportOptions_deleteNamedVariableList, + &hf_mms_ServiceSupportOptions_defineNamedType, + &hf_mms_ServiceSupportOptions_getNamedTypeAttributes, + &hf_mms_ServiceSupportOptions_deleteNamedType, + &hf_mms_ServiceSupportOptions_input, + &hf_mms_ServiceSupportOptions_output, + &hf_mms_ServiceSupportOptions_takeControl, + &hf_mms_ServiceSupportOptions_relinquishControl, + &hf_mms_ServiceSupportOptions_defineSemaphore, + &hf_mms_ServiceSupportOptions_deleteSemaphore, + &hf_mms_ServiceSupportOptions_reportSemaphoreStatus, + &hf_mms_ServiceSupportOptions_reportPoolSemaphoreStatus, + &hf_mms_ServiceSupportOptions_reportSemaphoreEntryStatus, + &hf_mms_ServiceSupportOptions_initiateDownloadSequence, + &hf_mms_ServiceSupportOptions_downloadSegment, + &hf_mms_ServiceSupportOptions_terminateDownloadSequence, + &hf_mms_ServiceSupportOptions_initiateUploadSequence, + &hf_mms_ServiceSupportOptions_uploadSegment, + &hf_mms_ServiceSupportOptions_terminateUploadSequence, + &hf_mms_ServiceSupportOptions_requestDomainDownload, + &hf_mms_ServiceSupportOptions_requestDomainUpload, + &hf_mms_ServiceSupportOptions_loadDomainContent, + &hf_mms_ServiceSupportOptions_storeDomainContent, + &hf_mms_ServiceSupportOptions_deleteDomain, + &hf_mms_ServiceSupportOptions_getDomainAttributes, + &hf_mms_ServiceSupportOptions_createProgramInvocation, + &hf_mms_ServiceSupportOptions_deleteProgramInvocation, + &hf_mms_ServiceSupportOptions_start, + &hf_mms_ServiceSupportOptions_stop, + &hf_mms_ServiceSupportOptions_resume, + &hf_mms_ServiceSupportOptions_reset, + &hf_mms_ServiceSupportOptions_kill, + &hf_mms_ServiceSupportOptions_getProgramInvocationAttributes, + &hf_mms_ServiceSupportOptions_obtainFile, + &hf_mms_ServiceSupportOptions_defineEventCondition, + &hf_mms_ServiceSupportOptions_deleteEventCondition, + &hf_mms_ServiceSupportOptions_getEventConditionAttributes, + &hf_mms_ServiceSupportOptions_reportEventConditionStatus, + &hf_mms_ServiceSupportOptions_alterEventConditionMonitoring, + &hf_mms_ServiceSupportOptions_triggerEvent, + &hf_mms_ServiceSupportOptions_defineEventAction, + &hf_mms_ServiceSupportOptions_deleteEventAction, + &hf_mms_ServiceSupportOptions_getEventActionAttributes, + &hf_mms_ServiceSupportOptions_reportActionStatus, + &hf_mms_ServiceSupportOptions_defineEventEnrollment, + &hf_mms_ServiceSupportOptions_deleteEventEnrollment, + &hf_mms_ServiceSupportOptions_alterEventEnrollment, + &hf_mms_ServiceSupportOptions_reportEventEnrollmentStatus, + &hf_mms_ServiceSupportOptions_getEventEnrollmentAttributes, + &hf_mms_ServiceSupportOptions_acknowledgeEventNotification, + &hf_mms_ServiceSupportOptions_getAlarmSummary, + &hf_mms_ServiceSupportOptions_getAlarmEnrollmentSummary, + &hf_mms_ServiceSupportOptions_readJournal, + &hf_mms_ServiceSupportOptions_writeJournal, + &hf_mms_ServiceSupportOptions_initializeJournal, + &hf_mms_ServiceSupportOptions_reportJournalStatus, + &hf_mms_ServiceSupportOptions_createJournal, + &hf_mms_ServiceSupportOptions_deleteJournal, + &hf_mms_ServiceSupportOptions_getCapabilityList, + &hf_mms_ServiceSupportOptions_fileOpen, + &hf_mms_ServiceSupportOptions_fileRead, + &hf_mms_ServiceSupportOptions_fileClose, + &hf_mms_ServiceSupportOptions_fileRename, + &hf_mms_ServiceSupportOptions_fileDelete, + &hf_mms_ServiceSupportOptions_fileDirectory, + &hf_mms_ServiceSupportOptions_unsolicitedStatus, + &hf_mms_ServiceSupportOptions_informationReport, + &hf_mms_ServiceSupportOptions_eventNotification, + &hf_mms_ServiceSupportOptions_attachToEventCondition, + &hf_mms_ServiceSupportOptions_attachToSemaphore, + &hf_mms_ServiceSupportOptions_conclude, + &hf_mms_ServiceSupportOptions_cancel, + NULL }; static int dissect_mms_ServiceSupportOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - ServiceSupportOptions_bits, hf_index, ett_mms_ServiceSupportOptions, + ServiceSupportOptions_bits, 85, hf_index, ett_mms_ServiceSupportOptions, NULL); return offset; @@ -9477,6 +9479,10 @@ void proto_register_mms(void) { { "real", "mms.real", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, + { &hf_mms_ParameterSupportOptions_spare_bit_9, + { "spare_bit_9", "mms.spare_bit_9", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, { &hf_mms_ParameterSupportOptions_cei, { "cei", "mms.cei", FT_BOOLEAN, 8, NULL, 0x20, diff --git a/epan/dissectors/packet-novell_pkis.c b/epan/dissectors/packet-novell_pkis.c index b3e67026e8..46860f0e5f 100644 --- a/epan/dissectors/packet-novell_pkis.c +++ b/epan/dissectors/packet-novell_pkis.c @@ -265,7 +265,7 @@ dissect_novell_pkis_CertificateClass(gboolean implicit_tag _U_, tvbuff_t *tvb _U static int dissect_novell_pkis_BIT_STRING_SIZE_96(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -276,7 +276,7 @@ dissect_novell_pkis_BIT_STRING_SIZE_96(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_novell_pkis_BIT_STRING_SIZE_64(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c index b4e1157a2f..67ff8e5714 100644 --- a/epan/dissectors/packet-ns_cert_exts.c +++ b/epan/dissectors/packet-ns_cert_exts.c @@ -146,22 +146,22 @@ dissect_ns_cert_exts_CertRenewalUrl(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ } -static const asn_namedbit CertType_bits[] = { - { 0, &hf_ns_cert_exts_CertType_ssl_client, -1, -1, "ssl-client", NULL }, - { 1, &hf_ns_cert_exts_CertType_ssl_server, -1, -1, "ssl-server", NULL }, - { 2, &hf_ns_cert_exts_CertType_smime, -1, -1, "smime", NULL }, - { 3, &hf_ns_cert_exts_CertType_object_signing, -1, -1, "object-signing", NULL }, - { 4, &hf_ns_cert_exts_CertType_reserved_for_future_use, -1, -1, "reserved-for-future-use", NULL }, - { 5, &hf_ns_cert_exts_CertType_ssl_ca, -1, -1, "ssl-ca", NULL }, - { 6, &hf_ns_cert_exts_CertType_smime_ca, -1, -1, "smime-ca", NULL }, - { 7, &hf_ns_cert_exts_CertType_object_signing_ca, -1, -1, "object-signing-ca", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * CertType_bits[] = { + &hf_ns_cert_exts_CertType_ssl_client, + &hf_ns_cert_exts_CertType_ssl_server, + &hf_ns_cert_exts_CertType_smime, + &hf_ns_cert_exts_CertType_object_signing, + &hf_ns_cert_exts_CertType_reserved_for_future_use, + &hf_ns_cert_exts_CertType_ssl_ca, + &hf_ns_cert_exts_CertType_smime_ca, + &hf_ns_cert_exts_CertType_object_signing_ca, + NULL }; static int dissect_ns_cert_exts_CertType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - CertType_bits, hf_index, ett_ns_cert_exts_CertType, + CertType_bits, 8, hf_index, ett_ns_cert_exts_CertType, NULL); return offset; diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c index e1f3e02d5f..40eb1938e9 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -217,7 +217,7 @@ dissect_ocsp_TBSRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_ocsp_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-p1.c b/epan/dissectors/packet-p1.c index a530ed3e08..ee96b32deb 100644 --- a/epan/dissectors/packet-p1.c +++ b/epan/dissectors/packet-p1.c @@ -569,8 +569,12 @@ static int hf_p1_PerMessageIndicators_U_reserved = -1; static int hf_p1_PerMessageIndicators_U_bit_5 = -1; static int hf_p1_PerMessageIndicators_U_bit_6 = -1; static int hf_p1_PerMessageIndicators_U_service_message = -1; +static int hf_p1_OriginatorReportRequest_spare_bit_0 = -1; +static int hf_p1_OriginatorReportRequest_spare_bit_1 = -1; +static int hf_p1_OriginatorReportRequest_spare_bit_2 = -1; static int hf_p1_OriginatorReportRequest_report = -1; static int hf_p1_OriginatorReportRequest_non_delivery_report = -1; +static int hf_p1_DeliveryFlags_spare_bit_0 = -1; static int hf_p1_DeliveryFlags_implicit_conversion_prohibited = -1; static int hf_p1_Criticality_for_submission = -1; static int hf_p1_Criticality_for_transfer = -1; @@ -593,29 +597,77 @@ static int hf_p1_BuiltInEncodedInformationTypes_videotex = -1; static int hf_p1_BuiltInEncodedInformationTypes_voice = -1; static int hf_p1_BuiltInEncodedInformationTypes_sfd = -1; static int hf_p1_BuiltInEncodedInformationTypes_mixed_mode = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_0 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_1 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_2 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_3 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_4 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_5 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_6 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_7 = -1; static int hf_p1_G3FacsimileNonBasicParameters_two_dimensional = -1; static int hf_p1_G3FacsimileNonBasicParameters_fine_resolution = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_10 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_11 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_12 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_13 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_14 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_15 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_16 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_17 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_18 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_19 = -1; static int hf_p1_G3FacsimileNonBasicParameters_unlimited_length = -1; static int hf_p1_G3FacsimileNonBasicParameters_b4_length = -1; static int hf_p1_G3FacsimileNonBasicParameters_a3_width = -1; static int hf_p1_G3FacsimileNonBasicParameters_b4_width = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_24 = -1; static int hf_p1_G3FacsimileNonBasicParameters_t6_coding = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_26 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_27 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_28 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_29 = -1; static int hf_p1_G3FacsimileNonBasicParameters_uncompressed = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_31 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_32 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_33 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_34 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_35 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_36 = -1; static int hf_p1_G3FacsimileNonBasicParameters_width_middle_864_of_1728 = -1; static int hf_p1_G3FacsimileNonBasicParameters_width_middle_1216_of_1728 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_39 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_40 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_41 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_42 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_43 = -1; static int hf_p1_G3FacsimileNonBasicParameters_resolution_type = -1; static int hf_p1_G3FacsimileNonBasicParameters_resolution_400x400 = -1; static int hf_p1_G3FacsimileNonBasicParameters_resolution_300x300 = -1; static int hf_p1_G3FacsimileNonBasicParameters_resolution_8x15 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_48 = -1; static int hf_p1_G3FacsimileNonBasicParameters_edi = -1; static int hf_p1_G3FacsimileNonBasicParameters_dtm = -1; static int hf_p1_G3FacsimileNonBasicParameters_bft = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_52 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_53 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_54 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_55 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_56 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_57 = -1; static int hf_p1_G3FacsimileNonBasicParameters_mixed_mode = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_59 = -1; static int hf_p1_G3FacsimileNonBasicParameters_character_mode = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_61 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_62 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_63 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_64 = -1; static int hf_p1_G3FacsimileNonBasicParameters_twelve_bits = -1; static int hf_p1_G3FacsimileNonBasicParameters_preferred_huffmann = -1; static int hf_p1_G3FacsimileNonBasicParameters_full_colour = -1; static int hf_p1_G3FacsimileNonBasicParameters_jpeg = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_69 = -1; +static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_70 = -1; static int hf_p1_G3FacsimileNonBasicParameters_processable_mode_26 = -1; /*--- End of included file: packet-p1-hf.c ---*/ @@ -1091,7 +1143,7 @@ dissect_p1_StrongCredentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_p1_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -2319,62 +2371,110 @@ dissect_p1_MTAOriginatorName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o } -static const asn_namedbit BuiltInEncodedInformationTypes_bits[] = { - { 0, &hf_p1_BuiltInEncodedInformationTypes_unknown, -1, -1, "unknown", NULL }, - { 1, &hf_p1_BuiltInEncodedInformationTypes_telex, -1, -1, "telex", NULL }, - { 2, &hf_p1_BuiltInEncodedInformationTypes_ia5_text, -1, -1, "ia5-text", NULL }, - { 3, &hf_p1_BuiltInEncodedInformationTypes_g3_facsimile, -1, -1, "g3-facsimile", NULL }, - { 4, &hf_p1_BuiltInEncodedInformationTypes_g4_class_1, -1, -1, "g4-class-1", NULL }, - { 5, &hf_p1_BuiltInEncodedInformationTypes_teletex, -1, -1, "teletex", NULL }, - { 6, &hf_p1_BuiltInEncodedInformationTypes_videotex, -1, -1, "videotex", NULL }, - { 7, &hf_p1_BuiltInEncodedInformationTypes_voice, -1, -1, "voice", NULL }, - { 8, &hf_p1_BuiltInEncodedInformationTypes_sfd, -1, -1, "sfd", NULL }, - { 9, &hf_p1_BuiltInEncodedInformationTypes_mixed_mode, -1, -1, "mixed-mode", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * BuiltInEncodedInformationTypes_bits[] = { + &hf_p1_BuiltInEncodedInformationTypes_unknown, + &hf_p1_BuiltInEncodedInformationTypes_telex, + &hf_p1_BuiltInEncodedInformationTypes_ia5_text, + &hf_p1_BuiltInEncodedInformationTypes_g3_facsimile, + &hf_p1_BuiltInEncodedInformationTypes_g4_class_1, + &hf_p1_BuiltInEncodedInformationTypes_teletex, + &hf_p1_BuiltInEncodedInformationTypes_videotex, + &hf_p1_BuiltInEncodedInformationTypes_voice, + &hf_p1_BuiltInEncodedInformationTypes_sfd, + &hf_p1_BuiltInEncodedInformationTypes_mixed_mode, + NULL }; static int dissect_p1_BuiltInEncodedInformationTypes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_constrained_bitstring(implicit_tag, actx, tree, tvb, offset, - 0, ub_built_in_encoded_information_types, BuiltInEncodedInformationTypes_bits, hf_index, ett_p1_BuiltInEncodedInformationTypes, + 0, ub_built_in_encoded_information_types, BuiltInEncodedInformationTypes_bits, 10, hf_index, ett_p1_BuiltInEncodedInformationTypes, NULL); return offset; } -static const asn_namedbit G3FacsimileNonBasicParameters_bits[] = { - { 8, &hf_p1_G3FacsimileNonBasicParameters_two_dimensional, -1, -1, "two-dimensional", NULL }, - { 9, &hf_p1_G3FacsimileNonBasicParameters_fine_resolution, -1, -1, "fine-resolution", NULL }, - { 20, &hf_p1_G3FacsimileNonBasicParameters_unlimited_length, -1, -1, "unlimited-length", NULL }, - { 21, &hf_p1_G3FacsimileNonBasicParameters_b4_length, -1, -1, "b4-length", NULL }, - { 22, &hf_p1_G3FacsimileNonBasicParameters_a3_width, -1, -1, "a3-width", NULL }, - { 23, &hf_p1_G3FacsimileNonBasicParameters_b4_width, -1, -1, "b4-width", NULL }, - { 25, &hf_p1_G3FacsimileNonBasicParameters_t6_coding, -1, -1, "t6-coding", NULL }, - { 30, &hf_p1_G3FacsimileNonBasicParameters_uncompressed, -1, -1, "uncompressed", NULL }, - { 37, &hf_p1_G3FacsimileNonBasicParameters_width_middle_864_of_1728, -1, -1, "width-middle-864-of-1728", NULL }, - { 38, &hf_p1_G3FacsimileNonBasicParameters_width_middle_1216_of_1728, -1, -1, "width-middle-1216-of-1728", NULL }, - { 44, &hf_p1_G3FacsimileNonBasicParameters_resolution_type, -1, -1, "resolution-type", NULL }, - { 45, &hf_p1_G3FacsimileNonBasicParameters_resolution_400x400, -1, -1, "resolution-400x400", NULL }, - { 46, &hf_p1_G3FacsimileNonBasicParameters_resolution_300x300, -1, -1, "resolution-300x300", NULL }, - { 47, &hf_p1_G3FacsimileNonBasicParameters_resolution_8x15, -1, -1, "resolution-8x15", NULL }, - { 49, &hf_p1_G3FacsimileNonBasicParameters_edi, -1, -1, "edi", NULL }, - { 50, &hf_p1_G3FacsimileNonBasicParameters_dtm, -1, -1, "dtm", NULL }, - { 51, &hf_p1_G3FacsimileNonBasicParameters_bft, -1, -1, "bft", NULL }, - { 58, &hf_p1_G3FacsimileNonBasicParameters_mixed_mode, -1, -1, "mixed-mode", NULL }, - { 60, &hf_p1_G3FacsimileNonBasicParameters_character_mode, -1, -1, "character-mode", NULL }, - { 65, &hf_p1_G3FacsimileNonBasicParameters_twelve_bits, -1, -1, "twelve-bits", NULL }, - { 66, &hf_p1_G3FacsimileNonBasicParameters_preferred_huffmann, -1, -1, "preferred-huffmann", NULL }, - { 67, &hf_p1_G3FacsimileNonBasicParameters_full_colour, -1, -1, "full-colour", NULL }, - { 68, &hf_p1_G3FacsimileNonBasicParameters_jpeg, -1, -1, "jpeg", NULL }, - { 71, &hf_p1_G3FacsimileNonBasicParameters_processable_mode_26, -1, -1, "processable-mode-26", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * G3FacsimileNonBasicParameters_bits[] = { + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_0, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_1, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_2, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_3, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_4, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_5, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_6, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_7, + &hf_p1_G3FacsimileNonBasicParameters_two_dimensional, + &hf_p1_G3FacsimileNonBasicParameters_fine_resolution, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_10, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_11, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_12, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_13, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_14, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_15, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_16, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_17, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_18, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_19, + &hf_p1_G3FacsimileNonBasicParameters_unlimited_length, + &hf_p1_G3FacsimileNonBasicParameters_b4_length, + &hf_p1_G3FacsimileNonBasicParameters_a3_width, + &hf_p1_G3FacsimileNonBasicParameters_b4_width, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_24, + &hf_p1_G3FacsimileNonBasicParameters_t6_coding, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_26, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_27, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_28, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_29, + &hf_p1_G3FacsimileNonBasicParameters_uncompressed, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_31, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_32, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_33, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_34, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_35, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_36, + &hf_p1_G3FacsimileNonBasicParameters_width_middle_864_of_1728, + &hf_p1_G3FacsimileNonBasicParameters_width_middle_1216_of_1728, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_39, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_40, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_41, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_42, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_43, + &hf_p1_G3FacsimileNonBasicParameters_resolution_type, + &hf_p1_G3FacsimileNonBasicParameters_resolution_400x400, + &hf_p1_G3FacsimileNonBasicParameters_resolution_300x300, + &hf_p1_G3FacsimileNonBasicParameters_resolution_8x15, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_48, + &hf_p1_G3FacsimileNonBasicParameters_edi, + &hf_p1_G3FacsimileNonBasicParameters_dtm, + &hf_p1_G3FacsimileNonBasicParameters_bft, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_52, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_53, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_54, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_55, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_56, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_57, + &hf_p1_G3FacsimileNonBasicParameters_mixed_mode, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_59, + &hf_p1_G3FacsimileNonBasicParameters_character_mode, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_61, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_62, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_63, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_64, + &hf_p1_G3FacsimileNonBasicParameters_twelve_bits, + &hf_p1_G3FacsimileNonBasicParameters_preferred_huffmann, + &hf_p1_G3FacsimileNonBasicParameters_full_colour, + &hf_p1_G3FacsimileNonBasicParameters_jpeg, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_69, + &hf_p1_G3FacsimileNonBasicParameters_spare_bit_70, + &hf_p1_G3FacsimileNonBasicParameters_processable_mode_26, + NULL }; int dissect_p1_G3FacsimileNonBasicParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - G3FacsimileNonBasicParameters_bits, hf_index, ett_p1_G3FacsimileNonBasicParameters, + G3FacsimileNonBasicParameters_bits, 72, hf_index, ett_p1_G3FacsimileNonBasicParameters, NULL); return offset; @@ -2632,22 +2732,22 @@ dissect_p1_Priority(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ } -static const asn_namedbit PerMessageIndicators_U_bits[] = { - { 0, &hf_p1_PerMessageIndicators_U_disclosure_of_other_recipients, -1, -1, "disclosure-of-other-recipients", NULL }, - { 1, &hf_p1_PerMessageIndicators_U_implicit_conversion_prohibited, -1, -1, "implicit-conversion-prohibited", NULL }, - { 2, &hf_p1_PerMessageIndicators_U_alternate_recipient_allowed, -1, -1, "alternate-recipient-allowed", NULL }, - { 3, &hf_p1_PerMessageIndicators_U_content_return_request, -1, -1, "content-return-request", NULL }, - { 4, &hf_p1_PerMessageIndicators_U_reserved, -1, -1, "reserved", NULL }, - { 5, &hf_p1_PerMessageIndicators_U_bit_5, -1, -1, "bit-5", NULL }, - { 6, &hf_p1_PerMessageIndicators_U_bit_6, -1, -1, "bit-6", NULL }, - { 7, &hf_p1_PerMessageIndicators_U_service_message, -1, -1, "service-message", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * PerMessageIndicators_U_bits[] = { + &hf_p1_PerMessageIndicators_U_disclosure_of_other_recipients, + &hf_p1_PerMessageIndicators_U_implicit_conversion_prohibited, + &hf_p1_PerMessageIndicators_U_alternate_recipient_allowed, + &hf_p1_PerMessageIndicators_U_content_return_request, + &hf_p1_PerMessageIndicators_U_reserved, + &hf_p1_PerMessageIndicators_U_bit_5, + &hf_p1_PerMessageIndicators_U_bit_6, + &hf_p1_PerMessageIndicators_U_service_message, + NULL }; static int dissect_p1_PerMessageIndicators_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_constrained_bitstring(implicit_tag, actx, tree, tvb, offset, - 0, ub_bit_options, PerMessageIndicators_U_bits, hf_index, ett_p1_PerMessageIndicators_U, + 0, ub_bit_options, PerMessageIndicators_U_bits, 8, hf_index, ett_p1_PerMessageIndicators_U, NULL); return offset; @@ -2833,16 +2933,16 @@ dissect_p1_ConvertedEncodedInformationTypes(gboolean implicit_tag _U_, tvbuff_t } -static const asn_namedbit OtherActions_bits[] = { - { 0, &hf_p1_OtherActions_redirected, -1, -1, "redirected", NULL }, - { 1, &hf_p1_OtherActions_dl_operation, -1, -1, "dl-operation", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * OtherActions_bits[] = { + &hf_p1_OtherActions_redirected, + &hf_p1_OtherActions_dl_operation, + NULL }; static int dissect_p1_OtherActions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_constrained_bitstring(implicit_tag, actx, tree, tvb, offset, - 0, ub_bit_options, OtherActions_bits, hf_index, ett_p1_OtherActions, + 0, ub_bit_options, OtherActions_bits, 2, hf_index, ett_p1_OtherActions, NULL); return offset; @@ -3028,17 +3128,17 @@ dissect_p1_ExtensionType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse } -static const asn_namedbit Criticality_bits[] = { - { 0, &hf_p1_Criticality_for_submission, -1, -1, "for-submission", NULL }, - { 1, &hf_p1_Criticality_for_transfer, -1, -1, "for-transfer", NULL }, - { 2, &hf_p1_Criticality_for_delivery, -1, -1, "for-delivery", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Criticality_bits[] = { + &hf_p1_Criticality_for_submission, + &hf_p1_Criticality_for_transfer, + &hf_p1_Criticality_for_delivery, + NULL }; static int dissect_p1_Criticality(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_constrained_bitstring(implicit_tag, actx, tree, tvb, offset, - 0, ub_bit_options, Criticality_bits, hf_index, ett_p1_Criticality, + 0, ub_bit_options, Criticality_bits, 3, hf_index, ett_p1_Criticality, NULL); return offset; @@ -3125,22 +3225,22 @@ dissect_p1_OriginallySpecifiedRecipientNumber(gboolean implicit_tag _U_, tvbuff_ } -static const asn_namedbit PerRecipientIndicators_bits[] = { - { 0, &hf_p1_PerRecipientIndicators_responsibility, -1, -1, "responsibility", NULL }, - { 1, &hf_p1_PerRecipientIndicators_originating_MTA_report, -1, -1, "originating-MTA-report", NULL }, - { 2, &hf_p1_PerRecipientIndicators_originating_MTA_non_delivery_report, -1, -1, "originating-MTA-non-delivery-report", NULL }, - { 3, &hf_p1_PerRecipientIndicators_originator_report, -1, -1, "originator-report", NULL }, - { 4, &hf_p1_PerRecipientIndicators_originator_non_delivery_report, -1, -1, "originator-non-delivery-report", NULL }, - { 5, &hf_p1_PerRecipientIndicators_reserved_5, -1, -1, "reserved-5", NULL }, - { 6, &hf_p1_PerRecipientIndicators_reserved_6, -1, -1, "reserved-6", NULL }, - { 7, &hf_p1_PerRecipientIndicators_reserved_7, -1, -1, "reserved-7", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * PerRecipientIndicators_bits[] = { + &hf_p1_PerRecipientIndicators_responsibility, + &hf_p1_PerRecipientIndicators_originating_MTA_report, + &hf_p1_PerRecipientIndicators_originating_MTA_non_delivery_report, + &hf_p1_PerRecipientIndicators_originator_report, + &hf_p1_PerRecipientIndicators_originator_non_delivery_report, + &hf_p1_PerRecipientIndicators_reserved_5, + &hf_p1_PerRecipientIndicators_reserved_6, + &hf_p1_PerRecipientIndicators_reserved_7, + NULL }; static int dissect_p1_PerRecipientIndicators(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_constrained_bitstring(implicit_tag, actx, tree, tvb, offset, - 8, ub_bit_options, PerRecipientIndicators_bits, hf_index, ett_p1_PerRecipientIndicators, + 8, ub_bit_options, PerRecipientIndicators_bits, 8, hf_index, ett_p1_PerRecipientIndicators, NULL); return offset; @@ -4060,16 +4160,19 @@ dissect_p1_RecipientName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse } -static const asn_namedbit OriginatorReportRequest_bits[] = { - { 3, &hf_p1_OriginatorReportRequest_report, -1, -1, "report", NULL }, - { 4, &hf_p1_OriginatorReportRequest_non_delivery_report, -1, -1, "non-delivery-report", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * OriginatorReportRequest_bits[] = { + &hf_p1_OriginatorReportRequest_spare_bit_0, + &hf_p1_OriginatorReportRequest_spare_bit_1, + &hf_p1_OriginatorReportRequest_spare_bit_2, + &hf_p1_OriginatorReportRequest_report, + &hf_p1_OriginatorReportRequest_non_delivery_report, + NULL }; static int dissect_p1_OriginatorReportRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_constrained_bitstring(implicit_tag, actx, tree, tvb, offset, - 0, ub_bit_options, OriginatorReportRequest_bits, hf_index, ett_p1_OriginatorReportRequest, + 0, ub_bit_options, OriginatorReportRequest_bits, 5, hf_index, ett_p1_OriginatorReportRequest, NULL); return offset; @@ -4306,16 +4409,16 @@ dissect_p1_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, } -static const asn_namedbit Operations_bits[] = { - { 0, &hf_p1_Operations_probe_submission_or_report_delivery, -1, -1, "probe-submission-or-report-delivery", NULL }, - { 1, &hf_p1_Operations_message_submission_or_message_delivery, -1, -1, "message-submission-or-message-delivery", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Operations_bits[] = { + &hf_p1_Operations_probe_submission_or_report_delivery, + &hf_p1_Operations_message_submission_or_message_delivery, + NULL }; static int dissect_p1_Operations(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_constrained_bitstring(implicit_tag, actx, tree, tvb, offset, - 0, ub_bit_options, Operations_bits, hf_index, ett_p1_Operations, + 0, ub_bit_options, Operations_bits, 2, hf_index, ett_p1_Operations, NULL); return offset; @@ -4398,17 +4501,17 @@ dissect_p1_SubmissionControlArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U } -static const asn_namedbit WaitingMessages_bits[] = { - { 0, &hf_p1_WaitingMessages_long_content, -1, -1, "long-content", NULL }, - { 1, &hf_p1_WaitingMessages_low_priority, -1, -1, "low-priority", NULL }, - { 2, &hf_p1_WaitingMessages_other_security_labels, -1, -1, "other-security-labels", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * WaitingMessages_bits[] = { + &hf_p1_WaitingMessages_long_content, + &hf_p1_WaitingMessages_low_priority, + &hf_p1_WaitingMessages_other_security_labels, + NULL }; static int dissect_p1_WaitingMessages(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_constrained_bitstring(implicit_tag, actx, tree, tvb, offset, - 0, ub_bit_options, WaitingMessages_bits, hf_index, ett_p1_WaitingMessages, + 0, ub_bit_options, WaitingMessages_bits, 3, hf_index, ett_p1_WaitingMessages, NULL); return offset; @@ -4629,15 +4732,16 @@ dissect_p1_DeliveredOriginatorName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const asn_namedbit DeliveryFlags_bits[] = { - { 1, &hf_p1_DeliveryFlags_implicit_conversion_prohibited, -1, -1, "implicit-conversion-prohibited", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * DeliveryFlags_bits[] = { + &hf_p1_DeliveryFlags_spare_bit_0, + &hf_p1_DeliveryFlags_implicit_conversion_prohibited, + NULL }; static int dissect_p1_DeliveryFlags(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_constrained_bitstring(implicit_tag, actx, tree, tvb, offset, - 0, ub_bit_options, DeliveryFlags_bits, hf_index, ett_p1_DeliveryFlags, + 0, ub_bit_options, DeliveryFlags_bits, 2, hf_index, ett_p1_DeliveryFlags, NULL); return offset; @@ -5136,17 +5240,17 @@ dissect_p1_T_objects(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const asn_namedbit T_source_type_bits[] = { - { 0, &hf_p1_T_source_type_originated_by, -1, -1, "originated-by", NULL }, - { 1, &hf_p1_T_source_type_redirected_by, -1, -1, "redirected-by", NULL }, - { 2, &hf_p1_T_source_type_dl_expanded_by, -1, -1, "dl-expanded-by", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_source_type_bits[] = { + &hf_p1_T_source_type_originated_by, + &hf_p1_T_source_type_redirected_by, + &hf_p1_T_source_type_dl_expanded_by, + NULL }; static int dissect_p1_T_source_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_source_type_bits, hf_index, ett_p1_T_source_type, + T_source_type_bits, 3, hf_index, ett_p1_T_source_type, NULL); return offset; @@ -5328,20 +5432,20 @@ dissect_p1_RestrictedDelivery(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const asn_namedbit T_standard_parameters_bits[] = { - { 0, &hf_p1_T_standard_parameters_user_name, -1, -1, "user-name", NULL }, - { 1, &hf_p1_T_standard_parameters_user_address, -1, -1, "user-address", NULL }, - { 2, &hf_p1_T_standard_parameters_deliverable_class, -1, -1, "deliverable-class", NULL }, - { 3, &hf_p1_T_standard_parameters_default_delivery_controls, -1, -1, "default-delivery-controls", NULL }, - { 4, &hf_p1_T_standard_parameters_redirections, -1, -1, "redirections", NULL }, - { 5, &hf_p1_T_standard_parameters_restricted_delivery, -1, -1, "restricted-delivery", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_standard_parameters_bits[] = { + &hf_p1_T_standard_parameters_user_name, + &hf_p1_T_standard_parameters_user_address, + &hf_p1_T_standard_parameters_deliverable_class, + &hf_p1_T_standard_parameters_default_delivery_controls, + &hf_p1_T_standard_parameters_redirections, + &hf_p1_T_standard_parameters_restricted_delivery, + NULL }; static int dissect_p1_T_standard_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_standard_parameters_bits, hf_index, ett_p1_T_standard_parameters, + T_standard_parameters_bits, 6, hf_index, ett_p1_T_standard_parameters, NULL); return offset; @@ -5670,22 +5774,22 @@ dissect_p1_PhysicalForwardingAddressRequest(gboolean implicit_tag _U_, tvbuff_t } -static const asn_namedbit PhysicalDeliveryModes_bits[] = { - { 0, &hf_p1_PhysicalDeliveryModes_ordinary_mail, -1, -1, "ordinary-mail", NULL }, - { 1, &hf_p1_PhysicalDeliveryModes_special_delivery, -1, -1, "special-delivery", NULL }, - { 2, &hf_p1_PhysicalDeliveryModes_express_mail, -1, -1, "express-mail", NULL }, - { 3, &hf_p1_PhysicalDeliveryModes_counter_collection, -1, -1, "counter-collection", NULL }, - { 4, &hf_p1_PhysicalDeliveryModes_counter_collection_with_telephone_advice, -1, -1, "counter-collection-with-telephone-advice", NULL }, - { 5, &hf_p1_PhysicalDeliveryModes_counter_collection_with_telex_advice, -1, -1, "counter-collection-with-telex-advice", NULL }, - { 6, &hf_p1_PhysicalDeliveryModes_counter_collection_with_teletex_advice, -1, -1, "counter-collection-with-teletex-advice", NULL }, - { 7, &hf_p1_PhysicalDeliveryModes_bureau_fax_delivery, -1, -1, "bureau-fax-delivery", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * PhysicalDeliveryModes_bits[] = { + &hf_p1_PhysicalDeliveryModes_ordinary_mail, + &hf_p1_PhysicalDeliveryModes_special_delivery, + &hf_p1_PhysicalDeliveryModes_express_mail, + &hf_p1_PhysicalDeliveryModes_counter_collection, + &hf_p1_PhysicalDeliveryModes_counter_collection_with_telephone_advice, + &hf_p1_PhysicalDeliveryModes_counter_collection_with_telex_advice, + &hf_p1_PhysicalDeliveryModes_counter_collection_with_teletex_advice, + &hf_p1_PhysicalDeliveryModes_bureau_fax_delivery, + NULL }; static int dissect_p1_PhysicalDeliveryModes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_constrained_bitstring(implicit_tag, actx, tree, tvb, offset, - 0, ub_bit_options, PhysicalDeliveryModes_bits, hf_index, ett_p1_PhysicalDeliveryModes, + 0, ub_bit_options, PhysicalDeliveryModes_bits, 8, hf_index, ett_p1_PhysicalDeliveryModes, NULL); return offset; @@ -7226,7 +7330,7 @@ dissect_p1_AsymmetricToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_p1_RandomNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -7274,7 +7378,7 @@ dissect_p1_MessageTokenSignedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_p1_EncryptionKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -10681,6 +10785,18 @@ void proto_register_p1(void) { { "service-message", "p1.service-message", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, + { &hf_p1_OriginatorReportRequest_spare_bit_0, + { "spare_bit_0", "p1.spare_bit_0", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_p1_OriginatorReportRequest_spare_bit_1, + { "spare_bit_1", "p1.spare_bit_1", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_p1_OriginatorReportRequest_spare_bit_2, + { "spare_bit_2", "p1.spare_bit_2", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, { &hf_p1_OriginatorReportRequest_report, { "report", "p1.report", FT_BOOLEAN, 8, NULL, 0x10, @@ -10689,6 +10805,10 @@ void proto_register_p1(void) { { "non-delivery-report", "p1.non-delivery-report", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, + { &hf_p1_DeliveryFlags_spare_bit_0, + { "spare_bit_0", "p1.spare_bit_0", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, { &hf_p1_DeliveryFlags_implicit_conversion_prohibited, { "implicit-conversion-prohibited", "p1.implicit-conversion-prohibited", FT_BOOLEAN, 8, NULL, 0x40, @@ -10777,6 +10897,38 @@ void proto_register_p1(void) { { "mixed-mode", "p1.mixed-mode", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_0, + { "spare_bit_0", "p1.spare_bit_0", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_1, + { "spare_bit_1", "p1.spare_bit_1", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_2, + { "spare_bit_2", "p1.spare_bit_2", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_3, + { "spare_bit_3", "p1.spare_bit_3", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_4, + { "spare_bit_4", "p1.spare_bit_4", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_5, + { "spare_bit_5", "p1.spare_bit_5", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_6, + { "spare_bit_6", "p1.spare_bit_6", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_7, + { "spare_bit_7", "p1.spare_bit_7", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL }}, { &hf_p1_G3FacsimileNonBasicParameters_two_dimensional, { "two-dimensional", "p1.two-dimensional", FT_BOOLEAN, 8, NULL, 0x80, @@ -10785,6 +10937,46 @@ void proto_register_p1(void) { { "fine-resolution", "p1.fine-resolution", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_10, + { "spare_bit_10", "p1.spare_bit_10", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_11, + { "spare_bit_11", "p1.spare_bit_11", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_12, + { "spare_bit_12", "p1.spare_bit_12", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_13, + { "spare_bit_13", "p1.spare_bit_13", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_14, + { "spare_bit_14", "p1.spare_bit_14", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_15, + { "spare_bit_15", "p1.spare_bit_15", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_16, + { "spare_bit_16", "p1.spare_bit_16", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_17, + { "spare_bit_17", "p1.spare_bit_17", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_18, + { "spare_bit_18", "p1.spare_bit_18", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_19, + { "spare_bit_19", "p1.spare_bit_19", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, { &hf_p1_G3FacsimileNonBasicParameters_unlimited_length, { "unlimited-length", "p1.unlimited-length", FT_BOOLEAN, 8, NULL, 0x08, @@ -10801,14 +10993,58 @@ void proto_register_p1(void) { { "b4-width", "p1.b4-width", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_24, + { "spare_bit_24", "p1.spare_bit_24", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, { &hf_p1_G3FacsimileNonBasicParameters_t6_coding, { "t6-coding", "p1.t6-coding", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_26, + { "spare_bit_26", "p1.spare_bit_26", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_27, + { "spare_bit_27", "p1.spare_bit_27", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_28, + { "spare_bit_28", "p1.spare_bit_28", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_29, + { "spare_bit_29", "p1.spare_bit_29", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, { &hf_p1_G3FacsimileNonBasicParameters_uncompressed, { "uncompressed", "p1.uncompressed", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_31, + { "spare_bit_31", "p1.spare_bit_31", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_32, + { "spare_bit_32", "p1.spare_bit_32", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_33, + { "spare_bit_33", "p1.spare_bit_33", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_34, + { "spare_bit_34", "p1.spare_bit_34", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_35, + { "spare_bit_35", "p1.spare_bit_35", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_36, + { "spare_bit_36", "p1.spare_bit_36", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, { &hf_p1_G3FacsimileNonBasicParameters_width_middle_864_of_1728, { "width-middle-864-of-1728", "p1.width-middle-864-of-1728", FT_BOOLEAN, 8, NULL, 0x04, @@ -10817,6 +11053,26 @@ void proto_register_p1(void) { { "width-middle-1216-of-1728", "p1.width-middle-1216-of-1728", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_39, + { "spare_bit_39", "p1.spare_bit_39", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_40, + { "spare_bit_40", "p1.spare_bit_40", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_41, + { "spare_bit_41", "p1.spare_bit_41", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_42, + { "spare_bit_42", "p1.spare_bit_42", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_43, + { "spare_bit_43", "p1.spare_bit_43", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, { &hf_p1_G3FacsimileNonBasicParameters_resolution_type, { "resolution-type", "p1.resolution-type", FT_BOOLEAN, 8, NULL, 0x08, @@ -10833,6 +11089,10 @@ void proto_register_p1(void) { { "resolution-8x15", "p1.resolution-8x15", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_48, + { "spare_bit_48", "p1.spare_bit_48", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, { &hf_p1_G3FacsimileNonBasicParameters_edi, { "edi", "p1.edi", FT_BOOLEAN, 8, NULL, 0x40, @@ -10845,14 +11105,58 @@ void proto_register_p1(void) { { "bft", "p1.bft", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_52, + { "spare_bit_52", "p1.spare_bit_52", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_53, + { "spare_bit_53", "p1.spare_bit_53", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_54, + { "spare_bit_54", "p1.spare_bit_54", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_55, + { "spare_bit_55", "p1.spare_bit_55", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_56, + { "spare_bit_56", "p1.spare_bit_56", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_57, + { "spare_bit_57", "p1.spare_bit_57", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, { &hf_p1_G3FacsimileNonBasicParameters_mixed_mode, { "mixed-mode", "p1.mixed-mode", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_59, + { "spare_bit_59", "p1.spare_bit_59", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, { &hf_p1_G3FacsimileNonBasicParameters_character_mode, { "character-mode", "p1.character-mode", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_61, + { "spare_bit_61", "p1.spare_bit_61", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_62, + { "spare_bit_62", "p1.spare_bit_62", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_63, + { "spare_bit_63", "p1.spare_bit_63", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_64, + { "spare_bit_64", "p1.spare_bit_64", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, { &hf_p1_G3FacsimileNonBasicParameters_twelve_bits, { "twelve-bits", "p1.twelve-bits", FT_BOOLEAN, 8, NULL, 0x40, @@ -10869,6 +11173,14 @@ void proto_register_p1(void) { { "jpeg", "p1.jpeg", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_69, + { "spare_bit_69", "p1.spare_bit_69", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, + { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_70, + { "spare_bit_70", "p1.spare_bit_70", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL }}, { &hf_p1_G3FacsimileNonBasicParameters_processable_mode_26, { "processable-mode-26", "p1.processable-mode-26", FT_BOOLEAN, 8, NULL, 0x01, diff --git a/epan/dissectors/packet-p22.c b/epan/dissectors/packet-p22.c index 7e57e50dd7..1dc38db0ec 100644 --- a/epan/dissectors/packet-p22.c +++ b/epan/dissectors/packet-p22.c @@ -986,19 +986,19 @@ dissect_p22_AuthorizingUsersField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const asn_namedbit NotificationRequests_bits[] = { - { 0, &hf_p22_NotificationRequests_rn, -1, -1, "rn", NULL }, - { 1, &hf_p22_NotificationRequests_nrn, -1, -1, "nrn", NULL }, - { 2, &hf_p22_NotificationRequests_ipm_return, -1, -1, "ipm-return", NULL }, - { 3, &hf_p22_NotificationRequests_an_supported, -1, -1, "an-supported", NULL }, - { 4, &hf_p22_NotificationRequests_suppress_an, -1, -1, "suppress-an", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * NotificationRequests_bits[] = { + &hf_p22_NotificationRequests_rn, + &hf_p22_NotificationRequests_nrn, + &hf_p22_NotificationRequests_ipm_return, + &hf_p22_NotificationRequests_an_supported, + &hf_p22_NotificationRequests_suppress_an, + NULL }; static int dissect_p22_NotificationRequests(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NotificationRequests_bits, hf_index, ett_p22_NotificationRequests, + NotificationRequests_bits, 5, hf_index, ett_p22_NotificationRequests, NULL); return offset; @@ -1441,7 +1441,7 @@ dissect_p22_G3FacsimileParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_p22_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -1633,7 +1633,7 @@ dissect_p22_EncryptedParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_p22_EncryptedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -3189,22 +3189,22 @@ dissect_p22_User_Identity_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ } -static const asn_namedbit Access_Request_bits[] = { - { 0, &hf_p22_Access_Request_read, -1, -1, "read", NULL }, - { 1, &hf_p22_Access_Request_insert, -1, -1, "insert", NULL }, - { 2, &hf_p22_Access_Request_replace, -1, -1, "replace", NULL }, - { 3, &hf_p22_Access_Request_extend, -1, -1, "extend", NULL }, - { 4, &hf_p22_Access_Request_erase, -1, -1, "erase", NULL }, - { 5, &hf_p22_Access_Request_read_attribute, -1, -1, "read-attribute", NULL }, - { 6, &hf_p22_Access_Request_change_attribute, -1, -1, "change-attribute", NULL }, - { 7, &hf_p22_Access_Request_delete_object, -1, -1, "delete-object", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Access_Request_bits[] = { + &hf_p22_Access_Request_read, + &hf_p22_Access_Request_insert, + &hf_p22_Access_Request_replace, + &hf_p22_Access_Request_extend, + &hf_p22_Access_Request_erase, + &hf_p22_Access_Request_read_attribute, + &hf_p22_Access_Request_change_attribute, + &hf_p22_Access_Request_delete_object, + NULL }; static int dissect_p22_Access_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Access_Request_bits, hf_index, ett_p22_Access_Request, + Access_Request_bits, 8, hf_index, ett_p22_Access_Request, NULL); return offset; @@ -3801,18 +3801,18 @@ dissect_p22_RecipientCategory(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const asn_namedbit RecipientSecurityRequest_bits[] = { - { 0, &hf_p22_RecipientSecurityRequest_content_non_repudiation, -1, -1, "content-non-repudiation", NULL }, - { 1, &hf_p22_RecipientSecurityRequest_content_proof, -1, -1, "content-proof", NULL }, - { 2, &hf_p22_RecipientSecurityRequest_ipn_non_repudiation, -1, -1, "ipn-non-repudiation", NULL }, - { 3, &hf_p22_RecipientSecurityRequest_ipn_proof, -1, -1, "ipn-proof", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * RecipientSecurityRequest_bits[] = { + &hf_p22_RecipientSecurityRequest_content_non_repudiation, + &hf_p22_RecipientSecurityRequest_content_proof, + &hf_p22_RecipientSecurityRequest_ipn_non_repudiation, + &hf_p22_RecipientSecurityRequest_ipn_proof, + NULL }; static int dissect_p22_RecipientSecurityRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - RecipientSecurityRequest_bits, hf_index, ett_p22_RecipientSecurityRequest, + RecipientSecurityRequest_bits, 4, hf_index, ett_p22_RecipientSecurityRequest, NULL); return offset; diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c index d079f023a6..52ebc9da69 100644 --- a/epan/dissectors/packet-p7.c +++ b/epan/dissectors/packet-p7.c @@ -1605,17 +1605,17 @@ dissect_p7_INTEGER_1_ub_messages(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i } -static const asn_namedbit OverrideRestrictions_bits[] = { - { 0, &hf_p7_OverrideRestrictions_override_content_types_restriction, -1, -1, "override-content-types-restriction", NULL }, - { 1, &hf_p7_OverrideRestrictions_override_EITs_restriction, -1, -1, "override-EITs-restriction", NULL }, - { 2, &hf_p7_OverrideRestrictions_override_attribute_length_restriction, -1, -1, "override-attribute-length-restriction", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * OverrideRestrictions_bits[] = { + &hf_p7_OverrideRestrictions_override_content_types_restriction, + &hf_p7_OverrideRestrictions_override_EITs_restriction, + &hf_p7_OverrideRestrictions_override_attribute_length_restriction, + NULL }; static int dissect_p7_OverrideRestrictions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_constrained_bitstring(implicit_tag, actx, tree, tvb, offset, - 1, ub_ua_restrictions, OverrideRestrictions_bits, hf_index, ett_p7_OverrideRestrictions, + 1, ub_ua_restrictions, OverrideRestrictions_bits, 3, hf_index, ett_p7_OverrideRestrictions, NULL); return offset; @@ -2331,20 +2331,20 @@ dissect_p7_MessageGroupRegistrations(gboolean implicit_tag _U_, tvbuff_t *tvb _U } -static const asn_namedbit T_registrations_bits[] = { - { 0, &hf_p7_T_registrations_auto_action_registrations, -1, -1, "auto-action-registrations", NULL }, - { 1, &hf_p7_T_registrations_list_attribute_defaults, -1, -1, "list-attribute-defaults", NULL }, - { 2, &hf_p7_T_registrations_fetch_attribute_defaults, -1, -1, "fetch-attribute-defaults", NULL }, - { 3, &hf_p7_T_registrations_ua_registrations, -1, -1, "ua-registrations", NULL }, - { 4, &hf_p7_T_registrations_submission_defaults, -1, -1, "submission-defaults", NULL }, - { 5, &hf_p7_T_registrations_message_group_registrations, -1, -1, "message-group-registrations", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_registrations_bits[] = { + &hf_p7_T_registrations_auto_action_registrations, + &hf_p7_T_registrations_list_attribute_defaults, + &hf_p7_T_registrations_fetch_attribute_defaults, + &hf_p7_T_registrations_ua_registrations, + &hf_p7_T_registrations_submission_defaults, + &hf_p7_T_registrations_message_group_registrations, + NULL }; static int dissect_p7_T_registrations(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_registrations_bits, hf_index, ett_p7_T_registrations, + T_registrations_bits, 6, hf_index, ett_p7_T_registrations, NULL); return offset; @@ -2435,7 +2435,7 @@ dissect_p7_Register_MSArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_p7_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -3384,17 +3384,17 @@ dissect_p7_ModifyErrorParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in } -static const asn_namedbit T_entry_class_problem_bits[] = { - { 0, &hf_p7_T_entry_class_problem_unsupported_entry_class, -1, -1, "unsupported-entry-class", NULL }, - { 1, &hf_p7_T_entry_class_problem_entry_class_not_subscribed, -1, -1, "entry-class-not-subscribed", NULL }, - { 2, &hf_p7_T_entry_class_problem_inappropriate_entry_class, -1, -1, "inappropriate-entry-class", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_entry_class_problem_bits[] = { + &hf_p7_T_entry_class_problem_unsupported_entry_class, + &hf_p7_T_entry_class_problem_entry_class_not_subscribed, + &hf_p7_T_entry_class_problem_inappropriate_entry_class, + NULL }; static int dissect_p7_T_entry_class_problem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_entry_class_problem_bits, hf_index, ett_p7_T_entry_class_problem, + T_entry_class_problem_bits, 3, hf_index, ett_p7_T_entry_class_problem, NULL); return offset; diff --git a/epan/dissectors/packet-p772.c b/epan/dissectors/packet-p772.c index 5ae0fc0874..c753bafe11 100644 --- a/epan/dissectors/packet-p772.c +++ b/epan/dissectors/packet-p772.c @@ -295,17 +295,17 @@ dissect_p772_InformationObject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const asn_namedbit Acp127NotificationType_bits[] = { - { 0, &hf_p772_Acp127NotificationType_acp127_nn, -1, -1, "acp127-nn", NULL }, - { 1, &hf_p772_Acp127NotificationType_acp127_pn, -1, -1, "acp127-pn", NULL }, - { 2, &hf_p772_Acp127NotificationType_acp127_tn, -1, -1, "acp127-tn", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Acp127NotificationType_bits[] = { + &hf_p772_Acp127NotificationType_acp127_nn, + &hf_p772_Acp127NotificationType_acp127_pn, + &hf_p772_Acp127NotificationType_acp127_tn, + NULL }; static int dissect_p772_Acp127NotificationType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Acp127NotificationType_bits, hf_index, ett_p772_Acp127NotificationType, + Acp127NotificationType_bits, 3, hf_index, ett_p772_Acp127NotificationType, NULL); return offset; @@ -1012,7 +1012,7 @@ dissect_p772_ForwardedEncryptedParameters(gboolean implicit_tag _U_, tvbuff_t *t static int dissect_p772_ForwardedEncryptedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c index a7fe6dea4a..35c2b83e81 100644 --- a/epan/dissectors/packet-pkcs1.c +++ b/epan/dissectors/packet-pkcs1.c @@ -168,7 +168,7 @@ dissect_pkcs1_DSA_Params(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_pkcs1_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-pkcs10.c b/epan/dissectors/packet-pkcs10.c index 6426e26a80..7f9e681734 100644 --- a/epan/dissectors/packet-pkcs10.c +++ b/epan/dissectors/packet-pkcs10.c @@ -184,7 +184,7 @@ dissect_pkcs10_CertificationRequestInfo(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_pkcs10_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c index 9375ac5124..11df03654e 100644 --- a/epan/dissectors/packet-pkinit.c +++ b/epan/dissectors/packet-pkinit.c @@ -252,7 +252,7 @@ dissect_pkinit_PaPkAsRep(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_pkinit_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c index b87faa78c6..b4deafc2d3 100644 --- a/epan/dissectors/packet-pkix1explicit.c +++ b/epan/dissectors/packet-pkix1explicit.c @@ -181,7 +181,7 @@ dissect_pkix1explicit_SubjectPublicKeyInfo(gboolean implicit_tag, tvbuff_t *tvb, int dissect_pkix1explicit_UniqueIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -343,7 +343,7 @@ dissect_pkix1explicit_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_pkix1explicit_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -602,7 +602,7 @@ dissect_pkix1explicit_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_pkix1explicit_IPAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-pkixac.c b/epan/dissectors/packet-pkixac.c index 5a59226dfb..48e30a9296 100644 --- a/epan/dissectors/packet-pkixac.c +++ b/epan/dissectors/packet-pkixac.c @@ -160,7 +160,7 @@ dissect_pkixac_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_pkixac_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -357,20 +357,20 @@ dissect_pkixac_RoleSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs } -static const asn_namedbit ClassList_bits[] = { - { 0, &hf_pkixac_ClassList_unmarked, -1, -1, "unmarked", NULL }, - { 1, &hf_pkixac_ClassList_unclassified, -1, -1, "unclassified", NULL }, - { 2, &hf_pkixac_ClassList_restricted, -1, -1, "restricted", NULL }, - { 3, &hf_pkixac_ClassList_confidential, -1, -1, "confidential", NULL }, - { 4, &hf_pkixac_ClassList_secret, -1, -1, "secret", NULL }, - { 5, &hf_pkixac_ClassList_topSecret, -1, -1, "topSecret", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * ClassList_bits[] = { + &hf_pkixac_ClassList_unmarked, + &hf_pkixac_ClassList_unclassified, + &hf_pkixac_ClassList_restricted, + &hf_pkixac_ClassList_confidential, + &hf_pkixac_ClassList_secret, + &hf_pkixac_ClassList_topSecret, + NULL }; static int dissect_pkixac_ClassList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - ClassList_bits, hf_index, ett_pkixac_ClassList, + ClassList_bits, 6, hf_index, ett_pkixac_ClassList, NULL); return offset; diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index 1812f85b67..f27a715eea 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -66,12 +66,30 @@ static int hf_pkixtsp_millis = -1; /* INTEGER_1_999 */ static int hf_pkixtsp_micros = -1; /* INTEGER_1_999 */ /* named bits */ static int hf_pkixtsp_PKIFailureInfo_badAlg = -1; +static int hf_pkixtsp_PKIFailureInfo_spare_bit_1 = -1; static int hf_pkixtsp_PKIFailureInfo_badRequest = -1; +static int hf_pkixtsp_PKIFailureInfo_spare_bit_3 = -1; +static int hf_pkixtsp_PKIFailureInfo_spare_bit_4 = -1; static int hf_pkixtsp_PKIFailureInfo_badDataFormat = -1; +static int hf_pkixtsp_PKIFailureInfo_spare_bit_6 = -1; +static int hf_pkixtsp_PKIFailureInfo_spare_bit_7 = -1; +static int hf_pkixtsp_PKIFailureInfo_spare_bit_8 = -1; +static int hf_pkixtsp_PKIFailureInfo_spare_bit_9 = -1; +static int hf_pkixtsp_PKIFailureInfo_spare_bit_10 = -1; +static int hf_pkixtsp_PKIFailureInfo_spare_bit_11 = -1; +static int hf_pkixtsp_PKIFailureInfo_spare_bit_12 = -1; +static int hf_pkixtsp_PKIFailureInfo_spare_bit_13 = -1; static int hf_pkixtsp_PKIFailureInfo_timeNotAvailable = -1; static int hf_pkixtsp_PKIFailureInfo_unacceptedPolicy = -1; static int hf_pkixtsp_PKIFailureInfo_unacceptedExtension = -1; static int hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable = -1; +static int hf_pkixtsp_PKIFailureInfo_spare_bit_18 = -1; +static int hf_pkixtsp_PKIFailureInfo_spare_bit_19 = -1; +static int hf_pkixtsp_PKIFailureInfo_spare_bit_20 = -1; +static int hf_pkixtsp_PKIFailureInfo_spare_bit_21 = -1; +static int hf_pkixtsp_PKIFailureInfo_spare_bit_22 = -1; +static int hf_pkixtsp_PKIFailureInfo_spare_bit_23 = -1; +static int hf_pkixtsp_PKIFailureInfo_spare_bit_24 = -1; static int hf_pkixtsp_PKIFailureInfo_systemFailure = -1; /*--- End of included file: packet-pkixtsp-hf.c ---*/ @@ -205,22 +223,40 @@ dissect_pkixtsp_PKIStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs } -static const asn_namedbit PKIFailureInfo_bits[] = { - { 0, &hf_pkixtsp_PKIFailureInfo_badAlg, -1, -1, "badAlg", NULL }, - { 2, &hf_pkixtsp_PKIFailureInfo_badRequest, -1, -1, "badRequest", NULL }, - { 5, &hf_pkixtsp_PKIFailureInfo_badDataFormat, -1, -1, "badDataFormat", NULL }, - { 14, &hf_pkixtsp_PKIFailureInfo_timeNotAvailable, -1, -1, "timeNotAvailable", NULL }, - { 15, &hf_pkixtsp_PKIFailureInfo_unacceptedPolicy, -1, -1, "unacceptedPolicy", NULL }, - { 16, &hf_pkixtsp_PKIFailureInfo_unacceptedExtension, -1, -1, "unacceptedExtension", NULL }, - { 17, &hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable, -1, -1, "addInfoNotAvailable", NULL }, - { 25, &hf_pkixtsp_PKIFailureInfo_systemFailure, -1, -1, "systemFailure", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * PKIFailureInfo_bits[] = { + &hf_pkixtsp_PKIFailureInfo_badAlg, + &hf_pkixtsp_PKIFailureInfo_spare_bit_1, + &hf_pkixtsp_PKIFailureInfo_badRequest, + &hf_pkixtsp_PKIFailureInfo_spare_bit_3, + &hf_pkixtsp_PKIFailureInfo_spare_bit_4, + &hf_pkixtsp_PKIFailureInfo_badDataFormat, + &hf_pkixtsp_PKIFailureInfo_spare_bit_6, + &hf_pkixtsp_PKIFailureInfo_spare_bit_7, + &hf_pkixtsp_PKIFailureInfo_spare_bit_8, + &hf_pkixtsp_PKIFailureInfo_spare_bit_9, + &hf_pkixtsp_PKIFailureInfo_spare_bit_10, + &hf_pkixtsp_PKIFailureInfo_spare_bit_11, + &hf_pkixtsp_PKIFailureInfo_spare_bit_12, + &hf_pkixtsp_PKIFailureInfo_spare_bit_13, + &hf_pkixtsp_PKIFailureInfo_timeNotAvailable, + &hf_pkixtsp_PKIFailureInfo_unacceptedPolicy, + &hf_pkixtsp_PKIFailureInfo_unacceptedExtension, + &hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable, + &hf_pkixtsp_PKIFailureInfo_spare_bit_18, + &hf_pkixtsp_PKIFailureInfo_spare_bit_19, + &hf_pkixtsp_PKIFailureInfo_spare_bit_20, + &hf_pkixtsp_PKIFailureInfo_spare_bit_21, + &hf_pkixtsp_PKIFailureInfo_spare_bit_22, + &hf_pkixtsp_PKIFailureInfo_spare_bit_23, + &hf_pkixtsp_PKIFailureInfo_spare_bit_24, + &hf_pkixtsp_PKIFailureInfo_systemFailure, + NULL }; static int dissect_pkixtsp_PKIFailureInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - PKIFailureInfo_bits, hf_index, ett_pkixtsp_PKIFailureInfo, + PKIFailureInfo_bits, 26, hf_index, ett_pkixtsp_PKIFailureInfo, NULL); return offset; @@ -520,14 +556,58 @@ void proto_register_pkixtsp(void) { { "badAlg", "pkixtsp.badAlg", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, + { &hf_pkixtsp_PKIFailureInfo_spare_bit_1, + { "spare_bit_1", "pkixtsp.spare_bit_1", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, { &hf_pkixtsp_PKIFailureInfo_badRequest, { "badRequest", "pkixtsp.badRequest", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, + { &hf_pkixtsp_PKIFailureInfo_spare_bit_3, + { "spare_bit_3", "pkixtsp.spare_bit_3", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, + { &hf_pkixtsp_PKIFailureInfo_spare_bit_4, + { "spare_bit_4", "pkixtsp.spare_bit_4", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, { &hf_pkixtsp_PKIFailureInfo_badDataFormat, { "badDataFormat", "pkixtsp.badDataFormat", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, + { &hf_pkixtsp_PKIFailureInfo_spare_bit_6, + { "spare_bit_6", "pkixtsp.spare_bit_6", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL }}, + { &hf_pkixtsp_PKIFailureInfo_spare_bit_7, + { "spare_bit_7", "pkixtsp.spare_bit_7", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL }}, + { &hf_pkixtsp_PKIFailureInfo_spare_bit_8, + { "spare_bit_8", "pkixtsp.spare_bit_8", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_pkixtsp_PKIFailureInfo_spare_bit_9, + { "spare_bit_9", "pkixtsp.spare_bit_9", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_pkixtsp_PKIFailureInfo_spare_bit_10, + { "spare_bit_10", "pkixtsp.spare_bit_10", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_pkixtsp_PKIFailureInfo_spare_bit_11, + { "spare_bit_11", "pkixtsp.spare_bit_11", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, + { &hf_pkixtsp_PKIFailureInfo_spare_bit_12, + { "spare_bit_12", "pkixtsp.spare_bit_12", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, + { &hf_pkixtsp_PKIFailureInfo_spare_bit_13, + { "spare_bit_13", "pkixtsp.spare_bit_13", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, { &hf_pkixtsp_PKIFailureInfo_timeNotAvailable, { "timeNotAvailable", "pkixtsp.timeNotAvailable", FT_BOOLEAN, 8, NULL, 0x02, @@ -544,6 +624,34 @@ void proto_register_pkixtsp(void) { { "addInfoNotAvailable", "pkixtsp.addInfoNotAvailable", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, + { &hf_pkixtsp_PKIFailureInfo_spare_bit_18, + { "spare_bit_18", "pkixtsp.spare_bit_18", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_pkixtsp_PKIFailureInfo_spare_bit_19, + { "spare_bit_19", "pkixtsp.spare_bit_19", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, + { &hf_pkixtsp_PKIFailureInfo_spare_bit_20, + { "spare_bit_20", "pkixtsp.spare_bit_20", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, + { &hf_pkixtsp_PKIFailureInfo_spare_bit_21, + { "spare_bit_21", "pkixtsp.spare_bit_21", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, + { &hf_pkixtsp_PKIFailureInfo_spare_bit_22, + { "spare_bit_22", "pkixtsp.spare_bit_22", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL }}, + { &hf_pkixtsp_PKIFailureInfo_spare_bit_23, + { "spare_bit_23", "pkixtsp.spare_bit_23", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL }}, + { &hf_pkixtsp_PKIFailureInfo_spare_bit_24, + { "spare_bit_24", "pkixtsp.spare_bit_24", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, { &hf_pkixtsp_PKIFailureInfo_systemFailure, { "systemFailure", "pkixtsp.systemFailure", FT_BOOLEAN, 8, NULL, 0x40, diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index ac29f34c6d..ee1cd44187 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -358,15 +358,15 @@ dissect_pres_Mode_selector(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off } -static const asn_namedbit Protocol_version_bits[] = { - { 0, &hf_pres_Protocol_version_version_1, -1, -1, "version-1", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Protocol_version_bits[] = { + &hf_pres_Protocol_version_version_1, + NULL }; static int dissect_pres_Protocol_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_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Protocol_version_bits, hf_index, ett_pres_Protocol_version, + Protocol_version_bits, 1, hf_index, ett_pres_Protocol_version, NULL); return offset; @@ -518,60 +518,60 @@ dissect_pres_Default_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const asn_namedbit Presentation_requirements_bits[] = { - { 0, &hf_pres_Presentation_requirements_context_management, -1, -1, "context-management", NULL }, - { 1, &hf_pres_Presentation_requirements_restoration, -1, -1, "restoration", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Presentation_requirements_bits[] = { + &hf_pres_Presentation_requirements_context_management, + &hf_pres_Presentation_requirements_restoration, + NULL }; static int dissect_pres_Presentation_requirements(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Presentation_requirements_bits, hf_index, ett_pres_Presentation_requirements, + Presentation_requirements_bits, 2, hf_index, ett_pres_Presentation_requirements, NULL); return offset; } -static const asn_namedbit User_session_requirements_bits[] = { - { 0, &hf_pres_User_session_requirements_half_duplex, -1, -1, "half-duplex", NULL }, - { 1, &hf_pres_User_session_requirements_duplex, -1, -1, "duplex", NULL }, - { 2, &hf_pres_User_session_requirements_expedited_data, -1, -1, "expedited-data", NULL }, - { 3, &hf_pres_User_session_requirements_minor_synchronize, -1, -1, "minor-synchronize", NULL }, - { 4, &hf_pres_User_session_requirements_major_synchronize, -1, -1, "major-synchronize", NULL }, - { 5, &hf_pres_User_session_requirements_resynchronize, -1, -1, "resynchronize", NULL }, - { 6, &hf_pres_User_session_requirements_activity_management, -1, -1, "activity-management", NULL }, - { 7, &hf_pres_User_session_requirements_negotiated_release, -1, -1, "negotiated-release", NULL }, - { 8, &hf_pres_User_session_requirements_capability_data, -1, -1, "capability-data", NULL }, - { 9, &hf_pres_User_session_requirements_exceptions, -1, -1, "exceptions", NULL }, - { 10, &hf_pres_User_session_requirements_typed_data, -1, -1, "typed-data", NULL }, - { 11, &hf_pres_User_session_requirements_symmetric_synchronize, -1, -1, "symmetric-synchronize", NULL }, - { 12, &hf_pres_User_session_requirements_data_separation, -1, -1, "data-separation", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * User_session_requirements_bits[] = { + &hf_pres_User_session_requirements_half_duplex, + &hf_pres_User_session_requirements_duplex, + &hf_pres_User_session_requirements_expedited_data, + &hf_pres_User_session_requirements_minor_synchronize, + &hf_pres_User_session_requirements_major_synchronize, + &hf_pres_User_session_requirements_resynchronize, + &hf_pres_User_session_requirements_activity_management, + &hf_pres_User_session_requirements_negotiated_release, + &hf_pres_User_session_requirements_capability_data, + &hf_pres_User_session_requirements_exceptions, + &hf_pres_User_session_requirements_typed_data, + &hf_pres_User_session_requirements_symmetric_synchronize, + &hf_pres_User_session_requirements_data_separation, + NULL }; static int dissect_pres_User_session_requirements(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - User_session_requirements_bits, hf_index, ett_pres_User_session_requirements, + User_session_requirements_bits, 13, hf_index, ett_pres_User_session_requirements, NULL); return offset; } -static const asn_namedbit Protocol_options_bits[] = { - { 0, &hf_pres_Protocol_options_nominated_context, -1, -1, "nominated-context", NULL }, - { 1, &hf_pres_Protocol_options_short_encoding, -1, -1, "short-encoding", NULL }, - { 2, &hf_pres_Protocol_options_packed_encoding_rules, -1, -1, "packed-encoding-rules", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Protocol_options_bits[] = { + &hf_pres_Protocol_options_nominated_context, + &hf_pres_Protocol_options_short_encoding, + &hf_pres_Protocol_options_packed_encoding_rules, + NULL }; static int dissect_pres_Protocol_options(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Protocol_options_bits, hf_index, ett_pres_Protocol_options, + Protocol_options_bits, 3, hf_index, ett_pres_Protocol_options, NULL); return offset; @@ -655,7 +655,7 @@ dissect_pres_T_octet_aligned(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_pres_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c index 84fc56b412..86040f43f7 100644 --- a/epan/dissectors/packet-qsig.c +++ b/epan/dissectors/packet-qsig.c @@ -931,6 +931,7 @@ static int hf_qsig_dnd_serviceList = -1; /* ServiceList */ static int hf_qsig_dnd_extendedServiceList = -1; /* T_extendedServiceList */ static int hf_qsig_dnd_extendedServiceList_01 = -1; /* T_extendedServiceList_01 */ /* named bits */ +static int hf_qsig_dnd_ServiceList_spare_bit_0 = -1; static int hf_qsig_dnd_ServiceList_dndo_low = -1; static int hf_qsig_dnd_ServiceList_dndo_medium = -1; static int hf_qsig_dnd_ServiceList_dndo_high = -1; @@ -959,6 +960,10 @@ static int hf_qsig_ci_resultExtension = -1; /* T_resultExtension */ static int hf_qsig_ci_ciProtectionLevel = -1; /* CIProtectionLevel */ static int hf_qsig_ci_resultExtension_01 = -1; /* T_resultExtension_01 */ /* named bits */ +static int hf_qsig_ci_ServiceList_spare_bit_0 = -1; +static int hf_qsig_ci_ServiceList_spare_bit_1 = -1; +static int hf_qsig_ci_ServiceList_spare_bit_2 = -1; +static int hf_qsig_ci_ServiceList_spare_bit_3 = -1; static int hf_qsig_ci_ServiceList_ci_low = -1; static int hf_qsig_ci_ServiceList_ci_medium = -1; static int hf_qsig_ci_ServiceList_ci_high = -1; @@ -1449,6 +1454,8 @@ static int hf_qsig_sms_SmscControlParameterHeader_sRforTransactionCompleted = -1 static int hf_qsig_sms_SmscControlParameterHeader_sRforPermanentError = -1; static int hf_qsig_sms_SmscControlParameterHeader_sRforTempErrorSCnotTrying = -1; static int hf_qsig_sms_SmscControlParameterHeader_sRforTempErrorSCstillTrying = -1; +static int hf_qsig_sms_SmscControlParameterHeader_spare_bit_4 = -1; +static int hf_qsig_sms_SmscControlParameterHeader_spare_bit_5 = -1; static int hf_qsig_sms_SmscControlParameterHeader_cancelSRRforConcatenatedSM = -1; static int hf_qsig_sms_SmscControlParameterHeader_includeOrigUDHintoSR = -1; @@ -4314,15 +4321,15 @@ static int dissect_qsig_cc_Extension_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /* --- Module Call-Offer-Operations-asn1-97 --- --- --- */ -static const asn_namedbit qsig_co_ServiceList_bits[] = { - { 0, &hf_qsig_co_ServiceList_callOffer, -1, -1, "callOffer", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * qsig_co_ServiceList_bits[] = { + &hf_qsig_co_ServiceList_callOffer, + NULL }; static int dissect_qsig_co_ServiceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - qsig_co_ServiceList_bits, hf_index, ett_qsig_co_ServiceList, + qsig_co_ServiceList_bits, 1, hf_index, ett_qsig_co_ServiceList, NULL); return offset; @@ -4899,17 +4906,18 @@ dissect_qsig_dnd_DNDOverrideArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in } -static const asn_namedbit qsig_dnd_ServiceList_bits[] = { - { 1, &hf_qsig_dnd_ServiceList_dndo_low, -1, -1, "dndo-low", NULL }, - { 2, &hf_qsig_dnd_ServiceList_dndo_medium, -1, -1, "dndo-medium", NULL }, - { 3, &hf_qsig_dnd_ServiceList_dndo_high, -1, -1, "dndo-high", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * qsig_dnd_ServiceList_bits[] = { + &hf_qsig_dnd_ServiceList_spare_bit_0, + &hf_qsig_dnd_ServiceList_dndo_low, + &hf_qsig_dnd_ServiceList_dndo_medium, + &hf_qsig_dnd_ServiceList_dndo_high, + NULL }; static int dissect_qsig_dnd_ServiceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - qsig_dnd_ServiceList_bits, hf_index, ett_qsig_dnd_ServiceList, + qsig_dnd_ServiceList_bits, 4, hf_index, ett_qsig_dnd_ServiceList, NULL); return offset; @@ -5073,17 +5081,21 @@ static int dissect_qsig_dnd_Extension_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /* --- Module Call-Intrusion-Operations-asn1-97 --- --- --- */ -static const asn_namedbit qsig_ci_ServiceList_bits[] = { - { 4, &hf_qsig_ci_ServiceList_ci_low, -1, -1, "ci-low", NULL }, - { 5, &hf_qsig_ci_ServiceList_ci_medium, -1, -1, "ci-medium", NULL }, - { 6, &hf_qsig_ci_ServiceList_ci_high, -1, -1, "ci-high", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * qsig_ci_ServiceList_bits[] = { + &hf_qsig_ci_ServiceList_spare_bit_0, + &hf_qsig_ci_ServiceList_spare_bit_1, + &hf_qsig_ci_ServiceList_spare_bit_2, + &hf_qsig_ci_ServiceList_spare_bit_3, + &hf_qsig_ci_ServiceList_ci_low, + &hf_qsig_ci_ServiceList_ci_medium, + &hf_qsig_ci_ServiceList_ci_high, + NULL }; static int dissect_qsig_ci_ServiceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - qsig_ci_ServiceList_bits, hf_index, ett_qsig_ci_ServiceList, + qsig_ci_ServiceList_bits, 7, hf_index, ett_qsig_ci_ServiceList, NULL); return offset; @@ -6871,32 +6883,32 @@ static int dissect_qsig_cint_CintExtension_PDU(tvbuff_t *tvb _U_, packet_info *p /* --- Module Common-Information-Operations-asn1-97 --- --- --- */ -static const asn_namedbit qsig_cmn_FeatureIdList_bits[] = { - { 0, &hf_qsig_cmn_FeatureIdList_reserved, -1, -1, "reserved", NULL }, - { 1, &hf_qsig_cmn_FeatureIdList_ssCFreRoutingSupported, -1, -1, "ssCFreRoutingSupported", NULL }, - { 2, &hf_qsig_cmn_FeatureIdList_ssCTreRoutingSupported, -1, -1, "ssCTreRoutingSupported", NULL }, - { 3, &hf_qsig_cmn_FeatureIdList_ssCCBSpossible, -1, -1, "ssCCBSpossible", NULL }, - { 4, &hf_qsig_cmn_FeatureIdList_ssCCNRpossible, -1, -1, "ssCCNRpossible", NULL }, - { 5, &hf_qsig_cmn_FeatureIdList_ssCOsupported, -1, -1, "ssCOsupported", NULL }, - { 6, &hf_qsig_cmn_FeatureIdList_ssCIforcedRelease, -1, -1, "ssCIforcedRelease", NULL }, - { 7, &hf_qsig_cmn_FeatureIdList_ssCIisolation, -1, -1, "ssCIisolation", NULL }, - { 8, &hf_qsig_cmn_FeatureIdList_ssCIwaitOnBusy, -1, -1, "ssCIwaitOnBusy", NULL }, - { 9, &hf_qsig_cmn_FeatureIdList_ssAOCsupportChargeRateProvAtGatewPinx, -1, -1, "ssAOCsupportChargeRateProvAtGatewPinx", NULL }, - { 10, &hf_qsig_cmn_FeatureIdList_ssAOCsupportInterimChargeProvAtGatewPinx, -1, -1, "ssAOCsupportInterimChargeProvAtGatewPinx", NULL }, - { 11, &hf_qsig_cmn_FeatureIdList_ssAOCsupportFinalChargeProvAtGatewPinx, -1, -1, "ssAOCsupportFinalChargeProvAtGatewPinx", NULL }, - { 12, &hf_qsig_cmn_FeatureIdList_anfPRsupportedAtCooperatingPinx, -1, -1, "anfPRsupportedAtCooperatingPinx", NULL }, - { 13, &hf_qsig_cmn_FeatureIdList_anfCINTcanInterceptImmediate, -1, -1, "anfCINTcanInterceptImmediate", NULL }, - { 14, &hf_qsig_cmn_FeatureIdList_anfCINTcanInterceptDelayed, -1, -1, "anfCINTcanInterceptDelayed", NULL }, - { 15, &hf_qsig_cmn_FeatureIdList_anfWTMIreRoutingSupported, -1, -1, "anfWTMIreRoutingSupported", NULL }, - { 16, &hf_qsig_cmn_FeatureIdList_anfPUMIreRoutingSupported, -1, -1, "anfPUMIreRoutingSupported", NULL }, - { 17, &hf_qsig_cmn_FeatureIdList_ssSSCTreRoutingSupported, -1, -1, "ssSSCTreRoutingSupported", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * qsig_cmn_FeatureIdList_bits[] = { + &hf_qsig_cmn_FeatureIdList_reserved, + &hf_qsig_cmn_FeatureIdList_ssCFreRoutingSupported, + &hf_qsig_cmn_FeatureIdList_ssCTreRoutingSupported, + &hf_qsig_cmn_FeatureIdList_ssCCBSpossible, + &hf_qsig_cmn_FeatureIdList_ssCCNRpossible, + &hf_qsig_cmn_FeatureIdList_ssCOsupported, + &hf_qsig_cmn_FeatureIdList_ssCIforcedRelease, + &hf_qsig_cmn_FeatureIdList_ssCIisolation, + &hf_qsig_cmn_FeatureIdList_ssCIwaitOnBusy, + &hf_qsig_cmn_FeatureIdList_ssAOCsupportChargeRateProvAtGatewPinx, + &hf_qsig_cmn_FeatureIdList_ssAOCsupportInterimChargeProvAtGatewPinx, + &hf_qsig_cmn_FeatureIdList_ssAOCsupportFinalChargeProvAtGatewPinx, + &hf_qsig_cmn_FeatureIdList_anfPRsupportedAtCooperatingPinx, + &hf_qsig_cmn_FeatureIdList_anfCINTcanInterceptImmediate, + &hf_qsig_cmn_FeatureIdList_anfCINTcanInterceptDelayed, + &hf_qsig_cmn_FeatureIdList_anfWTMIreRoutingSupported, + &hf_qsig_cmn_FeatureIdList_anfPUMIreRoutingSupported, + &hf_qsig_cmn_FeatureIdList_ssSSCTreRoutingSupported, + NULL }; static int dissect_qsig_cmn_FeatureIdList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - qsig_cmn_FeatureIdList_bits, hf_index, ett_qsig_cmn_FeatureIdList, + qsig_cmn_FeatureIdList_bits, 18, hf_index, ett_qsig_cmn_FeatureIdList, NULL); return offset; @@ -9912,20 +9924,22 @@ dissect_qsig_sms_SmSubmitParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const asn_namedbit qsig_sms_SmscControlParameterHeader_bits[] = { - { 0, &hf_qsig_sms_SmscControlParameterHeader_sRforTransactionCompleted, -1, -1, "sRforTransactionCompleted", NULL }, - { 1, &hf_qsig_sms_SmscControlParameterHeader_sRforPermanentError, -1, -1, "sRforPermanentError", NULL }, - { 2, &hf_qsig_sms_SmscControlParameterHeader_sRforTempErrorSCnotTrying, -1, -1, "sRforTempErrorSCnotTrying", NULL }, - { 3, &hf_qsig_sms_SmscControlParameterHeader_sRforTempErrorSCstillTrying, -1, -1, "sRforTempErrorSCstillTrying", NULL }, - { 6, &hf_qsig_sms_SmscControlParameterHeader_cancelSRRforConcatenatedSM, -1, -1, "cancelSRRforConcatenatedSM", NULL }, - { 7, &hf_qsig_sms_SmscControlParameterHeader_includeOrigUDHintoSR, -1, -1, "includeOrigUDHintoSR", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * qsig_sms_SmscControlParameterHeader_bits[] = { + &hf_qsig_sms_SmscControlParameterHeader_sRforTransactionCompleted, + &hf_qsig_sms_SmscControlParameterHeader_sRforPermanentError, + &hf_qsig_sms_SmscControlParameterHeader_sRforTempErrorSCnotTrying, + &hf_qsig_sms_SmscControlParameterHeader_sRforTempErrorSCstillTrying, + &hf_qsig_sms_SmscControlParameterHeader_spare_bit_4, + &hf_qsig_sms_SmscControlParameterHeader_spare_bit_5, + &hf_qsig_sms_SmscControlParameterHeader_cancelSRRforConcatenatedSM, + &hf_qsig_sms_SmscControlParameterHeader_includeOrigUDHintoSR, + NULL }; static int dissect_qsig_sms_SmscControlParameterHeader(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - qsig_sms_SmscControlParameterHeader_bits, hf_index, ett_qsig_sms_SmscControlParameterHeader, + qsig_sms_SmscControlParameterHeader_bits, 8, hf_index, ett_qsig_sms_SmscControlParameterHeader, NULL); return offset; @@ -13524,6 +13538,10 @@ void proto_register_qsig(void) { { "extendedServiceList", "qsig.dnd.extendedServiceList_element", FT_NONE, BASE_NONE, NULL, 0, "T_extendedServiceList_01", HFILL }}, + { &hf_qsig_dnd_ServiceList_spare_bit_0, + { "spare_bit_0", "qsig.dnd.spare_bit_0", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, { &hf_qsig_dnd_ServiceList_dndo_low, { "dndo-low", "qsig.dnd.dndo-low", FT_BOOLEAN, 8, NULL, 0x40, @@ -13623,6 +13641,22 @@ void proto_register_qsig(void) { { "resultExtension", "qsig.ci.resultExtension", FT_UINT32, BASE_DEC, VALS(qsig_ci_T_resultExtension_01_vals), 0, "T_resultExtension_01", HFILL }}, + { &hf_qsig_ci_ServiceList_spare_bit_0, + { "spare_bit_0", "qsig.ci.spare_bit_0", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_qsig_ci_ServiceList_spare_bit_1, + { "spare_bit_1", "qsig.ci.spare_bit_1", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_qsig_ci_ServiceList_spare_bit_2, + { "spare_bit_2", "qsig.ci.spare_bit_2", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_qsig_ci_ServiceList_spare_bit_3, + { "spare_bit_3", "qsig.ci.spare_bit_3", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, { &hf_qsig_ci_ServiceList_ci_low, { "ci-low", "qsig.ci.ci-low", FT_BOOLEAN, 8, NULL, 0x08, @@ -15440,6 +15474,14 @@ void proto_register_qsig(void) { { "sRforTempErrorSCstillTrying", "qsig.sms.sRforTempErrorSCstillTrying", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, + { &hf_qsig_sms_SmscControlParameterHeader_spare_bit_4, + { "spare_bit_4", "qsig.sms.spare_bit_4", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, + { &hf_qsig_sms_SmscControlParameterHeader_spare_bit_5, + { "spare_bit_5", "qsig.sms.spare_bit_5", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, { &hf_qsig_sms_SmscControlParameterHeader_cancelSRRforConcatenatedSM, { "cancelSRRforConcatenatedSM", "qsig.sms.cancelSRRforConcatenatedSM", FT_BOOLEAN, 8, NULL, 0x02, diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c index e4e63d88b4..54404dc97e 100644 --- a/epan/dissectors/packet-rrlp.c +++ b/epan/dissectors/packet-rrlp.c @@ -847,6 +847,7 @@ static int hf_rrlp_GPSAssistance_ephemerisExtension = -1; static int hf_rrlp_GPSAssistance_ephemerisExtensionCheck = -1; static int hf_rrlp_CommonGANSSAssistance_referenceTime = -1; static int hf_rrlp_CommonGANSSAssistance_referenceLocation = -1; +static int hf_rrlp_CommonGANSSAssistance_spare_bit_2 = -1; static int hf_rrlp_CommonGANSSAssistance_ionosphericModel = -1; static int hf_rrlp_CommonGANSSAssistance_addIonosphericModel = -1; static int hf_rrlp_CommonGANSSAssistance_earthOrientationParam = -1; @@ -10297,6 +10298,10 @@ void proto_register_rrlp(void) { { "referenceLocation", "rrlp.referenceLocation", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, + { &hf_rrlp_CommonGANSSAssistance_spare_bit_2, + { "spare_bit_2", "rrlp.spare_bit_2", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, { &hf_rrlp_CommonGANSSAssistance_ionosphericModel, { "ionosphericModel", "rrlp.ionosphericModel", FT_BOOLEAN, 8, NULL, 0x10, diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index 30cbb86f5e..0f801fe3b3 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -658,7 +658,7 @@ dissect_rtse_AbortReason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_rtse_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index 6bd86695fd..6ddec3262d 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -215,21 +215,21 @@ dissect_spnego_MechTypeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of } -static const asn_namedbit ContextFlags_bits[] = { - { 0, &hf_spnego_ContextFlags_delegFlag, -1, -1, "delegFlag", NULL }, - { 1, &hf_spnego_ContextFlags_mutualFlag, -1, -1, "mutualFlag", NULL }, - { 2, &hf_spnego_ContextFlags_replayFlag, -1, -1, "replayFlag", NULL }, - { 3, &hf_spnego_ContextFlags_sequenceFlag, -1, -1, "sequenceFlag", NULL }, - { 4, &hf_spnego_ContextFlags_anonFlag, -1, -1, "anonFlag", NULL }, - { 5, &hf_spnego_ContextFlags_confFlag, -1, -1, "confFlag", NULL }, - { 6, &hf_spnego_ContextFlags_integFlag, -1, -1, "integFlag", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * ContextFlags_bits[] = { + &hf_spnego_ContextFlags_delegFlag, + &hf_spnego_ContextFlags_mutualFlag, + &hf_spnego_ContextFlags_replayFlag, + &hf_spnego_ContextFlags_sequenceFlag, + &hf_spnego_ContextFlags_anonFlag, + &hf_spnego_ContextFlags_confFlag, + &hf_spnego_ContextFlags_integFlag, + NULL }; static int dissect_spnego_ContextFlags(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - ContextFlags_bits, hf_index, ett_spnego_ContextFlags, + ContextFlags_bits, 7, hf_index, ett_spnego_ContextFlags, NULL); return offset; diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index fb8d2e7673..2f6a69345e 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -1018,15 +1018,15 @@ dissect_tcap_TCMessage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const asn_namedbit AUDT_protocol_version_bits[] = { - { 0, &hf_tcap_AUDT_protocol_version_version1, -1, -1, "version1", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * AUDT_protocol_version_bits[] = { + &hf_tcap_AUDT_protocol_version_version1, + NULL }; static int dissect_tcap_AUDT_protocol_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_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - AUDT_protocol_version_bits, hf_index, ett_tcap_AUDT_protocol_version, + AUDT_protocol_version_bits, 1, hf_index, ett_tcap_AUDT_protocol_version, NULL); return offset; @@ -1118,15 +1118,15 @@ dissect_tcap_UniDialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of } -static const asn_namedbit AARQ_protocol_version_bits[] = { - { 0, &hf_tcap_AARQ_protocol_version_version1, -1, -1, "version1", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * AARQ_protocol_version_bits[] = { + &hf_tcap_AARQ_protocol_version_version1, + NULL }; static int dissect_tcap_AARQ_protocol_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_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - AARQ_protocol_version_bits, hf_index, ett_tcap_AARQ_protocol_version, + AARQ_protocol_version_bits, 1, hf_index, ett_tcap_AARQ_protocol_version, NULL); return offset; @@ -1189,15 +1189,15 @@ dissect_tcap_AARQ_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const asn_namedbit AARE_protocol_version_bits[] = { - { 0, &hf_tcap_AARE_protocol_version_version1, -1, -1, "version1", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * AARE_protocol_version_bits[] = { + &hf_tcap_AARE_protocol_version_version1, + NULL }; static int dissect_tcap_AARE_protocol_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_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - AARE_protocol_version_bits, hf_index, ett_tcap_AARE_protocol_version, + AARE_protocol_version_bits, 1, hf_index, ett_tcap_AARE_protocol_version, NULL); return offset; diff --git a/epan/dissectors/packet-tcg-cp-oids.c b/epan/dissectors/packet-tcg-cp-oids.c index b7cee4a9a8..0a55dab77f 100644 --- a/epan/dissectors/packet-tcg-cp-oids.c +++ b/epan/dissectors/packet-tcg-cp-oids.c @@ -366,7 +366,7 @@ dissect_tcg_cp_oids_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb _ static int dissect_tcg_cp_oids_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index e3cc317b58..e9674fa9d4 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -348,7 +348,7 @@ dissect_x509af_T_subjectPublicKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, tvbuff_t *bs_tvb = NULL; dissect_ber_bitstring(FALSE, actx, NULL, tvb, offset, - NULL, -1, -1, &bs_tvb); + NULL, 0, -1, -1, &bs_tvb); /* See RFC 3279 for possible subjectPublicKey values given an Algorithm ID. * The contents of subjectPublicKey are always explicitly tagged. */ @@ -357,7 +357,7 @@ dissect_x509af_T_subjectPublicKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } else { offset = dissect_ber_bitstring(FALSE, actx, tree, tvb, offset, - NULL, hf_index, -1, NULL); + NULL, 0, hf_index, -1, NULL); } @@ -492,7 +492,7 @@ dissect_x509af_T_signedCertificate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_x509af_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index d49b16c7bd..8f0e5caee5 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -511,23 +511,23 @@ dissect_x509ce_SubjectKeyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ } -static const asn_namedbit KeyUsage_bits[] = { - { 0, &hf_x509ce_KeyUsage_digitalSignature, -1, -1, "digitalSignature", NULL }, - { 1, &hf_x509ce_KeyUsage_contentCommitment, -1, -1, "contentCommitment", NULL }, - { 2, &hf_x509ce_KeyUsage_keyEncipherment, -1, -1, "keyEncipherment", NULL }, - { 3, &hf_x509ce_KeyUsage_dataEncipherment, -1, -1, "dataEncipherment", NULL }, - { 4, &hf_x509ce_KeyUsage_keyAgreement, -1, -1, "keyAgreement", NULL }, - { 5, &hf_x509ce_KeyUsage_keyCertSign, -1, -1, "keyCertSign", NULL }, - { 6, &hf_x509ce_KeyUsage_cRLSign, -1, -1, "cRLSign", NULL }, - { 7, &hf_x509ce_KeyUsage_encipherOnly, -1, -1, "encipherOnly", NULL }, - { 8, &hf_x509ce_KeyUsage_decipherOnly, -1, -1, "decipherOnly", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * KeyUsage_bits[] = { + &hf_x509ce_KeyUsage_digitalSignature, + &hf_x509ce_KeyUsage_contentCommitment, + &hf_x509ce_KeyUsage_keyEncipherment, + &hf_x509ce_KeyUsage_dataEncipherment, + &hf_x509ce_KeyUsage_keyAgreement, + &hf_x509ce_KeyUsage_keyCertSign, + &hf_x509ce_KeyUsage_cRLSign, + &hf_x509ce_KeyUsage_encipherOnly, + &hf_x509ce_KeyUsage_decipherOnly, + NULL }; int dissect_x509ce_KeyUsage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - KeyUsage_bits, hf_index, ett_x509ce_KeyUsage, + KeyUsage_bits, 9, hf_index, ett_x509ce_KeyUsage, NULL); return offset; @@ -885,40 +885,40 @@ dissect_x509ce_DistributionPointName(gboolean implicit_tag _U_, tvbuff_t *tvb _U } -static const asn_namedbit OnlyCertificateTypes_bits[] = { - { 0, &hf_x509ce_OnlyCertificateTypes_user, -1, -1, "user", NULL }, - { 1, &hf_x509ce_OnlyCertificateTypes_authority, -1, -1, "authority", NULL }, - { 2, &hf_x509ce_OnlyCertificateTypes_attribute, -1, -1, "attribute", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * OnlyCertificateTypes_bits[] = { + &hf_x509ce_OnlyCertificateTypes_user, + &hf_x509ce_OnlyCertificateTypes_authority, + &hf_x509ce_OnlyCertificateTypes_attribute, + NULL }; int dissect_x509ce_OnlyCertificateTypes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - OnlyCertificateTypes_bits, hf_index, ett_x509ce_OnlyCertificateTypes, + OnlyCertificateTypes_bits, 3, hf_index, ett_x509ce_OnlyCertificateTypes, NULL); return offset; } -static const asn_namedbit ReasonFlags_bits[] = { - { 0, &hf_x509ce_ReasonFlags_unused, -1, -1, "unused", NULL }, - { 1, &hf_x509ce_ReasonFlags_keyCompromise, -1, -1, "keyCompromise", NULL }, - { 2, &hf_x509ce_ReasonFlags_cACompromise, -1, -1, "cACompromise", NULL }, - { 3, &hf_x509ce_ReasonFlags_affiliationChanged, -1, -1, "affiliationChanged", NULL }, - { 4, &hf_x509ce_ReasonFlags_superseded, -1, -1, "superseded", NULL }, - { 5, &hf_x509ce_ReasonFlags_cessationOfOperation, -1, -1, "cessationOfOperation", NULL }, - { 6, &hf_x509ce_ReasonFlags_certificateHold, -1, -1, "certificateHold", NULL }, - { 7, &hf_x509ce_ReasonFlags_privilegeWithdrawn, -1, -1, "privilegeWithdrawn", NULL }, - { 8, &hf_x509ce_ReasonFlags_aACompromise, -1, -1, "aACompromise", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * ReasonFlags_bits[] = { + &hf_x509ce_ReasonFlags_unused, + &hf_x509ce_ReasonFlags_keyCompromise, + &hf_x509ce_ReasonFlags_cACompromise, + &hf_x509ce_ReasonFlags_affiliationChanged, + &hf_x509ce_ReasonFlags_superseded, + &hf_x509ce_ReasonFlags_cessationOfOperation, + &hf_x509ce_ReasonFlags_certificateHold, + &hf_x509ce_ReasonFlags_privilegeWithdrawn, + &hf_x509ce_ReasonFlags_aACompromise, + NULL }; int dissect_x509ce_ReasonFlags(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - ReasonFlags_bits, hf_index, ett_x509ce_ReasonFlags, + ReasonFlags_bits, 9, hf_index, ett_x509ce_ReasonFlags, NULL); return offset; @@ -1589,20 +1589,20 @@ dissect_x509ce_GeneralString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o } -static const asn_namedbit EntrustInfoFlags_bits[] = { - { 0, &hf_x509ce_EntrustInfoFlags_keyUpdateAllowed, -1, -1, "keyUpdateAllowed", NULL }, - { 1, &hf_x509ce_EntrustInfoFlags_newExtensions, -1, -1, "newExtensions", NULL }, - { 2, &hf_x509ce_EntrustInfoFlags_pKIXCertificate, -1, -1, "pKIXCertificate", NULL }, - { 3, &hf_x509ce_EntrustInfoFlags_enterpriseCategory, -1, -1, "enterpriseCategory", NULL }, - { 4, &hf_x509ce_EntrustInfoFlags_webCategory, -1, -1, "webCategory", NULL }, - { 5, &hf_x509ce_EntrustInfoFlags_sETCategory, -1, -1, "sETCategory", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * EntrustInfoFlags_bits[] = { + &hf_x509ce_EntrustInfoFlags_keyUpdateAllowed, + &hf_x509ce_EntrustInfoFlags_newExtensions, + &hf_x509ce_EntrustInfoFlags_pKIXCertificate, + &hf_x509ce_EntrustInfoFlags_enterpriseCategory, + &hf_x509ce_EntrustInfoFlags_webCategory, + &hf_x509ce_EntrustInfoFlags_sETCategory, + NULL }; static int dissect_x509ce_EntrustInfoFlags(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - EntrustInfoFlags_bits, hf_index, ett_x509ce_EntrustInfoFlags, + EntrustInfoFlags_bits, 6, hf_index, ett_x509ce_EntrustInfoFlags, NULL); return offset; @@ -1643,7 +1643,7 @@ dissect_x509ce_ScramblerCapabilities(gboolean implicit_tag _U_, tvbuff_t *tvb _U int dissect_x509ce_CiplusInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index c449c058c4..10639033c2 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -1900,17 +1900,17 @@ dissect_x509if_SEQUENCE_SIZE_1_MAX_OF_AttributeType(gboolean implicit_tag _U_, t } -static const asn_namedbit AllowedSubset_bits[] = { - { 0, &hf_x509if_AllowedSubset_baseObject, -1, -1, "baseObject", NULL }, - { 1, &hf_x509if_AllowedSubset_oneLevel, -1, -1, "oneLevel", NULL }, - { 2, &hf_x509if_AllowedSubset_wholeSubtree, -1, -1, "wholeSubtree", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * AllowedSubset_bits[] = { + &hf_x509if_AllowedSubset_baseObject, + &hf_x509if_AllowedSubset_oneLevel, + &hf_x509if_AllowedSubset_wholeSubtree, + NULL }; int dissect_x509if_AllowedSubset(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - AllowedSubset_bits, hf_index, ett_x509if_AllowedSubset, + AllowedSubset_bits, 3, hf_index, ett_x509if_AllowedSubset, NULL); return offset; diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index fa859c6537..e85046bb14 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -362,7 +362,7 @@ dissect_x509sat_DirectoryString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in int dissect_x509sat_UniqueIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -961,21 +961,21 @@ dissect_x509sat_T_intDay(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse } -static const asn_namedbit T_bitDay_bits[] = { - { 0, &hf_x509sat_T_bitDay_sunday, -1, -1, "sunday", NULL }, - { 1, &hf_x509sat_T_bitDay_monday, -1, -1, "monday", NULL }, - { 2, &hf_x509sat_T_bitDay_tuesday, -1, -1, "tuesday", NULL }, - { 3, &hf_x509sat_T_bitDay_wednesday, -1, -1, "wednesday", NULL }, - { 4, &hf_x509sat_T_bitDay_thursday, -1, -1, "thursday", NULL }, - { 5, &hf_x509sat_T_bitDay_friday, -1, -1, "friday", NULL }, - { 6, &hf_x509sat_T_bitDay_saturday, -1, -1, "saturday", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_bitDay_bits[] = { + &hf_x509sat_T_bitDay_sunday, + &hf_x509sat_T_bitDay_monday, + &hf_x509sat_T_bitDay_tuesday, + &hf_x509sat_T_bitDay_wednesday, + &hf_x509sat_T_bitDay_thursday, + &hf_x509sat_T_bitDay_friday, + &hf_x509sat_T_bitDay_saturday, + NULL }; static int dissect_x509sat_T_bitDay(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_bitDay_bits, hf_index, ett_x509sat_T_bitDay, + T_bitDay_bits, 7, hf_index, ett_x509sat_T_bitDay, NULL); return offset; @@ -1003,21 +1003,21 @@ dissect_x509sat_T_intNamedDays(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const asn_namedbit T_bitNamedDays_bits[] = { - { 0, &hf_x509sat_T_bitNamedDays_sunday, -1, -1, "sunday", NULL }, - { 1, &hf_x509sat_T_bitNamedDays_monday, -1, -1, "monday", NULL }, - { 2, &hf_x509sat_T_bitNamedDays_tuesday, -1, -1, "tuesday", NULL }, - { 3, &hf_x509sat_T_bitNamedDays_wednesday, -1, -1, "wednesday", NULL }, - { 4, &hf_x509sat_T_bitNamedDays_thursday, -1, -1, "thursday", NULL }, - { 5, &hf_x509sat_T_bitNamedDays_friday, -1, -1, "friday", NULL }, - { 6, &hf_x509sat_T_bitNamedDays_saturday, -1, -1, "saturday", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_bitNamedDays_bits[] = { + &hf_x509sat_T_bitNamedDays_sunday, + &hf_x509sat_T_bitNamedDays_monday, + &hf_x509sat_T_bitNamedDays_tuesday, + &hf_x509sat_T_bitNamedDays_wednesday, + &hf_x509sat_T_bitNamedDays_thursday, + &hf_x509sat_T_bitNamedDays_friday, + &hf_x509sat_T_bitNamedDays_saturday, + NULL }; static int dissect_x509sat_T_bitNamedDays(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_bitNamedDays_bits, hf_index, ett_x509sat_T_bitNamedDays, + T_bitNamedDays_bits, 7, hf_index, ett_x509sat_T_bitNamedDays, NULL); return offset; @@ -1120,19 +1120,19 @@ dissect_x509sat_T_intWeek(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs } -static const asn_namedbit T_bitWeek_bits[] = { - { 0, &hf_x509sat_T_bitWeek_week1, -1, -1, "week1", NULL }, - { 1, &hf_x509sat_T_bitWeek_week2, -1, -1, "week2", NULL }, - { 2, &hf_x509sat_T_bitWeek_week3, -1, -1, "week3", NULL }, - { 3, &hf_x509sat_T_bitWeek_week4, -1, -1, "week4", NULL }, - { 4, &hf_x509sat_T_bitWeek_week5, -1, -1, "week5", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_bitWeek_bits[] = { + &hf_x509sat_T_bitWeek_week1, + &hf_x509sat_T_bitWeek_week2, + &hf_x509sat_T_bitWeek_week3, + &hf_x509sat_T_bitWeek_week4, + &hf_x509sat_T_bitWeek_week5, + NULL }; static int dissect_x509sat_T_bitWeek(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_bitWeek_bits, hf_index, ett_x509sat_T_bitWeek, + T_bitWeek_bits, 5, hf_index, ett_x509sat_T_bitWeek, NULL); return offset; @@ -1176,26 +1176,26 @@ dissect_x509sat_T_intMonth(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off } -static const asn_namedbit T_bitMonth_bits[] = { - { 0, &hf_x509sat_T_bitMonth_january, -1, -1, "january", NULL }, - { 1, &hf_x509sat_T_bitMonth_february, -1, -1, "february", NULL }, - { 2, &hf_x509sat_T_bitMonth_march, -1, -1, "march", NULL }, - { 3, &hf_x509sat_T_bitMonth_april, -1, -1, "april", NULL }, - { 4, &hf_x509sat_T_bitMonth_may, -1, -1, "may", NULL }, - { 5, &hf_x509sat_T_bitMonth_june, -1, -1, "june", NULL }, - { 6, &hf_x509sat_T_bitMonth_july, -1, -1, "july", NULL }, - { 7, &hf_x509sat_T_bitMonth_august, -1, -1, "august", NULL }, - { 8, &hf_x509sat_T_bitMonth_september, -1, -1, "september", NULL }, - { 9, &hf_x509sat_T_bitMonth_october, -1, -1, "october", NULL }, - { 10, &hf_x509sat_T_bitMonth_november, -1, -1, "november", NULL }, - { 11, &hf_x509sat_T_bitMonth_december, -1, -1, "december", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_bitMonth_bits[] = { + &hf_x509sat_T_bitMonth_january, + &hf_x509sat_T_bitMonth_february, + &hf_x509sat_T_bitMonth_march, + &hf_x509sat_T_bitMonth_april, + &hf_x509sat_T_bitMonth_may, + &hf_x509sat_T_bitMonth_june, + &hf_x509sat_T_bitMonth_july, + &hf_x509sat_T_bitMonth_august, + &hf_x509sat_T_bitMonth_september, + &hf_x509sat_T_bitMonth_october, + &hf_x509sat_T_bitMonth_november, + &hf_x509sat_T_bitMonth_december, + NULL }; static int dissect_x509sat_T_bitMonth(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_bitMonth_bits, hf_index, ett_x509sat_T_bitMonth, + T_bitMonth_bits, 12, hf_index, ett_x509sat_T_bitMonth, NULL); return offset; @@ -1412,7 +1412,7 @@ dissect_x509sat_OctetString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_x509sat_BitString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; diff --git a/epan/dissectors/packet-xnap.c b/epan/dissectors/packet-xnap.c index 0480471a8b..1e2831ec9c 100644 --- a/epan/dissectors/packet-xnap.c +++ b/epan/dissectors/packet-xnap.c @@ -980,15 +980,19 @@ static int hf_xnap_T_interfaces_to_trace_x_nc = -1; static int hf_xnap_T_interfaces_to_trace_uu = -1; static int hf_xnap_T_interfaces_to_trace_f1_c = -1; static int hf_xnap_T_interfaces_to_trace_e1 = -1; +static int hf_xnap_T_nr_EncyptionAlgorithms_spare_bit_0 = -1; static int hf_xnap_T_nr_EncyptionAlgorithms_nea1_128 = -1; static int hf_xnap_T_nr_EncyptionAlgorithms_nea2_128 = -1; static int hf_xnap_T_nr_EncyptionAlgorithms_nea3_128 = -1; +static int hf_xnap_T_nr_IntegrityProtectionAlgorithms_spare_bit_0 = -1; static int hf_xnap_T_nr_IntegrityProtectionAlgorithms_nia1_128 = -1; static int hf_xnap_T_nr_IntegrityProtectionAlgorithms_nia2_128 = -1; static int hf_xnap_T_nr_IntegrityProtectionAlgorithms_nia3_128 = -1; +static int hf_xnap_T_e_utra_EncyptionAlgorithms_spare_bit_0 = -1; static int hf_xnap_T_e_utra_EncyptionAlgorithms_eea1_128 = -1; static int hf_xnap_T_e_utra_EncyptionAlgorithms_eea2_128 = -1; static int hf_xnap_T_e_utra_EncyptionAlgorithms_eea3_128 = -1; +static int hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_spare_bit_0 = -1; static int hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_eia1_128 = -1; static int hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_eia2_128 = -1; static int hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_eia3_128 = -1; @@ -15124,6 +15128,10 @@ void proto_register_xnap(void) { { "e1", "xnap.e1", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, + { &hf_xnap_T_nr_EncyptionAlgorithms_spare_bit_0, + { "spare_bit_0", "xnap.spare_bit_0", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, { &hf_xnap_T_nr_EncyptionAlgorithms_nea1_128, { "nea1-128", "xnap.nea1-128", FT_BOOLEAN, 8, NULL, 0x40, @@ -15136,6 +15144,10 @@ void proto_register_xnap(void) { { "nea3-128", "xnap.nea3-128", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, + { &hf_xnap_T_nr_IntegrityProtectionAlgorithms_spare_bit_0, + { "spare_bit_0", "xnap.spare_bit_0", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, { &hf_xnap_T_nr_IntegrityProtectionAlgorithms_nia1_128, { "nia1-128", "xnap.nia1-128", FT_BOOLEAN, 8, NULL, 0x40, @@ -15148,6 +15160,10 @@ void proto_register_xnap(void) { { "nia3-128", "xnap.nia3-128", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, + { &hf_xnap_T_e_utra_EncyptionAlgorithms_spare_bit_0, + { "spare_bit_0", "xnap.spare_bit_0", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, { &hf_xnap_T_e_utra_EncyptionAlgorithms_eea1_128, { "eea1-128", "xnap.eea1-128", FT_BOOLEAN, 8, NULL, 0x40, @@ -15160,6 +15176,10 @@ void proto_register_xnap(void) { { "eea3-128", "xnap.eea3-128", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, + { &hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_spare_bit_0, + { "spare_bit_0", "xnap.spare_bit_0", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, { &hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_eia1_128, { "eia1-128", "xnap.eia1-128", FT_BOOLEAN, 8, NULL, 0x40, diff --git a/epan/dissectors/packet-z3950.c b/epan/dissectors/packet-z3950.c index 064fd88a2d..9c5cdd79ef 100644 --- a/epan/dissectors/packet-z3950.c +++ b/epan/dissectors/packet-z3950.c @@ -1506,6 +1506,7 @@ static int hf_z3950_Options_U_resourceCtrl = -1; static int hf_z3950_Options_U_accessCtrl = -1; static int hf_z3950_Options_U_scan = -1; static int hf_z3950_Options_U_sort = -1; +static int hf_z3950_Options_U_spare_bit_9 = -1; static int hf_z3950_Options_U_extendedServices = -1; static int hf_z3950_Options_U_level_1Segmentation = -1; static int hf_z3950_Options_U_level_2Segmentation = -1; @@ -2116,17 +2117,17 @@ dissect_z3950_ReferenceId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs } -static const asn_namedbit ProtocolVersion_U_bits[] = { - { 0, &hf_z3950_ProtocolVersion_U_version_1, -1, -1, "version-1", NULL }, - { 1, &hf_z3950_ProtocolVersion_U_version_2, -1, -1, "version-2", NULL }, - { 2, &hf_z3950_ProtocolVersion_U_version_3, -1, -1, "version-3", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * ProtocolVersion_U_bits[] = { + &hf_z3950_ProtocolVersion_U_version_1, + &hf_z3950_ProtocolVersion_U_version_2, + &hf_z3950_ProtocolVersion_U_version_3, + NULL }; static int dissect_z3950_ProtocolVersion_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - ProtocolVersion_U_bits, hf_index, ett_z3950_ProtocolVersion_U, + ProtocolVersion_U_bits, 3, hf_index, ett_z3950_ProtocolVersion_U, NULL); return offset; @@ -2143,28 +2144,29 @@ dissect_z3950_ProtocolVersion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const asn_namedbit Options_U_bits[] = { - { 0, &hf_z3950_Options_U_search, -1, -1, "search", NULL }, - { 1, &hf_z3950_Options_U_present, -1, -1, "present", NULL }, - { 2, &hf_z3950_Options_U_delSet, -1, -1, "delSet", NULL }, - { 3, &hf_z3950_Options_U_resourceReport, -1, -1, "resourceReport", NULL }, - { 4, &hf_z3950_Options_U_triggerResourceCtrl, -1, -1, "triggerResourceCtrl", NULL }, - { 5, &hf_z3950_Options_U_resourceCtrl, -1, -1, "resourceCtrl", NULL }, - { 6, &hf_z3950_Options_U_accessCtrl, -1, -1, "accessCtrl", NULL }, - { 7, &hf_z3950_Options_U_scan, -1, -1, "scan", NULL }, - { 8, &hf_z3950_Options_U_sort, -1, -1, "sort", NULL }, - { 10, &hf_z3950_Options_U_extendedServices, -1, -1, "extendedServices", NULL }, - { 11, &hf_z3950_Options_U_level_1Segmentation, -1, -1, "level-1Segmentation", NULL }, - { 12, &hf_z3950_Options_U_level_2Segmentation, -1, -1, "level-2Segmentation", NULL }, - { 13, &hf_z3950_Options_U_concurrentOperations, -1, -1, "concurrentOperations", NULL }, - { 14, &hf_z3950_Options_U_namedResultSets, -1, -1, "namedResultSets", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Options_U_bits[] = { + &hf_z3950_Options_U_search, + &hf_z3950_Options_U_present, + &hf_z3950_Options_U_delSet, + &hf_z3950_Options_U_resourceReport, + &hf_z3950_Options_U_triggerResourceCtrl, + &hf_z3950_Options_U_resourceCtrl, + &hf_z3950_Options_U_accessCtrl, + &hf_z3950_Options_U_scan, + &hf_z3950_Options_U_sort, + &hf_z3950_Options_U_spare_bit_9, + &hf_z3950_Options_U_extendedServices, + &hf_z3950_Options_U_level_1Segmentation, + &hf_z3950_Options_U_level_2Segmentation, + &hf_z3950_Options_U_concurrentOperations, + &hf_z3950_Options_U_namedResultSets, + NULL }; static int dissect_z3950_Options_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Options_U_bits, hf_index, ett_z3950_Options_U, + Options_U_bits, 15, hf_index, ett_z3950_Options_U, NULL); return offset; @@ -12067,6 +12069,10 @@ void proto_register_z3950(void) { { "sort", "z3950.sort", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, + { &hf_z3950_Options_U_spare_bit_9, + { "spare_bit_9", "z3950.spare_bit_9", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, { &hf_z3950_Options_U_extendedServices, { "extendedServices", "z3950.extendedServices", FT_BOOLEAN, 8, NULL, 0x20, diff --git a/tools/asn2wrs.py b/tools/asn2wrs.py index bc02a91df0..96226d5d80 100755 --- a/tools/asn2wrs.py +++ b/tools/asn2wrs.py @@ -1214,12 +1214,14 @@ class EthCtx: for t in self.eth_type_ord: bits = self.eth_type[t]['val'].eth_named_bits() if (bits): + old_val = 0 for (val, id) in bits: self.named_bit.append({'name' : id, 'val' : val, - 'ethname' : 'hf_%s_%s_%s' % (self.eproto, t, asn2c(id)), - 'ftype' : 'FT_BOOLEAN', 'display' : '8', - 'strings' : 'NULL', - 'bitmask' : '0x'+('80','40','20','10','08','04','02','01')[val%8]}) + 'ethname' : 'hf_%s_%s_%s' % (self.eproto, t, asn2c(id)), + 'ftype' : 'FT_BOOLEAN', 'display' : '8', + 'strings' : 'NULL', + 'bitmask' : '0x'+('80','40','20','10','08','04','02','01')[val%8]}) + old_val = val + 1 if self.eth_type[t]['val'].eth_need_tree(): self.eth_type[t]['tree'] = "ett_%s_%s" % (self.eth_type[t]['proto'], t) else: @@ -1461,10 +1463,10 @@ class EthCtx: def eth_bits(self, tname, bits): out = "" out += "static const " - out += "asn_namedbit %(TABLE)s[] = {\n" + out += "int * %(TABLE)s[] = {\n" for (val, id) in bits: - out += ' { %2d, &hf_%s_%s_%s, -1, -1, "%s", NULL },\n' % (val, self.eproto, tname, asn2c(id), id) - out += " { 0, NULL, 0, 0, NULL, NULL }\n};\n" + out += ' &hf_%s_%s_%s,\n' % (self.eproto, tname, asn2c(id)) + out += " NULL\n};\n" return out #--- eth_type_fn_h ---------------------------------------------------------- @@ -4071,7 +4073,7 @@ class SeqType (SqType): e.val.eth_reg(ident, ectx, tstrip=1, parent=ident) def eth_type_default_table(self, ectx, tname): - #print "eth_type_default_table(tname='%s')" % (tname) + #print ("eth_type_default_table(tname='%s')" % (tname)) fname = ectx.eth_type[tname]['ref'][0] table = "static const %(ER)s_sequence_t %(TABLE)s[] = {\n" if hasattr(self, 'ext_list'): @@ -5330,6 +5332,8 @@ class ObjectIdentifierValue (Value): class NamedNumber(Node): def to_python (self, ctx): return "('%s',%s)" % (self.ident, self.val) + def __lt__(self, other): + return int(self.val) < int(other.val) class NamedNumListBase(Node): def to_python (self, ctx): @@ -5494,7 +5498,7 @@ class BitStringType (Type): return ('BER_CLASS_UNI', 'BER_UNI_TAG_BITSTRING') def eth_ftype(self, ectx): - return ('FT_BYTES', 'BASE_NONE') + return ('FT_BYTES', 'BASE_NONE') def eth_need_tree(self): return self.named_list @@ -5508,11 +5512,24 @@ class BitStringType (Type): 'new' : ectx.default_containing_variant == '_pdu_new' } return pdu + def sortNamedBits(self): + return self.named_list.val + def eth_named_bits(self): bits = [] if (self.named_list): - for e in (self.named_list): + sorted_list = self.named_list + sorted_list.sort() + expected_bit_no = 0; + for e in (sorted_list): + # Fill the table with "spare_bit" for "un named bits" + if (int(e.val) != 0) and (expected_bit_no != int(e.val)): + while ( expected_bit_no < int(e.val)): + bits.append((expected_bit_no, ("spare_bit_%u" % (expected_bit_no)))) + expected_bit_no = expected_bit_no + 1 + #print ("Adding named bits to list %s bit no %d" % (e.ident, int (e.val))) bits.append((int(e.val), e.ident)) + expected_bit_no = int(e.val) + 1 return bits def eth_type_default_pars(self, ectx, tname): @@ -5543,7 +5560,7 @@ class BitStringType (Type): return pars def eth_type_default_table(self, ectx, tname): - #print "eth_type_default_table(tname='%s')" % (tname) + #print ("eth_type_default_table(tname='%s')" % (tname)) table = '' bits = self.eth_named_bits() if (bits and ectx.Ber()): @@ -5552,15 +5569,16 @@ class BitStringType (Type): def eth_type_default_body(self, ectx, tname): if (ectx.Ber()): + bits = self.eth_named_bits() if (ectx.constraints_check and self.HasSizeConstraint()): body = ectx.eth_fn_call('dissect_%(ER)s_constrained_bitstring', ret='offset', par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'), - ('%(MIN_VAL)s', '%(MAX_VAL)s', '%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',), + ('%(MIN_VAL)s', '%(MAX_VAL)s', '%(TABLE)s', '%s' % len(bits),'%(HF_INDEX)s', '%(ETT_INDEX)s',), ('%(VAL_PTR)s',),)) else: body = ectx.eth_fn_call('dissect_%(ER)s_bitstring', ret='offset', par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'), - ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',), + ('%(TABLE)s', '%s' % len(bits), '%(HF_INDEX)s', '%(ETT_INDEX)s',), ('%(VAL_PTR)s',),)) elif (ectx.Per() or ectx.Oer()): if self.HasContentsConstraint(): |