Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
1a830cf2
Commit
1a830cf2
authored
Mar 18, 2019
by
tomita.y
Committed by
Haruki NAOI
Jul 16, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: reestablishment issue(SRB2 NULL)
parent
ad693fa1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
0 deletions
+32
-0
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
+1
-0
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+31
-0
No files found.
openair2/RRC/LTE/MESSAGES/asn1_msg.c
View file @
1a830cf2
...
...
@@ -4072,6 +4072,7 @@ do_RRCConnectionReestablishment(
LTE_DL_CCCH_Message_t
dl_ccch_msg
;
LTE_RRCConnectionReestablishment_t
*
rrcConnectionReestablishment
=
NULL
;
int
i
=
0
;
ue_context_pP
->
ue_context
.
reestablishment_xid
=
Transaction_id
;
LTE_SRB_ToAddModList_t
**
SRB_configList2
=
NULL
;
SRB_configList2
=
&
ue_context_pP
->
ue_context
.
SRB_configList2
[
Transaction_id
];
...
...
openair2/RRC/LTE/rrc_eNB.c
View file @
1a830cf2
...
...
@@ -1241,6 +1241,34 @@ void release_UE_in_freeList(module_id_t mod_id) {
}
}
int
rrc_eNB_previous_SRB2
(
rrc_eNB_ue_context_t
*
ue_context_pP
)
{
struct
SRB_ToAddMod
*
SRB2_config
=
NULL
;
uint8_t
i
;
SRB_ToAddModList_t
*
SRB_configList
=
ue_context_pP
->
ue_context
.
SRB_configList
;
SRB_ToAddModList_t
**
SRB_configList2
=
&
ue_context_pP
->
ue_context
.
SRB_configList2
[
ue_context_pP
->
ue_context
.
reestablishment_xid
];
if
(
*
SRB_configList2
!=
NULL
)
{
if
((
*
SRB_configList2
)
->
list
.
count
!=
0
){
LOG_D
(
RRC
,
"rrc_eNB_previous_SRB2 SRB_configList2(%p) count is %d
\n
SRB_configList2->list.array[0] addr is %p"
,
SRB_configList2
,
(
*
SRB_configList2
)
->
list
.
count
,
(
*
SRB_configList2
)
->
list
.
array
[
0
]);
}
for
(
i
=
0
;
(
i
<
(
*
SRB_configList2
)
->
list
.
count
)
&&
(
i
<
3
);
i
++
)
{
if
((
*
SRB_configList2
)
->
list
.
array
[
i
]
->
srb_Identity
==
2
){
SRB2_config
=
(
*
SRB_configList2
)
->
list
.
array
[
i
];
break
;
}
}
}
else
{
LOG_E
(
RRC
,
"rrc_eNB_previous_SRB2 SRB_configList2 NULL
\n
"
);
}
if
(
SRB2_config
!=
NULL
)
{
ASN_SEQUENCE_ADD
(
&
SRB_configList
->
list
,
SRB2_config
);
}
else
{
LOG_E
(
RRC
,
"rrc_eNB_previous_SRB2 SRB2_config NULL
\n
"
);
}
return
0
;
}
//-----------------------------------------------------------------------------
/*
* Process the rrc connection setup complete message from UE (SRB1 Active)
...
...
@@ -7009,6 +7037,7 @@ rrc_eNB_decode_ccch(
PROTOCOL_RRC_CTXT_UE_FMT
" RCConnectionReestablishmentComplete(Previous) don't receive, delete the c-rnti UE
\n
"
,
PROTOCOL_RRC_CTXT_UE_ARGS
(
ctxt_pP
));
RC
.
mac
[
ctxt_pP
->
module_id
]
->
UE_list
.
UE_sched_ctrl
[
UE_id
].
ue_reestablishment_reject_timer
=
1000
;
rrc_eNB_previous_SRB2
(
ue_context_p
);
}
//previous rnti
rnti_t
previous_rnti
=
0
;
...
...
@@ -7033,6 +7062,7 @@ rrc_eNB_decode_ccch(
PROTOCOL_RRC_CTXT_UE_FMT
" RCConnectionReestablishmentComplete(Previous) don't receive, delete the Previous UE
\n
"
,
PROTOCOL_RRC_CTXT_UE_ARGS
(
ctxt_pP
));
RC
.
mac
[
ctxt_pP
->
module_id
]
->
UE_list
.
UE_sched_ctrl
[
UE_id
].
ue_reestablishment_reject_timer
=
1000
;
rrc_eNB_previous_SRB2
(
ue_context_p
);
}
}
...
...
@@ -7749,6 +7779,7 @@ rrc_eNB_decode_dcch(
}
RC
.
mac
[
ctxt_pP
->
module_id
]
->
UE_list
.
UE_sched_ctrl
[
UE_id
].
ue_reestablishment_reject_timer
=
0
;
ue_context_p
->
ue_context
.
reestablishment_xid
=
-
1
;
if
(
ul_dcch_msg
->
message
.
choice
.
c1
.
choice
.
rrcConnectionReestablishmentComplete
.
criticalExtensions
.
present
==
LTE_RRCConnectionReestablishmentComplete__criticalExtensions_PR_rrcConnectionReestablishmentComplete_r8
)
{
...
...
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