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
ao gleen
OpenXG-RAN
Commits
e72a6798
Commit
e72a6798
authored
Jun 05, 2021
by
rmagueta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change some LOG levels
parent
98caeb10
Changes
38
Show whitespace changes
Inline
Side-by-side
Showing
38 changed files
with
303 additions
and
308 deletions
+303
-308
executables/nr-uesoftmodem.c
executables/nr-uesoftmodem.c
+5
-3
openair1/PHY/INIT/nr_parms.c
openair1/PHY/INIT/nr_parms.c
+3
-3
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
+3
-1
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
+5
-3
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
+1
-1
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
+1
-3
openair2/COMMON/gtpv1_u_messages_types.h
openair2/COMMON/gtpv1_u_messages_types.h
+6
-6
openair2/F1AP/f1ap_cu_interface_management.c
openair2/F1AP/f1ap_cu_interface_management.c
+12
-11
openair2/F1AP/f1ap_cu_rrc_message_transfer.c
openair2/F1AP/f1ap_cu_rrc_message_transfer.c
+4
-4
openair2/F1AP/f1ap_decoder.c
openair2/F1AP/f1ap_decoder.c
+1
-1
openair2/F1AP/f1ap_du_interface_management.c
openair2/F1AP/f1ap_du_interface_management.c
+1
-1
openair2/F1AP/f1ap_du_interface_management.h
openair2/F1AP/f1ap_du_interface_management.h
+3
-3
openair2/F1AP/f1ap_encoder.c
openair2/F1AP/f1ap_encoder.c
+1
-1
openair2/GNB_APP/MACRLC_nr_paramdef.h
openair2/GNB_APP/MACRLC_nr_paramdef.h
+4
-4
openair2/GNB_APP/gnb_app.c
openair2/GNB_APP/gnb_app.c
+1
-1
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+4
-3
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
+1
-1
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+2
-2
openair2/LAYER2/NR_MAC_UE/config_ue.c
openair2/LAYER2/NR_MAC_UE/config_ue.c
+2
-2
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+1
-1
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+5
-5
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
+7
-7
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+2
-3
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+1
-1
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
+1
-0
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+2
-2
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
+3
-3
openair2/RRC/NR/L2_nr_interface.c
openair2/RRC/NR/L2_nr_interface.c
+2
-2
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
+28
-34
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB.c
+31
-26
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR/rrc_gNB_NGAP.c
+1
-1
openair2/RRC/NR/rrc_gNB_nsa.c
openair2/RRC/NR/rrc_gNB_nsa.c
+1
-1
openair2/RRC/NR_UE/L2_interface_ue.c
openair2/RRC/NR_UE/L2_interface_ue.c
+6
-10
openair2/RRC/NR_UE/rrc_UE.c
openair2/RRC/NR_UE/rrc_UE.c
+147
-152
openair2/SIMULATION/NR_RRC/itti_sim.c
openair2/SIMULATION/NR_RRC/itti_sim.c
+1
-1
openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c
openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c
+1
-1
openair3/ocp-gtpu/gtp_itf.cpp
openair3/ocp-gtpu/gtp_itf.cpp
+2
-3
No files found.
executables/nr-uesoftmodem.c
View file @
e72a6798
...
...
@@ -153,8 +153,9 @@ int transmission_mode = 1;
int
numerology
=
0
;
int
oaisim_flag
=
0
;
int
emulate_rf
=
0
;
uint32_t
N_RB_DL
=
106
;
char
uecap_xer
[
1024
],
uecap_xer_in
=
0
;
uint32_t
N_RB_DL
=
106
;
char
uecap_xer_in
=
0
;
char
uecap_xer
[
1024
];
/* see file openair2/LAYER2/MAC/main.c for why abstraction_flag is needed
* this is very hackish - find a proper solution
...
...
@@ -335,8 +336,9 @@ void set_options(int CC_id, PHY_VARS_NR_UE *UE){
LOG_I
(
PHY
,
"Set UE frame_type %d
\n
"
,
fp
->
frame_type
);
}
LOG_I
(
PHY
,
"Set UE N_RB_DL %d
\n
"
,
N_RB_DL
);
fp
->
N_RB_DL
=
N_RB_DL
;
LOG_I
(
PHY
,
"Set UE N_RB_DL %d
\n
"
,
N_RB_DL
);
LOG_I
(
PHY
,
"Set UE nb_rx_antenna %d, nb_tx_antenna %d, threequarter_fs %d
\n
"
,
fp
->
nb_antennas_rx
,
fp
->
nb_antennas_tx
,
fp
->
threequarter_fs
);
}
...
...
openair1/PHY/INIT/nr_parms.c
View file @
e72a6798
...
...
@@ -261,11 +261,11 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
LOG_I
(
PHY
,
"Initializing frame parms: set nb_antenna_ports_gNB %d, tdd_config, %d, Nid_cell %d
\n
"
,
fp
->
nb_antenna_ports_gNB
,
fp
->
tdd_config
,
fp
->
Nid_cell
);
uint64_t
dl_bw_khz
=
(
12
*
config
->
carrier_config
.
dl_grid_size
[
config
->
ssb_config
.
scs_common
])
*
(
15
<<
config
->
ssb_config
.
scs_common
);
LOG_I
(
PHY
,
"dl_bw_kHz %lu
\n
"
,
dl_bw_khz
);
fp
->
dl_CarrierFreq
=
((
dl_bw_khz
>>
1
)
+
config
->
carrier_config
.
dl_frequency
)
*
1000
;
LOG_I
(
PHY
,
"dl_CarrierFreq %lu
\n
"
,
fp
->
dl_CarrierFreq
);
LOG_D
(
PHY
,
"dl_bw_kHz %lu
\n
"
,
dl_bw_khz
);
LOG_D
(
PHY
,
"dl_CarrierFreq %lu
\n
"
,
fp
->
dl_CarrierFreq
);
uint64_t
ul_bw_khz
=
(
12
*
config
->
carrier_config
.
ul_grid_size
[
config
->
ssb_config
.
scs_common
])
*
(
15
<<
config
->
ssb_config
.
scs_common
);
fp
->
ul_CarrierFreq
=
((
ul_bw_khz
>>
1
)
+
config
->
carrier_config
.
uplink_frequency
)
*
1000
;
...
...
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
View file @
e72a6798
...
...
@@ -732,8 +732,10 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
rel15
=
&
pdcch_vars
->
pdcch_config
[
i
];
int
n_rb
,
rb_offset
;
get_coreset_rballoc
(
rel15
->
coreset
.
frequency_domain_resource
,
&
n_rb
,
&
rb_offset
);
LOG_D
(
PHY
,
"pdcch coreset: freq %x, n_rb %d, rb_offset %d
\n
"
,
rel15
->
coreset
.
frequency_domain_resource
[
0
],
n_rb
,
rb_offset
);
for
(
int
s
=
rel15
->
coreset
.
StartSymbolIndex
;
s
<
(
rel15
->
coreset
.
StartSymbolIndex
+
rel15
->
coreset
.
duration
);
s
++
)
{
LOG_D
(
PHY
,
"in nr_pdcch_extract_rbs_single(rxdataF -> rxdataF_ext || dl_ch_estimates -> dl_ch_estimates_ext)
\n
"
);
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
View file @
e72a6798
...
...
@@ -264,13 +264,15 @@ int nr_ulsch_encoding(NR_UE_ULSCH_t *ulsch,
LOG_D
(
PHY
,
"ulsch coding nb_rb %d, Nl = %d
\n
"
,
nb_rb
,
harq_process
->
pusch_pdu
.
nrOfLayers
);
LOG_D
(
PHY
,
"ulsch coding A %d G %d mod_order %d
\n
"
,
A
,
G
,
mod_order
);
LOG_D
(
PHY
,
"harq_pid %d harq_process->ndi %d, pusch_data.new_data_indicator %d
\n
"
,
harq_pid
,
harq_process
->
ndi
,
harq_process
->
pusch_pdu
.
pusch_data
.
new_data_indicator
);
LOG_D
(
PHY
,
"harq_pid %d harq_process->ndi %d, pusch_data.new_data_indicator %d
\n
"
,
harq_pid
,
harq_process
->
ndi
,
harq_process
->
pusch_pdu
.
pusch_data
.
new_data_indicator
);
if
(
harq_process
->
first_tx
==
1
||
harq_process
->
ndi
!=
harq_process
->
pusch_pdu
.
pusch_data
.
new_data_indicator
)
{
// this is a new packet
#ifdef DEBUG_ULSCH_CODING
printf
(
"encoding thinks this is a new packet
\n
"
);
#endif
harq_process
->
first_tx
=
0
;
harq_process
->
first_tx
=
0
;
///////////////////////// a---->| add CRC |---->b /////////////////////////
///////////
/*
...
...
@@ -413,7 +415,7 @@ int nr_ulsch_encoding(NR_UE_ULSCH_t *ulsch,
///////////
///////////////////////////////////////////////////////////////////////////////
LOG_D
(
PHY
,
"setting ndi to %d from pusch_data
\n
"
,
harq_process
->
pusch_pdu
.
pusch_data
.
new_data_indicator
);
LOG_D
(
PHY
,
"setting ndi to %d from pusch_data
\n
"
,
harq_process
->
pusch_pdu
.
pusch_data
.
new_data_indicator
);
harq_process
->
ndi
=
harq_process
->
pusch_pdu
.
pusch_data
.
new_data_indicator
;
}
F
=
harq_process
->
F
;
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
View file @
e72a6798
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
View file @
e72a6798
...
...
@@ -558,7 +558,7 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
/* use of initial pucch configuration provided by system information 1 */
/***********************************************************************/
if
(
initial_pucch_id
!=
NB_INITIAL_PUCCH_RESOURCE
)
{
LOG_
I
(
MAC
,
"Selecting INITIAL PUCCH Resource
\n
"
);
LOG_
D
(
MAC
,
"Selecting INITIAL PUCCH Resource
\n
"
);
format
=
initial_pucch_resource
[
initial_pucch_id
].
format
;
starting_symbol_index
=
initial_pucch_resource
[
initial_pucch_id
].
startingSymbolIndex
;
nb_symbols_total
=
initial_pucch_resource
[
initial_pucch_id
].
nrofSymbols
;
...
...
@@ -989,8 +989,6 @@ uint8_t get_downlink_ack(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_t
int
V_DAI_m_DL
=
0
;
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
0
);
if
(
mac
->
DLbwp
[
0
]
&&
mac
->
DLbwp
[
0
]
->
bwp_Dedicated
&&
mac
->
DLbwp
[
0
]
->
bwp_Dedicated
->
pdsch_Config
&&
...
...
openair2/COMMON/gtpv1_u_messages_types.h
View file @
e72a6798
openair2/F1AP/f1ap_cu_interface_management.c
View file @
e72a6798
...
...
@@ -146,7 +146,7 @@ int CU_handle_F1_SETUP_REQUEST(instance_t instance,
/* tac */
if
(
served_cells_item_p
->
served_Cell_Information
.
fiveGS_TAC
)
{
OCTET_STRING_TO_INT16
(
served_cells_item_p
->
served_Cell_Information
.
fiveGS_TAC
,
F1AP_SETUP_REQ
(
message_p
).
tac
[
i
]);
LOG_
I
(
F1AP
,
"F1AP_SETUP_REQ(message_p).tac[%d] %d
\n
"
,
i
,
F1AP_SETUP_REQ
(
message_p
).
tac
[
i
]);
LOG_
D
(
F1AP
,
"F1AP_SETUP_REQ(message_p).tac[%d] %d
\n
"
,
i
,
F1AP_SETUP_REQ
(
message_p
).
tac
[
i
]);
}
/* - nRCGI */
TBCD_TO_MCC_MNC
(
&
(
served_cells_item_p
->
served_Cell_Information
.
nRCGI
.
pLMN_Identity
),
F1AP_SETUP_REQ
(
message_p
).
mcc
[
i
],
...
...
@@ -157,7 +157,7 @@ int CU_handle_F1_SETUP_REQUEST(instance_t instance,
// NR cellID
BIT_STRING_TO_NR_CELL_IDENTITY
(
&
served_cells_item_p
->
served_Cell_Information
.
nRCGI
.
nRCellIdentity
,
F1AP_SETUP_REQ
(
message_p
).
nr_cellid
[
i
]);
LOG_
I
(
F1AP
,
"[SCTP %d] Received nRCGI: MCC %d, MNC %d, CELL_ID %llu
\n
"
,
assoc_id
,
LOG_
D
(
F1AP
,
"[SCTP %d] Received nRCGI: MCC %d, MNC %d, CELL_ID %llu
\n
"
,
assoc_id
,
F1AP_SETUP_REQ
(
message_p
).
mcc
[
i
],
F1AP_SETUP_REQ
(
message_p
).
mnc
[
i
],
(
long
long
unsigned
int
)
F1AP_SETUP_REQ
(
message_p
).
nr_cellid
[
i
]);
...
...
@@ -169,7 +169,7 @@ int CU_handle_F1_SETUP_REQUEST(instance_t instance,
served_cells_item_p
->
served_Cell_Information
.
nRCGI
.
nRCellIdentity
.
buf
[
4
]);
/* - nRPCI */
F1AP_SETUP_REQ
(
message_p
).
nr_pci
[
i
]
=
served_cells_item_p
->
served_Cell_Information
.
nRPCI
;
LOG_
I
(
F1AP
,
"F1AP_SETUP_REQ(message_p).nr_pci[%d] %d
\n
"
,
LOG_
D
(
F1AP
,
"F1AP_SETUP_REQ(message_p).nr_pci[%d] %d
\n
"
,
i
,
F1AP_SETUP_REQ
(
message_p
).
nr_pci
[
i
]);
// System Information
...
...
@@ -319,7 +319,7 @@ int CU_send_F1_SETUP_RESPONSE(instance_t instance,
/* mandatory */
/* c3. cells to be Activated list */
int
num_cells_to_activate
=
f1ap_setup_resp
->
num_cells_to_activate
;
LOG_
I
(
F1AP
,
"num_cells_to_activate = %d
\n
"
,
num_cells_to_activate
);
LOG_
D
(
F1AP
,
"num_cells_to_activate = %d
\n
"
,
num_cells_to_activate
);
if
(
num_cells_to_activate
>
0
)
{
ie
=
(
F1AP_F1SetupResponseIEs_t
*
)
calloc
(
1
,
sizeof
(
F1AP_F1SetupResponseIEs_t
));
ie
->
id
=
F1AP_ProtocolIE_ID_id_Cells_to_be_Activated_List
;
...
...
@@ -328,7 +328,7 @@ int CU_send_F1_SETUP_RESPONSE(instance_t instance,
for
(
i
=
0
;
i
<
num_cells_to_activate
;
i
++
)
{
LOG_
I
(
F1AP
,
"[c3] (cell %d) mcc = %d, mnc = %d, mnc_digit_length = %d, nr_cellid = %lu
\n
"
,
LOG_
D
(
F1AP
,
"[c3] (cell %d) mcc = %d, mnc = %d, mnc_digit_length = %d, nr_cellid = %lu
\n
"
,
i
,
f1ap_setup_resp
->
cells_to_activate
[
i
].
mcc
,
f1ap_setup_resp
->
cells_to_activate
[
i
].
mnc
,
...
...
@@ -387,7 +387,7 @@ int CU_send_F1_SETUP_RESPONSE(instance_t instance,
(
const
char
*
)
f1ap_setup_resp
->
cells_to_activate
[
i
].
SI_container
[
sIBtype
],
f1ap_setup_resp
->
cells_to_activate
[
i
].
SI_container_length
[
sIBtype
]);
LOG_
I
(
F1AP
,
"f1ap_setup_resp->SI_container_length[%d][%d] = %d
\n
"
,
i
,
sIBtype
,
f1ap_setup_resp
->
cells_to_activate
[
i
].
SI_container_length
[
sIBtype
]);
LOG_
D
(
F1AP
,
"f1ap_setup_resp->SI_container_length[%d][%d] = %d
\n
"
,
i
,
sIBtype
,
f1ap_setup_resp
->
cells_to_activate
[
i
].
SI_container_length
[
sIBtype
]);
ASN_SEQUENCE_ADD
(
&
gNB_CUSystemInformation
->
sibtypetobeupdatedlist
.
list
,
sib_item
);
}
}
...
...
@@ -577,7 +577,7 @@ int CU_send_gNB_CU_CONFIGURATION_UPDATE(instance_t instance, f1ap_gnb_cu_configu
for
(
i
=
0
;
i
<
f1ap_gnb_cu_configuration_update
->
num_cells_to_activate
;
i
++
)
{
LOG_
I
(
F1AP
,
"[c2] (cell %d) mcc = %d, mnc = %d, mnc_digit_length = %d, nr_cellid = %lu
\n
"
,
LOG_
D
(
F1AP
,
"[c2] (cell %d) mcc = %d, mnc = %d, mnc_digit_length = %d, nr_cellid = %lu
\n
"
,
i
,
f1ap_gnb_cu_configuration_update
->
cells_to_activate
[
i
].
mcc
,
f1ap_gnb_cu_configuration_update
->
cells_to_activate
[
i
].
mnc
,
...
...
@@ -953,9 +953,10 @@ int CU_send_gNB_CU_CONFIGURATION_UPDATE(instance_t instance, f1ap_gnb_cu_configu
return
-
1
;
}
LOG_I
(
F1AP
,
"F1AP gNB-CU CONFIGURATION UPDATE : "
);
for
(
int
i
=
0
;
i
<
len
;
i
++
)
printf
(
"%02x "
,
buffer
[
i
]);
printf
(
"
\n
"
);
LOG_D
(
F1AP
,
"F1AP gNB-CU CONFIGURATION UPDATE
\n
"
);
//for (int i=0;i<len;i++) printf("%02x ",buffer[i]);
//printf("\n");
cu_f1ap_itti_send_sctp_data_req
(
instance
,
f1ap_du_data_from_du
->
assoc_id
,
buffer
,
len
,
0
);
return
0
;
}
...
...
@@ -971,7 +972,7 @@ int CU_handle_gNB_CU_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance,
uint32_t
assoc_id
,
uint32_t
stream
,
F1AP_F1AP_PDU_t
*
pdu
)
{
LOG_
I
(
F1AP
,
"Cell Configuration ok (assoc_id %d)
\n
"
,
assoc_id
);
LOG_
D
(
F1AP
,
"Cell Configuration ok (assoc_id %d)
\n
"
,
assoc_id
);
return
(
0
);
}
...
...
openair2/F1AP/f1ap_cu_rrc_message_transfer.c
View file @
e72a6798
...
...
@@ -132,10 +132,10 @@ int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(instance_t instance,
if
(
RC
.
nrrrc
&&
RC
.
nrrrc
[
GNB_INSTANCE_TO_MODULE_ID
(
instance
)]
->
node_type
==
ngran_gNB_CU
)
{
LOG_
I
(
F1AP
,
"%s() RRCContainer (CCCH) size %ld: "
,
__func__
,
ie
->
value
.
choice
.
RRCContainer
.
size
);
for
(
int
i
=
0
;
i
<
ie
->
value
.
choice
.
RRCContainer
.
size
;
i
++
)
printf
(
"%02x "
,
RRC_MAC_CCCH_DATA_IND
(
message_p
).
sdu
[
i
]);
printf
(
"
\n
"
);
LOG_
D
(
F1AP
,
"%s() RRCContainer (CCCH) size %ld: "
,
__func__
,
ie
->
value
.
choice
.
RRCContainer
.
size
);
//
for (int i = 0; i < ie->value.choice.RRCContainer.size; i++)
//
printf("%02x ", RRC_MAC_CCCH_DATA_IND (message_p).sdu[i]);
//
printf("\n");
/* DUtoCURRCContainer */
F1AP_FIND_PROTOCOLIE_BY_ID
(
F1AP_InitialULRRCMessageTransferIEs_t
,
ie
,
container
,
...
...
openair2/F1AP/f1ap_decoder.c
View file @
e72a6798
...
...
@@ -161,7 +161,7 @@ int f1ap_decode_pdu(F1AP_F1AP_PDU_t *pdu, const uint8_t *const buffer, uint32_t
0
,
0
);
if
(
1
/*asn1_decoder_xer_print*/
)
{
if
(
asn1_decoder_xer_print
)
{
LOG_E
(
F1AP
,
"----------------- ASN1 DECODER PRINT START-----------------
\n
"
);
xer_fprint
(
stdout
,
&
asn_DEF_F1AP_F1AP_PDU
,
pdu
);
LOG_E
(
F1AP
,
"----------------- ASN1 DECODER PRINT END -----------------
\n
"
);
...
...
openair2/F1AP/f1ap_du_interface_management.c
View file @
e72a6798
...
...
@@ -397,7 +397,7 @@ int DU_send_F1_SETUP_REQUEST(instance_t instance) {
(
const
char
*
)
f1ap_du_data
->
mib
[
i
],
//f1ap_du_data->mib,
f1ap_du_data
->
mib_length
[
i
]);
LOG_
I
(
F1AP
,
"Filling SIB1_message for cell %d, length %d
\n
"
,
i
,
f1ap_du_data
->
sib1_length
[
i
]);
LOG_
D
(
F1AP
,
"Filling SIB1_message for cell %d, length %d
\n
"
,
i
,
f1ap_du_data
->
sib1_length
[
i
]);
OCTET_STRING_fromBuf
(
&
gNB_DU_System_Information
->
sIB1_message
,
// sept. 2018
(
const
char
*
)
f1ap_du_data
->
sib1
[
i
],
f1ap_du_data
->
sib1_length
[
i
]);
...
...
openair2/F1AP/f1ap_du_interface_management.h
View file @
e72a6798
openair2/F1AP/f1ap_encoder.c
View file @
e72a6798
...
...
@@ -33,7 +33,7 @@
#include "f1ap_common.h"
#include "f1ap_encoder.h"
int
asn1_encoder_xer_print
=
1
;
int
asn1_encoder_xer_print
=
0
;
/*
static inline int f1ap_encode_initiating(f1ap_message *message,
...
...
openair2/GNB_APP/MACRLC_nr_paramdef.h
View file @
e72a6798
openair2/GNB_APP/gnb_app.c
View file @
e72a6798
...
...
@@ -140,7 +140,7 @@ static void init_pdcp(void) {
uint32_t
pdcp_initmask
=
(
IS_SOFTMODEM_NOS1
)
?
(
PDCP_USE_NETLINK_BIT
|
LINK_ENB_PDCP_TO_IP_DRIVER_BIT
)
:
LINK_ENB_PDCP_TO_GTPV1U_BIT
;
if
(
IS_SOFTMODEM_NOS1
)
{
printf
(
"IS_SOFTMODEM_NOS1 option enabled
\n
"
);
LOG_I
(
PDCP
,
"IS_SOFTMODEM_NOS1 option enabled
\n
"
);
pdcp_initmask
=
pdcp_initmask
|
ENB_NAS_USE_TUN_BIT
|
SOFTMODEM_NOKRNMOD_BIT
;
}
...
...
openair2/GNB_APP/gnb_config.c
View file @
e72a6798
...
...
@@ -727,7 +727,7 @@ void RCconfig_nr_macrlc() {
RC
.
nrmac
[
j
]
->
ulsch_max_slots_inactivity
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_ULSCH_MAX_SLOTS_INACTIVITY
].
uptr
);
}
// for (j=0;j<RC.nb_nr_macrlc_inst;j++)
}
else
{
// MacRLC_ParamList.numelt > 0
printf
(
"No %s configuration found
\n
"
,
CONFIG_STRING_MACRLC_LIST
);
LOG_E
(
PHY
,
"No %s configuration found
\n
"
,
CONFIG_STRING_MACRLC_LIST
);
// AssertFatal (0,"No " CONFIG_STRING_MACRLC_LIST " configuration found");
}
...
...
@@ -1301,13 +1301,14 @@ int RCconfig_NR_NG(MessageDef *msg_p, uint32_t i) {
NGAP_REGISTER_GNB_REQ
(
msg_p
).
amf_ip_address
[
j
].
ipv4
=
1
;
NGAP_REGISTER_GNB_REQ
(
msg_p
).
amf_ip_address
[
j
].
ipv6
=
1
;
}
/* not in configuration yet ...
/* not in configuration yet ...
if (NGParamList.paramarray[l][GNB_AMF_BROADCAST_PLMN_INDEX].iptr)
NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_num[l] = NGParamList.paramarray[l][GNB_AMF_BROADCAST_PLMN_INDEX].numelt;
else
NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_num[l] = 0;
*/
*/
AssertFatal
(
NGAP_REGISTER_GNB_REQ
(
msg_p
).
broadcast_plmn_num
[
l
]
<=
NGAP_REGISTER_GNB_REQ
(
msg_p
).
num_plmn
,
"List of broadcast PLMN to be sent to AMF can not be longer than actual "
"PLMN list (max %d, but is %d)
\n
"
,
...
...
openair2/LAYER2/MAC/eNB_scheduler_RA.c
View file @
e72a6798
...
...
@@ -1288,7 +1288,7 @@ initiate_ra_proc(module_id_t module_idP,
prach_ParametersListCE_r13
=
&
ext4_prach
->
prach_ParametersListCE_r13
;
}
LOG_
I
(
MAC
,
LOG_
D
(
MAC
,
"[eNB %d][RAPROC] CC_id %d Frame %d, Subframe %d Initiating RA procedure for preamble index %d, timing offset %d
\n
"
,
module_idP
,
CC_id
,
frameP
,
subframeP
,
preamble_index
,
timing_offset
);
LOG_D
(
MAC
,
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
e72a6798
...
...
@@ -316,7 +316,7 @@ rx_sdu(const module_id_t enb_mod_idP,
if
(
no_sig
||
sduP
==
NULL
)
{
// we've got an error on Msg3
if
(
no_sig
)
{
LOG_
W
(
MAC
,
"No signal in Msg3
\n
"
);
LOG_
D
(
MAC
,
"No signal in Msg3
\n
"
);
}
LOG_D
(
MAC
,
"[eNB %d] CC_id %d, RA %d ULSCH in error in round %d/%d
\n
"
,
...
...
@@ -728,7 +728,7 @@ rx_sdu(const module_id_t enb_mod_idP,
}
if
(
no_sig
)
{
LOG_
W
(
MAC
,
"No signal
\n
"
);
LOG_
D
(
MAC
,
"No signal
\n
"
);
break
;
}
...
...
openair2/LAYER2/NR_MAC_UE/config_ue.c
View file @
e72a6798
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
e72a6798
...
...
@@ -63,7 +63,7 @@
#include "common/utils/LOG/vcd_signal_dumper.h"
//#define ENABLE_MAC_PAYLOAD_DEBUG 1
#define DEBUG_EXTRACT_DCI
//
#define DEBUG_EXTRACT_DCI
//#define DEBUG_RAR
extern
uint32_t
N_RB_DL
;
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @
e72a6798
...
...
@@ -2072,7 +2072,7 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
ulsch_buffer
[
j
]
=
0
;
}
//
#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
LOG_I
(
NR_MAC
,
"Printing UL MAC payload UE side, payload_offset: %d
\n
"
,
payload_offset
);
for
(
int
i
=
0
;
i
<
buflen
;
i
++
)
{
//harq_process_ul_ue->a[i] = (unsigned char) rand();
...
...
@@ -2080,7 +2080,7 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
printf
(
"%02x "
,(
unsigned
char
)
ulsch_buffer
[
i
]);
}
printf
(
"
\n
"
);
//
#endif
#endif
return
1
;
}
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
e72a6798
...
...
@@ -462,7 +462,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
NR_UE_info_t
*
UE_info
=
&
RC
.
nrmac
[
Mod_idP
]
->
UE_info
;
if
(
add_ue
==
1
&&
get_softmodem_params
()
->
phy_test
)
{
const
int
UE_id
=
add_new_nr_ue
(
Mod_idP
,
rnti
,
CellGroup
);
LOG_I
(
PHY
,
"Added new UE_id %d/%x with initial CellGroup
\n
"
,
UE_id
,
rnti
);
LOG_I
(
NR_MAC
,
"Added new UE_id %d/%x with initial CellGroup
\n
"
,
UE_id
,
rnti
);
}
else
if
(
add_ue
==
1
&&
!
get_softmodem_params
()
->
phy_test
)
{
const
int
CC_id
=
0
;
NR_COMMON_channels_t
*
cc
=
&
RC
.
nrmac
[
Mod_idP
]
->
common_channels
[
CC_id
];
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
View file @
e72a6798
...
...
@@ -66,7 +66,7 @@ void dump_mac_stats(gNB_MAC_INST *gNB)
NR_UE_info_t
*
UE_info
=
&
gNB
->
UE_info
;
int
num
=
1
;
for
(
int
UE_id
=
UE_info
->
list
.
head
;
UE_id
>=
0
;
UE_id
=
UE_info
->
list
.
next
[
UE_id
])
{
LOG_I
(
MAC
,
"UE ID %d RNTI %04x (%d/%d) PH %d dB PCMAX %d dBm
\n
"
,
LOG_I
(
NR_
MAC
,
"UE ID %d RNTI %04x (%d/%d) PH %d dB PCMAX %d dBm
\n
"
,
UE_id
,
UE_info
->
rnti
[
UE_id
],
num
++
,
...
...
@@ -75,16 +75,16 @@ void dump_mac_stats(gNB_MAC_INST *gNB)
UE_info
->
UE_sched_ctrl
[
UE_id
].
pcmax
);
NR_mac_stats_t
*
stats
=
&
UE_info
->
mac_stats
[
UE_id
];
const
int
avg_rsrp
=
stats
->
num_rsrp_meas
>
0
?
stats
->
cumul_rsrp
/
stats
->
num_rsrp_meas
:
0
;
LOG_I
(
MAC
,
"UE %d: dlsch_rounds %d/%d/%d/%d, dlsch_errors %d, average RSRP %d (%d meas)
\n
"
,
LOG_I
(
NR_
MAC
,
"UE %d: dlsch_rounds %d/%d/%d/%d, dlsch_errors %d, average RSRP %d (%d meas)
\n
"
,
UE_id
,
stats
->
dlsch_rounds
[
0
],
stats
->
dlsch_rounds
[
1
],
stats
->
dlsch_rounds
[
2
],
stats
->
dlsch_rounds
[
3
],
stats
->
dlsch_errors
,
avg_rsrp
,
stats
->
num_rsrp_meas
);
stats
->
num_rsrp_meas
=
0
;
stats
->
cumul_rsrp
=
0
;
LOG_I
(
MAC
,
"UE %d: dlsch_total_bytes %d
\n
"
,
UE_id
,
stats
->
dlsch_total_bytes
);
LOG_I
(
NR_
MAC
,
"UE %d: dlsch_total_bytes %d
\n
"
,
UE_id
,
stats
->
dlsch_total_bytes
);
const
NR_UE_sched_ctrl_t
*
sched_ctrl
=
&
UE_info
->
UE_sched_ctrl
[
UE_id
];
LOG_I
(
MAC
,
"UE %d: ulsch_rounds %d/%d/%d/%d, ulsch_errors %d, PUSCH SNR %2.1f dB, PUCCH SNR %2.1f dB, noise rssi %2.1f dB
\n
"
,
LOG_I
(
NR_
MAC
,
"UE %d: ulsch_rounds %d/%d/%d/%d, ulsch_errors %d, PUSCH SNR %2.1f dB, PUCCH SNR %2.1f dB, noise rssi %2.1f dB
\n
"
,
UE_id
,
stats
->
ulsch_rounds
[
0
],
stats
->
ulsch_rounds
[
1
],
stats
->
ulsch_rounds
[
2
],
stats
->
ulsch_rounds
[
3
],
...
...
@@ -92,15 +92,15 @@ void dump_mac_stats(gNB_MAC_INST *gNB)
(
float
)
sched_ctrl
->
pusch_snrx10
/
10
,
(
float
)
sched_ctrl
->
pucch_snrx10
/
10
,
(
float
)
(
sched_ctrl
->
raw_rssi
-
1280
)
/
10
);
LOG_I
(
MAC
,
LOG_I
(
NR_
MAC
,
"UE %d: ulsch_total_bytes_scheduled %d, ulsch_total_bytes_received %d
\n
"
,
UE_id
,
stats
->
ulsch_total_bytes_scheduled
,
stats
->
ulsch_total_bytes_rx
);
for
(
int
lc_id
=
0
;
lc_id
<
63
;
lc_id
++
)
{
if
(
stats
->
lc_bytes_tx
[
lc_id
]
>
0
)
LOG_D
(
MAC
,
"UE %d: LCID %d: %d bytes TX
\n
"
,
UE_id
,
lc_id
,
stats
->
lc_bytes_tx
[
lc_id
]);
LOG_D
(
NR_
MAC
,
"UE %d: LCID %d: %d bytes TX
\n
"
,
UE_id
,
lc_id
,
stats
->
lc_bytes_tx
[
lc_id
]);
if
(
stats
->
lc_bytes_rx
[
lc_id
]
>
0
)
LOG_D
(
MAC
,
"UE %d: LCID %d: %d bytes RX
\n
"
,
UE_id
,
lc_id
,
stats
->
lc_bytes_rx
[
lc_id
]);
LOG_D
(
NR_
MAC
,
"UE %d: LCID %d: %d bytes RX
\n
"
,
UE_id
,
lc_id
,
stats
->
lc_bytes_rx
[
lc_id
]);
}
}
print_meas
(
&
gNB
->
eNB_scheduler
,
"DL & UL scheduling timing stats"
,
NULL
,
NULL
);
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
View file @
e72a6798
...
...
@@ -998,9 +998,8 @@ void nr_schedule_ue_spec(module_id_t module_id,
memset
(
&
dci_payload
,
0
,
sizeof
(
dci_pdu_rel15_t
));
// bwp indicator
const
int
n_dl_bwp
=
bwp
?
UE_info
->
CellGroup
[
UE_id
]
->
spCellConfig
->
spCellConfigDedicated
->
downlinkBWP_ToAddModList
->
list
.
count
:
0
;
AssertFatal
(
n_dl_bwp
<=
1
,
"downlinkBWP_ToAddModList has %d BWP!
\n
"
,
n_dl_bwp
);
AssertFatal
(
n_dl_bwp
<=
1
,
"downlinkBWP_ToAddModList has %d BWP!
\n
"
,
n_dl_bwp
);
// as per table 7.3.1.1.2-1 in 38.212
dci_payload
.
bwp_indicator
.
val
=
bwp
?
(
n_dl_bwp
<
4
?
bwp
->
bwp_Id
:
bwp
->
bwp_Id
-
1
)
:
0
;
if
(
bwp
)
AssertFatal
(
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
resourceAllocation
==
NR_PDSCH_Config__resourceAllocation_resourceAllocationType1
,
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
e72a6798
...
...
@@ -1822,7 +1822,7 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP, NR_CellGroupConfig_t *CellG
for
(
int
i
=
0
;
i
<
MAX_MOBILES_PER_GNB
;
i
++
)
{
if
(
UE_info
->
active
[
i
])
{
LOG_
I
(
NR_MAC
,
"UE %x is active, skipping
\n
"
,
rntiP
);
LOG_
D
(
NR_MAC
,
"UE %x is active, skipping
\n
"
,
rntiP
);
continue
;
}
int
UE_id
=
i
;
...
...
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
View file @
e72a6798
...
...
@@ -64,6 +64,7 @@ static void nr_pdcp_entity_recv_pdu(nr_pdcp_entity_t *entity,
buffer
[
2
];
header_size
=
3
;
}
/* SRBs always have MAC-I, even if integrity is not active */
if
(
entity
->
has_integrity
||
entity
->
type
==
NR_PDCP_SRB
)
{
integrity_size
=
4
;
...
...
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
View file @
e72a6798
...
...
@@ -534,7 +534,7 @@ rb_found:
memblock
=
get_free_mem_block
(
size
,
__FUNCTION__
);
memcpy
(
memblock
->
data
,
buf
,
size
);
LOG_
I
(
PDCP
,
"%s(): (srb %d) calling rlc_data_req size %d
\n
"
,
__func__
,
rb_id
,
size
);
LOG_
D
(
PDCP
,
"%s(): (srb %d) calling rlc_data_req size %d
\n
"
,
__func__
,
rb_id
,
size
);
//for (i = 0; i < size; i++) printf(" %2.2x", (unsigned char)memblock->data[i]);
//printf("\n");
enqueue_rlc_data_req
(
&
ctxt
,
0
,
MBMS_FLAG_NO
,
rb_id
,
sdu_id
,
0
,
size
,
memblock
,
NULL
,
NULL
);
...
...
@@ -718,7 +718,7 @@ void pdcp_run(const protocol_ctxt_t *const ctxt_pP)
}
switch
(
ITTI_MSG_ID
(
msg_p
))
{
case
RRC_DCCH_DATA_REQ
:
LOG_
I
(
PDCP
,
"Received RRC_DCCH_DATA_REQ type at PDCP task
\n
"
);
LOG_
D
(
PDCP
,
"Received RRC_DCCH_DATA_REQ type at PDCP task
\n
"
);
PROTOCOL_CTXT_SET_BY_MODULE_ID
(
&
ctxt
,
RRC_DCCH_DATA_REQ
(
msg_p
).
module_id
,
...
...
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
View file @
e72a6798
...
...
@@ -448,7 +448,7 @@ static void deliver_sdu(void *_ue, nr_rlc_entity_t *entity, char *buf, int size)
exit
(
1
);
rb_found:
LOG_
I
(
RLC
,
"%s:%d:%s: delivering SDU (rnti %d is_srb %d rb_id %d) size %d
\n
"
,
LOG_
D
(
RLC
,
"%s:%d:%s: delivering SDU (rnti %d is_srb %d rb_id %d) size %d
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
,
ue
->
rnti
,
is_srb
,
rb_id
,
size
);
memblock
=
get_free_mem_block
(
size
,
__func__
);
...
...
@@ -640,7 +640,7 @@ static void add_rlc_srb(int rnti, struct NR_SRB_ToAddMod *s, NR_RLC_BearerConfig
int
t_reassembly
;
int
sn_field_length
;
LOG_
I
(
RLC
,
"Trying to add SRB %d
\n
"
,
srb_id
);
LOG_
D
(
RLC
,
"Trying to add SRB %d
\n
"
,
srb_id
);
if
(
srb_id
!=
1
&&
srb_id
!=
2
)
{
LOG_E
(
RLC
,
"%s:%d:%s: fatal, bad srb id %d
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
,
srb_id
);
...
...
@@ -707,7 +707,7 @@ static void add_rlc_srb(int rnti, struct NR_SRB_ToAddMod *s, NR_RLC_BearerConfig
sn_field_length
);
nr_rlc_ue_add_srb_rlc_entity
(
ue
,
srb_id
,
nr_rlc_am
);
LOG_
I
(
RLC
,
"%s:%d:%s: added srb %d to UE with RNTI 0x%x
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
,
srb_id
,
rnti
);
LOG_
D
(
RLC
,
"%s:%d:%s: added srb %d to UE with RNTI 0x%x
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
,
srb_id
,
rnti
);
}
nr_rlc_manager_unlock
(
nr_rlc_ue_manager
);
}
...
...
openair2/RRC/NR/L2_nr_interface.c
View file @
e72a6798
...
...
@@ -166,7 +166,7 @@ nr_rrc_data_req(
//------------------------------------------------------------------------------
{
if
(
sdu_sizeP
==
255
)
{
LOG_
I
(
NR_
RRC
,
"sdu_sizeP == 255"
);
LOG_
D
(
RRC
,
"sdu_sizeP == 255"
);
return
FALSE
;
}
...
...
@@ -332,7 +332,7 @@ int8_t nr_mac_rrc_data_ind(const module_id_t module_idP,
int
sdu2_len
=
(
enc_rval
.
encoded
+
7
)
/
8
;
if
(
enc_rval
.
encoded
==
-
1
)
{
LOG_
I
(
F1AP
,
"Could not encoded cellGroupConfig, failed element %s
\n
"
,
enc_rval
.
failed_type
->
name
);
LOG_
E
(
F1AP
,
"Could not encoded cellGroupConfig, failed element %s
\n
"
,
enc_rval
.
failed_type
->
name
);
exit
(
-
1
);
}
/* do ITTI message */
...
...
openair2/RRC/NR/MESSAGES/asn1_msg.c
View file @
e72a6798
...
...
@@ -1197,7 +1197,6 @@ void fill_initial_cellGroupConfig(rnti_t rnti,
rlc_BearerConfig
->
servedRadioBearer
->
present
=
NR_RLC_BearerConfig__servedRadioBearer_PR_srb_Identity
;
rlc_BearerConfig
->
servedRadioBearer
->
choice
.
srb_Identity
=
1
;
rlc_BearerConfig
->
reestablishRLC
=
NULL
;
//if (0) {
rlc_Config
=
calloc
(
1
,
sizeof
(
NR_RLC_Config_t
));
rlc_Config
->
present
=
NR_RLC_Config_PR_am
;
rlc_Config
->
choice
.
am
=
calloc
(
1
,
sizeof
(
*
rlc_Config
->
choice
.
am
));
...
...
@@ -1211,10 +1210,7 @@ void fill_initial_cellGroupConfig(rnti_t rnti,
rlc_Config
->
choice
.
am
->
ul_AM_RLC
.
pollPDU
=
NR_PollPDU_infinity
;
rlc_Config
->
choice
.
am
->
ul_AM_RLC
.
pollByte
=
NR_PollByte_infinity
;
rlc_Config
->
choice
.
am
->
ul_AM_RLC
.
maxRetxThreshold
=
NR_UL_AM_RLC__maxRetxThreshold_t8
;
//}
rlc_BearerConfig
->
rlc_Config
=
rlc_Config
;
//if (0) {
logicalChannelConfig
=
calloc
(
1
,
sizeof
(
NR_LogicalChannelConfig_t
));
logicalChannelConfig
->
ul_SpecificParameters
=
calloc
(
1
,
sizeof
(
*
logicalChannelConfig
->
ul_SpecificParameters
));
logicalChannelConfig
->
ul_SpecificParameters
->
priority
=
1
;
...
...
@@ -1226,9 +1222,7 @@ void fill_initial_cellGroupConfig(rnti_t rnti,
*
logicalChannelConfig
->
ul_SpecificParameters
->
schedulingRequestID
=
0
;
logicalChannelConfig
->
ul_SpecificParameters
->
logicalChannelSR_Mask
=
0
;
logicalChannelConfig
->
ul_SpecificParameters
->
logicalChannelSR_DelayTimerApplied
=
0
;
//}
rlc_BearerConfig
->
mac_LogicalChannelConfig
=
logicalChannelConfig
;
ASN_SEQUENCE_ADD
(
&
cellGroupConfig
->
rlc_BearerToAddModList
->
list
,
rlc_BearerConfig
);
// SRB2
...
...
@@ -1460,9 +1454,9 @@ uint8_t do_NR_SecurityModeCommand(
dl_dcch_msg
.
message
.
choice
.
c1
->
choice
.
securityModeCommand
->
criticalExtensions
.
choice
.
securityModeCommand
->
securityConfigSMC
.
securityAlgorithmConfig
.
integrityProtAlgorithm
=
integrityProtAlgorithm
;
//
if ( LOG_DEBUGFLAG(DEBUG_ASN1) ) {
if
(
LOG_DEBUGFLAG
(
DEBUG_ASN1
)
)
{
xer_fprint
(
stdout
,
&
asn_DEF_NR_DL_DCCH_Message
,
(
void
*
)
&
dl_dcch_msg
);
//
}
}
enc_rval
=
uper_encode_to_buffer
(
&
asn_DEF_NR_DL_DCCH_Message
,
NULL
,
...
...
@@ -1920,8 +1914,8 @@ do_NR_DLInformationTransfer(
encoded
=
uper_encode_to_new_buffer
(
&
asn_DEF_NR_DL_DCCH_Message
,
NULL
,
(
void
*
)
&
dl_dcch_msg
,
(
void
**
)
buffer
);
AssertFatal
(
encoded
>
0
,
"ASN1 message encoding failed (%s, %ld)!
\n
"
,
"DLInformationTransfer"
,
encoded
);
LOG_
I
(
NR_RRC
,
"DLInformationTransfer Encoded %zd bytes
\n
"
,
encoded
);
for
(
int
i
=
0
;
i
<
encoded
;
i
++
)
printf
(
"%02x "
,(
*
buffer
)[
i
]);
LOG_
D
(
NR_RRC
,
"DLInformationTransfer Encoded %zd bytes
\n
"
,
encoded
);
//
for (int i=0;i<encoded;i++) printf("%02x ",(*buffer)[i]);
return
encoded
;
}
...
...
openair2/RRC/NR/rrc_gNB.c
View file @
e72a6798
...
...
@@ -1261,7 +1261,7 @@ rrc_gNB_process_RRCReconfigurationComplete(
ue_context_pP
->
ue_context
.
rnti
);
#ifndef ITTI_SIM
LOG_
I
(
NR_RRC
,
"Configuring PDCP DRBs/SRBs for UE %x
\n
"
,
ue_context_pP
->
ue_context
.
rnti
);
LOG_
D
(
NR_RRC
,
"Configuring PDCP DRBs/SRBs for UE %x
\n
"
,
ue_context_pP
->
ue_context
.
rnti
);
nr_rrc_pdcp_config_asn1_req
(
ctxt_pP
,
SRB_configList
,
// NULL,
...
...
@@ -1277,7 +1277,7 @@ rrc_gNB_process_RRCReconfigurationComplete(
ue_context_pP
->
ue_context
.
masterCellGroup
->
rlc_BearerToAddModList
);
/* Refresh SRBs/DRBs */
if
(
!
NODE_IS_CU
(
RC
.
nrrrc
[
ctxt_pP
->
module_id
]
->
node_type
))
{
LOG_
I
(
NR_RRC
,
"Configuring RLC DRBs/SRBs for UE %x
\n
"
,
ue_context_pP
->
ue_context
.
rnti
);
LOG_
D
(
NR_RRC
,
"Configuring RLC DRBs/SRBs for UE %x
\n
"
,
ue_context_pP
->
ue_context
.
rnti
);
nr_rrc_rlc_config_asn1_req
(
ctxt_pP
,
SRB_configList
,
// NULL,
DRB_configList
,
...
...
@@ -2179,8 +2179,10 @@ rrc_gNB_decode_dcch(
LOG_D
(
NR_RRC
,
PROTOCOL_NR_RRC_CTXT_UE_FMT
" Decoding UL-DCCH Message
\n
"
,
PROTOCOL_NR_RRC_CTXT_UE_ARGS
(
ctxt_pP
));
for
(
int
i
=
0
;
i
<
sdu_sizeP
;
i
++
)
printf
(
"%02x "
,
Rx_sdu
[
i
]);
printf
(
"
\n
"
);
//for (int i=0;i<sdu_sizeP;i++) printf("%02x ",Rx_sdu[i]);
//printf("\n");
dec_rval
=
uper_decode
(
NULL
,
&
asn_DEF_NR_UL_DCCH_Message
,
...
...
@@ -2189,7 +2191,7 @@ rrc_gNB_decode_dcch(
sdu_sizeP
,
0
,
0
);
xer_fprint
(
stdout
,
&
asn_DEF_NR_UL_DCCH_Message
,
(
void
*
)
ul_dcch_msg
);
// xer_fprint(stdout, &asn_DEF_NR_UL_DCCH_Message, (void *)&
ul_dcch_msg);
{
for
(
i
=
0
;
i
<
sdu_sizeP
;
i
++
)
{
...
...
@@ -2787,6 +2789,7 @@ void *rrc_gnb_task(void *args_p) {
int
result
;
//SRB_INFO *srb_info_p;
//int CC_id;
protocol_ctxt_t
ctxt
=
{.
module_id
=
0
,
.
enb_flag
=
1
,
.
instance
=
0
,
...
...
@@ -2797,6 +2800,7 @@ void *rrc_gnb_task(void *args_p) {
.
configured
=
true
,
.
brOption
=
false
};
itti_mark_task_ready
(
TASK_RRC_GNB
);
LOG_I
(
NR_RRC
,
"Entering main loop of NR_RRC message task
\n
"
);
...
...
@@ -2850,10 +2854,12 @@ void *rrc_gnb_task(void *args_p) {
NR_RRC_MAC_CCCH_DATA_IND
(
msg_p
).
sdu_size
,
NR_RRC_MAC_CCCH_DATA_IND
(
msg_p
).
du_to_cu_rrc_container
,
NR_RRC_MAC_CCCH_DATA_IND
(
msg_p
).
CC_id
);
if
(
NR_RRC_MAC_CCCH_DATA_IND
(
msg_p
).
du_to_cu_rrc_container
)
{
free
(
NR_RRC_MAC_CCCH_DATA_IND
(
msg_p
).
du_to_cu_rrc_container
->
buf
);
free
(
NR_RRC_MAC_CCCH_DATA_IND
(
msg_p
).
du_to_cu_rrc_container
);
}
break
;
/* Messages from PDCP */
...
...
@@ -3087,7 +3093,7 @@ rrc_gNB_generate_SecurityModeCommand(
GNB_RRC_DCCH_DATA_IND
(
message_p
).
size
=
size
;
itti_send_msg_to_task
(
TASK_RRC_UE_SIM
,
ctxt_pP
->
instance
,
message_p
);
#else
LOG_
I
(
NR_RRC
,
"calling rrc_data_req :securityModeCommand
\n
"
);
LOG_
D
(
NR_RRC
,
"calling rrc_data_req :securityModeCommand
\n
"
);
nr_rrc_data_req
(
ctxt_pP
,
DCCH
,
rrc_gNB_mui
++
,
...
...
@@ -3169,8 +3175,7 @@ rrc_gNB_generate_UECapabilityEnquiry(
GNB_RRC_DCCH_DATA_IND
(
message_p
).
size
=
size
;
itti_send_msg_to_task
(
TASK_RRC_UE_SIM
,
ctxt_pP
->
instance
,
message_p
);
#else
nr_rrc_data_req
(
ctxt_pP
,
nr_rrc_data_req
(
ctxt_pP
,
DCCH
,
rrc_gNB_mui
++
,
SDU_CONFIRM_NO
,
...
...
openair2/RRC/NR/rrc_gNB_NGAP.c
View file @
e72a6798
...
...
@@ -686,7 +686,7 @@ rrc_gNB_process_security(
/* Save security parameters */
ue_context_pP
->
ue_context
.
security_capabilities
=
*
security_capabilities_pP
;
// translation
LOG_
I
(
NR_RRC
,
LOG_
D
(
NR_RRC
,
"[gNB %d] NAS security_capabilities.encryption_algorithms %u AS ciphering_algorithm %lu NAS security_capabilities.integrity_algorithms %u AS integrity_algorithm %u
\n
"
,
ctxt_pP
->
module_id
,
ue_context_pP
->
ue_context
.
security_capabilities
.
nRencryption_algorithms
,
...
...
openair2/RRC/NR/rrc_gNB_nsa.c
View file @
e72a6798
openair2/RRC/NR_UE/L2_interface_ue.c
View file @
e72a6798
...
...
@@ -83,7 +83,7 @@ nr_mac_rrc_data_ind_ue(
case
CCCH
:
if
(
pdu_len
>
0
)
{
LOG_
I
(
NR_RRC
,
"[UE %d] Received SDU for CCCH on SRB %u from gNB %d
\n
"
,
module_id
,
channel
&
RAB_OFFSET
,
gNB_index
);
LOG_
T
(
NR_RRC
,
"[UE %d] Received SDU for CCCH on SRB %u from gNB %d
\n
"
,
module_id
,
channel
&
RAB_OFFSET
,
gNB_index
);
MessageDef
*
message_p
;
int
msg_sdu_size
=
CCCH_SDU_SIZE
;
...
...
@@ -129,13 +129,12 @@ int8_t nr_mac_rrc_data_req_ue(const module_id_t Mod_idP,
//NR_UE_rrc_inst[Mod_idP].Info[gNB_id].T300_active = 1;
//NR_UE_rrc_inst[Mod_idP].Info[gNB_id].T300_cnt = 0;
LOG_
I
(
NR_RRC
,
"nr_mac_rrc_data_req_ue: Payload size = %i
\n
"
,
NR_UE_rrc_inst
[
Mod_idP
].
Srb0
[
gNB_id
].
Tx_buffer
.
payload_size
);
LOG_
D
(
NR_RRC
,
"nr_mac_rrc_data_req_ue: Payload size = %i
\n
"
,
NR_UE_rrc_inst
[
Mod_idP
].
Srb0
[
gNB_id
].
Tx_buffer
.
payload_size
);
memcpy
(
buffer_pP
,
(
uint8_t
*
)
NR_UE_rrc_inst
[
Mod_idP
].
Srb0
[
gNB_id
].
Tx_buffer
.
Payload
,
NR_UE_rrc_inst
[
Mod_idP
].
Srb0
[
gNB_id
].
Tx_buffer
.
payload_size
);
for
(
int
i
=
0
;
i
<
NR_UE_rrc_inst
[
Mod_idP
].
Srb0
[
gNB_id
].
Tx_buffer
.
payload_size
;
i
++
)
{
//LOG_I(NR_RRC,"(%i): %i\n", i, buffer_pP[i]);
printf
(
"%02x "
,
buffer_pP
[
i
]);
LOG_D
(
NR_RRC
,
"(%i): %i
\n
"
,
i
,
buffer_pP
[
i
]);
}
printf
(
"
\n
"
);
return
NR_UE_rrc_inst
[
Mod_idP
].
Srb0
[
gNB_id
].
Tx_buffer
.
payload_size
;
case
DCCH
:
...
...
@@ -163,11 +162,8 @@ rrc_data_req_ue(
MessageDef
*
message_p
;
// Uses a new buffer to avoid issue with PDCP buffer content that could be changed by PDCP (asynchronous message handling).
uint8_t
*
message_buffer
;
message_buffer
=
itti_malloc
(
TASK_RRC_UE
,
TASK_PDCP_UE
,
sdu_sizeP
);
LOG_I
(
RRC
,
"Sending RRC message for SRB %ld, sdu_size %d
\n
"
,
rb_idP
,
sdu_sizeP
);
message_buffer
=
itti_malloc
(
TASK_RRC_UE
,
TASK_PDCP_UE
,
sdu_sizeP
);
LOG_D
(
RRC
,
"Sending RRC message for SRB %ld, sdu_size %d
\n
"
,
rb_idP
,
sdu_sizeP
);
memcpy
(
message_buffer
,
buffer_pP
,
sdu_sizeP
);
message_p
=
itti_alloc_new_message
(
TASK_RRC_UE
,
0
,
RRC_DCCH_DATA_REQ
);
RRC_DCCH_DATA_REQ
(
message_p
).
frame
=
ctxt_pP
->
frame
;
...
...
openair2/RRC/NR_UE/rrc_UE.c
View file @
e72a6798
...
...
@@ -567,7 +567,7 @@ int8_t nr_rrc_ue_decode_NR_BCCH_BCH_Message(
buffer_len
);
if
((
dec_rval
.
code
!=
RC_OK
)
||
(
dec_rval
.
consumed
==
0
))
{
LOG_
I
(
NR_RRC
,
"NR_BCCH_BCH decode error
\n
"
);
LOG_
E
(
NR_RRC
,
"NR_BCCH_BCH decode error
\n
"
);
// free the memory
SEQUENCE_free
(
&
asn_DEF_NR_BCCH_BCH_Message
,
(
void
*
)
bcch_message
,
1
);
return
-
1
;
...
...
@@ -1194,7 +1194,7 @@ int8_t nr_rrc_ue_decode_NR_BCCH_DL_SCH_Message(
NR_UE_rrc_inst
[
module_id
].
ra_trigger
=
INITIAL_ACCESS_FROM_RRC_IDLE
;
// TODO: remove flag after full RA procedures implemented
// get_softmodem_params()->do_ra = 1;
LOG_
I
(
PHY
,
"Setting state to NR_RRC_SI_RECEIVED
\n
"
);
LOG_
D
(
PHY
,
"Setting state to NR_RRC_SI_RECEIVED
\n
"
);
nr_rrc_set_state
(
module_id
,
NR_RRC_SI_RECEIVED
);
}
// take ServingCellConfigCommon and configure L1/L2
...
...
@@ -1260,6 +1260,7 @@ nr_rrc_ue_process_masterCellGroup(
(
uint8_t
*
)
masterCellGroup
->
buf
,
masterCellGroup
->
size
,
0
,
0
);
xer_fprint
(
stdout
,
&
asn_DEF_NR_CellGroupConfig
,
(
const
void
*
)
cellGroupConfig
);
if
(
cellGroupConfig
->
spCellConfig
!=
NULL
&&
cellGroupConfig
->
spCellConfig
->
reconfigurationWithSync
!=
NULL
){
//TODO (perform Reconfiguration with sync according to 5.3.5.5.2)
//TODO (resume all suspended radio bearers and resume SCG transmission for all radio bearers, if suspended)
...
...
@@ -1293,7 +1294,7 @@ nr_rrc_ue_process_masterCellGroup(
else
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
cell_group_config
=
cellGroupConfig
;
}
LOG_
I
(
RRC
,
"Sending CellGroupConfig to MAC
\n
"
);
LOG_
D
(
RRC
,
"Sending CellGroupConfig to MAC
\n
"
);
nr_rrc_mac_config_req_ue
(
ctxt_pP
->
module_id
,
0
,
0
,
NULL
,
NULL
,
cellGroupConfig
,
NULL
);
//TODO (configure the SpCell as specified in 5.3.5.5.7)
}
...
...
@@ -1351,18 +1352,18 @@ static void rrc_ue_generate_RRCSetupComplete(
"[FRAME %05d][RRC_UE][MOD %02d][][--- PDCP_DATA_REQ/%d Bytes (RRCSetupComplete to gNB %d MUI %d) --->][PDCP][MOD %02d][RB %02d]
\n
"
,
ctxt_pP
->
frame
,
ctxt_pP
->
module_id
+
NB_RN_INST
,
size
,
gNB_index
,
nr_rrc_mui
,
ctxt_pP
->
module_id
+
NB_eNB_INST
,
DCCH
);
for
(
int
i
=
0
;
i
<
size
;
i
++
)
printf
(
"%02x "
,
buffer
[
i
]);
printf
(
"
\n
"
);
//
for (int i=0;i<size;i++) printf("%02x ",buffer[i]);
//
printf("\n");
// ctxt_pP_local.rnti = ctxt_pP->rnti;
rrc_data_req_ue
(
ctxt_pP
,
rrc_data_req_ue
(
ctxt_pP
,
DCCH
,
nr_rrc_mui
++
,
SDU_CONFIRM_NO
,
size
,
buffer
,
PDCP_TRANSMISSION_MODE_CONTROL
);
#ifdef ITTI_SIM
MessageDef
*
message_p
;
uint8_t
*
message_buffer
;
...
...
@@ -1382,7 +1383,7 @@ int8_t nr_rrc_ue_decode_ccch( const protocol_ctxt_t *const ctxt_pP, const NR_SRB
asn_dec_rval_t
dec_rval
;
int
rval
=
0
;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_DECODE_CCCH
,
VCD_FUNCTION_IN
);
LOG_
I
(
RRC
,
"[NR UE%d] Decoding DL-CCCH message (%d bytes), State %d
\n
"
,
ctxt_pP
->
module_id
,
Srb_info
->
Rx_buffer
.
payload_size
,
LOG_
D
(
RRC
,
"[NR UE%d] Decoding DL-CCCH message (%d bytes), State %d
\n
"
,
ctxt_pP
->
module_id
,
Srb_info
->
Rx_buffer
.
payload_size
,
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
Info
[
gNB_index
].
State
);
dec_rval
=
uper_decode
(
NULL
,
&
asn_DEF_NR_DL_CCCH_Message
,
...
...
@@ -1390,9 +1391,9 @@ int8_t nr_rrc_ue_decode_ccch( const protocol_ctxt_t *const ctxt_pP, const NR_SRB
(
uint8_t
*
)
Srb_info
->
Rx_buffer
.
Payload
,
100
,
0
,
0
);
//
if ( LOG_DEBUGFLAG(DEBUG_ASN1) ) {
if
(
LOG_DEBUGFLAG
(
DEBUG_ASN1
)
)
{
xer_fprint
(
stdout
,
&
asn_DEF_NR_DL_CCCH_Message
,(
void
*
)
dl_ccch_msg
);
//
}
}
if
((
dec_rval
.
code
!=
RC_OK
)
&&
(
dec_rval
.
consumed
==
0
))
{
LOG_E
(
RRC
,
"[UE %d] Frame %d : Failed to decode DL-CCCH-Message (%zu bytes)
\n
"
,
ctxt_pP
->
module_id
,
ctxt_pP
->
frame
,
dec_rval
.
consumed
);
...
...
@@ -1633,8 +1634,7 @@ int8_t nr_rrc_ue_decode_ccch( const protocol_ctxt_t *const ctxt_pP, const NR_SRB
pdcp_t
*
pdcp_p
=
NULL
;
hash_key_t
key
=
HASHTABLE_NOT_A_KEY_VALUE
;
hashtable_rc_t
h_rc
;
key
=
PDCP_COLL_KEY_VALUE
(
ctxt_pP
->
module_id
,
ctxt_pP
->
rnti
,
ctxt_pP
->
enb_flag
,
DCCH
,
SRB_FLAG_YES
);
key
=
PDCP_COLL_KEY_VALUE
(
ctxt_pP
->
module_id
,
ctxt_pP
->
rnti
,
ctxt_pP
->
enb_flag
,
DCCH
,
SRB_FLAG_YES
);
h_rc
=
hashtable_get
(
pdcp_coll_p
,
key
,
(
void
**
)
&
pdcp_p
);
if
(
h_rc
==
HASH_TABLE_OK
)
{
...
...
@@ -1666,8 +1666,7 @@ int8_t nr_rrc_ue_decode_ccch( const protocol_ctxt_t *const ctxt_pP, const NR_SRB
|
(
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
integrityProtAlgorithm
<<
4
),
kRRCenc
,
kRRCint
,
kUPenc
);
}
else
{
LOG_I
(
NR_RRC
,
"skipped pdcp_config_set_security() as securityMode == 0x%02x"
,
securityMode
);
LOG_I
(
NR_RRC
,
"skipped pdcp_config_set_security() as securityMode == 0x%02x"
,
securityMode
);
}
}
else
{
LOG_I
(
NR_RRC
,
"Could not get PDCP instance where key=0x%ld
\n
"
,
key
);
...
...
@@ -1713,8 +1712,7 @@ int8_t nr_rrc_ue_decode_ccch( const protocol_ctxt_t *const ctxt_pP, const NR_SRB
GNB_RRC_DCCH_DATA_IND
(
message_p
).
size
=
(
enc_rval
.
encoded
+
7
)
/
8
;
itti_send_msg_to_task
(
TASK_RRC_GNB_SIM
,
ctxt_pP
->
instance
,
message_p
);
#else
rrc_data_req_ue
(
ctxt_pP
,
rrc_data_req_ue
(
ctxt_pP
,
DCCH
,
nr_rrc_mui
++
,
SDU_CONFIRM_NO
,
...
...
@@ -1757,13 +1755,13 @@ int8_t nr_rrc_ue_decode_ccch( const protocol_ctxt_t *const ctxt_pP, const NR_SRB
module_id
,
NR_UE_rrc_inst
[
module_id
].
Srb0
[
gNB_index
].
Tx_buffer
.
payload_size
,
gNB_index
);
for
(
i
=
0
;
i
<
NR_UE_rrc_inst
[
module_id
].
Srb0
[
gNB_index
].
Tx_buffer
.
payload_size
;
i
++
)
{
//
LOG_T(NR_RRC,"%x.",NR_UE_rrc_inst[module_id].Srb0[gNB_index].Tx_buffer.Payload[i]);
printf
(
"%x."
,
NR_UE_rrc_inst
[
module_id
].
Srb0
[
gNB_index
].
Tx_buffer
.
Payload
[
i
]);
LOG_T
(
NR_RRC
,
"%x."
,
NR_UE_rrc_inst
[
module_id
].
Srb0
[
gNB_index
].
Tx_buffer
.
Payload
[
i
]);
//
printf("%x.",NR_UE_rrc_inst[module_id].Srb0[gNB_index].Tx_buffer.Payload[i]);
}
//
LOG_T(NR_RRC,"\n");
printf
(
"
\n
"
);
LOG_T
(
NR_RRC
,
"
\n
"
);
//
printf("\n");
/*UE_rrc_inst[ue_mod_idP].Srb0[Idx].Tx_buffer.Payload[i] = taus()&0xff;
UE_rrc_inst[ue_mod_idP].Srb0[Idx].Tx_buffer.payload_size =i; */
...
...
@@ -2011,10 +2009,8 @@ nr_rrc_ue_establish_srb2(
if
(
radioBearerConfig
->
srb_ToAddModList
!=
NULL
)
{
if
(
radioBearerConfig
->
securityConfig
!=
NULL
)
{
if
(
*
radioBearerConfig
->
securityConfig
->
keyToUse
==
NR_SecurityConfig__keyToUse_master
)
{
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
cipheringAlgorithm
=
radioBearerConfig
->
securityConfig
->
securityAlgorithmConfig
->
cipheringAlgorithm
;
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
integrityProtAlgorithm
=
*
radioBearerConfig
->
securityConfig
->
securityAlgorithmConfig
->
integrityProtAlgorithm
;
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
cipheringAlgorithm
=
radioBearerConfig
->
securityConfig
->
securityAlgorithmConfig
->
cipheringAlgorithm
;
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
integrityProtAlgorithm
=
*
radioBearerConfig
->
securityConfig
->
securityAlgorithmConfig
->
integrityProtAlgorithm
;
}
}
...
...
@@ -2318,8 +2314,7 @@ nr_rrc_ue_establish_srb2(
itti_send_msg_to_task
(
TASK_NAS_UE
,
ctxt_pP
->
instance
,
msg_p
);
break
;
case
NR_DL_DCCH_MessageType__c1_PR_ueCapabilityEnquiry
:
LOG_I
(
NR_RRC
,
"[UE %d] Received Capability Enquiry (gNB %d)
\n
"
,
ctxt_pP
->
module_id
,
gNB_indexP
);
LOG_I
(
NR_RRC
,
"[UE %d] Received Capability Enquiry (gNB %d)
\n
"
,
ctxt_pP
->
module_id
,
gNB_indexP
);
nr_rrc_ue_process_ueCapabilityEnquiry
(
ctxt_pP
,
dl_dcch_msg
->
message
.
choice
.
c1
->
choice
.
ueCapabilityEnquiry
,
...
...
@@ -2418,7 +2413,7 @@ nr_rrc_ue_establish_srb2(
break
;
case
NR_RRC_MAC_CCCH_DATA_IND
:
LOG_I
(
NR_RRC
,
"[UE %d] RNTI %x Received %s: frameP %d, gNB %d
\n
"
,
LOG_D
(
NR_RRC
,
"[UE %d] RNTI %x Received %s: frameP %d, gNB %d
\n
"
,
ue_mod_id
,
NR_RRC_MAC_CCCH_DATA_IND
(
msg_p
).
rnti
,
ITTI_MSG_NAME
(
msg_p
),
...
...
@@ -2438,7 +2433,7 @@ nr_rrc_ue_establish_srb2(
/* PDCP messages */
case
NR_RRC_DCCH_DATA_IND
:
PROTOCOL_CTXT_SET_BY_MODULE_ID
(
&
ctxt
,
NR_RRC_DCCH_DATA_IND
(
msg_p
).
module_id
,
GNB_FLAG_NO
,
NR_RRC_DCCH_DATA_IND
(
msg_p
).
rnti
,
NR_RRC_DCCH_DATA_IND
(
msg_p
).
frame
,
0
,
NR_RRC_DCCH_DATA_IND
(
msg_p
).
gNB_index
);
LOG_
I
(
NR_RRC
,
"[UE %d] Received %s: frameP %d, DCCH %d, gNB %d
\n
"
,
LOG_
D
(
NR_RRC
,
"[UE %d] Received %s: frameP %d, DCCH %d, gNB %d
\n
"
,
NR_RRC_DCCH_DATA_IND
(
msg_p
).
module_id
,
ITTI_MSG_NAME
(
msg_p
),
NR_RRC_DCCH_DATA_IND
(
msg_p
).
frame
,
...
...
openair2/SIMULATION/NR_RRC/itti_sim.c
View file @
e72a6798
...
...
@@ -416,7 +416,7 @@ int create_tasks_nrue(uint32_t ue_nb) {
return
-
1
;
}
LOG_
I
(
NR_RRC
,
"create TASK_NAS_NRUE
\n
"
);
LOG_
D
(
NR_RRC
,
"create TASK_NAS_NRUE
\n
"
);
if
(
itti_create_task
(
TASK_NAS_NRUE
,
nas_nrue_task
,
NULL
)
<
0
)
{
LOG_E
(
NR_RRC
,
"Create task for NAS UE failed
\n
"
);
return
-
1
;
...
...
openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c
View file @
e72a6798
...
...
@@ -59,7 +59,7 @@
extern
"C"
{
#endif
#define LOG_GTPU 1
//
#define LOG_GTPU 1
/*--------------------------------------------------------------------------*
* P R I V A T E F U N C T I O N S *
*--------------------------------------------------------------------------*/
...
...
openair3/ocp-gtpu/gtp_itf.cpp
View file @
e72a6798
...
...
@@ -436,7 +436,7 @@ teid_t newGtpuCreateTunnel(instance_t instance, rnti_t rnti, int incoming_bearer
tmp
->
outgoing_port
=
port
;
tmp
->
teid_outgoing
=
outgoing_teid
;
pthread_mutex_unlock
(
&
globGtp
.
gtp_lock
);
LOG_
I
(
GTPU
,
"Created tunnel for RNTI %x, bearer: %d/%d teid for DL: %x, teid for UL %x
\n
"
,
LOG_
D
(
GTPU
,
"Created tunnel for RNTI %x, bearer: %d/%d teid for DL: %x, teid for UL %x
\n
"
,
rnti
,
outgoing_bearer_id
,
incoming_bearer_id
,
tmp
->
teid_incoming
,
...
...
@@ -576,8 +576,7 @@ int newGtpuDeleteTunnel(instance_t instance, rnti_t rnti) {
inst
->
ue2te_mapping
.
erase
(
it
);
pthread_mutex_unlock
(
&
globGtp
.
gtp_lock
);
LOG_I
(
GTPU
,
"Deleted all tunnels for RNTI %d (%d tunnels deleted)
\n
"
,
rnti
,
nb
);
LOG_I
(
GTPU
,
"Deleted all tunnels for RNTI %d (%d tunnels deleted)
\n
"
,
rnti
,
nb
);
return
!
GTPNOK
;
}
...
...
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