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
alex037yang
OpenXG-RAN
Commits
ab7ec853
Commit
ab7ec853
authored
May 11, 2020
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/rlc_v2_coverity_fixes' into develop_integration_2020_w19
parents
bca9ecfd
21a2a8c6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
2 deletions
+18
-2
openair2/LAYER2/rlc_v2/rlc_entity_um.c
openair2/LAYER2/rlc_v2/rlc_entity_um.c
+1
-0
openair2/LAYER2/rlc_v2/rlc_oai_api.c
openair2/LAYER2/rlc_v2/rlc_oai_api.c
+17
-2
No files found.
openair2/LAYER2/rlc_v2/rlc_entity_um.c
View file @
ab7ec853
...
...
@@ -360,6 +360,7 @@ static tx_pdu_size_t tx_pdu_size(rlc_entity_um_t *entity, int maxsize)
ret
.
data_size
=
0
;
ret
.
header_size
=
0
;
ret
.
last_sdu_is_full
=
1
;
ret
.
first_sdu_length
=
0
;
/* TX PDU - let's make the biggest PDU we can with the SDUs we have */
sdu_count
=
0
;
...
...
openair2/LAYER2/rlc_v2/rlc_oai_api.c
View file @
ab7ec853
...
...
@@ -134,7 +134,10 @@ tbs_size_t mac_rlc_data_req(
}
if
(
MBMS_flagP
==
MBMS_FLAG_YES
)
{
rb
=
ue
->
drb
[
channel_idP
-
1
];
if
(
channel_idP
>=
1
&&
channel_idP
<=
5
)
rb
=
ue
->
drb
[
channel_idP
-
1
];
else
rb
=
NULL
;
}
...
...
@@ -192,7 +195,10 @@ mac_rlc_status_resp_t mac_rlc_status_ind(
}
if
(
MBMS_flagP
==
MBMS_FLAG_YES
)
{
rb
=
ue
->
drb
[
channel_idP
-
1
];
if
(
channel_idP
>=
1
&&
channel_idP
<=
5
)
rb
=
ue
->
drb
[
channel_idP
-
1
];
else
rb
=
NULL
;
}
if
(
rb
!=
NULL
)
{
...
...
@@ -316,7 +322,9 @@ rlc_op_status_t rlc_data_req (const protocol_ctxt_t *const ctxt_pP,
if
(
rb_idP
>=
1
&&
rb_idP
<=
5
)
rb
=
ue
->
drb
[
rb_idP
-
1
];
}
if
(
MBMS_flagP
==
MBMS_FLAG_YES
)
{
if
(
rb_idP
>=
1
&&
rb_idP
<=
5
)
rb
=
ue
->
drb
[
rb_idP
-
1
];
}
...
...
@@ -875,12 +883,19 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP
mbms_service_id
=
MBMS_SessionInfo_p
->
tmgi_r9
.
serviceId_r9
.
buf
[
2
];
//serviceId is 3-octet string
// mbms_service_id = j;
#if 0
/* TODO: check if this code should stay there
* as it is both enb and ue cases do the same thing
*/
// can set the mch_id = i
if (ctxt_pP->enb_flag) {
drb_id = (mbms_service_id * LTE_maxSessionPerPMCH ) + mbms_session_id;//+ (LTE_maxDRB + 3) * MAX_MOBILES_PER_ENB; // 1
} else {
drb_id = (mbms_service_id * LTE_maxSessionPerPMCH ) + mbms_session_id; // + (LTE_maxDRB + 3); // 15
}
#endif
drb_id
=
(
mbms_service_id
*
LTE_maxSessionPerPMCH
)
+
mbms_session_id
;
LOG_I
(
RLC
,
PROTOCOL_CTXT_FMT
" CONFIG REQ MBMS ASN1 LC ID %u RB ID %u SESSION ID %u SERVICE ID %u, mbms_rnti %x
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
...
...
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