diff options
Diffstat (limited to 'epan/dissectors/packet-gsm_map.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_map.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 43a35cbf36..26edd39770 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -190,7 +190,7 @@ static int hf_gsm_map_subscriberDataStored = -1; /* AgeIndicator */ static int hf_gsm_map_imeisv = -1; /* IMEI */ static int hf_gsm_map_skipSubscriberDataUpdate = -1; /* NULL */ static int hf_gsm_map_PrivateExtensionList_item = -1; /* PrivateExtension */ -static int hf_gsm_map_extId = -1; /* OBJECT_IDENTIFIER */ +static int hf_gsm_map_extId = -1; /* T_extId */ static int hf_gsm_map_extType = -1; /* T_extType */ static int hf_gsm_map_privateExtensionList = -1; /* PrivateExtensionList */ static int hf_gsm_map_slr_Arg_PCS_Extensions = -1; /* SLR_Arg_PCS_Extensions */ @@ -2085,16 +2085,13 @@ static int dissect_operationLocalvalue(proto_tree *tree _U_, tvbuff_t *tvb _U_, static int dissect_gsm_map_OBJECT_IDENTIFIER(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_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &obj_id); + offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); return offset; } static int dissect_globalValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { return dissect_gsm_map_OBJECT_IDENTIFIER(FALSE, tvb, offset, actx, tree, hf_gsm_map_globalValue); } -static int dissect_extId(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_gsm_map_OBJECT_IDENTIFIER(FALSE, tvb, offset, actx, tree, hf_gsm_map_extId); -} static const value_string gsm_map_OPERATION_vals[] = { @@ -2996,6 +2993,18 @@ static int dissect_diagnosticInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o static int +dissect_gsm_map_T_extId(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_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &obj_id); + + return offset; +} +static int dissect_extId(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { + return dissect_gsm_map_T_extId(FALSE, tvb, offset, actx, tree, hf_gsm_map_extId); +} + + + +static int dissect_gsm_map_T_extType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 520 "gsmmap.cnf" @@ -17615,7 +17624,7 @@ void proto_register_gsm_map(void) { { &hf_gsm_map_extId, { "extId", "gsm_map.extId", FT_OID, BASE_NONE, NULL, 0, - "gsm_map.OBJECT_IDENTIFIER", HFILL }}, + "gsm_map.T_extId", HFILL }}, { &hf_gsm_map_extType, { "extType", "gsm_map.extType", FT_NONE, BASE_NONE, NULL, 0, |