forked from osmocom/wireshark
GSM MAP: ensure that p2p_dir is always initialized before calling GSM SMS dissector
Bug: 10234 Change-Id: Ie340b849015febe46f91836440d44d4cfde005a4 Reviewed-on: https://code.wireshark.org/review/2695 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin
parent
60ffafdb7c
commit
e39e44df24
|
|
@ -383,6 +383,13 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
|||
|
||||
if (!actx->value_ptr)
|
||||
return offset;
|
||||
if (actx->pinfo->p2p_dir == P2P_DIR_UNKNOWN) {
|
||||
if (opcode == 44) {
|
||||
actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
||||
} else if (opcode == 46) {
|
||||
actx->pinfo->p2p_dir = P2P_DIR_SENT;
|
||||
}
|
||||
}
|
||||
call_dissector_only(gsm_sms_handle, (tvbuff_t*)actx->value_ptr, actx->pinfo, top_tree, NULL);
|
||||
|
||||
#.FN_BODY MO-ForwardSM-Arg
|
||||
|
|
@ -392,6 +399,9 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
|||
|
||||
if (!actx->value_ptr)
|
||||
return offset;
|
||||
if (actx->pinfo->p2p_dir == P2P_DIR_UNKNOWN) {
|
||||
actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
||||
}
|
||||
call_dissector_only(gsm_sms_handle, (tvbuff_t*)actx->value_ptr, actx->pinfo, top_tree, NULL);
|
||||
|
||||
#.FN_BODY MO-ForwardSM-Res
|
||||
|
|
@ -401,6 +411,9 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
|||
|
||||
if (!actx->value_ptr)
|
||||
return offset;
|
||||
if (actx->pinfo->p2p_dir == P2P_DIR_UNKNOWN) {
|
||||
actx->pinfo->p2p_dir = P2P_DIR_SENT;
|
||||
}
|
||||
call_dissector_only(gsm_sms_handle, (tvbuff_t*)actx->value_ptr, actx->pinfo, top_tree, NULL);
|
||||
|
||||
#.FN_BODY MT-ForwardSM-Arg
|
||||
|
|
@ -410,6 +423,9 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
|||
|
||||
if (!actx->value_ptr)
|
||||
return offset;
|
||||
if (actx->pinfo->p2p_dir == P2P_DIR_UNKNOWN) {
|
||||
actx->pinfo->p2p_dir = P2P_DIR_SENT;
|
||||
}
|
||||
call_dissector_only(gsm_sms_handle, (tvbuff_t*)actx->value_ptr, actx->pinfo, top_tree, NULL);
|
||||
|
||||
#.FN_BODY MT-ForwardSM-Res
|
||||
|
|
@ -419,6 +435,9 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
|||
|
||||
if (!actx->value_ptr)
|
||||
return offset;
|
||||
if (actx->pinfo->p2p_dir == P2P_DIR_UNKNOWN) {
|
||||
actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
||||
}
|
||||
call_dissector_only(gsm_sms_handle, (tvbuff_t*)actx->value_ptr, actx->pinfo, top_tree, NULL);
|
||||
|
||||
#.FN_BODY MT-ForwardSM-VGCS-Arg
|
||||
|
|
@ -428,6 +447,9 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
|||
|
||||
if (!actx->value_ptr)
|
||||
return offset;
|
||||
if (actx->pinfo->p2p_dir == P2P_DIR_UNKNOWN) {
|
||||
actx->pinfo->p2p_dir = P2P_DIR_SENT;
|
||||
}
|
||||
call_dissector_only(gsm_sms_handle, (tvbuff_t*)actx->value_ptr, actx->pinfo, top_tree, NULL);
|
||||
|
||||
#.FN_BODY MT-ForwardSM-VGCS-Res
|
||||
|
|
@ -437,6 +459,9 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
|||
|
||||
if (!actx->value_ptr)
|
||||
return offset;
|
||||
if (actx->pinfo->p2p_dir == P2P_DIR_UNKNOWN) {
|
||||
actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
||||
}
|
||||
call_dissector_only(gsm_sms_handle, (tvbuff_t*)actx->value_ptr, actx->pinfo, top_tree, NULL);
|
||||
|
||||
#.FN_BODY SS-Status VAL_PTR = ¶meter_tvb
|
||||
|
|
|
|||
|
|
@ -3587,7 +3587,7 @@ static const ber_sequence_t gsm_map_ExternalSignalInfo_sequence[] = {
|
|||
|
||||
int
|
||||
dissect_gsm_map_ExternalSignalInfo(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 760 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 785 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
/*
|
||||
-- Information about the internal structure is given in
|
||||
-- clause 7.6.9.
|
||||
|
|
@ -3803,7 +3803,7 @@ dissect_gsm_map_AlertingPattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
int
|
||||
dissect_gsm_map_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 585 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 610 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
guint8 octet;
|
||||
|
|
@ -3954,7 +3954,7 @@ dissect_gsm_map_HLR_List(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
int
|
||||
dissect_gsm_map_GlobalCellId(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 840 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 865 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
proto_tree *subtree;
|
||||
|
||||
|
|
@ -4231,7 +4231,7 @@ dissect_gsm_map_TA_Id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
int
|
||||
dissect_gsm_map_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 609 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 634 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
proto_tree *subtree;
|
||||
|
|
@ -4279,7 +4279,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 621 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 646 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
proto_tree *subtree;
|
||||
|
|
@ -4405,7 +4405,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 463 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 488 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
/* Note Ext-SS-Status can have more than one byte */
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
|
@ -4538,7 +4538,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 443 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 468 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
guint8 octet;
|
||||
|
|
@ -4572,7 +4572,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 528 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 553 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
|
||||
proto_tree_add_item(tree, hf_gsm_map_notification_to_forwarding_party, tvb, 0,1,ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tree, hf_gsm_map_redirecting_presentation, tvb, 0,1,ENC_BIG_ENDIAN);
|
||||
|
|
@ -4891,7 +4891,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 486 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 511 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
/*The structure of the USSD-DataCodingScheme is defined by
|
||||
* the Cell Broadcast Data Coding Scheme as described in
|
||||
* TS 3GPP TS 23.038
|
||||
|
|
@ -4917,7 +4917,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 501 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 526 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
guint length;
|
||||
|
|
@ -6444,7 +6444,7 @@ static const ber_sequence_t gsm_map_sm_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 389 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 396 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
|
||||
/* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
|
|
@ -6453,6 +6453,9 @@ dissect_gsm_map_sm_MO_ForwardSM_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
|
|||
|
||||
if (!actx->value_ptr)
|
||||
return offset;
|
||||
if (actx->pinfo->p2p_dir == P2P_DIR_UNKNOWN) {
|
||||
actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
||||
}
|
||||
call_dissector_only(gsm_sms_handle, (tvbuff_t*)actx->value_ptr, actx->pinfo, top_tree, NULL);
|
||||
|
||||
|
||||
|
|
@ -6469,7 +6472,7 @@ static const ber_sequence_t gsm_map_sm_MO_ForwardSM_Res_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_map_sm_MO_ForwardSM_Res(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 398 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 408 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
|
||||
/* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
|
|
@ -6478,6 +6481,9 @@ dissect_gsm_map_sm_MO_ForwardSM_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
|
|||
|
||||
if (!actx->value_ptr)
|
||||
return offset;
|
||||
if (actx->pinfo->p2p_dir == P2P_DIR_UNKNOWN) {
|
||||
actx->pinfo->p2p_dir = P2P_DIR_SENT;
|
||||
}
|
||||
call_dissector_only(gsm_sms_handle, (tvbuff_t*)actx->value_ptr, actx->pinfo, top_tree, NULL);
|
||||
|
||||
|
||||
|
|
@ -6501,7 +6507,7 @@ static const ber_sequence_t gsm_map_sm_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 407 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 420 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
|
||||
/* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
|
|
@ -6510,6 +6516,9 @@ dissect_gsm_map_sm_MT_ForwardSM_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
|
|||
|
||||
if (!actx->value_ptr)
|
||||
return offset;
|
||||
if (actx->pinfo->p2p_dir == P2P_DIR_UNKNOWN) {
|
||||
actx->pinfo->p2p_dir = P2P_DIR_SENT;
|
||||
}
|
||||
call_dissector_only(gsm_sms_handle, (tvbuff_t*)actx->value_ptr, actx->pinfo, top_tree, NULL);
|
||||
|
||||
|
||||
|
|
@ -6526,7 +6535,7 @@ static const ber_sequence_t gsm_map_sm_MT_ForwardSM_Res_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_map_sm_MT_ForwardSM_Res(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 416 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 432 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
|
||||
/* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
|
|
@ -6535,6 +6544,9 @@ dissect_gsm_map_sm_MT_ForwardSM_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
|
|||
|
||||
if (!actx->value_ptr)
|
||||
return offset;
|
||||
if (actx->pinfo->p2p_dir == P2P_DIR_UNKNOWN) {
|
||||
actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
||||
}
|
||||
call_dissector_only(gsm_sms_handle, (tvbuff_t*)actx->value_ptr, actx->pinfo, top_tree, NULL);
|
||||
|
||||
|
||||
|
|
@ -6697,7 +6709,7 @@ static const ber_sequence_t gsm_map_sm_MT_ForwardSM_VGCS_Arg_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_map_sm_MT_ForwardSM_VGCS_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 425 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 444 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
|
||||
/* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
|
|
@ -6706,6 +6718,9 @@ dissect_gsm_map_sm_MT_ForwardSM_VGCS_Arg(gboolean implicit_tag _U_, tvbuff_t *tv
|
|||
|
||||
if (!actx->value_ptr)
|
||||
return offset;
|
||||
if (actx->pinfo->p2p_dir == P2P_DIR_UNKNOWN) {
|
||||
actx->pinfo->p2p_dir = P2P_DIR_SENT;
|
||||
}
|
||||
call_dissector_only(gsm_sms_handle, (tvbuff_t*)actx->value_ptr, actx->pinfo, top_tree, NULL);
|
||||
|
||||
|
||||
|
|
@ -6751,7 +6766,7 @@ static const ber_sequence_t gsm_map_sm_MT_ForwardSM_VGCS_Res_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_map_sm_MT_ForwardSM_VGCS_Res(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 434 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 456 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
|
||||
/* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
|
|
@ -6760,6 +6775,9 @@ dissect_gsm_map_sm_MT_ForwardSM_VGCS_Res(gboolean implicit_tag _U_, tvbuff_t *tv
|
|||
|
||||
if (!actx->value_ptr)
|
||||
return offset;
|
||||
if (actx->pinfo->p2p_dir == P2P_DIR_UNKNOWN) {
|
||||
actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
||||
}
|
||||
call_dissector_only(gsm_sms_handle, (tvbuff_t*)actx->value_ptr, actx->pinfo, top_tree, NULL);
|
||||
|
||||
|
||||
|
|
@ -8127,7 +8145,7 @@ dissect_gsm_map_ms_GeographicalInformation(gboolean implicit_tag _U_, tvbuff_t *
|
|||
|
||||
static int
|
||||
dissect_gsm_map_ms_LocationNumber(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 901 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 926 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
proto_tree *subtree;
|
||||
const char *digit_str;
|
||||
|
|
@ -8811,7 +8829,7 @@ dissect_gsm_map_ms_SGSN_Capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_gsm_map_ms_APN(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 874 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 899 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
proto_tree *subtree;
|
||||
int length, name_len, tmp;
|
||||
|
|
@ -9062,7 +9080,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 657 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 682 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
|
|
@ -9085,7 +9103,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 669 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 694 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
|
|
@ -9170,7 +9188,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 633 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 658 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
proto_tree *subtree;
|
||||
|
||||
|
|
@ -9241,7 +9259,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 645 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 670 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
|
|
@ -10176,7 +10194,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 534 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 559 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
|
||||
proto_tree_add_item(tree, hf_gsm_map_notification_to_forwarding_party, tvb, 0,1,ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tree, hf_gsm_map_redirecting_presentation, tvb, 0,1,ENC_BIG_ENDIAN);
|
||||
|
|
@ -11339,7 +11357,7 @@ dissect_gsm_map_ms_VlrCamelSubscriptionInfo(gboolean implicit_tag _U_, tvbuff_t
|
|||
|
||||
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 542 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 567 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
guint8 pdp_type_org;
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
|
|
@ -11372,7 +11390,7 @@ dissect_gsm_map_ms_PDP_Type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
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 564 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 589 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
|
@ -11394,7 +11412,7 @@ dissect_gsm_map_ms_QoS_Subscribed(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
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 575 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 600 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
|
|
@ -15589,7 +15607,7 @@ dissect_gsm_map_lcs_ProvideSubscriberLocation_Arg(gboolean implicit_tag _U_, tvb
|
|||
|
||||
int
|
||||
dissect_gsm_map_lcs_Ext_GeographicalInformation(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 852 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 877 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
proto_tree *subtree;
|
||||
|
||||
|
|
@ -17018,7 +17036,7 @@ static const ber_sequence_t gsm_old_Bss_APDU_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_old_Bss_APDU(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 682 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 707 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
guint8 octet;
|
||||
guint8 length;
|
||||
tvbuff_t *next_tvb;
|
||||
|
|
@ -17737,6 +17755,13 @@ dissect_gsm_old_ForwardSM_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
if (!actx->value_ptr)
|
||||
return offset;
|
||||
if (actx->pinfo->p2p_dir == P2P_DIR_UNKNOWN) {
|
||||
if (opcode == 44) {
|
||||
actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
||||
} else if (opcode == 46) {
|
||||
actx->pinfo->p2p_dir = P2P_DIR_SENT;
|
||||
}
|
||||
}
|
||||
call_dissector_only(gsm_sms_handle, (tvbuff_t*)actx->value_ptr, actx->pinfo, top_tree, NULL);
|
||||
|
||||
|
||||
|
|
@ -18592,7 +18617,7 @@ dissect_gsm_ss_LCS_PeriodicLocationCancellationArg(gboolean implicit_tag _U_, tv
|
|||
|
||||
static int
|
||||
dissect_gsm_map_ericsson_T_locationInformation(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 930 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
#line 955 "../../asn1/gsm_map/gsm_map.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
proto_tree *subtree;
|
||||
guint8 rat;
|
||||
|
|
|
|||
Loading…
Reference in New Issue