maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
f71766c3ee473cd183939557c061fc80f5166a77
openairinterface5g/openair2/F1AP
T
History
Cedric Roux f71766c3ee Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78 
Conflicts:
	openair2/F1AP/f1ap_du_ue_context_management.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/RRC/NR/MESSAGES/asn1_msg.h
	openair2/RRC/NR/rrc_gNB.c
	openair3/ocp-gtpu/gtp_itf.cpp

There were some important conflicts in openair3/ocp-gtpu/gtp_itf.cpp
I rewrote a bit the function Gtpv1uHandleGpdu(). It might have been
done wrongly.
To be tested and fixed if needed.

To redo the merge, if needed:
git checkout 9b2a163ebb
git merge 5ea828e149
2022-06-08 15:48:24 +02:00
..
MESSAGES/ASN1
add F1AP Rel16 asn file
2021-02-01 14:12:18 +09:00
dummy_enb.c
Changes to SDAP code
2022-04-01 17:04:08 +02:00
f1ap_common.c
astyle only
2021-10-03 22:04:17 +02:00
f1ap_common.h
Remove MSC library, it is not used anywhere
2022-01-27 10:53:07 +01:00
f1ap_cu_interface_management.c
fix CU assert and bugs discovered after
2021-12-28 11:29:26 +01:00
f1ap_cu_interface_management.h
Coarse grain cleanup: a lot of errors fixed
2021-07-03 16:32:20 +02:00
f1ap_cu_paging.c
Update F1AP new code structure to closer implementing all the procedures
2018-09-13 16:25:51 +02:00
f1ap_cu_paging.h
Update F1AP new code structure to closer implementing all the procedures
2018-09-13 16:25:51 +02:00
f1ap_cu_rrc_message_transfer.c
fix CU assert and bugs discovered after
2021-12-28 11:29:26 +01:00
f1ap_cu_rrc_message_transfer.h
Coarse grain cleanup: a lot of errors fixed
2021-07-03 16:32:20 +02:00
f1ap_cu_system_information.c
Update F1AP new code structure to closer implementing all the procedures
2018-09-13 16:25:51 +02:00
f1ap_cu_system_information.h
Update F1AP new code structure to closer implementing all the procedures
2018-09-13 16:25:51 +02:00
f1ap_cu_task.c
Merge remote-tracking branch 'origin/tdd25period_for_MR' into F1_interop_ACC
2022-03-09 19:16:23 +01:00
f1ap_cu_task.h
change instance id to 3GPP length
2021-09-09 11:37:00 +02:00
f1ap_cu_ue_context_management.c
Correct how gtp-u extension header is parsed
2021-12-15 18:38:25 +01:00
f1ap_cu_ue_context_management.h
Trigger UE context modification request at the CU upon reception of PDU Session Resource setup request from the AMF
2021-10-05 13:43:19 +02:00
f1ap_cu_warning_message_transmission.c
Update F1AP new code structure to closer implementing all the procedures
2018-09-13 16:25:51 +02:00
f1ap_cu_warning_message_transmission.h
Update F1AP new code structure to closer implementing all the procedures
2018-09-13 16:25:51 +02:00
f1ap_decoder.c
Remove xml prints of F1AP messages
2022-04-15 10:34:53 +02:00
f1ap_decoder.h
Update F1AP new code structure to closer implementing all the procedures
2018-09-13 16:25:51 +02:00
f1ap_default_values.h
Use correct SCTP port number for F1AP according to standards
2021-10-12 19:38:19 +02:00
f1ap_du_interface_management.c
Merge remote-tracking branch 'origin/tdd25period_for_MR' into F1_interop_ACC
2022-03-09 19:16:23 +01:00
f1ap_du_interface_management.h
merge latest develop
2021-07-26 15:03:47 +02:00
f1ap_du_paging.c
Update F1AP new code structure to closer implementing all the procedures
2018-09-13 16:25:51 +02:00
f1ap_du_paging.h
Update F1AP new code structure to closer implementing all the procedures
2018-09-13 16:25:51 +02:00
f1ap_du_rrc_message_transfer.c
Merge remote-tracking branch 'origin/develop' into F1C_extensions_develop
2022-01-17 13:19:45 +01:00
f1ap_du_rrc_message_transfer.h
change instance id to 3GPP length
2021-09-09 11:37:00 +02:00
f1ap_du_system_information.c
Update F1AP new code structure to closer implementing all the procedures
2018-09-13 16:25:51 +02:00
f1ap_du_system_information.h
Update F1AP new code structure to closer implementing all the procedures
2018-09-13 16:25:51 +02:00
f1ap_du_task.c
Integrate true reporting of buffer availability of RLC(DU) towards the CU
2022-04-07 16:34:16 +02:00
f1ap_du_task.h
Replace redundant CU_F1AP/DU_F1AP with F1AP
2019-02-22 10:26:41 +01:00
f1ap_du_ue_context_management.c
Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78
2022-06-08 15:48:24 +02:00
f1ap_du_ue_context_management.h
Generation of UE context modification response at F1AP layer of the DU
2021-10-08 10:31:53 +02:00
f1ap_du_warning_message_transmission.c
Update F1AP new code structure to closer implementing all the procedures
2018-09-13 16:25:51 +02:00
f1ap_du_warning_message_transmission.h
Update F1AP new code structure to closer implementing all the procedures
2018-09-13 16:25:51 +02:00
f1ap_encoder.c
Remove xml prints of F1AP messages
2022-04-15 10:34:53 +02:00
f1ap_encoder.h
Update F1AP new code structure to closer implementing all the procedures
2018-09-13 16:25:51 +02:00
f1ap_handlers.c
Add implementation of UE context modification response handler at F1AP layer of the CU
2021-10-08 13:37:46 +02:00
f1ap_itti_messaging.c
Integrate true reporting of buffer availability of RLC(DU) towards the CU
2022-04-07 16:34:16 +02:00
f1ap_itti_messaging.h
remove most of globale variables, remain data model inconsistency and race conditions
2021-07-06 09:49:47 +02:00
f1ap_messaging.h
Coarse grain cleanup: a lot of errors fixed
2021-07-03 16:32:20 +02:00