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
lizhongxiao
OpenXG UE
Commits
319b4432
Commit
319b4432
authored
Jun 21, 2021
by
Laurent THOMAS
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix merge NR_SA_F1AP_5GRECORDS and fix warnings, a regression in UE (LCID lopp)
parent
94a90364
Changes
24
Hide whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
32 additions
and
81 deletions
+32
-81
executables/nr-gnb.c
executables/nr-gnb.c
+1
-0
openair1/PHY/LTE_TRANSPORT/transport_common.h
openair1/PHY/LTE_TRANSPORT/transport_common.h
+0
-16
openair1/PHY/NR_TRANSPORT/nr_ulsch.h
openair1/PHY/NR_TRANSPORT/nr_ulsch.h
+1
-0
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
+0
-1
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
+1
-1
openair1/PHY/defs_nr_UE.h
openair1/PHY/defs_nr_UE.h
+0
-1
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
+3
-3
openair2/COMMON/platform_types.h
openair2/COMMON/platform_types.h
+2
-10
openair2/F1AP/f1ap_cu_rrc_message_transfer.c
openair2/F1AP/f1ap_cu_rrc_message_transfer.c
+0
-7
openair2/F1AP/f1ap_du_rrc_message_transfer.c
openair2/F1AP/f1ap_du_rrc_message_transfer.c
+0
-7
openair2/F1AP/f1ap_du_ue_context_management.c
openair2/F1AP/f1ap_du_ue_context_management.c
+0
-7
openair2/GNB_APP/gnb_app.c
openair2/GNB_APP/gnb_app.c
+1
-0
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
+5
-0
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+9
-9
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+0
-2
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+2
-1
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
+0
-1
openair2/RRC/LTE/L2_interface.c
openair2/RRC/LTE/L2_interface.c
+0
-2
openair2/RRC/NR/L2_nr_interface.c
openair2/RRC/NR/L2_nr_interface.c
+1
-0
openair2/UTIL/OPT/probe.c
openair2/UTIL/OPT/probe.c
+4
-0
openair3/NAS/NR_UE/nr_nas_msg_sim.c
openair3/NAS/NR_UE/nr_nas_msg_sim.c
+0
-9
openair3/UICC/usim_interface.h
openair3/UICC/usim_interface.h
+1
-0
openair3/ocp-gtpu/gtp_itf.cpp
openair3/ocp-gtpu/gtp_itf.cpp
+0
-3
No files found.
executables/nr-gnb.c
View file @
319b4432
...
...
@@ -86,6 +86,7 @@
#include "T.h"
#include "nfapi/oai_integration/vendor_ext.h"
#include <nfapi/oai_integration/nfapi_pnf.h>
#include <openair1/PHY/NR_TRANSPORT/nr_ulsch.h>
//#define DEBUG_THREADS 1
//#define USRP_DEBUG 1
...
...
openair1/PHY/LTE_TRANSPORT/transport_common.h
View file @
319b4432
...
...
@@ -65,22 +65,6 @@
#define MAX_NUM_CHANNEL_BITS (14*1200*6) // 14 symbols, 1200 REs, 12 bits/RE
#define MAX_NUM_RE (14*1200)
#if !defined(SI_RNTI)
#define SI_RNTI (rnti_t)0xffff
#define SI_RNTI_MBMS (rnti_t)0xfff9
#endif
#if !defined(M_RNTI)
#define M_RNTI (rnti_t)0xfffd
#endif
#if !defined(P_RNTI)
#define P_RNTI (rnti_t)0xfffe
#endif
#if !defined(CBA_RNTI)
#define CBA_RNTI (rnti_t)0xfff4
#endif
#if !defined(C_RNTI)
#define C_RNTI (rnti_t)0x1234
#endif
// These are the codebook indexes according to Table 6.3.4.2.3-1 of 36.211
//1 layer
#define PMI_2A_11 0
...
...
openair1/PHY/NR_TRANSPORT/nr_ulsch.h
View file @
319b4432
...
...
@@ -91,6 +91,7 @@ int16_t find_nr_ulsch(uint16_t rnti, PHY_VARS_gNB *gNB,find_type_t type);
void
dump_pusch_stats
(
FILE
*
fd
,
PHY_VARS_gNB
*
gNB
);
void
dump_nr_I0_stats
(
FILE
*
fd
,
PHY_VARS_gNB
*
gNB
);
void
clear_pusch_stats
(
PHY_VARS_gNB
*
gNB
);
NR_gNB_SCH_STATS_t
*
get_ulsch_stats
(
PHY_VARS_gNB
*
gNB
,
NR_gNB_ULSCH_t
*
ulsch
);
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
View file @
319b4432
...
...
@@ -1218,7 +1218,6 @@ int nr_rx_pusch(PHY_VARS_gNB *gNB,
rel15_ul
);
nr_gnb_measurements
(
gNB
,
ulsch_id
,
harq_pid
,
symbol
);
int
num_symb
=
rel15_ul
->
nr_of_symbols
;
for
(
aarx
=
0
;
aarx
<
frame_parms
->
nb_antennas_rx
;
aarx
++
)
{
if
(
symbol
==
rel15_ul
->
start_symbol_index
)
{
gNB
->
pusch_vars
[
ulsch_id
]
->
ulsch_power
[
aarx
]
=
0
;
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
View file @
319b4432
...
...
@@ -66,7 +66,7 @@ int32_t generate_nr_prach(PHY_VARS_NR_UE *ue, uint8_t gNB_id, uint8_t slot){
uint8_t
Mod_id
,
fd_occasion
,
preamble_index
,
restricted_set
,
not_found
;
uint16_t
rootSequenceIndex
,
prach_fmt_id
,
NCS
,
*
prach_root_sequence_map
,
preamble_offset
=
0
;
uint16_t
preamble_shift
=
0
,
preamble_index0
,
n_shift_ra
,
n_shift_ra_bar
,
d_start
,
numshift
,
N_ZC
,
u
,
offset
,
offset2
,
first_nonzero_root_idx
;
uint16_t
preamble_shift
=
0
,
preamble_index0
,
n_shift_ra
,
n_shift_ra_bar
,
d_start
=
INT16_MAX
,
numshift
,
N_ZC
,
u
,
offset
,
offset2
,
first_nonzero_root_idx
;
int16_t
prach_tmp
[
98304
*
2
*
4
]
__attribute__
((
aligned
(
32
)));
int16_t
Ncp
=
0
,
amp
,
*
prach
,
*
prach2
,
*
prachF
,
*
Xu
;
...
...
openair1/PHY/defs_nr_UE.h
View file @
319b4432
...
...
@@ -1071,7 +1071,6 @@ typedef struct {
#endif
int
dl_stats
[
5
];
void
*
uicc
;
}
PHY_VARS_NR_UE
;
...
...
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
View file @
319b4432
...
...
@@ -567,7 +567,7 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
int
occ_Index
=
0
;
NR_UE_HARQ_STATUS_t
*
harq_status
=
&
ue
->
dlsch
[
proc
->
thread_id
][
gNB_id
][
0
]
->
harq_processes
[
dl_harq_pid
]
->
harq_ack
;
int
BWPsize
,
BWPstart
;
int
BWPsize
,
BWPstart
=
INT_MAX
;
if
(
select_pucch_resource
(
ue
,
mac
,
gNB_id
,
N_UCI
,
pucch_resource_indicator
,
&
initial_pucch_id
,
&
pucch_resource_set
,
&
pucch_resource_id
,
harq_status
)
==
TRUE
)
{
/* use of initial pucch configuration provided by system information 1 */
...
...
@@ -1290,8 +1290,8 @@ boolean_t select_pucch_resource(PHY_VARS_NR_UE *ue, NR_UE_MAC_INST_t *mac, uint8
if
(
resource_set_found
==
TRUE
)
{
if
(
pucch_resource_indicator
<
MAX_PUCCH_RESOURCE_INDICATOR
)
{
// Verify that the value of pucch_resource_indicator is valid
struct
NR_PUCCH_Config__resourceSetToAddModList
*
resourceSetToAddModList
;
struct
NR_PUCCH_Config__resourceToAddModList
*
resourceToAddModList
;
struct
NR_PUCCH_Config__resourceSetToAddModList
*
resourceSetToAddModList
=
NULL
;
struct
NR_PUCCH_Config__resourceToAddModList
*
resourceToAddModList
=
NULL
;
if
(
bwp_id
>
0
&&
mac
->
ULbwp
[
bwp_id
-
1
])
{
AssertFatal
(
mac
->
ULbwp
[
bwp_id
-
1
]
->
bwp_Dedicated
->
pucch_Config
->
choice
.
setup
->
resourceSetToAddModList
!=
NULL
,
"mac->ULbwp[bwp_id-1]->bwp_Dedicated->pucch_Config->choice.setup->resourceSetToAddModList is null
\n
"
);
resourceSetToAddModList
=
mac
->
ULbwp
[
bwp_id
-
1
]
->
bwp_Dedicated
->
pucch_Config
->
choice
.
setup
->
resourceSetToAddModList
;
...
...
openair2/COMMON/platform_types.h
View file @
319b4432
...
...
@@ -195,21 +195,13 @@ typedef uint8_t mme_code_t;
typedef
uint32_t
m_tmsi_t
;
//Random UE identity length = 40 bits
#if ! defined(NOT_A_RANDOM_UE_IDENTITY)
#define NOT_A_RANDOM_UE_IDENTITY (uint64_t)0xFFFFFFFF
#endif
#if ! defined(NOT_A_RNTI)
#define NOT_A_RNTI (rnti_t)0
#endif
#if ! defined(M_RNTI)
#define M_RNTI (rnti_t)0xFFFD
#endif
#if ! defined(P_RNTI)
#define P_RNTI (rnti_t)0xFFFE
#endif
#if ! defined(SI_RNTI)
#define SI_RNTI (rnti_t)0xFFFF
#endif
#define CBA_RNTI (rnti_t)0xfff4
#define OAI_C_RNTI (rnti_t)0x1234
typedef
enum
config_action_e
{
CONFIG_ACTION_NULL
=
0
,
CONFIG_ACTION_ADD
=
1
,
...
...
openair2/F1AP/f1ap_cu_rrc_message_transfer.c
View file @
319b4432
...
...
@@ -38,13 +38,6 @@
#include "common/ran_context.h"
#include "openair3/UTILS/conversions.h"
// undefine C_RNTI from
// openair1/PHY/LTE_TRANSPORT/transport_common.h which
// replaces in ie->value.choice.C_RNTI, causing
// a compile error
#undef C_RNTI
// Bing Kai: create CU and DU context, and put all the information there.
uint64_t
du_ue_f1ap_id
=
0
;
uint32_t
f1ap_assoc_id
=
0
;
...
...
openair2/F1AP/f1ap_du_rrc_message_transfer.c
View file @
319b4432
...
...
@@ -56,13 +56,6 @@
#include "intertask_interface.h"
#include "LAYER2/NR_MAC_gNB/mac_proto.h"
// undefine C_RNTI from
// openair1/PHY/LTE_TRANSPORT/transport_common.h which
// replaces in ie->value.choice.C_RNTI, causing
// a compile error
#undef C_RNTI
extern
f1ap_setup_req_t
*
f1ap_du_data
;
extern
RAN_CONTEXT_t
RC
;
extern
f1ap_cudu_inst_t
f1ap_du_inst
[
MAX_eNB
];
...
...
openair2/F1AP/f1ap_du_ue_context_management.c
View file @
319b4432
...
...
@@ -41,13 +41,6 @@
#include "openair2/RRC/NR/rrc_gNB_UE_context.h"
#include "openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h"
// undefine C_RNTI from
// openair1/PHY/LTE_TRANSPORT/transport_common.h which
// replaces in ie->value.choice.C_RNTI, causing
// a compile error
#undef C_RNTI
extern
f1ap_setup_req_t
*
f1ap_du_data
;
extern
f1ap_cudu_inst_t
f1ap_du_inst
[
MAX_eNB
];
extern
RAN_CONTEXT_t
RC
;
...
...
openair2/GNB_APP/gnb_app.c
View file @
319b4432
...
...
@@ -46,6 +46,7 @@
#include "f1ap_cu_task.h"
#include "f1ap_du_task.h"
#include "nfapi/oai_integration/vendor_ext.h"
#include <openair2/LAYER2/nr_pdcp/nr_pdcp.h>
extern
unsigned
char
NB_gNB_INST
;
extern
RAN_CONTEXT_t
RC
;
...
...
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
View file @
319b4432
...
...
@@ -169,4 +169,9 @@ uint8_t get_transformPrecoding(const NR_BWP_UplinkCommon_t *initialUplinkBWP,
int
rnti_type
,
uint8_t
configuredGrant
);
void
nr_mac_eNB_rrc_ul_failure
(
const
module_id_t
Mod_instP
,
const
int
CC_idP
,
const
frame_t
frameP
,
const
sub_frame_t
subframeP
,
const
rnti_t
rntiP
)
;
#endif
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @
319b4432
...
...
@@ -1941,9 +1941,9 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
// TO DO: Multiplex in the order defined by the logical channel prioritization
for
(
lcid
=
UL_SCH_LCID_SRB1
;
lcid
<
MAX_LCID
;
lcid
++
)
{
lcid_buffer_occupancy_new
=
mac_rlc_get_buffer_occupancy_ind
(
module_idP
,
mac
->
crnti
,
eNB_index
,
frameP
,
subframe
,
ENB_FLAG_NO
,
lcid
);
if
(
mac_rlc_get_buffer_occupancy_ind
(
module_idP
,
mac
->
crnti
,
eNB_index
,
frameP
,
subframe
,
ENB_FLAG_NO
,
lcid
)
)
{
if
(
lcid_buffer_occupancy_new
)
{
buflen_remain
=
buflen
-
(
total_rlc_pdu_header_len
+
sdu_length_total
+
MAX_RLC_SDU_SUBHEADER_SIZE
);
LOG_I
(
NR_MAC
,
...
...
@@ -1953,7 +1953,7 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
buflen
,
sdu_length_total
,
total_rlc_pdu_header_len
,
buflen_remain
);
// ,nr_ue_mac_inst->scheduling_info.BSR_bytes[nr_ue_mac_inst->scheduling_info.LCGID[lcid]]
while
(
buflen_remain
>
0
&&
lcid_buffer_occupancy_new
){
while
(
buflen_remain
>
0
&&
lcid_buffer_occupancy_new
){
sdu_lengths
[
num_sdus
]
=
mac_rlc_data_req
(
module_idP
,
mac
->
crnti
,
...
...
@@ -1980,13 +1980,14 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
num_sdus
++
;
}
/* Get updated BO after multiplexing this PDU */
lcid_buffer_occupancy_new
=
mac_rlc_get_buffer_occupancy_ind
(
module_idP
,
mac
->
crnti
,
eNB_index
,
frameP
,
subframe
,
ENB_FLAG_NO
,
lcid
);
buflen_remain
=
buflen
-
(
total_rlc_pdu_header_len
+
sdu_length_total
+
MAX_RLC_SDU_SUBHEADER_SIZE
);
}
}
}
}
}
// Generate ULSCH PDU
if
(
num_sdus
>
0
)
{
payload_offset
=
nr_generate_ulsch_pdu
(
ulsch_sdus
,
...
...
@@ -2001,9 +2002,8 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
0
,
// long_bsr
0
,
// post_padding
buflen
);
// TBS in bytes
}
else
return
0
;
}
else
return
0
;
// Padding: fill remainder of ULSCH with 0
if
(
buflen
-
payload_offset
>
0
){
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
319b4432
...
...
@@ -1138,7 +1138,6 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
gNB_MAC_INST
*
nr_mac
=
RC
.
nrmac
[
module_idP
];
NR_COMMON_channels_t
*
cc
=
&
nr_mac
->
common_channels
[
CC_id
];
NR_ServingCellConfigCommon_t
*
scc
=
cc
->
ServingCellConfigCommon
;
if
(
ra
->
Msg4_frame
==
frameP
&&
ra
->
Msg4_slot
==
slotP
)
{
...
...
@@ -1301,7 +1300,6 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
// look up the PDCCH PDU for this CC, BWP, and CORESET. If it does not exist, create it. This is especially
// important if we have multiple RAs, and the DLSCH has to reuse them, so we need to mark them
const
int
bwpid
=
bwp
?
bwp
->
bwp_Id
:
0
;
const
int
coresetid
=
coreset
->
controlResourceSetId
;
nfapi_nr_dl_tti_pdcch_pdu_rel15_t
*
pdcch_pdu_rel15
=
nr_mac
->
pdcch_pdu_idx
[
CC_id
][
ra
->
bwp_id
][
coresetid
];
if
(
!
pdcch_pdu_rel15
)
{
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
319b4432
...
...
@@ -1881,7 +1881,7 @@ void get_pdsch_to_harq_feedback(int Mod_idP,
if
(
CellGroup
&&
CellGroup
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
)
ubwp
=
CellGroup
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
->
list
.
array
[
bwp_id
-
1
];
NR_SearchSpace_t
*
ss
;
NR_SearchSpace_t
*
ss
=
NULL
;
// common search type uses DCI format 1_0
if
(
ss_type
==
NR_SearchSpace__searchSpaceType_PR_common
)
{
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
319b4432
...
...
@@ -85,7 +85,8 @@ void nr_process_mac_pdu(
LOG_E
(
NR_MAC
,
"%s() UE_id == -1
\n
"
,
__func__
);
return
;
}
trace_NRpdu
(
DIRECTION_UPLINK
,
pduP
,
mac_pdu_len
,
UE_id
,
WS_C_RNTI
,
rnti
,
frameP
,
0
,
0
,
0
);
if
(
pduP
[
0
]
!=
UL_SCH_LCID_PADDING
)
trace_NRpdu
(
DIRECTION_UPLINK
,
pduP
,
mac_pdu_len
,
UE_id
,
WS_C_RNTI
,
rnti
,
frameP
,
0
,
0
,
0
);
NR_UE_sched_ctrl_t
*
sched_ctrl
=
&
UE_info
->
UE_sched_ctrl
[
UE_id
];
// For both DL/UL-SCH
...
...
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
View file @
319b4432
...
...
@@ -38,7 +38,6 @@
#include "common/ran_context.h"
#include "NR_UL-CCCH-Message.h"
#undef C_RNTI // C_RNTI is used in F1AP generated code, prevent preprocessor replace
#include "openair2/F1AP/f1ap_du_rrc_message_transfer.h"
#include "openair2/LAYER2/PROTO_AGENT/proto_agent.h"
...
...
openair2/RRC/LTE/L2_interface.c
View file @
319b4432
...
...
@@ -49,8 +49,6 @@
#include "intertask_interface.h"
#include "flexran_agent_extern.h"
#undef C_RNTI // C_RNTI is used in F1AP generated code, prevent preprocessor replace
//#include "f1ap_du_rrc_message_transfer.h"
#include "openair2/F1AP/f1ap_du_rrc_message_transfer.h"
extern
RAN_CONTEXT_t
RC
;
...
...
openair2/RRC/NR/L2_nr_interface.c
View file @
319b4432
...
...
@@ -44,6 +44,7 @@
#include "NR_BCCH-BCH-Message.h"
#include "rrc_gNB_UE_context.h"
#include <openair2/RRC/NR/MESSAGES/asn1_msg.h>
#include <openair2/F1AP/f1ap_du_rrc_message_transfer.h>
extern
RAN_CONTEXT_t
RC
;
...
...
openair2/UTIL/OPT/probe.c
View file @
319b4432
...
...
@@ -441,6 +441,10 @@ static void SendFrameNR(guint8 radioType, guint8 direction, guint8 rntiType,
tmp16
=
htons
(
subframe
);
// frame counter : this will give an expert info as wireshark expects SF and not F
memcpy
(
frameBuffer
+
frameOffset
,
&
tmp16
,
2
);
frameOffset
+=
2
;
if
(
direction
==
0
)
{
//ulink
frameBuffer
[
frameOffset
++
]
=
MAC_NR_PHR_TYPE2_OTHERCELL_TAG
;
frameBuffer
[
frameOffset
++
]
=
0
;
}
/***************************************/
/* Now write the MAC PDU */
...
...
openair3/NAS/NR_UE/nr_nas_msg_sim.c
View file @
319b4432
...
...
@@ -44,19 +44,10 @@
#include <openair3/NAS/COMMON/NR_NAS_defs.h>
#include <openair1/PHY/phy_extern_nr_ue.h>
//char netName[] = "5G:mnc099.mcc208.3gppnetwork.org";
//char imsi[] = "2089900007487"; //"208990100001100";
// USIM_API_K: fe c8 6b a6 eb 70 7e d0 89 05 75 7b 1b b4 4b 8f
//uint8_t k[16] = {0xfe, 0xc8, 0x6b, 0xa6, 0xeb, 0x70, 0x7e, 0xd0, 0x89, 0x05, 0x75, 0x7b, 0x1b, 0xb4, 0x4b, 0x8f};
// OPC: c4 24 49 36 3b ba d0 2b 66 d1 6b c9 75 d7 7c c1
//const uint8_t opc[16] = {0xc4, 0x24, 0x49, 0x36, 0x3b, 0xba, 0xd0, 0x2b, 0x66, 0xd1, 0x6b, 0xc9, 0x75, 0xd7, 0x7c, 0xc1};
uint8_t
*
registration_request_buf
;
uint32_t
registration_request_len
;
extern
char
*
baseNetAddress
;
static
int
nas_protected_security_header_encode
(
char
*
buffer
,
const
fgs_nas_message_security_header_t
*
header
,
...
...
openair3/UICC/usim_interface.h
View file @
319b4432
...
...
@@ -66,6 +66,7 @@ typedef struct {
/*
* Read the configuration file, section name variable to be able to manage several UICC
*/
uicc_t
*
checkUicc
(
int
Mod_id
);
uicc_t
*
init_uicc
(
char
*
sectionName
);
void
uicc_milenage_generate
(
uint8_t
*
autn
,
uicc_t
*
uicc
);
uicc_t
*
checkUicc
(
int
Mod_id
);
...
...
openair3/ocp-gtpu/gtp_itf.cpp
View file @
319b4432
...
...
@@ -283,9 +283,6 @@ static void gtpv1uEndTunnel(instance_t instance, gtpv1u_enb_tunnel_data_req_t *r
LOG_D
(
GTPU
,
"sending end packet to %s
\n
"
,
inet_ntoa
(
to
.
sin_addr
)
);
if
(
sendto
(
compatInst
(
instance
),
(
void
*
)
&
msgHdr
,
sizeof
(
msgHdr
),
0
,(
struct
sockaddr
*
)
&
to
,
sizeof
(
to
)
)
!=
sizeof
(
msgHdr
))
{
char
ip4
[
INET_ADDRSTRLEN
];
char
ip6
[
INET6_ADDRSTRLEN
];
LOG_E
(
GTPU
,
"[SD %ld] Failed to send data to %s on port %d, buffer size %lu
\n
"
,
compatInst
(
instance
),
inet_ntop
(
AF_INET
,
&
tmp
.
outgoing_ip_addr
,
ip4
,
INET_ADDRSTRLEN
),
tmp
.
outgoing_port
,
sizeof
(
msgHdr
));
...
...
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