forked from osmocom/wireshark
Fix some GSM MAP Warnings.
svn path=/trunk/; revision=22154
This commit is contained in:
Anders Broman
parent
7efcc33a1e
commit
83ffab00e2
|
|
@ -358,8 +358,6 @@ PrepareHO-ResOld ::= SEQUENCE {
|
|||
bss-APDU Bss-APDU OPTIONAL,
|
||||
... }
|
||||
|
||||
SendAuthenticationInfoArgOld ::= IMSI
|
||||
|
||||
SendAuthenticationInfoResOld ::= SEQUENCE ( SIZE( 1 .. 5 ) ) OF
|
||||
SEQUENCE {
|
||||
rand RAND,
|
||||
|
|
@ -445,10 +443,6 @@ CurrentPassword ::= NumericString (SIZE( 4 ) )
|
|||
--registerCC-Entry OPERATION
|
||||
-- ARGUMENT
|
||||
|
||||
|
||||
ServiceCentreAddress ::= OCTET STRING ( SIZE( 1 .. 20 ) )
|
||||
|
||||
|
||||
SecureTransportArg ::= SEQUENCE {
|
||||
securityHeader SecurityHeader,
|
||||
protectedPayload ProtectedPayload OPTIONAL
|
||||
|
|
|
|||
|
|
@ -110,8 +110,6 @@ VelocityEstimate
|
|||
MAP-DialoguePDU B "0.4.0.0.1.1.1.1" "map-DialogueAS"
|
||||
|
||||
# Conformance for ROS stuff
|
||||
#.PDU
|
||||
Component
|
||||
|
||||
#.FN_BODY InvokeParameter
|
||||
offset = dissect_invokeData(tree, tvb, offset, actx);
|
||||
|
|
|
|||
|
|
@ -71,11 +71,8 @@
|
|||
int proto_gsm_map = -1;
|
||||
int proto_gsm_map_dialogue = -1;
|
||||
|
||||
static int hf_gsm_map_SendAuthenticationInfoArg = -1;
|
||||
static int hf_gsm_map_SendAuthenticationInfoRes = -1;
|
||||
static int hf_gsm_mapSendEndSignal = -1;
|
||||
static int hf_gsm_old_Component_PDU = -1;
|
||||
static int hf_gsm_map_getPassword = -1;
|
||||
static int hf_gsm_map_CheckIMEIArg = -1;
|
||||
static int hf_gsm_map_currentPassword = -1;
|
||||
static int hf_gsm_map_extension = -1;
|
||||
static int hf_gsm_map_nature_of_number = -1;
|
||||
|
|
@ -878,7 +875,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
|
|||
offset=dissect_mc_message(tvb, offset, actx, tree,
|
||||
FALSE, dissect_gsm_map_Identity, hf_gsm_map_ms_identity,
|
||||
FALSE, dissect_gsm_map_Identity, hf_gsm_map_ms_identity,
|
||||
TRUE , dissect_gsm_map_ms_CancelLocationArg_U, -1);/*undefined*/
|
||||
TRUE , dissect_gsm_map_ms_CancelLocationArg, -1);/*undefined*/
|
||||
break;
|
||||
case 4: /*provideRoamingNumber*/
|
||||
offset=dissect_gsm_map_ch_ProvideRoamingNumberArg(FALSE, tvb, offset, actx, tree, -1);
|
||||
|
|
@ -967,7 +964,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
|
|||
offset=dissect_mc_message(tvb, offset, actx, tree,
|
||||
FALSE, NULL, -1,
|
||||
FALSE, dissect_gsm_old_Bss_APDU, -1,
|
||||
TRUE , dissect_gsm_map_ms_ProcessAccessSignalling_Arg_U, -1);
|
||||
TRUE , dissect_gsm_map_ms_ProcessAccessSignalling_Arg, -1);
|
||||
break;
|
||||
case 34: /*forwardAccessSignalling*/
|
||||
offset=dissect_mc_message(tvb, offset, actx, tree,
|
||||
|
|
@ -1084,7 +1081,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
|
|||
offset=dissect_mc_message(tvb, offset, actx, tree,
|
||||
FALSE, NULL, -1,
|
||||
FALSE, dissect_gsm_old_PrepareHO_ArgOld, -1,
|
||||
TRUE, dissect_gsm_map_ms_PrepareHO_Arg_U, -1);
|
||||
TRUE, dissect_gsm_map_ms_PrepareHO_Arg, -1);
|
||||
break;
|
||||
case 69: /*prepareSubsequentHandover*/
|
||||
offset=dissect_mc_message(tvb, offset, actx, tree,
|
||||
|
|
@ -1440,8 +1437,10 @@ static int dissect_returnResultData(proto_tree *tree, tvbuff_t *tvb, int offset,
|
|||
offset=dissect_gsm_map_ms_NoteMM_EventRes(FALSE, tvb, offset, actx, tree, -1);
|
||||
break;
|
||||
case 109: /*SS-protocol lcs-PeriodicLocationCancellation*/
|
||||
/* No parameter */
|
||||
break;
|
||||
case 110: /*SS-protocol lcs-LocationUpdate*/
|
||||
offset=dissect_gsm_ss_LCS_LocationUpdateRes(FALSE, tvb, offset, actx, tree, -1);
|
||||
break;
|
||||
case 111: /*SS-protocol lcs-PeriodicLocationRequest*/
|
||||
offset=dissect_gsm_ss_LCS_PeriodicLocationRequestRes(FALSE, tvb, offset, actx, tree, -1);
|
||||
|
|
@ -2129,27 +2128,14 @@ void proto_register_gsm_map(void) {
|
|||
|
||||
/* List of fields */
|
||||
static hf_register_info hf[] = {
|
||||
|
||||
{ &hf_gsm_map_SendAuthenticationInfoArg,
|
||||
{ "SendAuthenticationInfoArg", "gsm_map.SendAuthenticationInfoArg",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"SendAuthenticationInfoArg", HFILL }},
|
||||
{ &hf_gsm_map_SendAuthenticationInfoRes,
|
||||
{ "SendAuthenticationInfoRes", "gsm_map.SendAuthenticationInfoRes",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"SendAuthenticationInfoRes", HFILL }},
|
||||
{ &hf_gsm_old_Component_PDU,
|
||||
{ "Component", "gsm_old.Component",
|
||||
FT_UINT32, BASE_DEC, VALS(gsm_old_Component_vals), 0,
|
||||
"gsm_old.Component", HFILL }},
|
||||
{ &hf_gsm_map_currentPassword,
|
||||
{ "currentPassword", "gsm_map.currentPassword",
|
||||
FT_STRING, BASE_NONE, NULL, 0,
|
||||
"", HFILL }},
|
||||
{ &hf_gsm_mapSendEndSignal,
|
||||
{ "mapSendEndSignalArg", "gsm_map.mapsendendsignalarg",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"mapSendEndSignalArg", HFILL }},
|
||||
{ &hf_gsm_map_CheckIMEIArg,
|
||||
{ "gsm_CheckIMEIArg", "gsm_map.CheckIMEIArg",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"gsm_CheckIMEIArg", HFILL }},
|
||||
{ &hf_gsm_map_extension,
|
||||
{ "Extension", "gsm_map.extension",
|
||||
FT_BOOLEAN, 8, TFS(&gsm_map_extension_value), 0x80,
|
||||
|
|
|
|||
|
|
@ -79,11 +79,8 @@
|
|||
int proto_gsm_map = -1;
|
||||
int proto_gsm_map_dialogue = -1;
|
||||
|
||||
static int hf_gsm_map_SendAuthenticationInfoArg = -1;
|
||||
static int hf_gsm_map_SendAuthenticationInfoRes = -1;
|
||||
static int hf_gsm_mapSendEndSignal = -1;
|
||||
static int hf_gsm_old_Component_PDU = -1;
|
||||
static int hf_gsm_map_getPassword = -1;
|
||||
static int hf_gsm_map_CheckIMEIArg = -1;
|
||||
static int hf_gsm_map_currentPassword = -1;
|
||||
static int hf_gsm_map_extension = -1;
|
||||
static int hf_gsm_map_nature_of_number = -1;
|
||||
|
|
@ -1202,7 +1199,6 @@ static int hf_gsm_map_dialogue_map_ProviderAbortReason = -1; /* MAP_ProviderAbo
|
|||
|
||||
/* --- Module DummyMAP --- --- --- */
|
||||
|
||||
static int hf_gsm_old_Component_PDU = -1; /* Component */
|
||||
static int hf_gsm_old_invoke = -1; /* Invoke */
|
||||
static int hf_gsm_old_returnResultLast = -1; /* ReturnResult */
|
||||
static int hf_gsm_old_returnError = -1; /* ReturnError */
|
||||
|
|
@ -1353,7 +1349,7 @@ static int hf_gsm_ss_areaEventInfo = -1; /* AreaEventInfo */
|
|||
static int hf_gsm_ss_qoS = -1; /* LCS_QoS */
|
||||
|
||||
/*--- End of included file: packet-gsm_map-hf.c ---*/
|
||||
#line 139 "packet-gsm_map-template.c"
|
||||
#line 136 "packet-gsm_map-template.c"
|
||||
|
||||
/* Initialize the subtree pointers */
|
||||
static gint ett_gsm_map = -1;
|
||||
|
|
@ -1928,7 +1924,7 @@ static gint ett_gsm_ss_LCS_PeriodicLocationCancellationArg = -1;
|
|||
|
||||
|
||||
/*--- End of included file: packet-gsm_map-ett.c ---*/
|
||||
#line 159 "packet-gsm_map-template.c"
|
||||
#line 156 "packet-gsm_map-template.c"
|
||||
|
||||
static dissector_table_t sms_dissector_table; /* SMS TPDU */
|
||||
static dissector_handle_t data_handle;
|
||||
|
|
@ -2494,7 +2490,7 @@ dissect_gsm_map_T_extId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
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 145 "gsmmap.cnf"
|
||||
#line 143 "gsmmap.cnf"
|
||||
proto_tree_add_text(tree, tvb, offset, -1, "Extension Data");
|
||||
if (obj_id){
|
||||
offset=call_ber_oid_callback(obj_id, tvb, offset, actx->pinfo, tree);
|
||||
|
|
@ -2609,7 +2605,7 @@ dissect_gsm_map_SLR_ArgExtensionContainer(gboolean implicit_tag _U_, tvbuff_t *t
|
|||
|
||||
static int
|
||||
dissect_gsm_map_TBCD_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_) {
|
||||
#line 184 "gsmmap.cnf"
|
||||
#line 182 "gsmmap.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
char *digit_str;
|
||||
|
||||
|
|
@ -2632,7 +2628,7 @@ dissect_gsm_map_TBCD_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
int
|
||||
dissect_gsm_map_AddressString(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 154 "gsmmap.cnf"
|
||||
#line 152 "gsmmap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
char *digit_str;
|
||||
|
|
@ -2719,7 +2715,7 @@ dissect_gsm_map_ProtocolId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_gsm_map_SignalInfo(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 256 "gsmmap.cnf"
|
||||
#line 254 "gsmmap.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
|
|
@ -2799,7 +2795,7 @@ dissect_gsm_map_AccessNetworkProtocolId(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_gsm_map_LongSignalInfo(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 203 "gsmmap.cnf"
|
||||
#line 201 "gsmmap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
guint8 octet;
|
||||
|
|
@ -3251,7 +3247,7 @@ dissect_gsm_map_CellGlobalIdOrServiceAreaIdFixedLength(gboolean implicit_tag _U_
|
|||
|
||||
int
|
||||
dissect_gsm_map_LAIFixedLength(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 471 "gsmmap.cnf"
|
||||
#line 469 "gsmmap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
proto_item *item;
|
||||
|
|
@ -3379,7 +3375,7 @@ dissect_gsm_map_EMLPP_Info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_gsm_map_Ext_SS_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_) {
|
||||
#line 309 "gsmmap.cnf"
|
||||
#line 307 "gsmmap.cnf"
|
||||
/* Note Ext-SS-Status can have more than one byte */
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
|
@ -3502,7 +3498,7 @@ dissect_gsm_map_ss_RegisterSS_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
int
|
||||
dissect_gsm_map_ss_SS_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_) {
|
||||
#line 289 "gsmmap.cnf"
|
||||
#line 287 "gsmmap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
guint8 octet;
|
||||
|
|
@ -3536,7 +3532,7 @@ dissect_gsm_map_ss_ForwardingOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
#line 374 "gsmmap.cnf"
|
||||
#line 372 "gsmmap.cnf"
|
||||
|
||||
proto_tree_add_item(tree, hf_gsm_map_notification_to_forwarding_party, tvb, 0,1,FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_redirecting_presentation, tvb, 0,1,FALSE);
|
||||
|
|
@ -3855,7 +3851,7 @@ dissect_gsm_map_ss_InterrogateSS_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
|
||||
int
|
||||
dissect_gsm_map_ss_USSD_DataCodingScheme(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 336 "gsmmap.cnf"
|
||||
#line 334 "gsmmap.cnf"
|
||||
/*The structure of the USSD-DataCodingScheme is defined by
|
||||
* the Cell Broadcast Data Coding Scheme as described in
|
||||
* TS 3GPP TS 23.038
|
||||
|
|
@ -3879,7 +3875,7 @@ dissect_gsm_map_ss_USSD_DataCodingScheme(gboolean implicit_tag _U_, tvbuff_t *tv
|
|||
|
||||
int
|
||||
dissect_gsm_map_ss_USSD_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_) {
|
||||
#line 349 "gsmmap.cnf"
|
||||
#line 347 "gsmmap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
int length;
|
||||
|
|
@ -5218,7 +5214,7 @@ dissect_gsm_map_sm_SM_RP_DA(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_gsm_map_sm_T_msisdn(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 252 "gsmmap.cnf"
|
||||
#line 250 "gsmmap.cnf"
|
||||
actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
||||
offset = dissect_gsm_map_ISDN_AddressString(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
|
|
@ -5232,7 +5228,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
|||
|
||||
static int
|
||||
dissect_gsm_map_sm_T_serviceCentreAddressOA(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 244 "gsmmap.cnf"
|
||||
#line 242 "gsmmap.cnf"
|
||||
actx->pinfo->p2p_dir = P2P_DIR_SENT;
|
||||
offset = dissect_gsm_map_AddressString(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
|
|
@ -5278,7 +5274,7 @@ static const ber_sequence_t MO_ForwardSM_Arg_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_map_sm_MO_ForwardSM_Arg(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 271 "gsmmap.cnf"
|
||||
#line 269 "gsmmap.cnf"
|
||||
|
||||
/* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
|
|
@ -5321,7 +5317,7 @@ static const ber_sequence_t MT_ForwardSM_Arg_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_map_sm_MT_ForwardSM_Arg(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 280 "gsmmap.cnf"
|
||||
#line 278 "gsmmap.cnf"
|
||||
|
||||
/* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
|
|
@ -6147,7 +6143,7 @@ dissect_gsm_map_ms_VLR_Capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
int
|
||||
dissect_gsm_map_ms_GSN_Address(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 431 "gsmmap.cnf"
|
||||
#line 429 "gsmmap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
guint8 octet;
|
||||
|
|
@ -6784,7 +6780,7 @@ dissect_gsm_map_ms_UpdateGprsLocationRes(gboolean implicit_tag _U_, tvbuff_t *tv
|
|||
|
||||
static int
|
||||
dissect_gsm_map_ms_IntegrityProtectionInformation(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 511 "gsmmap.cnf"
|
||||
#line 509 "gsmmap.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
|
|
@ -6807,7 +6803,7 @@ dissect_gsm_map_ms_IntegrityProtectionInformation(gboolean implicit_tag _U_, tvb
|
|||
|
||||
static int
|
||||
dissect_gsm_map_ms_EncryptionInformation(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 523 "gsmmap.cnf"
|
||||
#line 521 "gsmmap.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
|
|
@ -6892,7 +6888,7 @@ dissect_gsm_map_ms_AllowedUMTS_Algorithms(gboolean implicit_tag _U_, tvbuff_t *t
|
|||
|
||||
static int
|
||||
dissect_gsm_map_ms_RadioResourceInformation(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 485 "gsmmap.cnf"
|
||||
#line 483 "gsmmap.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
proto_item *item;
|
||||
proto_tree *subtree;
|
||||
|
|
@ -6965,7 +6961,7 @@ dissect_gsm_map_ms_BSSMAP_ServiceHandover(gboolean implicit_tag _U_, tvbuff_t *t
|
|||
|
||||
static int
|
||||
dissect_gsm_map_ms_RANAP_ServiceHandover(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 499 "gsmmap.cnf"
|
||||
#line 497 "gsmmap.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
|
|
@ -7699,7 +7695,7 @@ static int
|
|||
dissect_gsm_map_ms_T_forwardingOptions(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_gsm_map_ms_Ext_ForwOptions(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 380 "gsmmap.cnf"
|
||||
#line 378 "gsmmap.cnf"
|
||||
|
||||
proto_tree_add_item(tree, hf_gsm_map_notification_to_forwarding_party, tvb, 0,1,FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_redirecting_presentation, tvb, 0,1,FALSE);
|
||||
|
|
@ -8894,7 +8890,7 @@ dissect_gsm_map_ms_ContextId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_gsm_map_ms_PDP_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_) {
|
||||
#line 388 "gsmmap.cnf"
|
||||
#line 386 "gsmmap.cnf"
|
||||
guint8 pdp_type_org;
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
|
|
@ -8937,7 +8933,7 @@ dissect_gsm_map_ms_PDP_Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
int
|
||||
dissect_gsm_map_ms_QoS_Subscribed(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 410 "gsmmap.cnf"
|
||||
#line 408 "gsmmap.cnf"
|
||||
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
|
@ -8969,7 +8965,7 @@ dissect_gsm_map_ms_APN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
int
|
||||
dissect_gsm_map_ms_Ext_QoS_Subscribed(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 421 "gsmmap.cnf"
|
||||
#line 419 "gsmmap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
|
|
@ -10124,7 +10120,7 @@ dissect_gsm_map_ms_SubscriberState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
int
|
||||
dissect_gsm_map_ms_RAIdentity(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 457 "gsmmap.cnf"
|
||||
#line 455 "gsmmap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
proto_item *item;
|
||||
|
|
@ -13311,7 +13307,7 @@ static const value_string gsm_old_GSMMAPOperationLocalvalue_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_old_GSMMAPOperationLocalvalue(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 130 "gsmmap.cnf"
|
||||
#line 128 "gsmmap.cnf"
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&opcode);
|
||||
|
|
@ -13369,7 +13365,7 @@ dissect_gsm_old_MAP_OPERATION(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_gsm_old_InvokeParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 117 "gsmmap.cnf"
|
||||
#line 115 "gsmmap.cnf"
|
||||
offset = dissect_invokeData(tree, tvb, offset, actx);
|
||||
|
||||
|
||||
|
|
@ -13398,7 +13394,7 @@ dissect_gsm_old_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_gsm_old_ReturnResultParameter(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 120 "gsmmap.cnf"
|
||||
#line 118 "gsmmap.cnf"
|
||||
offset = dissect_returnResultData(tree, tvb, offset, actx);
|
||||
|
||||
|
||||
|
|
@ -13541,7 +13537,7 @@ dissect_gsm_old_MAP_ERROR(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_gsm_old_ReturnErrorParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 123 "gsmmap.cnf"
|
||||
#line 121 "gsmmap.cnf"
|
||||
offset = dissect_returnErrorData(tree, tvb, offset, actx);
|
||||
|
||||
|
||||
|
|
@ -13850,15 +13846,6 @@ dissect_gsm_old_PrepareHO_ResOld(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
|
||||
|
||||
static int
|
||||
dissect_gsm_old_SendAuthenticationInfoArgOld(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_gsm_map_IMSI(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_gsm_old_RAND(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_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
|
|
@ -14032,16 +14019,6 @@ dissect_gsm_old_CurrentPassword(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
|
||||
|
||||
static int
|
||||
dissect_gsm_old_ServiceCentreAddress(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_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_gsm_old_SecurityParametersIndex(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_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
|
|
@ -14299,7 +14276,7 @@ dissect_gsm_old_SM_RP_DAold(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_gsm_old_T_msisdn(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 248 "gsmmap.cnf"
|
||||
#line 246 "gsmmap.cnf"
|
||||
actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
||||
offset = dissect_gsm_map_ISDN_AddressString(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
|
|
@ -14313,7 +14290,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
|||
|
||||
static int
|
||||
dissect_gsm_old_T_serviceCentreAddressOA(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 240 "gsmmap.cnf"
|
||||
#line 238 "gsmmap.cnf"
|
||||
actx->pinfo->p2p_dir = P2P_DIR_SENT;
|
||||
offset = dissect_gsm_map_AddressString(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
|
|
@ -14358,7 +14335,7 @@ static const ber_sequence_t ForwardSM_Arg_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_old_ForwardSM_Arg(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 262 "gsmmap.cnf"
|
||||
#line 260 "gsmmap.cnf"
|
||||
|
||||
/* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
|
|
@ -14374,14 +14351,6 @@ dissect_gsm_old_ForwardSM_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
return offset;
|
||||
}
|
||||
|
||||
/*--- PDUs ---*/
|
||||
|
||||
static void dissect_Component_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
dissect_gsm_old_Component(FALSE, tvb, 0, &asn1_ctx, tree, hf_gsm_old_Component_PDU);
|
||||
}
|
||||
|
||||
|
||||
/* --- Module SS-DataTypes --- --- --- */
|
||||
|
||||
|
|
@ -15112,7 +15081,7 @@ dissect_gsm_ss_LCS_PeriodicLocationCancellationArg(gboolean implicit_tag _U_, tv
|
|||
|
||||
|
||||
/*--- End of included file: packet-gsm_map-fn.c ---*/
|
||||
#line 568 "packet-gsm_map-template.c"
|
||||
#line 565 "packet-gsm_map-template.c"
|
||||
|
||||
/* Specific translation for MAP V3 */
|
||||
const value_string gsm_map_V1V2_opr_code_strings[] = {
|
||||
|
|
@ -15426,7 +15395,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
|
|||
offset=dissect_mc_message(tvb, offset, actx, tree,
|
||||
FALSE, dissect_gsm_map_Identity, hf_gsm_map_ms_identity,
|
||||
FALSE, dissect_gsm_map_Identity, hf_gsm_map_ms_identity,
|
||||
TRUE , dissect_gsm_map_ms_CancelLocationArg_U, -1);/*undefined*/
|
||||
TRUE , dissect_gsm_map_ms_CancelLocationArg, -1);/*undefined*/
|
||||
break;
|
||||
case 4: /*provideRoamingNumber*/
|
||||
offset=dissect_gsm_map_ch_ProvideRoamingNumberArg(FALSE, tvb, offset, actx, tree, -1);
|
||||
|
|
@ -15515,7 +15484,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
|
|||
offset=dissect_mc_message(tvb, offset, actx, tree,
|
||||
FALSE, NULL, -1,
|
||||
FALSE, dissect_gsm_old_Bss_APDU, -1,
|
||||
TRUE , dissect_gsm_map_ms_ProcessAccessSignalling_Arg_U, -1);
|
||||
TRUE , dissect_gsm_map_ms_ProcessAccessSignalling_Arg, -1);
|
||||
break;
|
||||
case 34: /*forwardAccessSignalling*/
|
||||
offset=dissect_mc_message(tvb, offset, actx, tree,
|
||||
|
|
@ -15632,7 +15601,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
|
|||
offset=dissect_mc_message(tvb, offset, actx, tree,
|
||||
FALSE, NULL, -1,
|
||||
FALSE, dissect_gsm_old_PrepareHO_ArgOld, -1,
|
||||
TRUE, dissect_gsm_map_ms_PrepareHO_Arg_U, -1);
|
||||
TRUE, dissect_gsm_map_ms_PrepareHO_Arg, -1);
|
||||
break;
|
||||
case 69: /*prepareSubsequentHandover*/
|
||||
offset=dissect_mc_message(tvb, offset, actx, tree,
|
||||
|
|
@ -15988,8 +15957,10 @@ static int dissect_returnResultData(proto_tree *tree, tvbuff_t *tvb, int offset,
|
|||
offset=dissect_gsm_map_ms_NoteMM_EventRes(FALSE, tvb, offset, actx, tree, -1);
|
||||
break;
|
||||
case 109: /*SS-protocol lcs-PeriodicLocationCancellation*/
|
||||
/* No parameter */
|
||||
break;
|
||||
case 110: /*SS-protocol lcs-LocationUpdate*/
|
||||
offset=dissect_gsm_ss_LCS_LocationUpdateRes(FALSE, tvb, offset, actx, tree, -1);
|
||||
break;
|
||||
case 111: /*SS-protocol lcs-PeriodicLocationRequest*/
|
||||
offset=dissect_gsm_ss_LCS_PeriodicLocationRequestRes(FALSE, tvb, offset, actx, tree, -1);
|
||||
|
|
@ -16677,27 +16648,14 @@ void proto_register_gsm_map(void) {
|
|||
|
||||
/* List of fields */
|
||||
static hf_register_info hf[] = {
|
||||
|
||||
{ &hf_gsm_map_SendAuthenticationInfoArg,
|
||||
{ "SendAuthenticationInfoArg", "gsm_map.SendAuthenticationInfoArg",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"SendAuthenticationInfoArg", HFILL }},
|
||||
{ &hf_gsm_map_SendAuthenticationInfoRes,
|
||||
{ "SendAuthenticationInfoRes", "gsm_map.SendAuthenticationInfoRes",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"SendAuthenticationInfoRes", HFILL }},
|
||||
{ &hf_gsm_old_Component_PDU,
|
||||
{ "Component", "gsm_old.Component",
|
||||
FT_UINT32, BASE_DEC, VALS(gsm_old_Component_vals), 0,
|
||||
"gsm_old.Component", HFILL }},
|
||||
{ &hf_gsm_map_currentPassword,
|
||||
{ "currentPassword", "gsm_map.currentPassword",
|
||||
FT_STRING, BASE_NONE, NULL, 0,
|
||||
"", HFILL }},
|
||||
{ &hf_gsm_mapSendEndSignal,
|
||||
{ "mapSendEndSignalArg", "gsm_map.mapsendendsignalarg",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"mapSendEndSignalArg", HFILL }},
|
||||
{ &hf_gsm_map_CheckIMEIArg,
|
||||
{ "gsm_CheckIMEIArg", "gsm_map.CheckIMEIArg",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"gsm_CheckIMEIArg", HFILL }},
|
||||
{ &hf_gsm_map_extension,
|
||||
{ "Extension", "gsm_map.extension",
|
||||
FT_BOOLEAN, 8, TFS(&gsm_map_extension_value), 0x80,
|
||||
|
|
@ -21033,10 +20991,6 @@ void proto_register_gsm_map(void) {
|
|||
|
||||
/* --- Module DummyMAP --- --- --- */
|
||||
|
||||
{ &hf_gsm_old_Component_PDU,
|
||||
{ "Component", "gsm_old.Component",
|
||||
FT_UINT32, BASE_DEC, VALS(gsm_old_Component_vals), 0,
|
||||
"gsm_old.Component", HFILL }},
|
||||
{ &hf_gsm_old_invoke,
|
||||
{ "invoke", "gsm_old.invoke",
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
|
|
@ -21622,7 +21576,7 @@ void proto_register_gsm_map(void) {
|
|||
"gsm_map_lcs.LCS_QoS", HFILL }},
|
||||
|
||||
/*--- End of included file: packet-gsm_map-hfarr.c ---*/
|
||||
#line 2403 "packet-gsm_map-template.c"
|
||||
#line 2389 "packet-gsm_map-template.c"
|
||||
};
|
||||
|
||||
/* List of subtrees */
|
||||
|
|
@ -22199,7 +22153,7 @@ void proto_register_gsm_map(void) {
|
|||
|
||||
|
||||
/*--- End of included file: packet-gsm_map-ettarr.c ---*/
|
||||
#line 2425 "packet-gsm_map-template.c"
|
||||
#line 2411 "packet-gsm_map-template.c"
|
||||
};
|
||||
|
||||
/* Register protocol */
|
||||
|
|
@ -22271,7 +22225,7 @@ void proto_register_gsm_map(void) {
|
|||
|
||||
|
||||
/*--- End of included file: packet-gsm_map-dis-tab.c ---*/
|
||||
#line 2443 "packet-gsm_map-template.c"
|
||||
#line 2429 "packet-gsm_map-template.c"
|
||||
add_oid_str_name("1.2.826.0.1249.58.1.0","iso(1) member-body(2) bsi(826) disc(0) ericsson(1249) gsmNetworkApplicationsDefinition(58) gsm-Map(1) gsm-Map-Ext(0)" );
|
||||
add_oid_str_name("1.3.12.2.1107.3.66.1.2","accessTypeNotAllowed-id" );
|
||||
/*add_oid_str_name("0.4.0.0.1.0.1.3","itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) networkLocUp(1) version3(3)" );
|
||||
|
|
|
|||
Loading…
Reference in New Issue