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
Raphael Defosseux
e0731d54a0
Merge remote-tracking branch 'origin/develop' into ci-deploy-docker-compose
2020-12-04 10:08:40 +01:00
Raphael Defosseux
2d6fea51b3
Merge remote-tracking branch 'origin/oc-docker-october-improvements' into ci-deploy-docker-compose
2020-12-01 10:09:02 +01:00
hardy
a0d58f224c
Merge remote-tracking branch 'origin/NR_SA_NGAP_RRC_wk42' into integration_2020_wk48
2020-11-19 14:57:08 +01:00
hardy
02594fea3b
Merge remote-tracking branch 'origin/feature/make-s1-mme-port-configurable' into integration_2020_wk47
2020-11-17 13:53:10 +01:00
Raphael Defosseux
524354aebc
OC: fix typos
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-11-16 13:32:44 +01:00
Mohammed Ismail
d4d0776774
sctp_event_subscribe updated
...
Signed-off-by: Mohammed Ismail <mohammed.ismail@eurecom.fr >
2020-11-16 13:32:44 +01: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
hardy
f267efbe5a
Merge remote-tracking branch 'origin/s1ap-bugfix-rab_setup' into integration_2020_wk46_2
2020-11-13 13:23:18 +01: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
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
Eugene Bogush
3c3593c6a6
fix for proc: e_rab_setup_resp
2020-11-04 15:26:54 +01:00
Frédéric Leroy
1426ee5ed6
feat: add optional parameter port for mme connection
2020-11-02 17:16:29 +01: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
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
masayuki.harada
483f4b2d1b
Fix merge miss.
2020-10-28 04:21:41 +09:00
masayuki.harada
dc288b7bc8
Merge branch 'develop_SA_L3' into NR_SA_NGAP_RRC_wk42
...
# Conflicts:
# openair2/GNB_APP/gnb_paramdef.h
# openair2/RRC/NR/rrc_gNB.c
2020-10-28 03:57:14 +09:00
masayuki.harada
8cff73dc39
Fix merge error.
2020-10-28 03:19:41 +09:00
masayuki.harada
1956fd3b72
Merge commit 'b67badef1b2fd390d801e20644b08df0d5880583' into develop_SA_L3
...
# Conflicts:
# common/utils/ocp_itti/intertask_interface.h
# openair2/RRC/NR/rrc_gNB.c
# openair3/NGAP/ngap_gNB_nas_procedures.c
2020-10-27 20:25:16 +09:00
masayuki.harada
4649f0f615
Merge remote-tracking branch 'remotes/origin/develop_SA_SIM' into develop_SA_L3
2020-10-27 19:47:49 +09:00
He Shanyun
5880c1f8c7
add nas message for registration request
2020-10-27 09:28:47 +00:00
yaojie
a5343618cf
Added the judgment of the NGAP field in the configuration file
2020-10-27 07:40:09 +00:00
Xue Song
62292f892e
modify ngap_gNB_handle_nas_first_req
2020-10-27 01:56:41 +00:00
hardy
89d7353ddf
Merge remote-tracking branch 'origin/fixes-tun' into integration_2020_wk44
2020-10-26 17:28:11 +01:00
Wu.Jing
66bc0bac1e
Merge branch 'master' into develop_SA_L3
2020-10-26 09:04:03 +00:00
Wu.Jing
08e775559b
Merge branch 'develop_SA_SIM' into develop_SA_L3
2020-10-26 09:02:18 +00:00
masayuki.harada
1ce1e8f82b
Merge branch 'oai_develop'
...
# Conflicts:
# ci-scripts/Jenkinsfile-gitlab
2020-10-26 15:03:58 +09:00
Xue Song
ce85677762
modify some issues
2020-10-23 03:42:06 +00:00
Laurent
c8111292e9
fix warnings from merge
2020-10-22 21:06:35 +02:00
Laurent
5c69510f17
merge develop, improve doc
2020-10-21 14:38:17 +02:00
masayuki.harada
a6a39d9951
Merge branch 'develop_SA_L3' into NR_SA_NGAP_RRC_wk42
...
# Conflicts:
# openair2/RRC/NR/rrc_gNB.c
2020-10-21 16:41:09 +09:00
He Shanyun
e15f0b2813
add struct for registration request message
2020-10-20 11:30:06 +00:00
Wu.Jing
0312db24b4
comment nnsf that it hasnot be test
2020-10-15 08:57:28 +00:00
Wu.Jing
b2722225ab
Merge branch 'master' into develop_SA_L3
2020-10-15 08:26:42 +00:00
masayuki.harada
af35e37c74
Merge branch 'oai_develop'
...
# Conflicts:
# openair2/RRC/NR/rrc_gNB.c
2020-10-15 15:25:04 +09:00
yaojie
f00e5deb14
fix about nnfs,make it TODO
2020-10-14 08:34:41 +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
hardy
fd571e9014
Merge remote-tracking branch 'origin/small-bugfixes-w40' into integration_2020_wk41
2020-10-12 18:08:16 +02:00
Laurent
489fc7c0fe
trial
2020-10-12 10:52:46 +02:00
Wu.Jing
079157eb55
cherry-pick 3efc7538ac
2020-10-10 11:26:40 +09:00
zhenghuangkun
6ca5753555
Add author and email
2020-10-10 10:56:14 +09:00
He Shanyun
c180323de4
fix compile issue about build ngap asn file
2020-10-10 10:55:49 +09:00