Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
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
lizhongxiao
OpenXG-RAN
Commits
15022153
Commit
15022153
authored
Feb 01, 2021
by
heshanyun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change output format for ran ue ngap id
parent
a53d6795
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR/rrc_gNB_NGAP.c
+12
-12
No files found.
openair2/RRC/NR/rrc_gNB_NGAP.c
View file @
15022153
...
...
@@ -498,13 +498,13 @@ rrc_gNB_process_NGAP_INITIAL_CONTEXT_SETUP_REQ(
gNB_ue_ngap_id
=
NGAP_INITIAL_CONTEXT_SETUP_REQ
(
msg_p
).
gNB_ue_ngap_id
;
ue_context_p
=
rrc_gNB_get_ue_context_from_ngap_ids
(
instance
,
ue_initial_id
,
gNB_ue_ngap_id
);
LOG_I
(
NR_RRC
,
"[gNB %d] Received %s: ue_initial_id %d, gNB_ue_ngap_id %
d
\n
"
,
LOG_I
(
NR_RRC
,
"[gNB %d] Received %s: ue_initial_id %d, gNB_ue_ngap_id %
u
\n
"
,
instance
,
msg_name
,
ue_initial_id
,
gNB_ue_ngap_id
);
if
(
ue_context_p
==
NULL
)
{
/* Can not associate this message to an UE index, send a failure to NGAP and discard it! */
MessageDef
*
msg_fail_p
=
NULL
;
LOG_W
(
NR_RRC
,
"[gNB %d] In NGAP_INITIAL_CONTEXT_SETUP_REQ: unknown UE from NGAP ids (%d, %
d
)
\n
"
,
instance
,
ue_initial_id
,
gNB_ue_ngap_id
);
LOG_W
(
NR_RRC
,
"[gNB %d] In NGAP_INITIAL_CONTEXT_SETUP_REQ: unknown UE from NGAP ids (%d, %
u
)
\n
"
,
instance
,
ue_initial_id
,
gNB_ue_ngap_id
);
msg_fail_p
=
itti_alloc_new_message
(
TASK_RRC_GNB
,
NGAP_INITIAL_CONTEXT_SETUP_FAIL
);
NGAP_INITIAL_CONTEXT_SETUP_FAIL
(
msg_fail_p
).
gNB_ue_ngap_id
=
gNB_ue_ngap_id
;
// TODO add failure cause when defined!
...
...
@@ -720,7 +720,7 @@ rrc_gNB_process_NGAP_DOWNLINK_NAS(
ue_initial_id
=
NGAP_DOWNLINK_NAS
(
msg_p
).
ue_initial_id
;
gNB_ue_ngap_id
=
NGAP_DOWNLINK_NAS
(
msg_p
).
gNB_ue_ngap_id
;
ue_context_p
=
rrc_gNB_get_ue_context_from_ngap_ids
(
instance
,
ue_initial_id
,
gNB_ue_ngap_id
);
LOG_I
(
NR_RRC
,
"[gNB %d] Received %s: ue_initial_id %d, gNB_ue_ngap_id %
d
\n
"
,
LOG_I
(
NR_RRC
,
"[gNB %d] Received %s: ue_initial_id %d, gNB_ue_ngap_id %
u
\n
"
,
instance
,
msg_name
,
ue_initial_id
,
...
...
@@ -738,7 +738,7 @@ rrc_gNB_process_NGAP_DOWNLINK_NAS(
gNB_ue_ngap_id
);
/* Can not associate this message to an UE index, send a failure to NGAP and discard it! */
MessageDef
*
msg_fail_p
;
LOG_W
(
NR_RRC
,
"[gNB %d] In NGAP_DOWNLINK_NAS: unknown UE from NGAP ids (%d, %
d
)
\n
"
,
instance
,
ue_initial_id
,
gNB_ue_ngap_id
);
LOG_W
(
NR_RRC
,
"[gNB %d] In NGAP_DOWNLINK_NAS: unknown UE from NGAP ids (%d, %
u
)
\n
"
,
instance
,
ue_initial_id
,
gNB_ue_ngap_id
);
msg_fail_p
=
itti_alloc_new_message
(
TASK_RRC_GNB
,
NGAP_NAS_NON_DELIVERY_IND
);
NGAP_NAS_NON_DELIVERY_IND
(
msg_fail_p
).
gNB_ue_ngap_id
=
gNB_ue_ngap_id
;
NGAP_NAS_NON_DELIVERY_IND
(
msg_fail_p
).
nas_pdu
.
length
=
NGAP_DOWNLINK_NAS
(
msg_p
).
nas_pdu
.
length
;
...
...
@@ -946,12 +946,12 @@ rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(
ue_initial_id
=
NGAP_PDUSESSION_SETUP_REQ
(
msg_p
).
ue_initial_id
;
gNB_ue_ngap_id
=
NGAP_PDUSESSION_SETUP_REQ
(
msg_p
).
gNB_ue_ngap_id
;
ue_context_p
=
rrc_gNB_get_ue_context_from_ngap_ids
(
instance
,
ue_initial_id
,
gNB_ue_ngap_id
);
LOG_I
(
NR_RRC
,
"[gNB %d] Received %s: ue_initial_id %d, gNB_ue_ngap_id %
d
\n
"
,
LOG_I
(
NR_RRC
,
"[gNB %d] Received %s: ue_initial_id %d, gNB_ue_ngap_id %
u
\n
"
,
instance
,
msg_name
,
ue_initial_id
,
gNB_ue_ngap_id
);
if
(
ue_context_p
==
NULL
)
{
MessageDef
*
msg_fail_p
=
NULL
;
LOG_W
(
NR_RRC
,
"[gNB %d] In NGAP_PDUSESSION_SETUP_REQ: unknown UE from NGAP ids (%d, %
d
)
\n
"
,
instance
,
ue_initial_id
,
gNB_ue_ngap_id
);
LOG_W
(
NR_RRC
,
"[gNB %d] In NGAP_PDUSESSION_SETUP_REQ: unknown UE from NGAP ids (%d, %
u
)
\n
"
,
instance
,
ue_initial_id
,
gNB_ue_ngap_id
);
msg_fail_p
=
itti_alloc_new_message
(
TASK_RRC_GNB
,
NGAP_PDUSESSION_SETUP_REQUEST_FAIL
);
NGAP_PDUSESSION_SETUP_REQ
(
msg_fail_p
).
gNB_ue_ngap_id
=
gNB_ue_ngap_id
;
// TODO add failure cause when defined!
...
...
@@ -1064,7 +1064,7 @@ rrc_gNB_process_NGAP_UE_CONTEXT_RELEASE_REQ (
if
(
ue_context_p
==
NULL
)
{
/* Can not associate this message to an UE index, send a failure to ngAP and discard it! */
MessageDef
*
msg_fail_p
;
LOG_W
(
RRC
,
"[gNB %d] In NGAP_UE_CONTEXT_RELEASE_REQ: unknown UE from gNB_ue_ngap_id (%
d
)
\n
"
,
LOG_W
(
RRC
,
"[gNB %d] In NGAP_UE_CONTEXT_RELEASE_REQ: unknown UE from gNB_ue_ngap_id (%
u
)
\n
"
,
instance
,
gNB_ue_ngap_id
);
msg_fail_p
=
itti_alloc_new_message
(
TASK_RRC_GNB
,
NGAP_UE_CONTEXT_RELEASE_RESP
);
/* TODO change message ID. */
...
...
@@ -1106,7 +1106,7 @@ rrc_gNB_process_NGAP_UE_CONTEXT_RELEASE_COMMAND(
if
(
ue_context_p
==
NULL
)
{
/* Can not associate this message to an UE index */
MessageDef
*
msg_complete_p
=
NULL
;
LOG_W
(
RRC
,
"[gNB %d] In NGAP_UE_CONTEXT_RELEASE_COMMAND: unknown UE from gNB_ue_ngap_id (%
d
)
\n
"
,
LOG_W
(
RRC
,
"[gNB %d] In NGAP_UE_CONTEXT_RELEASE_COMMAND: unknown UE from gNB_ue_ngap_id (%
u
)
\n
"
,
instance
,
gNB_ue_ngap_id
);
MSC_LOG_EVENT
(
MSC_RRC_GNB
,
"0 NGAP_UE_CONTEXT_RELEASE_COMPLETE gNB_ue_ngap_id 0x%06"
PRIX32
" context not found"
,
...
...
@@ -1257,7 +1257,7 @@ rrc_gNB_send_NGAP_PDUSESSION_RELEASE_RESPONSE(
memcpy
(
&
(
NGAP_PDUSESSION_RELEASE_RESPONSE
(
msg_p
).
pdusessions_failed
[
0
]),
&
ue_context_pP
->
ue_context
.
pdusessions_release_failed
[
0
],
sizeof
(
pdusession_failed_t
)
*
ue_context_pP
->
ue_context
.
nb_release_of_pdusessions
);
ue_context_pP
->
ue_context
.
setup_pdu_sessions
-=
pdu_sessions_released
;
LOG_I
(
NR_RRC
,
"NGAP PDUSESSION RELEASE RESPONSE: GNB_UE_NGAP_ID %
d
release_pdu_sessions %d setup_pdu_sessions %d
\n
"
,
LOG_I
(
NR_RRC
,
"NGAP PDUSESSION RELEASE RESPONSE: GNB_UE_NGAP_ID %
u
release_pdu_sessions %d setup_pdu_sessions %d
\n
"
,
NGAP_PDUSESSION_RELEASE_RESPONSE
(
msg_p
).
gNB_ue_ngap_id
,
pdu_sessions_released
,
ue_context_pP
->
ue_context
.
setup_pdu_sessions
);
itti_send_msg_to_task
(
TASK_NGAP
,
ctxt_pP
->
instance
,
msg_p
);
...
...
@@ -1300,12 +1300,12 @@ rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND(
return
-
1
;
}
ue_context_p
=
rrc_gNB_get_ue_context_from_ngap_ids
(
instance
,
UE_INITIAL_ID_INVALID
,
gNB_ue_ngap_id
);
LOG_I
(
NR_RRC
,
"[gNB %d] Received %s: gNB_ue_ngap_id %
d
\n
"
,
instance
,
msg_name
,
gNB_ue_ngap_id
);
LOG_I
(
NR_RRC
,
"[gNB %d] Received %s: gNB_ue_ngap_id %
u
\n
"
,
instance
,
msg_name
,
gNB_ue_ngap_id
);
if
(
ue_context_p
!=
NULL
)
{
PROTOCOL_CTXT_SET_BY_INSTANCE
(
&
ctxt
,
instance
,
GNB_FLAG_YES
,
ue_context_p
->
ue_context
.
rnti
,
0
,
0
);
xid
=
rrc_gNB_get_next_transaction_identifier
(
ctxt
.
module_id
);
LOG_I
(
NR_RRC
,
"PDU Session Release Command: AMF_UE_NGAP_ID %lu GNB_UE_NGAP_ID %
d
release_pdusessions %d
\n
"
,
LOG_I
(
NR_RRC
,
"PDU Session Release Command: AMF_UE_NGAP_ID %lu GNB_UE_NGAP_ID %
u
release_pdusessions %d
\n
"
,
NGAP_PDUSESSION_RELEASE_COMMAND
(
msg_p
).
amf_ue_ngap_id
&
0x000000FFFFFFFFFF
,
gNB_ue_ngap_id
,
nb_pdusessions_torelease
);
for
(
pdusession
=
0
;
pdusession
<
nb_pdusessions_torelease
;
pdusession
++
)
{
...
...
@@ -1383,7 +1383,7 @@ rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND(
LOG_I
(
NR_RRC
,
"Send PDU Session Release Response
\n
"
);
}
}
else
{
LOG_E
(
NR_RRC
,
"PDU Session Release Command: AMF_UE_NGAP_ID %lu GNB_UE_NGAP_ID %
d
Error ue_context_p NULL
\n
"
,
LOG_E
(
NR_RRC
,
"PDU Session Release Command: AMF_UE_NGAP_ID %lu GNB_UE_NGAP_ID %
u
Error ue_context_p NULL
\n
"
,
NGAP_PDUSESSION_RELEASE_COMMAND
(
msg_p
).
amf_ue_ngap_id
&
0x000000FFFFFFFFFF
,
NGAP_PDUSESSION_RELEASE_COMMAND
(
msg_p
).
gNB_ue_ngap_id
);
return
-
1
;
}
...
...
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