Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-AMF
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenXG
OpenXG-AMF
Commits
bbb0d923
Commit
bbb0d923
authored
Jan 05, 2021
by
Tien-Thinh Nguyen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug fix for PDU Session Resource Release Response
parent
0ace9b7f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
16 deletions
+16
-16
src/amf-app/amf_n1.cpp
src/amf-app/amf_n1.cpp
+5
-5
src/amf-app/amf_n11.cpp
src/amf-app/amf_n11.cpp
+1
-1
src/amf-app/mysql_db.cpp
src/amf-app/mysql_db.cpp
+2
-2
src/ngap/ngapIEs/PDUSessionResourceReleasedItemRelRes.cpp
src/ngap/ngapIEs/PDUSessionResourceReleasedItemRelRes.cpp
+1
-1
src/ngap/ngapMsgs/PduSessionResourceReleaseResponse.cpp
src/ngap/ngapMsgs/PduSessionResourceReleaseResponse.cpp
+7
-7
No files found.
src/amf-app/amf_n1.cpp
View file @
bbb0d923
...
...
@@ -279,7 +279,7 @@ void amf_n1::handle_itti_message(itti_uplink_nas_data_ind &nas_data_ind) {
mac32_recv
);
if
(
mac32
==
mac32_recv
)
{
isMatched
=
true
;
Logger
::
amf_n1
().
error
(
"Integrity matched"
);
Logger
::
amf_n1
().
debug
(
"Integrity matched"
);
//nc.get()->security_ctx->ul_count.seq_num ++;
}
if
(
!
isMatched
)
{
...
...
@@ -724,18 +724,18 @@ void amf_n1::registration_request_handle(bool isNasSig,
}
break
;
case
MOBILITY_REGISTRATION_UPDATING
:
{
Logger
::
amf_n1
().
error
(
"Network handling mobility registration ..."
);
Logger
::
amf_n1
().
debug
(
"Network handling mobility registration ..."
);
run_mobility_registration_update_procedure
(
nc
);
}
break
;
case
PERIODIC_REGISTRATION_UPDATING
:
{
Logger
::
amf_n1
().
error
(
Logger
::
amf_n1
().
warn
(
"Network doesn't support periodic registration, reject ..."
);
}
break
;
case
EMERGENCY_REGISTRATION
:
{
if
(
!
amf_cfg
.
is_emergency_support
.
compare
(
"false"
))
{
Logger
::
amf_n1
().
error
(
Logger
::
amf_n1
().
warn
(
"Network doesn't support emergency registration, reject ..."
);
response_registration_reject_msg
(
_5GMM_CAUSE_ILLEGAL_UE
,
ran_ue_ngap_id
,
amf_ue_ngap_id
);
//cause?
...
...
@@ -857,7 +857,7 @@ void amf_n1::run_registration_procedure(std::shared_ptr<nas_context> &nc) {
nc
.
get
()
->
ngKsi
=
ngksi
;
handle_auth_vector_successful_result
(
nc
);
}
else
{
Logger
::
amf_n1
().
error
(
"Request authentication vectors failure"
);
Logger
::
amf_n1
().
warn
(
"Request authentication vectors failure"
);
response_registration_reject_msg
(
_5GMM_CAUSE_ILLEGAL_UE
,
nc
.
get
()
->
ran_ue_ngap_id
,
nc
.
get
()
->
amf_ue_ngap_id
);
//cause?
...
...
src/amf-app/amf_n11.cpp
View file @
bbb0d923
...
...
@@ -582,7 +582,7 @@ void amf_n11::curl_http_client(std::string remoteUri, std::string jsonData,
(
uint8_t
*
)
bdata
(
n2sm_hex
),
blength
(
n2sm_hex
));
itti_msg
->
n2sm
=
n2sm_hex
;
itti_msg
->
is_n2sm_set
=
true
;
itti_msg
->
n2sm_info_type
=
response_data
[
"n2
SmInfoType"
];
//response_data["n2InfoContainer"]["smInfo"]["n2InfoContent"]["ngapIeType"];
itti_msg
->
n2sm_info_type
=
response_data
[
"n2
InfoContainer"
][
"smInfo"
][
"n2InfoContent"
][
"ngapIeType"
];
//response_data["n2SmInfoType"];
}
itti_msg
->
supi
=
supi
;
...
...
src/amf-app/mysql_db.cpp
View file @
bbb0d923
...
...
@@ -148,7 +148,7 @@ void amf_n1::mysql_push_rand_sqn(std::string imsi, uint8_t *rand_p,
mysql_free_result
(
res
);
}
else
{
if
(
mysql_field_count
(
db_desc
->
db_conn
)
==
0
)
{
Logger
::
amf_n1
().
error
(
"[MySQL] %lld rows affected"
,
Logger
::
amf_n1
().
debug
(
"[MySQL] %lld rows affected"
,
mysql_affected_rows
(
db_desc
->
db_conn
));
}
else
{
/* some error occurred */
Logger
::
amf_n1
().
error
(
"Could not retrieve result set"
);
...
...
@@ -189,7 +189,7 @@ void amf_n1::mysql_increment_sqn(std::string imsi) {
mysql_free_result
(
res
);
}
else
{
if
(
mysql_field_count
(
db_desc
->
db_conn
)
==
0
)
{
Logger
::
amf_n1
().
error
(
"[MySQL] %lld rows affected"
,
Logger
::
amf_n1
().
debug
(
"[MySQL] %lld rows affected"
,
mysql_affected_rows
(
db_desc
->
db_conn
));
}
else
{
Logger
::
amf_n1
().
error
(
"Could not retrieve result set"
);
...
...
src/ngap/ngapIEs/PDUSessionResourceReleasedItemRelRes.cpp
View file @
bbb0d923
...
...
@@ -74,7 +74,7 @@ bool PDUSessionResourceReleasedItemRelRes::encode2PDUSessionResourceReleasedItem
bool
PDUSessionResourceReleasedItemRelRes
::
decodefromPDUSessionResourceReleasedItemRelRes
(
Ngap_PDUSessionResourceReleasedItemRelRes_t
*
pduSessionResourceReleasedItemRelRes
)
{
pDUSessionID
=
new
PDUSessionID
();
pDUSessionID
->
setPDUSessionID
(
pduSessionResourceReleasedItemRelRes
->
pDUSessionID
);
pDUSessionResourceReleaseResponseTransfer
=
pduSessionResourceReleasedItemRelRes
->
pDUSessionResourceReleaseResponseTransfer
;
...
...
src/ngap/ngapMsgs/PduSessionResourceReleaseResponse.cpp
View file @
bbb0d923
...
...
@@ -97,7 +97,7 @@ void PduSessionResourceReleaseResponseMsg::setAmfUeNgapId(unsigned long id) {
1
,
sizeof
(
Ngap_PDUSessionResourceReleaseResponseIEs_t
));
ie
->
id
=
Ngap_ProtocolIE_ID_id_AMF_UE_NGAP_ID
;
ie
->
criticality
=
Ngap_Criticality_
reject
;
ie
->
criticality
=
Ngap_Criticality_
ignore
;
ie
->
value
.
present
=
Ngap_PDUSessionResourceReleaseResponseIEs__value_PR_AMF_UE_NGAP_ID
;
...
...
@@ -125,7 +125,7 @@ void PduSessionResourceReleaseResponseMsg::setRanUeNgapId(
(
Ngap_PDUSessionResourceReleaseResponseIEs_t
*
)
calloc
(
1
,
sizeof
(
Ngap_PDUSessionResourceReleaseResponseIEs_t
));
ie
->
id
=
Ngap_ProtocolIE_ID_id_RAN_UE_NGAP_ID
;
ie
->
criticality
=
Ngap_Criticality_
reject
;
ie
->
criticality
=
Ngap_Criticality_
ignore
;
ie
->
value
.
present
=
Ngap_PDUSessionResourceReleaseResponseIEs__value_PR_RAN_UE_NGAP_ID
;
...
...
@@ -168,7 +168,7 @@ void PduSessionResourceReleaseResponseMsg::setPduSessionResourceReleasedList(
1
,
sizeof
(
Ngap_PDUSessionResourceReleaseResponseIEs_t
));
ie
->
id
=
Ngap_ProtocolIE_ID_id_PDUSessionResourceReleasedListRelRes
;
ie
->
criticality
=
Ngap_Criticality_
reject
;
ie
->
criticality
=
Ngap_Criticality_
ignore
;
ie
->
value
.
present
=
Ngap_PDUSessionResourceReleaseResponseIEs__value_PR_PDUSessionResourceReleasedListRelRes
;
...
...
@@ -216,7 +216,7 @@ void PduSessionResourceReleaseResponseMsg::setUserLocationInfoNR(
(
Ngap_PDUSessionResourceReleaseResponseIEs_t
*
)
calloc
(
1
,
sizeof
(
Ngap_PDUSessionResourceReleaseResponseIEs_t
));
ie
->
id
=
Ngap_ProtocolIE_ID_id_UserLocationInformation
;
ie
->
criticality
=
Ngap_Criticality_
reject
;
ie
->
criticality
=
Ngap_Criticality_
ignore
;
ie
->
value
.
present
=
Ngap_PDUSessionResourceReleaseResponseIEs__value_PR_UserLocationInformation
;
...
...
@@ -299,7 +299,7 @@ bool PduSessionResourceReleaseResponseMsg::decodefrompdu(
switch
(
pduSessionResourceReleaseResponseIEs
->
protocolIEs
.
list
.
array
[
i
]
->
id
)
{
case
Ngap_ProtocolIE_ID_id_AMF_UE_NGAP_ID
:
{
if
(
pduSessionResourceReleaseResponseIEs
->
protocolIEs
.
list
.
array
[
i
]
->
criticality
==
Ngap_Criticality_
reject
->
criticality
==
Ngap_Criticality_
ignore
&&
pduSessionResourceReleaseResponseIEs
->
protocolIEs
.
list
.
array
[
i
]
->
value
.
present
==
Ngap_PDUSessionResourceReleaseResponseIEs__value_PR_AMF_UE_NGAP_ID
)
{
...
...
@@ -319,7 +319,7 @@ bool PduSessionResourceReleaseResponseMsg::decodefrompdu(
case
Ngap_ProtocolIE_ID_id_RAN_UE_NGAP_ID
:
{
if
(
pduSessionResourceReleaseResponseIEs
->
protocolIEs
.
list
.
array
[
i
]
->
criticality
==
Ngap_Criticality_
reject
->
criticality
==
Ngap_Criticality_
ignore
&&
pduSessionResourceReleaseResponseIEs
->
protocolIEs
.
list
.
array
[
i
]
->
value
.
present
==
Ngap_PDUSessionResourceReleaseResponseIEs__value_PR_RAN_UE_NGAP_ID
)
{
...
...
@@ -339,7 +339,7 @@ bool PduSessionResourceReleaseResponseMsg::decodefrompdu(
case
Ngap_ProtocolIE_ID_id_PDUSessionResourceReleasedListRelRes
:
{
if
(
pduSessionResourceReleaseResponseIEs
->
protocolIEs
.
list
.
array
[
i
]
->
criticality
==
Ngap_Criticality_
reject
->
criticality
==
Ngap_Criticality_
ignore
&&
pduSessionResourceReleaseResponseIEs
->
protocolIEs
.
list
.
array
[
i
]
->
value
.
present
==
Ngap_PDUSessionResourceReleaseResponseIEs__value_PR_PDUSessionResourceReleasedListRelRes
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment