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
canghaiwuhen
OpenXG-RAN
Commits
43def3d7
Commit
43def3d7
authored
Sep 20, 2018
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
crashes inside DU_send_UL_RRC_MESSAGE_TRANSFER
parent
7ea6cb25
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
11 deletions
+26
-11
openair2/F1AP/f1ap_du_rrc_message_transfer.c
openair2/F1AP/f1ap_du_rrc_message_transfer.c
+16
-2
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+1
-1
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c
+2
-1
openair2/LAYER2/RLC/rlc.c
openair2/LAYER2/RLC/rlc.c
+4
-4
openair2/LAYER2/RLC/rlc_mac.c
openair2/LAYER2/RLC/rlc_mac.c
+3
-3
No files found.
openair2/F1AP/f1ap_du_rrc_message_transfer.c
View file @
43def3d7
...
...
@@ -209,7 +209,7 @@ int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance,
LOG_I
(
RRC
,
"Logical Channel DL-CCCH (SRB0), Received RRCConnectionSetup DU_ID %x/RNTI %x
\n
"
,
du_ue_f1ap_id
,
f1ap_get_rnti_by_du_id
(
&
f1ap_du_ue
[
0
],
du_ue_f1ap_id
));
f1ap_get_rnti_by_du_id
(
&
f1ap_du_ue
[
instance
],
du_ue_f1ap_id
));
// Get configuration
RRCConnectionSetup_t
*
rrcConnectionSetup
=
&
dl_ccch_msg
->
message
.
choice
.
c1
.
choice
.
rrcConnectionSetup
;
...
...
@@ -243,6 +243,20 @@ int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance,
}
}
protocol_ctxt_t
ctxt
;
ctxt
.
rnti
=
f1ap_get_rnti_by_du_id
(
&
f1ap_du_ue
[
instance
],
du_ue_f1ap_id
);
ctxt
.
module_id
=
instance
;
ctxt
.
enb_flag
=
1
;
rrc_rlc_config_asn1_req
(
&
ctxt
,
SRB_configList
,
(
DRB_ToAddModList_t
*
)
NULL
,
(
DRB_ToReleaseList_t
*
)
NULL
#if (RRC_VERSION >= MAKE_VERSION(9, 0, 0))
,
(
PMCH_InfoList_r9_t
*
)
NULL
,
0
,
0
# endif
);
// This should be somewhere in the f1ap_cudu_ue_inst_t
int
macrlc_instance
=
0
;
...
...
@@ -318,7 +332,7 @@ int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance,
int
DU_send_UL_RRC_MESSAGE_TRANSFER
(
instance_t
instance
,
f1ap_ul_rrc_message_t
*
f1ap_ul_rrc
)
{
LOG_
D
(
DU_F1AP
,
"DU_send_UL_RRC_MESSAGE_TRANSFER
\n
"
);
LOG_
I
(
DU_F1AP
,
"DU_send_UL_RRC_MESSAGE_TRANSFER
\n
"
);
F1AP_F1AP_PDU_t
pdu
;
F1AP_ULRRCMessageTransfer_t
*
out
;
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
43def3d7
...
...
@@ -686,7 +686,7 @@ rx_sdu(const module_id_t enb_mod_idP,
//UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer += UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer / 4;
}
LOG_
D
(
MAC
,
LOG_
I
(
MAC
,
"[eNB %d] CC_id %d Frame %d : ULSCH -> UL-DCCH, received %d bytes form UE %d on LCID %d
\n
"
,
enb_mod_idP
,
CC_idP
,
frameP
,
rx_lengths
[
i
],
UE_id
,
rx_lcids
[
i
]);
...
...
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c
View file @
43def3d7
...
...
@@ -42,7 +42,7 @@
#include "UL-AM-RLC.h"
#include "DL-AM-RLC.h"
#define TRACE_RLC_AM_PDU 1
//-----------------------------------------------------------------------------
uint32_t
rlc_am_get_status_pdu_buffer_occupancy
(
...
...
@@ -936,6 +936,7 @@ rlc_am_mac_data_indication (
(
void
)
l_rlc_p
;
/* avoid gcc warning "unused variable" */
LOG_I
(
RLC
,
"In rlc_am_mac_indication: size %d
\n
"
,
tb_size_in_bytes
);
#if TRACE_RLC_AM_PDU || MESSAGE_CHART_GENERATOR
if
(
data_indP
.
data
.
nb_elements
>
0
)
{
...
...
openair2/LAYER2/RLC/rlc.c
View file @
43def3d7
...
...
@@ -665,15 +665,15 @@ void rlc_data_ind (
//-----------------------------------------------------------------------------
#if defined(TRACE_RLC_PAYLOAD)
LOG_
D
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %u] Display of rlc_data_ind: size %u
\n
"
,
//
#if defined(TRACE_RLC_PAYLOAD)
LOG_
I
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %u] Display of rlc_data_ind: size %u
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
(
srb_flagP
)
?
"SRB"
:
"DRB"
,
rb_idP
,
sdu_sizeP
);
rlc_util_print_hex_octets
(
RLC
,
(
unsigned
char
*
)
sdu_pP
->
data
,
sdu_sizeP
);
#endif
//
rlc_util_print_hex_octets(RLC, (unsigned char*)sdu_pP->data, sdu_sizeP);
//
#endif
#if T_TRACER
if
(
ctxt_pP
->
enb_flag
)
...
...
openair2/LAYER2/RLC/rlc_mac.c
View file @
43def3d7
...
...
@@ -38,7 +38,7 @@
#include "assertions.h"
#include "common/utils/LOG/vcd_signal_dumper.h"
//
#define DEBUG_MAC_INTERFACE 1
#define DEBUG_MAC_INTERFACE 1
//-----------------------------------------------------------------------------
struct
mac_data_ind
mac_rlc_deserialize_tb
(
...
...
@@ -260,7 +260,7 @@ void mac_rlc_data_ind (
#ifdef DEBUG_MAC_INTERFACE
if
(
num_tbP
)
{
LOG_
D
(
RLC
,
PROTOCOL_CTXT_FMT
" MAC_RLC_DATA_IND on channel %d (%d), rb max %d, Num_tb %d
\n
"
,
LOG_
I
(
RLC
,
PROTOCOL_CTXT_FMT
" MAC_RLC_DATA_IND on channel %d (%d), rb max %d, Num_tb %d
\n
"
,
PROTOCOL_CTXT_ARGS
(
&
ctxt
),
channel_idP
,
RLC_MAX_LC
,
...
...
@@ -292,7 +292,7 @@ void mac_rlc_data_ind (
rlc_mode
=
rlc_union_p
->
mode
;
}
else
{
rlc_mode
=
RLC_MODE_NONE
;
//AssertFatal (0 , "%s RLC not configured rb id %u lcid %u module %u!\n", __FUNCTION__, rb_id, channel_idP, ue_module_idP
);
AssertFatal
(
0
,
"%s RLC not configured lcid %u ! (h_rc %d)
\n
"
,
__FUNCTION__
,
channel_idP
,
h_rc
);
}
struct
mac_data_ind
data_ind
=
mac_rlc_deserialize_tb
(
buffer_pP
,
tb_sizeP
,
num_tbP
,
crcs_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