David Kim
aaf50cbb80
revert to previous openair3/S1AP/s1ap_eNB_handlers.c version due to compile error
2021-03-17 23:31:40 -07:00
David Kim
b90c0680ec
adding x2c setting with epc
2021-03-17 21:08:41 -07:00
Michael Cook
092caec8ca
Merge branch 'episys-merge' into episys/trial-merge-to-master
2021-03-14 10:58:46 -04:00
Melissa Elkadi
98c8ddb673
Merge remote-tracking branch 'origin/develop' into episys-merge
...
Removing references to memcpy_dl_config_req and
memcpy_tx_req because these functions are leaking
memory. For our standalone mode we have created
new/modified memcpy_dl/tx_req functions.
2021-02-24 11:49:17 -08:00
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
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
Melissa
9fa09f530f
Updated non-blocking PDCP socket
...
More accurately, we changed the do/while infinite
loop to be an infinite for loop for the read command of
the socket. The socket file descriptor choice is more clear now.
2021-02-09 14:09:39 -08: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
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 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
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
Laurent
3b0c43c04b
fix memory allocation error
2021-01-10 21:41:22 +01: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
Wu.Jing
19118c13d1
Merge branch 'master' into develop_SA_L3
2020-12-18 11:52:59 +09:00
He Shanyun
ec48bb8913
implement rrcReestablishmentComplete
2020-12-11 09:54:43 +09:00
He Shanyun
547d7b01b8
change the sleep location for the ittisim
2020-12-08 17:13:09 +09:00
Raphael Defosseux
e0731d54a0
Merge remote-tracking branch 'origin/develop' into ci-deploy-docker-compose
2020-12-04 10:08:40 +01: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
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
yaojie
dfba9dd767
add temporary data for PDUSessionResourceReleaseResponseTransfer
2020-12-01 17:30:47 +09:00
Robert Schmidt
53b197fd16
Fix: when adding an MME through FlexRAN, set port
2020-11-27 10:25:02 +01:00
yaojie
59c2b9eb06
fixed warnings and add ie for PDUSessionResourceReleaseCommandTransfer
2020-11-26 15:56:39 +09:00
Xue Song
6e2f63bf1f
Add rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND and rrc_gNB_send_NGAP_PDUSESSION_RELEASE_RESPONSE
2020-11-25 18:55:59 +09:00
yaojie
7034159e8e
add sleep between RRCReconfigurationComplete and RegistrationComplete
2020-11-25 10:52:06 +09:00
wu.jing
0fdc671177
fix merge problems in ittisim
2020-11-24 10:44:09 +00: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
f3d51a58fb
Merge branch 'develop_SA_RRC' into develop_SA_SIM
...
Conflicts:
common/utils/ocp_itti/intertask_interface.h
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/rrc_UE.c
openair2/RRC/NR_UE/rrc_defs.h
openair3/NGAP/ngap_gNB_nas_procedures.c
2020-11-24 05:15:06 +00:00
wu.jing
d987c0919f
Merge branch 'master' into develop_SA_L3
2020-11-24 04:57:19 +00:00
yaojie
9d579b7a47
fix errors and warnings
2020-11-20 14:39:45 +09: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
yaojie
959681424c
fix some errors and warnings.
2020-11-18 03:12:59 +00: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
Xue Song
e524cd9482
Add rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ
...
Add rrc_gNB_send_NGAP_PDUSESSION_SETUP_RESP
Fix some problems about pdu session setup
2020-11-17 19:03:55 +09: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
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