Raymond Knopp
a446eb0ebc
Merge branch 'episys/master' into episys-merge
...
Conflicts:
common/utils/LOG/log.h
common/utils/ocp_itti/intertask_interface.cpp
nfapi/oai_integration/nfapi_vnf.c
nfapi/open-nFAPI/nfapi/src/nfapi.c
openair2/LAYER2/MAC/main_ue.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/PHY_INTERFACE/phy_stub_UE.c
openair2/RRC/LTE/rrc_UE.c
openair2/RRC/LTE/rrc_eNB.c
openair3/NAS/UE/ESM/esm_ebr_context.c
targets/COMMON/openairinterface5g_limits.h
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-uesoftmodem.c
2021-02-13 22:52:33 +01: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
Xue Song
a85f261b54
add license text
...
fix some problems
2021-02-01 13:59:56 +09:00
Michael Cook
ee86a66722
Merge commit '0b40edef2adc45965dcfe2071b0c4170389ae8b5' into episys/master
2021-01-12 18:11:10 -05:00
Melissa Elkadi
42ae8207ee
NFAPI_MODE logic to include standalone mode
...
Every if statement that includes a check for
the NFAPI_MODE that did not check for the new
PNF_STANDALONE_MODE now has been updated. Also
changed the tx_req and dl_config_req logs
when they are received at the OAI UE to be
info logs instead of error logs.
2021-01-12 06:54:16 -08:00
Melissa Elkadi
a288e502f0
Cleanup before merge
...
The clean up includes removing white space changes, adding logs,
adding comments to make various changes more obvious, etc.
2021-01-08 14:31:13 -08:00
Melissa Elkadi
3108258bb6
Adding USIM data for up to 18 UEs
2021-01-06 14:24:15 -08:00
Melissa Elkadi
08cfc0c9df
Select fair RR packet scheduler
...
Also fixed some build problems
2020-12-23 09:28:54 -08: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
He Shanyun
547d7b01b8
change the sleep location for the ittisim
2020-12-08 17:13:09 +09:00
Melissa
e3d34c8b01
Fixed multiple UE EPC integration by resetting user->ueid=0;. Lots of logs in this commit, will remove later
2020-12-01 13:39:05 -08:00
wu.jing
c994c2ad8f
Merge branch 'develop_SA_SIM' into develop_SA_L3
...
Conflicts:
common/utils/ocp_itti/intertask_interface.h
openair2/COMMON/gtpv1_u_messages_types.h
openair2/GNB_APP/gnb_config.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/nr_rrc_proto.h
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/rrc_UE.c
openair3/NAS/NR_UE/nr_nas_msg_sim.h
openair3/NGAP/ngap_gNB_nas_procedures.c
2020-11-24 09:15:52 +00:00
wu.jing
d987c0919f
Merge branch 'master' into develop_SA_L3
2020-11-24 04:57:19 +00:00
masayuki.harada
e3d3c6e418
Merge branch 'NR_SA_NGAP_RRC_wk42' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_NGAP_RRC_wk42
2020-11-16 13:59:33 +09:00
yincong
c208bffa3a
add OAI license
2020-11-13 16:11:41 +08:00
zhenghuangkun@cn.fujitsu.com
f64bba177a
Modify SA source code
2020-11-13 07:37:22 +00:00
He Shanyun
d1a055ff70
implement pdusession establishment request
2020-11-12 03:06:10 +00:00
matzakos
7772a51c07
Merge remote-tracking branch 'origin/develop' into NR_SA_NGAP_RRC_wk42
...
Conflicts:
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/nr_rrc_proto.h
targets/COMMON/create_nr_tasks.c
2020-11-09 15:52:52 +01:00
He Shanyun
3d75f3c199
deal with Registration Accept
2020-11-06 08:21:01 +00:00
zhenghuangkun
d395831a54
Fix error registration complete
2020-11-06 07:44:58 +00:00
zhenghuangkun
86a3bfc0d6
Modify registration complete
2020-11-06 07:20:12 +00:00
zhenghuangkun
4041f14d1f
Modify registration complete
2020-11-06 07:17:23 +00:00
zhenghuangkun
0e2e5f4c7e
add nas message for registration complete
2020-11-06 05:30:11 +00:00
Xue Song
7bef73bfa8
set nas message container for security mode complete
2020-11-05 07:57:05 +00:00
He Shanyun
1a9fd6028f
set authentication code for security mode complete
2020-11-05 01:20:46 +00:00
Xue Song
89eae04132
Add NAS Security Mode Complete
2020-11-03 09:58:23 +00:00
He Shanyun
947194a271
implement authentication response
2020-11-02 09:51:03 +00:00
He Shanyun
63795a6c94
implement identityresponse
2020-10-30 08:34:52 +00:00
Laurent
7d603191db
merge develop
2020-10-29 16:29:32 +01:00
Laurent
136d9ccb67
add documentation and code review comments
2020-10-29 16:14:55 +01:00
zhenghuangkun
881a6d4afc
add nas message for registration complete
2020-10-29 05:43:59 +00:00
matzakos
87c83aaf21
Merge remote-tracking branch 'origin/develop' into NR_SA_NGAP_RRC_wk42
...
Conflicts:
cmake_targets/CMakeLists.txt
docker/Dockerfile.enb.rhel7.oc4-4
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
2020-10-29 00:19:49 +01:00
He Shanyun
f2bb26a91b
add decode and encode for registration accept
2020-10-28 05:59:58 +00:00
He Shanyun
52f92b7ce0
set mnc
2020-10-28 01:44:18 +00:00
He Shanyun
90a10cd051
set amf setid and regionid for registration request
2020-10-27 11:06:23 +00:00
He Shanyun
5880c1f8c7
add nas message for registration request
2020-10-27 09:28:47 +00:00
Laurent
c8111292e9
fix warnings from merge
2020-10-22 21:06:35 +02:00
He Shanyun
e15f0b2813
add struct for registration request message
2020-10-20 11:30:06 +00:00
Robert Schmidt
a6126a39a5
Remove MAX_NUMBER_NETIF and use num UE
2020-10-13 09:07:46 +02:00
Robert Schmidt
8c5976e279
Use "ip add" to add IP addresses
...
This then only uses the "modern" ip tool instead of ifconfig, and the
command is more "homogeneous".
2020-10-13 09:07:46 +02:00
Robert Schmidt
298956509f
Delete double UE IP config setup
2020-10-13 09:07:46 +02:00
Robert Schmidt
4c7035e6e3
Remove UESIM_EXPANSION
...
This completely removes the UESIM_EXPANSION define: it does not compile
at the moment. Its function was to multiplex multiple UEs on the same
TUN interface. However, this functionality is not needed since it is
possible to allocate many TUN devices (i.e., >= 32).
2020-10-13 09:07:46 +02:00
Laurent
910a130eb2
Merge branch 'noCore' of https://gitlab.eurecom.fr/oai/openairinterface5g into noCore
2020-10-12 18:25:19 +02:00
Laurent
4f2d8ebfcd
merge develop, use Linux crypto library
2020-10-12 18:24:08 +02:00
Laurent
489fc7c0fe
trial
2020-10-12 10:52:46 +02:00
Raphael Defosseux
43c76e868f
CI: adding waiver on License Banner check for milenage.h file
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-10-08 13:44:56 +02:00
laurent
6b50cbcae2
continue 5G SA
2020-10-01 16:13:03 +02:00
laurent
ffd4c20e58
fix L2 tracing in wireshark, start security mode comman
2020-09-24 11:55:43 +02:00