maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,367 Commits 5 Branches 0 Tags
20653cd31b3c9e27c7af664ffd1eef14fdc504ae
Commit Graph
724 Commits
Author SHA1 Message Date
matzakos 20653cd31b Modify configuration of NGAP and NAS messages to comply with OAI CN configuration according to Fujitsu patch 
-Hardcodings to be removed later when the NAS extensions will be integrated for OAI UE
 2021-04-27 13:26:06 +02:00
Raymond Knopp 2be602e938 Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_5GRECORDS 2021-04-26 10:51:18 +02:00
hardy c4745c3e46 Merge remote-tracking branch 'origin/new-gtpu' into integration_2020_wk15 
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/TOOLS/time_meas.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/LAYER2/RLC/rlc.h
 2021-04-14 14:56:04 +02:00
Laurent Thomas 307098da4a merge develop 2021-04-09 12:39:33 +02:00
Laurent OpenCells c0ef3e6f88 fix gcc reported issues 2021-04-03 23:37:58 +02:00
Raymond Knopp 4d0d4fcb29 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS 
Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_sdu.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR_UE/rrc_UE.c
 2021-03-27 15:31:22 +01:00
Raymond Knopp 9dd6e3bb82 Merge remote-tracking branch 'origin/develop-SA-CBRA-CUDU' into NR_SA_F1AP_5GRECORDS 
Conflicts:
	executables/nr-uesoftmodem.c
	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
	openair2/RRC/NR/L2_nr_interface.c
 2021-03-18 07:50:08 +01:00
He Shanyun 8965dd782b Merge remote-tracking branch 'remotes/origin/develop_SA_CUDU_rfsim_with_5gc' into integration_w5GC 
Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
 2021-03-11 14:39:36 +09:00
masayuki.harada 535efa0fd2 Remove s1ap_eNB_timer.c and s1ap_eNB_timer.h 2021-03-10 23:16:12 +09:00
matzakos 906fd2b68f Merge branch NR_SA_F1AP_RFSIMULATOR3 into NR_SA_F1AP_5GRECORDS 2021-03-09 15:24:11 +01:00
masayuki.harada 969425f6a8 Replace to itti timer. 
Fix nnsf selection.
Fix indentation and opening brace.
 2021-03-09 03:25:00 +09:00
masayuki.harada ff994453a4 Merge remote-tracking branch 'remotes/oai/develop' into HEAD 
# Conflicts:
#	openair3/S1AP/s1ap_eNB.c
#	openair3/S1AP/s1ap_eNB_handlers.c
 2021-03-08 14:51:11 +09:00
Xue Song 834d6f1055 Merge branch 'master' into NR_SA_F1AP_RFSIMULATOR3_Lo 
Conflicts:
	cmake_targets/CMakeLists.txt
	executables/nr-softmodem.c
	executables/nr-uesoftmodem.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
 2021-03-05 19:07:43 +09:00
Xue Song b6febe214f add GTPV1U_GNB_TUNNEL_DATA_REQ and UDP_DATA_IND 
if the UE is running with noS1, u-plane for rfsim with Free5GC + CU/DU is OK
 2021-02-25 14:00:14 +09:00
Raymond Knopp 4d9ebf0ac0 Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_RFSIMULATOR2 
Conflicts:
	cmake_targets/CMakeLists.txt
	executables/nr-softmodem.c
	executables/nr-uesoftmodem.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
	openair3/NGAP/ngap_gNB_nas_procedures.c
 2021-02-24 23:00:04 +01:00
Xue Song 5918c03cd4 add nrue nas task 2021-02-16 14:14:46 +09:00
Laurent Thomas abfa103247 fix re-reading and end marker code 2021-02-15 10:54:35 +01:00
Cedric Roux 0b4335accc NSA: some work on security (for PDCP) 
- compute correct kgNB
- propagate properly NR security capabilities of an UE
  (involves: rrc, s1ap, x2ap)
 2021-02-12 16:01:37 +01:00
Xue Song e1a92eadba Merge branch 'master' into develop_SA_rfsim_for_F1 
Conflicts:
	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
	openair3/NGAP/ngap_gNB_nas_procedures.c
 2021-02-10 15:56:50 +09:00
Laurent Thomas fa63d9a4e6 merge develop 2021-02-08 11:56:42 +01:00
Xue Song 52edf0c123 Merge branch 'master' into develop_SA_rfsim_for_F1 
Conflicts:
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
	openair2/F1AP/f1ap_cu_interface_management.c
	openair2/F1AP/f1ap_cu_rrc_message_transfer.c
	openair2/F1AP/f1ap_cu_task.c
	openair2/F1AP/f1ap_du_interface_management.c
	openair2/F1AP/f1ap_du_task.c
	openair2/GNB_APP/gnb_app.c
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
	openair2/RRC/NR/L2_nr_interface.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/L2_interface_ue.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
 2021-02-04 18:16:37 +09:00
Xue Song 6a3b7b40a5 Merge branch 'master' into develop_SA_L3 
Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
 2021-02-03 14:58:07 +09:00
Laurent Thomas 7eda2b7409 remainign bug after merge develop 2021-02-01 15:35:17 +01:00
Laurent Thomas 6b37681854 merge develop, minor code addition 2021-02-01 09:02:57 +01:00
Xue Song a85f261b54 add license text 
fix some problems
 2021-02-01 13:59:56 +09:00
hardy 9c810b311d Merge remote-tracking branch 'origin/itti-enhancement' into integration_2021_wk04_b 2021-01-29 07:40:07 +01:00
hardy 62aec337bf Merge remote-tracking branch 'origin/flexran-repair-mme-mgmt' into integration_2021_wk04_b 2021-01-29 07:39:49 +01:00
laurent 4b345f1589 tested with one UE, better intergration with legacy gtpu 2021-01-27 15:09:00 +01:00
Laurent Thomas 954b0f559d new gtp before tests 2021-01-25 12:59:38 +01:00
Xue Song d9934436c3 fix some cppcheck errors 2021-01-25 14:26:39 +09:00
Laurent Thomas 75ad3da9d9 start new gtpu 2021-01-21 15:51:30 +01:00
Laurent Thomas eddebae1e4 fix after code review 2021-01-21 13:47:18 +01:00
He Shanyun b425e6f495 fix cppcheck error and warning 2021-01-16 12:04:00 +09:00
Laurent 3b0c43c04b fix memory allocation error 2021-01-10 21:41:22 +01:00
masayuki.harada 674339237f Add handling of error case. 2021-01-06 20:20:22 +09:00
masayuki.harada 27413fc4fc Fix merge miss. 2021-01-06 20:13:02 +09:00
Haruki NAOI cf41c788d6 fix s1ap stack overflow. 
(cherry picked from commit f6b51079021347c19d528200f04d7cdba1dde0e5)

# Conflicts:
#	openair3/S1AP/s1ap_eNB.c
 2021-01-06 19:53:32 +09:00
Wu Jing 4a14c4c706 fix build waning 
(cherry picked from commit 624fe21f52117959940066a6cfc5f8beac70e462)

# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_RA.c
#	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
#	openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
#	openair3/S1AP/s1ap_eNB.c

# Conflicts:
#	openair3/S1AP/s1ap_eNB.c
 2021-01-06 19:52:37 +09:00
Cai Yang 52acfc75de Fix s1ap_eNB_timer.c warnings 
(cherry picked from commit 39850dcfadb37e24ccfe41e0a85a9f2136eeff4a)
 2021-01-06 19:52:02 +09:00
Wu.Jing 4c75866a54 Fix cppcheck warning 
(cherry picked from commit aaa4d390fdefc4e8071b80edc90a580907c9dec3)
 2021-01-06 19:51:46 +09:00
Wu.Jing 8c607fe85b Fix build error in --UE because of s1ap_eNB.c 
(cherry picked from commit 519e6628d572c9b6cf8031632d4e22e2f8dc5b93)
 2021-01-06 19:51:34 +09:00
Haruki NAOI 46407ca42b Add S1down auto recovery. 
(cherry picked from commit 2339972ceaeb75fe18c0b2ae9ea69216dd919668)
 2021-01-06 19:51:11 +09:00
Ding Yumei 7631a1dc1d fix s1ap StreamID issue 2021-01-06 19:35:32 +09:00
Wu Jing cead17f2d8 Fix openair3/NAS/UE cppcheck error 2021-01-06 19:33:04 +09:00
Haruki NAOI f006866c74 Fix: Drop paging message on sctp stream zero. 
(cherry picked from commit 2d45f940be267e013781d6baba5b2ab665e64c88)
 2021-01-06 19:32:14 +09:00
Wu Jing df17a8dd4f merge NNSF feature based on v1.0.2 
(cherry picked from commit b9e93a16379cf261502d9451b60bd787c07da64e)
 2021-01-06 19:31:35 +09:00
He Shanyun 63a5c693b4 modify decode error about supportedCodecList in NAS message 2021-01-06 19:08:41 +09:00
Laurent 42a110338c itti dynamic queue creation, and 64 bits instance id 2020-12-23 13:56:01 +01:00
yaojie d5696baf71 Fix merge conflict 2020-12-21 12:25:36 +09:00
Wu.Jing 37d52bdf60 Merge branch 'develop_SA_SIM' into develop_SA_L3 
Conflicts:
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair2/RRC/NR_UE/rrc_defs.h
	openair3/NGAP/ngap_gNB_nas_procedures.c
 2020-12-18 17:38:07 +09:00