From 7b5431a62c0fa1f52edc165e6e8f37be61a2fe73 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier@mycompany.com>
Date: Tue, 6 Oct 2015 16:53:42 +0000
Subject: [PATCH] renamed openair-cn to openair3
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7886 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
cmake_targets/CMakeLists.txt | 108 +++++++++---------
cmake_targets/at_commands/CMakeLists.txt | 26 ++---
cmake_targets/nas_sim_tools/CMakeLists.txt | 54 ++++-----
cmake_targets/tools/build_helper | 8 +-
cmake_targets/tools/indent_source_code | 6 +-
cmake_targets/tools/perf_oai.bash | 4 +-
oaienv | 2 -
{openair-cn => openair3}/COMMON/as_message.h | 0
.../COMMON/common_types.h | 0
.../COMMON/gtpv1_u_messages_def.h | 0
.../COMMON/gtpv1_u_messages_types.h | 0
.../COMMON/intertask_interface_conf.h | 0
.../COMMON/messages_def.h | 0
.../COMMON/messages_types.h | 0
.../COMMON/nas_messages_def.h | 0
.../COMMON/nas_messages_types.h | 0
.../COMMON/s1ap_messages_def.h | 0
.../COMMON/s1ap_messages_types.h | 0
.../COMMON/sctp_messages_def.h | 0
.../COMMON/sctp_messages_types.h | 0
.../COMMON/security_types.h | 0
{openair-cn => openair3}/COMMON/tasks_def.h | 0
.../COMMON/udp_messages_def.h | 0
.../COMMON/udp_messages_types.h | 0
{openair-cn => openair3}/COPYING | 0
{openair-cn => openair3}/DOCS/COPYING | 0
{openair-cn => openair3}/DOCS/DOXYGEN/COPYING | 0
.../DOCS/DOXYGEN/Doxyfile.in | 0
.../DOCS/DOXYGEN/Makefile.am | 0
{openair-cn => openair3}/DOCS/Latex/COPYING | 0
.../DOCS/Latex/DefaultBearer/COPYING | 0
.../Latex/DefaultBearer/DefaultBearer.pdf | Bin
.../Latex/DefaultBearer/DefaultBearer.tex | 0
.../DOCS/Latex/EPC/COPYING | 0
.../DOCS/Latex/EPC/EPC.pdf | Bin
.../DOCS/Latex/EPC/EPC.tex | 0
.../DOCS/Latex/EPC/Makefile | 0
{openair-cn => openair3}/DOCS/Makefile.am | 0
{openair-cn => openair3}/GTPV1-U/Makefile.am | 0
{openair-cn => openair3}/GTPV1-U/Makefile.eNB | 0
{openair-cn => openair3}/GTPV1-U/gtpv1u.h | 0
{openair-cn => openair3}/GTPV1-U/gtpv1u_eNB.c | 0
.../GTPV1-U/gtpv1u_eNB_defs.h | 0
.../GTPV1-U/gtpv1u_eNB_task.h | 0
.../GTPV1-U/gtpv1u_sgw_defs.h | 0
.../GTPV1-U/gtpv1u_task.c | 0
.../GTPV1-U/gtpv1u_teid_pool.c | 0
.../GTPV1-U/nw-gtpv1u/AUTHORS | 0
.../GTPV1-U/nw-gtpv1u/COPYING | 0
.../GTPV1-U/nw-gtpv1u/ChangeLog | 0
.../GTPV1-U/nw-gtpv1u/NEWS | 0
.../GTPV1-U/nw-gtpv1u/README | 0
.../GTPV1-U/nw-gtpv1u/include/NwGtpv1uLog.h | 0
.../nw-gtpv1u/include/NwGtpv1uPrivate.h | 0
.../GTPV1-U/nw-gtpv1u/include/NwGtpv1uTrxn.h | 0
.../include/NwGtpv1uTunnelEndPoint.h | 0
.../GTPV1-U/nw-gtpv1u/shared/NwGtpv1u.h | 0
.../GTPV1-U/nw-gtpv1u/shared/NwGtpv1uError.h | 0
.../GTPV1-U/nw-gtpv1u/shared/NwGtpv1uIe.h | 0
.../GTPV1-U/nw-gtpv1u/shared/NwGtpv1uMsg.h | 0
.../GTPV1-U/nw-gtpv1u/shared/NwLog.h | 0
.../GTPV1-U/nw-gtpv1u/shared/NwTypes.h | 0
.../GTPV1-U/nw-gtpv1u/shared/NwUtils.h | 0
.../GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c | 0
.../GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c | 0
.../GTPV1-U/nw-gtpv1u/src/NwGtpv1uTrxn.c | 0
.../nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c | 0
.../GTPV1-U/nw-gtpv1u/test-app/Makefile.am | 0
.../GTPV1-U/nw-gtpv1u/test-app/Makefile.in | 0
.../test-app/nw-helloworld/Makefile.am | 0
.../test-app/nw-helloworld/Makefile.in | 0
.../nw-gtpv1u/test-app/nw-helloworld/NwEvt.h | 0
.../nw-helloworld/NwMiniLogMgrEntity.c | 0
.../nw-helloworld/NwMiniLogMgrEntity.h | 0
.../nw-helloworld/NwMiniTmrMgrEntity.c | 0
.../nw-helloworld/NwMiniTmrMgrEntity.h | 0
.../test-app/nw-helloworld/NwMiniUdpEntity.c | 0
.../test-app/nw-helloworld/NwMiniUdpEntity.h | 0
.../test-app/nw-helloworld/NwMiniUlpEntity.c | 0
.../test-app/nw-helloworld/NwMiniUlpEntity.h | 0
.../test-app/nw-helloworld/helloworld.c | 0
{openair-cn => openair3}/INTERTASK_INTERFACE | 0
.../NAS/COMMON/API/NETWORK/COPYING | 0
.../NAS/COMMON/API/NETWORK/Makefile | 0
.../NAS/COMMON/API/NETWORK/as_message.c | 0
.../NAS/COMMON/API/NETWORK/as_message.h | 0
.../NAS/COMMON/API/NETWORK/l2_message.h | 0
.../NAS/COMMON/API/NETWORK/nas_message.c | 0
.../NAS/COMMON/API/NETWORK/nas_message.h | 0
.../NAS/COMMON/API/NETWORK/network_api.c | 0
.../NAS/COMMON/API/NETWORK/network_api.h | 0
{openair-cn => openair3}/NAS/COMMON/COPYING | 0
.../NAS/COMMON/EMM/MSG/AttachAccept.c | 0
.../NAS/COMMON/EMM/MSG/AttachAccept.h | 0
.../NAS/COMMON/EMM/MSG/AttachComplete.c | 0
.../NAS/COMMON/EMM/MSG/AttachComplete.h | 0
.../NAS/COMMON/EMM/MSG/AttachReject.c | 0
.../NAS/COMMON/EMM/MSG/AttachReject.h | 0
.../NAS/COMMON/EMM/MSG/AttachRequest.c | 0
.../NAS/COMMON/EMM/MSG/AttachRequest.h | 0
.../COMMON/EMM/MSG/AuthenticationFailure.c | 0
.../COMMON/EMM/MSG/AuthenticationFailure.h | 0
.../NAS/COMMON/EMM/MSG/AuthenticationReject.c | 0
.../NAS/COMMON/EMM/MSG/AuthenticationReject.h | 0
.../COMMON/EMM/MSG/AuthenticationRequest.c | 0
.../COMMON/EMM/MSG/AuthenticationRequest.h | 0
.../COMMON/EMM/MSG/AuthenticationResponse.c | 0
.../COMMON/EMM/MSG/AuthenticationResponse.h | 0
.../NAS/COMMON/EMM/MSG/COPYING | 0
.../COMMON/EMM/MSG/CsServiceNotification.c | 0
.../COMMON/EMM/MSG/CsServiceNotification.h | 0
.../NAS/COMMON/EMM/MSG/DetachAccept.c | 0
.../NAS/COMMON/EMM/MSG/DetachAccept.h | 0
.../NAS/COMMON/EMM/MSG/DetachRequest.c | 0
.../NAS/COMMON/EMM/MSG/DetachRequest.h | 0
.../NAS/COMMON/EMM/MSG/DownlinkNasTransport.c | 0
.../NAS/COMMON/EMM/MSG/DownlinkNasTransport.h | 0
.../NAS/COMMON/EMM/MSG/EmmInformation.c | 0
.../NAS/COMMON/EMM/MSG/EmmInformation.h | 0
.../NAS/COMMON/EMM/MSG/EmmStatus.c | 0
.../NAS/COMMON/EMM/MSG/EmmStatus.h | 0
.../COMMON/EMM/MSG/ExtendedServiceRequest.c | 0
.../COMMON/EMM/MSG/ExtendedServiceRequest.h | 0
.../COMMON/EMM/MSG/GutiReallocationCommand.c | 0
.../COMMON/EMM/MSG/GutiReallocationCommand.h | 0
.../COMMON/EMM/MSG/GutiReallocationComplete.c | 0
.../COMMON/EMM/MSG/GutiReallocationComplete.h | 0
.../NAS/COMMON/EMM/MSG/IdentityRequest.c | 0
.../NAS/COMMON/EMM/MSG/IdentityRequest.h | 0
.../NAS/COMMON/EMM/MSG/IdentityResponse.c | 0
.../NAS/COMMON/EMM/MSG/IdentityResponse.h | 0
.../NAS/COMMON/EMM/MSG/Makefile | 0
.../COMMON/EMM/MSG/NASSecurityModeCommand.h | 0
.../COMMON/EMM/MSG/NASSecurityModeComplete.h | 0
.../NAS/COMMON/EMM/MSG/SecurityModeCommand.c | 0
.../NAS/COMMON/EMM/MSG/SecurityModeComplete.c | 0
.../NAS/COMMON/EMM/MSG/SecurityModeReject.c | 0
.../NAS/COMMON/EMM/MSG/SecurityModeReject.h | 0
.../NAS/COMMON/EMM/MSG/ServiceReject.c | 0
.../NAS/COMMON/EMM/MSG/ServiceReject.h | 0
.../NAS/COMMON/EMM/MSG/ServiceRequest.c | 0
.../NAS/COMMON/EMM/MSG/ServiceRequest.h | 0
.../COMMON/EMM/MSG/TrackingAreaUpdateAccept.c | 0
.../COMMON/EMM/MSG/TrackingAreaUpdateAccept.h | 0
.../EMM/MSG/TrackingAreaUpdateComplete.c | 0
.../EMM/MSG/TrackingAreaUpdateComplete.h | 0
.../COMMON/EMM/MSG/TrackingAreaUpdateReject.c | 0
.../COMMON/EMM/MSG/TrackingAreaUpdateReject.h | 0
.../EMM/MSG/TrackingAreaUpdateRequest.c | 0
.../EMM/MSG/TrackingAreaUpdateRequest.h | 0
.../NAS/COMMON/EMM/MSG/UplinkNasTransport.c | 0
.../NAS/COMMON/EMM/MSG/UplinkNasTransport.h | 0
.../NAS/COMMON/EMM/MSG/emm_cause.h | 0
.../NAS/COMMON/EMM/MSG/emm_msg.c | 0
.../NAS/COMMON/EMM/MSG/emm_msg.h | 0
.../NAS/COMMON/EMM/MSG/emm_msgDef.h | 0
.../ActivateDedicatedEpsBearerContextAccept.c | 0
.../ActivateDedicatedEpsBearerContextAccept.h | 0
.../ActivateDedicatedEpsBearerContextReject.c | 0
.../ActivateDedicatedEpsBearerContextReject.h | 0
...ActivateDedicatedEpsBearerContextRequest.c | 0
...ActivateDedicatedEpsBearerContextRequest.h | 0
.../ActivateDefaultEpsBearerContextAccept.c | 0
.../ActivateDefaultEpsBearerContextAccept.h | 0
.../ActivateDefaultEpsBearerContextReject.c | 0
.../ActivateDefaultEpsBearerContextReject.h | 0
.../ActivateDefaultEpsBearerContextRequest.c | 0
.../ActivateDefaultEpsBearerContextRequest.h | 0
.../ESM/MSG/BearerResourceAllocationReject.c | 0
.../ESM/MSG/BearerResourceAllocationReject.h | 0
.../ESM/MSG/BearerResourceAllocationRequest.c | 0
.../ESM/MSG/BearerResourceAllocationRequest.h | 0
.../MSG/BearerResourceModificationReject.c | 0
.../MSG/BearerResourceModificationReject.h | 0
.../MSG/BearerResourceModificationRequest.c | 0
.../MSG/BearerResourceModificationRequest.h | 0
.../NAS/COMMON/ESM/MSG/COPYING | 0
.../MSG/DeactivateEpsBearerContextAccept.c | 0
.../MSG/DeactivateEpsBearerContextAccept.h | 0
.../MSG/DeactivateEpsBearerContextRequest.c | 0
.../MSG/DeactivateEpsBearerContextRequest.h | 0
.../COMMON/ESM/MSG/EsmInformationRequest.c | 0
.../COMMON/ESM/MSG/EsmInformationRequest.h | 0
.../COMMON/ESM/MSG/EsmInformationResponse.c | 0
.../COMMON/ESM/MSG/EsmInformationResponse.h | 0
.../NAS/COMMON/ESM/MSG/EsmStatus.c | 0
.../NAS/COMMON/ESM/MSG/EsmStatus.h | 0
.../NAS/COMMON/ESM/MSG/Makefile | 0
.../ESM/MSG/ModifyEpsBearerContextAccept.c | 0
.../ESM/MSG/ModifyEpsBearerContextAccept.h | 0
.../ESM/MSG/ModifyEpsBearerContextReject.c | 0
.../ESM/MSG/ModifyEpsBearerContextReject.h | 0
.../ESM/MSG/ModifyEpsBearerContextRequest.c | 0
.../ESM/MSG/ModifyEpsBearerContextRequest.h | 0
.../COMMON/ESM/MSG/PdnConnectivityReject.c | 0
.../COMMON/ESM/MSG/PdnConnectivityReject.h | 0
.../COMMON/ESM/MSG/PdnConnectivityRequest.c | 0
.../COMMON/ESM/MSG/PdnConnectivityRequest.h | 0
.../NAS/COMMON/ESM/MSG/PdnDisconnectReject.c | 0
.../NAS/COMMON/ESM/MSG/PdnDisconnectReject.h | 0
.../NAS/COMMON/ESM/MSG/PdnDisconnectRequest.c | 0
.../NAS/COMMON/ESM/MSG/PdnDisconnectRequest.h | 0
.../NAS/COMMON/ESM/MSG/esm_cause.h | 0
.../NAS/COMMON/ESM/MSG/esm_msg.c | 0
.../NAS/COMMON/ESM/MSG/esm_msg.h | 0
.../NAS/COMMON/ESM/MSG/esm_msgDef.h | 0
.../NAS/COMMON/IES/AccessPointName.c | 0
.../NAS/COMMON/IES/AccessPointName.h | 0
.../NAS/COMMON/IES/AdditionalUpdateResult.c | 0
.../NAS/COMMON/IES/AdditionalUpdateResult.h | 0
.../NAS/COMMON/IES/AdditionalUpdateType.c | 0
.../NAS/COMMON/IES/AdditionalUpdateType.h | 0
.../COMMON/IES/ApnAggregateMaximumBitRate.c | 0
.../COMMON/IES/ApnAggregateMaximumBitRate.h | 0
.../IES/AuthenticationFailureParameter.c | 0
.../IES/AuthenticationFailureParameter.h | 0
.../COMMON/IES/AuthenticationParameterAutn.c | 0
.../COMMON/IES/AuthenticationParameterAutn.h | 0
.../COMMON/IES/AuthenticationParameterRand.c | 0
.../COMMON/IES/AuthenticationParameterRand.h | 0
.../IES/AuthenticationResponseParameter.c | 0
.../IES/AuthenticationResponseParameter.h | 0
.../NAS/COMMON/IES/COPYING | 0
.../COMMON/IES/CipheringKeySequenceNumber.c | 0
.../COMMON/IES/CipheringKeySequenceNumber.h | 0
{openair-cn => openair3}/NAS/COMMON/IES/Cli.c | 0
{openair-cn => openair3}/NAS/COMMON/IES/Cli.h | 0
.../NAS/COMMON/IES/CsfbResponse.c | 0
.../NAS/COMMON/IES/CsfbResponse.h | 0
.../NAS/COMMON/IES/DaylightSavingTime.c | 0
.../NAS/COMMON/IES/DaylightSavingTime.h | 0
.../NAS/COMMON/IES/DetachType.c | 0
.../NAS/COMMON/IES/DetachType.h | 0
.../NAS/COMMON/IES/DrxParameter.c | 0
.../NAS/COMMON/IES/DrxParameter.h | 0
.../NAS/COMMON/IES/EmergencyNumberList.c | 0
.../NAS/COMMON/IES/EmergencyNumberList.h | 0
.../NAS/COMMON/IES/EmmCause.c | 0
.../NAS/COMMON/IES/EmmCause.h | 0
.../NAS/COMMON/IES/EpsAttachResult.c | 0
.../NAS/COMMON/IES/EpsAttachResult.h | 0
.../NAS/COMMON/IES/EpsAttachType.c | 0
.../NAS/COMMON/IES/EpsAttachType.h | 0
.../NAS/COMMON/IES/EpsBearerContextStatus.c | 0
.../NAS/COMMON/IES/EpsBearerContextStatus.h | 0
.../NAS/COMMON/IES/EpsBearerIdentity.c | 0
.../NAS/COMMON/IES/EpsBearerIdentity.h | 0
.../NAS/COMMON/IES/EpsMobileIdentity.c | 0
.../NAS/COMMON/IES/EpsMobileIdentity.h | 0
.../NAS/COMMON/IES/EpsNetworkFeatureSupport.c | 0
.../NAS/COMMON/IES/EpsNetworkFeatureSupport.h | 0
.../NAS/COMMON/IES/EpsQualityOfService.c | 0
.../NAS/COMMON/IES/EpsQualityOfService.h | 0
.../NAS/COMMON/IES/EpsUpdateResult.c | 0
.../NAS/COMMON/IES/EpsUpdateResult.h | 0
.../NAS/COMMON/IES/EpsUpdateType.c | 0
.../NAS/COMMON/IES/EpsUpdateType.h | 0
.../NAS/COMMON/IES/EsmCause.c | 0
.../NAS/COMMON/IES/EsmCause.h | 0
.../COMMON/IES/EsmInformationTransferFlag.c | 0
.../COMMON/IES/EsmInformationTransferFlag.h | 0
.../NAS/COMMON/IES/EsmMessageContainer.c | 0
.../NAS/COMMON/IES/EsmMessageContainer.h | 0
.../NAS/COMMON/IES/GprsTimer.c | 0
.../NAS/COMMON/IES/GprsTimer.h | 0
.../NAS/COMMON/IES/GutiType.c | 0
.../NAS/COMMON/IES/GutiType.h | 0
.../NAS/COMMON/IES/IdentityType2.c | 0
.../NAS/COMMON/IES/IdentityType2.h | 0
.../NAS/COMMON/IES/ImeisvRequest.c | 0
.../NAS/COMMON/IES/ImeisvRequest.h | 0
.../NAS/COMMON/IES/KsiAndSequenceNumber.c | 0
.../NAS/COMMON/IES/KsiAndSequenceNumber.h | 0
.../NAS/COMMON/IES/LcsClientIdentity.c | 0
.../NAS/COMMON/IES/LcsClientIdentity.h | 0
.../NAS/COMMON/IES/LcsIndicator.c | 0
.../NAS/COMMON/IES/LcsIndicator.h | 0
.../NAS/COMMON/IES/LinkedEpsBearerIdentity.c | 0
.../NAS/COMMON/IES/LinkedEpsBearerIdentity.h | 0
.../IES/LlcServiceAccessPointIdentifier.c | 0
.../IES/LlcServiceAccessPointIdentifier.h | 0
.../COMMON/IES/LocationAreaIdentification.c | 0
.../COMMON/IES/LocationAreaIdentification.h | 0
.../NAS/COMMON/IES/Makefile | 0
.../NAS/COMMON/IES/MessageType.c | 0
.../NAS/COMMON/IES/MessageType.h | 0
.../NAS/COMMON/IES/MobileIdentity.c | 0
.../NAS/COMMON/IES/MobileIdentity.h | 0
.../NAS/COMMON/IES/MobileStationClassmark2.c | 0
.../NAS/COMMON/IES/MobileStationClassmark2.h | 0
.../NAS/COMMON/IES/MobileStationClassmark3.c | 0
.../NAS/COMMON/IES/MobileStationClassmark3.h | 0
.../NAS/COMMON/IES/MsNetworkCapability.c | 0
.../NAS/COMMON/IES/MsNetworkCapability.h | 0
.../NAS/COMMON/IES/MsNetworkFeatureSupport.c | 0
.../NAS/COMMON/IES/MsNetworkFeatureSupport.h | 0
.../NAS/COMMON/IES/NasKeySetIdentifier.c | 0
.../NAS/COMMON/IES/NasKeySetIdentifier.h | 0
.../NAS/COMMON/IES/NasMessageContainer.c | 0
.../NAS/COMMON/IES/NasMessageContainer.h | 0
.../NAS/COMMON/IES/NasRequestType.c | 0
.../NAS/COMMON/IES/NasRequestType.h | 0
.../NAS/COMMON/IES/NasSecurityAlgorithms.c | 0
.../NAS/COMMON/IES/NasSecurityAlgorithms.h | 0
.../NAS/COMMON/IES/NetworkName.c | 0
.../NAS/COMMON/IES/NetworkName.h | 0
.../NAS/COMMON/IES/Nonce.c | 0
.../NAS/COMMON/IES/Nonce.h | 0
.../NAS/COMMON/IES/PTmsiSignature.c | 0
.../NAS/COMMON/IES/PTmsiSignature.h | 0
.../NAS/COMMON/IES/PacketFlowIdentifier.c | 0
.../NAS/COMMON/IES/PacketFlowIdentifier.h | 0
.../NAS/COMMON/IES/PagingIdentity.c | 0
.../NAS/COMMON/IES/PagingIdentity.h | 0
.../NAS/COMMON/IES/PdnAddress.c | 0
.../NAS/COMMON/IES/PdnAddress.h | 0
.../NAS/COMMON/IES/PdnType.c | 0
.../NAS/COMMON/IES/PdnType.h | 0
.../NAS/COMMON/IES/PlmnList.c | 0
.../NAS/COMMON/IES/PlmnList.h | 0
.../COMMON/IES/ProcedureTransactionIdentity.c | 0
.../COMMON/IES/ProcedureTransactionIdentity.h | 0
.../COMMON/IES/ProtocolConfigurationOptions.c | 0
.../COMMON/IES/ProtocolConfigurationOptions.h | 0
.../NAS/COMMON/IES/ProtocolDiscriminator.c | 0
.../NAS/COMMON/IES/ProtocolDiscriminator.h | 0
.../NAS/COMMON/IES/QualityOfService.c | 0
.../NAS/COMMON/IES/QualityOfService.h | 0
.../NAS/COMMON/IES/RadioPriority.c | 0
.../NAS/COMMON/IES/RadioPriority.h | 0
.../NAS/COMMON/IES/SecurityHeaderType.c | 0
.../NAS/COMMON/IES/SecurityHeaderType.h | 0
.../NAS/COMMON/IES/ServiceType.c | 0
.../NAS/COMMON/IES/ServiceType.h | 0
.../NAS/COMMON/IES/ShortMac.c | 0
.../NAS/COMMON/IES/ShortMac.h | 0
.../NAS/COMMON/IES/SsCode.c | 0
.../NAS/COMMON/IES/SsCode.h | 0
.../NAS/COMMON/IES/SupportedCodecList.c | 0
.../NAS/COMMON/IES/SupportedCodecList.h | 0
.../NAS/COMMON/IES/TimeZone.c | 0
.../NAS/COMMON/IES/TimeZone.h | 0
.../NAS/COMMON/IES/TimeZoneAndTime.c | 0
.../NAS/COMMON/IES/TimeZoneAndTime.h | 0
.../NAS/COMMON/IES/TmsiStatus.c | 0
.../NAS/COMMON/IES/TmsiStatus.h | 0
.../NAS/COMMON/IES/TrackingAreaIdentity.c | 0
.../NAS/COMMON/IES/TrackingAreaIdentity.h | 0
.../NAS/COMMON/IES/TrackingAreaIdentityList.c | 0
.../NAS/COMMON/IES/TrackingAreaIdentityList.h | 0
.../IES/TrafficFlowAggregateDescription.c | 0
.../IES/TrafficFlowAggregateDescription.h | 0
.../NAS/COMMON/IES/TrafficFlowTemplate.c | 0
.../NAS/COMMON/IES/TrafficFlowTemplate.h | 0
.../NAS/COMMON/IES/TransactionIdentifier.c | 0
.../NAS/COMMON/IES/TransactionIdentifier.h | 0
.../NAS/COMMON/IES/UeNetworkCapability.c | 0
.../NAS/COMMON/IES/UeNetworkCapability.h | 0
...UeRadioCapabilityInformationUpdateNeeded.c | 0
...UeRadioCapabilityInformationUpdateNeeded.h | 0
.../NAS/COMMON/IES/UeSecurityCapability.c | 0
.../NAS/COMMON/IES/UeSecurityCapability.h | 0
.../VoiceDomainPreferenceAndUeUsageSetting.c | 0
.../VoiceDomainPreferenceAndUeUsageSetting.h | 0
.../NAS/COMMON/UTIL/COPYING | 0
.../NAS/COMMON/UTIL/Makefile | 0
.../NAS/COMMON/UTIL/OctetString.c | 0
.../NAS/COMMON/UTIL/OctetString.h | 0
.../NAS/COMMON/UTIL/TLVDecoder.c | 0
.../NAS/COMMON/UTIL/TLVDecoder.h | 0
.../NAS/COMMON/UTIL/TLVEncoder.c | 0
.../NAS/COMMON/UTIL/TLVEncoder.h | 0
.../NAS/COMMON/UTIL/device.c | 0
.../NAS/COMMON/UTIL/device.h | 0
.../NAS/COMMON/UTIL/memory.c | 0
.../NAS/COMMON/UTIL/memory.h | 0
.../NAS/COMMON/UTIL/nas_log.c | 0
.../NAS/COMMON/UTIL/nas_log.h | 0
.../NAS/COMMON/UTIL/nas_timer.c | 0
.../NAS/COMMON/UTIL/nas_timer.h | 0
.../NAS/COMMON/UTIL/parser.c | 0
.../NAS/COMMON/UTIL/parser.h | 0
.../NAS/COMMON/UTIL/socket.c | 0
.../NAS/COMMON/UTIL/socket.h | 0
.../NAS/COMMON/UTIL/stty.c | 0
.../NAS/COMMON/UTIL/tst/Makefile | 0
.../NAS/COMMON/UTIL/tst/timer.c | 0
.../NAS/COMMON/UTIL/tst/timer_debug.txt | 0
.../NAS/COMMON/commonDef.h | 0
.../NAS/COMMON/networkDef.h | 0
.../NAS/COMMON/securityDef.h | 0
{openair-cn => openair3}/NAS/COMMON/userDef.h | 0
{openair-cn => openair3}/NAS/COPYING | 0
.../NAS/TEST/AS_SIMULATOR/COPYING | 0
.../NAS/TEST/AS_SIMULATOR/Makefile | 0
.../NAS/TEST/AS_SIMULATOR/as_data.c | 0
.../NAS/TEST/AS_SIMULATOR/as_data.h | 0
.../NAS/TEST/AS_SIMULATOR/as_process.c | 0
.../NAS/TEST/AS_SIMULATOR/as_process.h | 0
.../NAS/TEST/AS_SIMULATOR/as_simulator.c | 0
.../TEST/AS_SIMULATOR/as_simulator_parser.c | 0
.../TEST/AS_SIMULATOR/as_simulator_parser.h | 0
.../NAS/TEST/AS_SIMULATOR/nas_data.c | 0
.../NAS/TEST/AS_SIMULATOR/nas_data.h | 0
.../NAS/TEST/AS_SIMULATOR/nas_process.c | 0
.../NAS/TEST/AS_SIMULATOR/nas_process.h | 0
{openair-cn => openair3}/NAS/TEST/COPYING | 0
.../NAS/TEST/MSC/ActivatePDN.png | Bin
.../NAS/TEST/MSC/AuthenticationReject.png | Bin
{openair-cn => openair3}/NAS/TEST/MSC/COPYING | 0
.../NAS/TEST/MSC/DeactivatePDN.png | Bin
.../NAS/TEST/MSC/InitialAttach.png | Bin
.../NAS/TEST/MSC/InitialAttachReject.png | Bin
.../NAS/TEST/MSC/NomalDetach.png | Bin
{openair-cn => openair3}/NAS/TEST/MSC/README | 0
.../NAS/TEST/MSC/SwitchOffDetach.png | Bin
.../NAS/TEST/MSC/msc_gen.py | 0
{openair-cn => openair3}/NAS/TEST/MSC/mscgen | Bin
.../NAS/TEST/NETWORK/COPYING | 0
.../NAS/TEST/NETWORK/Makefile | 0
.../NAS/TEST/NETWORK/README | 0
.../NAS/TEST/NETWORK/network_parser.c | 0
.../NAS/TEST/NETWORK/network_parser.h | 0
.../NAS/TEST/NETWORK/network_simulator.c | 0
.../NAS/TEST/USER/COPYING | 0
.../NAS/TEST/USER/Makefile | 0
.../NAS/TEST/USER/user_parser.c | 0
.../NAS/TEST/USER/user_parser.h | 0
.../NAS/TEST/USER/user_simulator.c | 0
{openair-cn => openair3}/NAS/TOOLS/COPYING | 0
{openair-cn => openair3}/NAS/TOOLS/Makefile | 0
{openair-cn => openair3}/NAS/TOOLS/network.h | 0
{openair-cn => openair3}/NAS/TOOLS/ue_data.c | 0
.../NAS/TOOLS/usim_data.c | 0
.../NAS/UE/API/USER/COPYING | 0
.../NAS/UE/API/USER/Makefile | 0
.../NAS/UE/API/USER/at_command.c | 0
.../NAS/UE/API/USER/at_command.h | 0
.../NAS/UE/API/USER/at_error.c | 0
.../NAS/UE/API/USER/at_error.h | 0
.../NAS/UE/API/USER/at_response.c | 0
.../NAS/UE/API/USER/at_response.h | 0
.../NAS/UE/API/USER/tst/Makefile | 0
.../NAS/UE/API/USER/tst/at_parser.c | 0
.../NAS/UE/API/USER/tst/at_parser.in | 0
.../NAS/UE/API/USER/tst/at_parser.in.bis | 0
.../NAS/UE/API/USER/tst/at_parser.out | 0
.../NAS/UE/API/USER/tst/at_parser.out.bis | 0
.../NAS/UE/API/USER/tst/smartcom.txt | 0
.../NAS/UE/API/USER/user_api.c | 0
.../NAS/UE/API/USER/user_api.h | 0
.../NAS/UE/API/USER/user_indication.c | 0
.../NAS/UE/API/USER/user_indication.h | 0
.../NAS/UE/API/USIM/COPYING | 0
.../NAS/UE/API/USIM/Makefile | 0
.../NAS/UE/API/USIM/aka_functions.c | 0
.../NAS/UE/API/USIM/aka_functions.h | 0
.../NAS/UE/API/USIM/usim_api.c | 0
.../NAS/UE/API/USIM/usim_api.h | 0
{openair-cn => openair3}/NAS/UE/EMM/Attach.c | 0
.../NAS/UE/EMM/Authentication.c | 0
{openair-cn => openair3}/NAS/UE/EMM/Detach.c | 0
.../NAS/UE/EMM/EmmStatusHdl.c | 0
.../NAS/UE/EMM/Identification.c | 0
.../NAS/UE/EMM/IdleMode.c | 0
.../NAS/UE/EMM/IdleMode.h | 0
.../NAS/UE/EMM/LowerLayer.c | 0
.../NAS/UE/EMM/LowerLayer.h | 0
.../NAS/UE/EMM/SAP/COPYING | 0
.../NAS/UE/EMM/SAP/EmmDeregistered.c | 0
.../UE/EMM/SAP/EmmDeregisteredAttachNeeded.c | 0
.../SAP/EmmDeregisteredAttemptingToAttach.c | 0
.../NAS/UE/EMM/SAP/EmmDeregisteredInitiated.c | 0
.../EMM/SAP/EmmDeregisteredLimitedService.c | 0
.../EMM/SAP/EmmDeregisteredNoCellAvailable.c | 0
.../NAS/UE/EMM/SAP/EmmDeregisteredNoImsi.c | 0
.../UE/EMM/SAP/EmmDeregisteredNormalService.c | 0
.../UE/EMM/SAP/EmmDeregisteredPlmnSearch.c | 0
.../NAS/UE/EMM/SAP/EmmNull.c | 0
.../NAS/UE/EMM/SAP/EmmRegistered.c | 0
.../EMM/SAP/EmmRegisteredAttemptingToUpdate.c | 0
.../SAP/EmmRegisteredImsiDetachInitiated.c | 0
.../NAS/UE/EMM/SAP/EmmRegisteredInitiated.c | 0
.../UE/EMM/SAP/EmmRegisteredLimitedService.c | 0
.../UE/EMM/SAP/EmmRegisteredNoCellAvailable.c | 0
.../UE/EMM/SAP/EmmRegisteredNormalService.c | 0
.../NAS/UE/EMM/SAP/EmmRegisteredPlmnSearch.c | 0
.../UE/EMM/SAP/EmmRegisteredUpdateNeeded.c | 0
.../UE/EMM/SAP/EmmServiceRequestInitiated.c | 0
.../SAP/EmmTrackingAreaUpdatingInitiated.c | 0
.../NAS/UE/EMM/SAP/emm_as.c | 0
.../NAS/UE/EMM/SAP/emm_as.h | 0
.../NAS/UE/EMM/SAP/emm_asDef.h | 0
.../NAS/UE/EMM/SAP/emm_esm.c | 0
.../NAS/UE/EMM/SAP/emm_esm.h | 0
.../NAS/UE/EMM/SAP/emm_esmDef.h | 0
.../NAS/UE/EMM/SAP/emm_fsm.c | 0
.../NAS/UE/EMM/SAP/emm_fsm.h | 0
.../NAS/UE/EMM/SAP/emm_recv.c | 0
.../NAS/UE/EMM/SAP/emm_recv.h | 0
.../NAS/UE/EMM/SAP/emm_reg.c | 0
.../NAS/UE/EMM/SAP/emm_reg.h | 0
.../NAS/UE/EMM/SAP/emm_regDef.h | 0
.../NAS/UE/EMM/SAP/emm_sap.c | 0
.../NAS/UE/EMM/SAP/emm_sap.h | 0
.../NAS/UE/EMM/SAP/emm_send.c | 0
.../NAS/UE/EMM/SAP/emm_send.h | 0
.../NAS/UE/EMM/SecurityModeControl.c | 0
.../NAS/UE/EMM/ServiceRequestHdl.c | 0
.../NAS/UE/EMM/TrackingAreaUpdate.c | 0
{openair-cn => openair3}/NAS/UE/EMM/emmData.h | 0
.../NAS/UE/EMM/emm_main.c | 0
.../NAS/UE/EMM/emm_main.h | 0
.../NAS/UE/EMM/emm_proc.h | 0
.../ESM/DedicatedEpsBearerContextActivation.c | 0
.../ESM/DefaultEpsBearerContextActivation.c | 0
.../NAS/UE/ESM/EpsBearerContextDeactivation.c | 0
.../NAS/UE/ESM/EsmStatusHdl.c | 0
.../NAS/UE/ESM/PdnConnectivity.c | 0
.../NAS/UE/ESM/PdnDisconnect.c | 0
.../NAS/UE/ESM/SAP/COPYING | 0
.../NAS/UE/ESM/SAP/esm_recv.c | 0
.../NAS/UE/ESM/SAP/esm_recv.h | 0
.../NAS/UE/ESM/SAP/esm_sap.c | 0
.../NAS/UE/ESM/SAP/esm_sap.h | 0
.../NAS/UE/ESM/SAP/esm_sapDef.h | 0
.../NAS/UE/ESM/SAP/esm_send.c | 0
.../NAS/UE/ESM/SAP/esm_send.h | 0
{openair-cn => openair3}/NAS/UE/ESM/esmData.h | 0
{openair-cn => openair3}/NAS/UE/ESM/esm_ebr.c | 0
{openair-cn => openair3}/NAS/UE/ESM/esm_ebr.h | 0
.../NAS/UE/ESM/esm_ebr_context.c | 0
.../NAS/UE/ESM/esm_ebr_context.h | 0
{openair-cn => openair3}/NAS/UE/ESM/esm_ip.c | 0
.../NAS/UE/ESM/esm_main.c | 0
.../NAS/UE/ESM/esm_main.h | 0
.../NAS/UE/ESM/esm_proc.h | 0
{openair-cn => openair3}/NAS/UE/ESM/esm_pt.c | 0
{openair-cn => openair3}/NAS/UE/ESM/esm_pt.h | 0
{openair-cn => openair3}/NAS/UE/UEprocess.c | 0
.../NAS/UE/nas_itti_messaging.c | 0
.../NAS/UE/nas_itti_messaging.h | 0
{openair-cn => openair3}/NAS/UE/nas_network.c | 0
{openair-cn => openair3}/NAS/UE/nas_network.h | 0
{openair-cn => openair3}/NAS/UE/nas_parser.c | 0
{openair-cn => openair3}/NAS/UE/nas_parser.h | 0
{openair-cn => openair3}/NAS/UE/nas_proc.c | 0
{openair-cn => openair3}/NAS/UE/nas_proc.h | 0
{openair-cn => openair3}/NAS/UE/nas_ue_task.c | 0
{openair-cn => openair3}/NAS/UE/nas_user.c | 0
{openair-cn => openair3}/NAS/UE/nas_user.h | 0
{openair-cn => openair3}/S1AP/COPYING | 0
.../S1AP/MESSAGES/ASN1/COPYING | 0
.../S1AP/MESSAGES/ASN1/R10.5/COPYING | 0
.../ASN1/R10.5/S1AP-CommonDataTypes.asn | 0
.../MESSAGES/ASN1/R10.5/S1AP-Constants.asn | 0
.../MESSAGES/ASN1/R10.5/S1AP-Containers.asn | 0
.../S1AP/MESSAGES/ASN1/R10.5/S1AP-IEs.asn | 0
.../MESSAGES/ASN1/R10.5/S1AP-PDU-Contents.asn | 0
.../ASN1/R10.5/S1AP-PDU-Descriptions.asn | 0
.../S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU.asn | 0
.../S1AP/MESSAGES/ASN1/R8.10/COPYING | 0
.../ASN1/R8.10/S1AP-CommonDataTypes.asn | 0
.../MESSAGES/ASN1/R8.10/S1AP-Constants.asn | 0
.../S1AP/MESSAGES/ASN1/R8.10/S1AP-IEs.asn | 0
.../MESSAGES/ASN1/R8.10/S1AP-PDU-Contents.asn | 0
.../S1AP/MESSAGES/ASN1/R8.10/S1AP-PDU.asn | 0
.../S1AP/MESSAGES/ASN1/R9.8/COPYING | 0
.../ASN1/R9.8/S1AP-CommonDataTypes.asn | 0
.../MESSAGES/ASN1/R9.8/S1AP-Constants.asn | 0
.../MESSAGES/ASN1/R9.8/S1AP-Containers.asn | 0
.../S1AP/MESSAGES/ASN1/R9.8/S1AP-IEs.asn | 0
.../MESSAGES/ASN1/R9.8/S1AP-PDU-Contents.asn | 0
.../ASN1/R9.8/S1AP-PDU-Descriptions.asn | 0
.../S1AP/MESSAGES/ASN1/R9.8/S1AP-PDU.asn | 0
.../S1AP/MESSAGES/ASN1/README | 0
.../S1AP/MESSAGES/ASN1/asn1cpatch.p0 | 0
.../S1AP/MESSAGES/ASN1/asn1cpatch_2.p0 | 0
.../S1AP/MESSAGES/ASN1/asn1tostruct.py | 0
.../S1AP/MESSAGES/COPYING | 0
{openair-cn => openair3}/S1AP/s1ap_common.c | 0
{openair-cn => openair3}/S1AP/s1ap_common.h | 0
{openair-cn => openair3}/S1AP/s1ap_eNB.c | 0
{openair-cn => openair3}/S1AP/s1ap_eNB.h | 0
.../s1ap_eNB_context_management_procedures.c | 0
.../s1ap_eNB_context_management_procedures.h | 0
.../S1AP/s1ap_eNB_decoder.c | 0
.../S1AP/s1ap_eNB_decoder.h | 0
.../S1AP/s1ap_eNB_default_values.h | 0
{openair-cn => openair3}/S1AP/s1ap_eNB_defs.h | 0
.../S1AP/s1ap_eNB_encoder.c | 0
.../S1AP/s1ap_eNB_encoder.h | 0
.../S1AP/s1ap_eNB_handlers.c | 0
.../S1AP/s1ap_eNB_handlers.h | 0
.../S1AP/s1ap_eNB_itti_messaging.c | 0
.../S1AP/s1ap_eNB_itti_messaging.h | 0
.../S1AP/s1ap_eNB_management_procedures.c | 0
.../S1AP/s1ap_eNB_management_procedures.h | 0
.../S1AP/s1ap_eNB_nas_procedures.c | 0
.../S1AP/s1ap_eNB_nas_procedures.h | 0
{openair-cn => openair3}/S1AP/s1ap_eNB_nnsf.c | 0
{openair-cn => openair3}/S1AP/s1ap_eNB_nnsf.h | 0
.../S1AP/s1ap_eNB_overload.c | 0
.../S1AP/s1ap_eNB_overload.h | 0
.../S1AP/s1ap_eNB_trace.c | 0
.../S1AP/s1ap_eNB_trace.h | 0
.../S1AP/s1ap_eNB_ue_context.c | 0
.../S1AP/s1ap_eNB_ue_context.h | 0
{openair-cn => openair3}/SCTP/COPYING | 0
{openair-cn => openair3}/SCTP/sctp_common.c | 0
{openair-cn => openair3}/SCTP/sctp_common.h | 0
.../SCTP/sctp_default_values.h | 0
{openair-cn => openair3}/SCTP/sctp_eNB_defs.h | 0
.../SCTP/sctp_eNB_itti_messaging.c | 0
.../SCTP/sctp_eNB_itti_messaging.h | 0
{openair-cn => openair3}/SCTP/sctp_eNB_task.c | 0
{openair-cn => openair3}/SCTP/sctp_eNB_task.h | 0
.../SCTP/sctp_primitives_client.c | 0
.../SCTP/sctp_primitives_client.h | 0
{openair-cn => openair3}/SECU/COPYING | 0
{openair-cn => openair3}/SECU/kdf.c | 0
.../SECU/key_nas_deriver.c | 0
.../SECU/key_nas_encryption.c | 0
.../SECU/nas_stream_eea1.c | 0
.../SECU/nas_stream_eea2.c | 0
.../SECU/nas_stream_eia1.c | 0
.../SECU/nas_stream_eia2.c | 0
{openair-cn => openair3}/SECU/rijndael.c | 0
{openair-cn => openair3}/SECU/rijndael.h | 0
{openair-cn => openair3}/SECU/secu_defs.h | 0
{openair-cn => openair3}/SECU/snow3g.c | 0
{openair-cn => openair3}/SECU/snow3g.h | 0
{openair-cn => openair3}/TEST/COPYING | 0
.../TEST_1MME_1ENB_1UE_ATTACH_GUTI/enb1.conf | 0
.../TEST_1MME_1ENB_1UE_ATTACH_GUTI/trace.pdml | 0
.../TEST/EPC_TEST/generate_scenario.c | 0
.../TEST/EPC_TEST/mme_test_s1_pcap2pdml | 0
{openair-cn => openair3}/TEST/Makefile.am | 0
.../TEST/oaisim_mme_client_test.c | 0
.../TEST/oaisim_mme_itti_test.c | 0
.../TEST/oaisim_mme_list_benchmark.c | 0
.../TEST/oaisim_mme_s1ap_test.c | 0
.../TEST/oaisim_mme_sctp_test.c | 0
.../TEST/oaisim_mme_test_s1c.c | 0
.../TEST/oaisim_mme_test_s1c.h | 0
.../TEST/oaisim_mme_test_s1c_s1ap.c | 0
.../TEST/oaisim_mme_test_s1c_s1ap.h | 0
.../TEST/oaisim_mme_test_s1c_scenario.c | 0
.../TEST/oaisim_mme_test_s1c_scenario.h | 0
.../TEST/oaisim_mme_test_s1c_scenario1.c | 0
.../TEST/test_aes128_cmac_encrypt.c | 0
.../TEST/test_aes128_ctr_decrypt.c | 0
.../TEST/test_aes128_ctr_encrypt.c | 0
{openair-cn => openair3}/TEST/test_kdf.c | 0
{openair-cn => openair3}/TEST/test_s1ap.c | 0
{openair-cn => openair3}/TEST/test_secu.c | 0
.../TEST/test_secu_kenb.c | 0
.../TEST/test_secu_knas.c | 0
.../TEST/test_secu_knas_encrypt_eea1.c | 0
.../TEST/test_secu_knas_encrypt_eea2.c | 0
.../TEST/test_secu_knas_encrypt_eia1.c | 0
.../TEST/test_secu_knas_encrypt_eia2.c | 0
.../TEST/test_secu_knas_stream_int.c | 0
{openair-cn => openair3}/TEST/test_util.c | 0
{openair-cn => openair3}/TEST/test_util.h | 0
{openair-cn => openair3}/UDP/COPYING | 0
{openair-cn => openair3}/UDP/udp_eNB_task.c | 0
{openair-cn => openair3}/UDP/udp_eNB_task.h | 0
{openair-cn => openair3}/UTILS/CONF/COPYING | 0
{openair-cn => openair3}/UTILS/COPYING | 0
.../UTILS/HASHTABLE/COPYING | 0
.../UTILS/HASHTABLE/Makefile.am | 0
.../UTILS/HASHTABLE/Makefile.eNB | 0
.../UTILS/HASHTABLE/hashtable.c | 0
.../UTILS/HASHTABLE/hashtable.h | 0
.../UTILS/HASHTABLE/obj_hashtable.c | 0
.../UTILS/HASHTABLE/obj_hashtable.h | 0
{openair-cn => openair3}/UTILS/Makefile.am | 0
{openair-cn => openair3}/UTILS/conversions.c | 0
{openair-cn => openair3}/UTILS/conversions.h | 0
{openair-cn => openair3}/UTILS/enum_string.c | 0
{openair-cn => openair3}/UTILS/enum_string.h | 0
{openair-cn => openair3}/UTILS/log.c | 0
{openair-cn => openair3}/UTILS/log.h | 0
{openair-cn => openair3}/UTILS/mcc_mnc_itu.c | 0
{openair-cn => openair3}/UTILS/mcc_mnc_itu.h | 0
{openair-cn => openair3}/UTILS/mme_config.c | 0
{openair-cn => openair3}/UTILS/mme_config.h | 0
.../UTILS/mme_default_values.h | 0
{openair-cn => openair3}/UTILS/mme_parser.y | 0
{openair-cn => openair3}/UTILS/mme_scanner.l | 0
{openair-cn => openair3}/UTILS/queue.h | 0
{openair-cn => openair3}/UTILS/tree.h | 0
{openair-cn => openair3}/valgrind.sh | 0
targets/Makefile.common | 32 +++---
targets/PROJECTS/E-MBMS/utils.bash | 8 +-
.../GENERIC-LTE-EPC/CONF/epc.generic.conf | 2 +-
.../CONF/epc.on.enb.example.conf | 2 +-
.../start_enb_and_ue_virt.bash | 20 ++--
.../PROJECTS/GENERIC-LTE-EPC/start_ue.bash | 22 ++--
targets/PROJECTS/GENERIC-LTE-EPC/utils.bash | 38 +++---
.../install_asn1c_0.9.24.modified.bash | 2 +-
targets/build_helper.bash | 50 ++++----
targets/build_oai.bash | 26 ++---
targets/perf_oai.bash | 4 +-
705 files changed, 206 insertions(+), 208 deletions(-)
rename {openair-cn => openair3}/COMMON/as_message.h (100%)
rename {openair-cn => openair3}/COMMON/common_types.h (100%)
rename {openair-cn => openair3}/COMMON/gtpv1_u_messages_def.h (100%)
rename {openair-cn => openair3}/COMMON/gtpv1_u_messages_types.h (100%)
rename {openair-cn => openair3}/COMMON/intertask_interface_conf.h (100%)
rename {openair-cn => openair3}/COMMON/messages_def.h (100%)
rename {openair-cn => openair3}/COMMON/messages_types.h (100%)
rename {openair-cn => openair3}/COMMON/nas_messages_def.h (100%)
rename {openair-cn => openair3}/COMMON/nas_messages_types.h (100%)
rename {openair-cn => openair3}/COMMON/s1ap_messages_def.h (100%)
rename {openair-cn => openair3}/COMMON/s1ap_messages_types.h (100%)
rename {openair-cn => openair3}/COMMON/sctp_messages_def.h (100%)
rename {openair-cn => openair3}/COMMON/sctp_messages_types.h (100%)
rename {openair-cn => openair3}/COMMON/security_types.h (100%)
rename {openair-cn => openair3}/COMMON/tasks_def.h (100%)
rename {openair-cn => openair3}/COMMON/udp_messages_def.h (100%)
rename {openair-cn => openair3}/COMMON/udp_messages_types.h (100%)
rename {openair-cn => openair3}/COPYING (100%)
rename {openair-cn => openair3}/DOCS/COPYING (100%)
rename {openair-cn => openair3}/DOCS/DOXYGEN/COPYING (100%)
rename {openair-cn => openair3}/DOCS/DOXYGEN/Doxyfile.in (100%)
rename {openair-cn => openair3}/DOCS/DOXYGEN/Makefile.am (100%)
rename {openair-cn => openair3}/DOCS/Latex/COPYING (100%)
rename {openair-cn => openair3}/DOCS/Latex/DefaultBearer/COPYING (100%)
rename {openair-cn => openair3}/DOCS/Latex/DefaultBearer/DefaultBearer.pdf (100%)
rename {openair-cn => openair3}/DOCS/Latex/DefaultBearer/DefaultBearer.tex (100%)
rename {openair-cn => openair3}/DOCS/Latex/EPC/COPYING (100%)
rename {openair-cn => openair3}/DOCS/Latex/EPC/EPC.pdf (100%)
rename {openair-cn => openair3}/DOCS/Latex/EPC/EPC.tex (100%)
rename {openair-cn => openair3}/DOCS/Latex/EPC/Makefile (100%)
rename {openair-cn => openair3}/DOCS/Makefile.am (100%)
rename {openair-cn => openair3}/GTPV1-U/Makefile.am (100%)
rename {openair-cn => openair3}/GTPV1-U/Makefile.eNB (100%)
rename {openair-cn => openair3}/GTPV1-U/gtpv1u.h (100%)
rename {openair-cn => openair3}/GTPV1-U/gtpv1u_eNB.c (100%)
rename {openair-cn => openair3}/GTPV1-U/gtpv1u_eNB_defs.h (100%)
rename {openair-cn => openair3}/GTPV1-U/gtpv1u_eNB_task.h (100%)
rename {openair-cn => openair3}/GTPV1-U/gtpv1u_sgw_defs.h (100%)
rename {openair-cn => openair3}/GTPV1-U/gtpv1u_task.c (100%)
rename {openair-cn => openair3}/GTPV1-U/gtpv1u_teid_pool.c (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/AUTHORS (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/COPYING (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/ChangeLog (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/NEWS (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/README (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/include/NwGtpv1uLog.h (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/include/NwGtpv1uPrivate.h (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/include/NwGtpv1uTrxn.h (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/include/NwGtpv1uTunnelEndPoint.h (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/shared/NwGtpv1u.h (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uError.h (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uIe.h (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uMsg.h (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/shared/NwLog.h (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/shared/NwTypes.h (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/shared/NwUtils.h (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTrxn.c (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/test-app/Makefile.am (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/test-app/Makefile.in (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/Makefile.am (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/Makefile.in (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwEvt.h (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniLogMgrEntity.c (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniLogMgrEntity.h (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniTmrMgrEntity.c (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniTmrMgrEntity.h (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUdpEntity.c (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUdpEntity.h (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUlpEntity.c (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUlpEntity.h (100%)
rename {openair-cn => openair3}/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/helloworld.c (100%)
rename {openair-cn => openair3}/INTERTASK_INTERFACE (100%)
rename {openair-cn => openair3}/NAS/COMMON/API/NETWORK/COPYING (100%)
rename {openair-cn => openair3}/NAS/COMMON/API/NETWORK/Makefile (100%)
rename {openair-cn => openair3}/NAS/COMMON/API/NETWORK/as_message.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/API/NETWORK/as_message.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/API/NETWORK/l2_message.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/API/NETWORK/nas_message.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/API/NETWORK/nas_message.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/API/NETWORK/network_api.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/API/NETWORK/network_api.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/COPYING (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/AttachAccept.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/AttachAccept.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/AttachComplete.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/AttachComplete.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/AttachReject.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/AttachReject.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/AttachRequest.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/AttachRequest.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/AuthenticationFailure.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/AuthenticationFailure.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/AuthenticationReject.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/AuthenticationReject.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/AuthenticationRequest.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/AuthenticationRequest.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/AuthenticationResponse.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/AuthenticationResponse.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/COPYING (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/CsServiceNotification.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/CsServiceNotification.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/DetachAccept.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/DetachAccept.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/DetachRequest.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/DetachRequest.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/DownlinkNasTransport.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/DownlinkNasTransport.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/EmmInformation.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/EmmInformation.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/EmmStatus.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/EmmStatus.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/ExtendedServiceRequest.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/ExtendedServiceRequest.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/GutiReallocationCommand.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/GutiReallocationCommand.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/GutiReallocationComplete.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/GutiReallocationComplete.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/IdentityRequest.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/IdentityRequest.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/IdentityResponse.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/IdentityResponse.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/Makefile (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/NASSecurityModeCommand.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/NASSecurityModeComplete.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/SecurityModeCommand.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/SecurityModeComplete.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/SecurityModeReject.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/SecurityModeReject.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/ServiceReject.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/ServiceReject.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/ServiceRequest.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/ServiceRequest.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/TrackingAreaUpdateAccept.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/TrackingAreaUpdateAccept.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/TrackingAreaUpdateComplete.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/TrackingAreaUpdateComplete.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/TrackingAreaUpdateReject.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/TrackingAreaUpdateReject.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/TrackingAreaUpdateRequest.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/TrackingAreaUpdateRequest.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/UplinkNasTransport.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/UplinkNasTransport.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/emm_cause.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/emm_msg.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/emm_msg.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/EMM/MSG/emm_msgDef.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextRequest.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextRequest.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextAccept.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextAccept.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextReject.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextReject.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/BearerResourceAllocationReject.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/BearerResourceAllocationReject.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/BearerResourceAllocationRequest.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/BearerResourceAllocationRequest.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/BearerResourceModificationReject.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/BearerResourceModificationReject.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/BearerResourceModificationRequest.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/BearerResourceModificationRequest.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/COPYING (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextAccept.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextAccept.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextRequest.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextRequest.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/EsmInformationRequest.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/EsmInformationRequest.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/EsmInformationResponse.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/EsmInformationResponse.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/EsmStatus.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/EsmStatus.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/Makefile (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextAccept.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextAccept.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextReject.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextReject.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextRequest.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextRequest.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/PdnConnectivityReject.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/PdnConnectivityReject.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/PdnConnectivityRequest.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/PdnConnectivityRequest.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/PdnDisconnectReject.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/PdnDisconnectReject.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/PdnDisconnectRequest.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/PdnDisconnectRequest.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/esm_cause.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/esm_msg.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/esm_msg.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/ESM/MSG/esm_msgDef.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/AccessPointName.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/AccessPointName.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/AdditionalUpdateResult.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/AdditionalUpdateResult.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/AdditionalUpdateType.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/AdditionalUpdateType.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/ApnAggregateMaximumBitRate.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/ApnAggregateMaximumBitRate.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/AuthenticationFailureParameter.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/AuthenticationFailureParameter.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/AuthenticationParameterAutn.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/AuthenticationParameterAutn.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/AuthenticationParameterRand.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/AuthenticationParameterRand.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/AuthenticationResponseParameter.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/AuthenticationResponseParameter.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/COPYING (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/CipheringKeySequenceNumber.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/CipheringKeySequenceNumber.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/Cli.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/Cli.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/CsfbResponse.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/CsfbResponse.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/DaylightSavingTime.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/DaylightSavingTime.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/DetachType.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/DetachType.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/DrxParameter.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/DrxParameter.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EmergencyNumberList.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EmergencyNumberList.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EmmCause.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EmmCause.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EpsAttachResult.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EpsAttachResult.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EpsAttachType.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EpsAttachType.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EpsBearerContextStatus.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EpsBearerContextStatus.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EpsBearerIdentity.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EpsBearerIdentity.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EpsMobileIdentity.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EpsMobileIdentity.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EpsNetworkFeatureSupport.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EpsNetworkFeatureSupport.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EpsQualityOfService.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EpsQualityOfService.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EpsUpdateResult.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EpsUpdateResult.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EpsUpdateType.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EpsUpdateType.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EsmCause.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EsmCause.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EsmInformationTransferFlag.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EsmInformationTransferFlag.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EsmMessageContainer.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/EsmMessageContainer.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/GprsTimer.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/GprsTimer.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/GutiType.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/GutiType.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/IdentityType2.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/IdentityType2.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/ImeisvRequest.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/ImeisvRequest.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/KsiAndSequenceNumber.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/KsiAndSequenceNumber.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/LcsClientIdentity.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/LcsClientIdentity.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/LcsIndicator.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/LcsIndicator.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/LinkedEpsBearerIdentity.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/LinkedEpsBearerIdentity.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/LlcServiceAccessPointIdentifier.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/LlcServiceAccessPointIdentifier.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/LocationAreaIdentification.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/LocationAreaIdentification.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/Makefile (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/MessageType.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/MessageType.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/MobileIdentity.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/MobileIdentity.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/MobileStationClassmark2.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/MobileStationClassmark2.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/MobileStationClassmark3.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/MobileStationClassmark3.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/MsNetworkCapability.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/MsNetworkCapability.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/MsNetworkFeatureSupport.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/MsNetworkFeatureSupport.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/NasKeySetIdentifier.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/NasKeySetIdentifier.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/NasMessageContainer.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/NasMessageContainer.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/NasRequestType.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/NasRequestType.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/NasSecurityAlgorithms.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/NasSecurityAlgorithms.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/NetworkName.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/NetworkName.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/Nonce.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/Nonce.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/PTmsiSignature.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/PTmsiSignature.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/PacketFlowIdentifier.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/PacketFlowIdentifier.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/PagingIdentity.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/PagingIdentity.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/PdnAddress.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/PdnAddress.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/PdnType.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/PdnType.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/PlmnList.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/PlmnList.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/ProcedureTransactionIdentity.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/ProcedureTransactionIdentity.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/ProtocolConfigurationOptions.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/ProtocolConfigurationOptions.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/ProtocolDiscriminator.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/ProtocolDiscriminator.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/QualityOfService.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/QualityOfService.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/RadioPriority.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/RadioPriority.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/SecurityHeaderType.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/SecurityHeaderType.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/ServiceType.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/ServiceType.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/ShortMac.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/ShortMac.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/SsCode.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/SsCode.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/SupportedCodecList.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/SupportedCodecList.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/TimeZone.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/TimeZone.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/TimeZoneAndTime.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/TimeZoneAndTime.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/TmsiStatus.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/TmsiStatus.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/TrackingAreaIdentity.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/TrackingAreaIdentity.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/TrackingAreaIdentityList.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/TrackingAreaIdentityList.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/TrafficFlowAggregateDescription.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/TrafficFlowAggregateDescription.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/TrafficFlowTemplate.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/TrafficFlowTemplate.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/TransactionIdentifier.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/TransactionIdentifier.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/UeNetworkCapability.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/UeNetworkCapability.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/UeRadioCapabilityInformationUpdateNeeded.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/UeRadioCapabilityInformationUpdateNeeded.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/UeSecurityCapability.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/UeSecurityCapability.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/COPYING (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/Makefile (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/OctetString.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/OctetString.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/TLVDecoder.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/TLVDecoder.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/TLVEncoder.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/TLVEncoder.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/device.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/device.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/memory.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/memory.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/nas_log.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/nas_log.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/nas_timer.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/nas_timer.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/parser.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/parser.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/socket.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/socket.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/stty.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/tst/Makefile (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/tst/timer.c (100%)
rename {openair-cn => openair3}/NAS/COMMON/UTIL/tst/timer_debug.txt (100%)
rename {openair-cn => openair3}/NAS/COMMON/commonDef.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/networkDef.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/securityDef.h (100%)
rename {openair-cn => openair3}/NAS/COMMON/userDef.h (100%)
rename {openair-cn => openair3}/NAS/COPYING (100%)
rename {openair-cn => openair3}/NAS/TEST/AS_SIMULATOR/COPYING (100%)
rename {openair-cn => openair3}/NAS/TEST/AS_SIMULATOR/Makefile (100%)
rename {openair-cn => openair3}/NAS/TEST/AS_SIMULATOR/as_data.c (100%)
rename {openair-cn => openair3}/NAS/TEST/AS_SIMULATOR/as_data.h (100%)
rename {openair-cn => openair3}/NAS/TEST/AS_SIMULATOR/as_process.c (100%)
rename {openair-cn => openair3}/NAS/TEST/AS_SIMULATOR/as_process.h (100%)
rename {openair-cn => openair3}/NAS/TEST/AS_SIMULATOR/as_simulator.c (100%)
rename {openair-cn => openair3}/NAS/TEST/AS_SIMULATOR/as_simulator_parser.c (100%)
rename {openair-cn => openair3}/NAS/TEST/AS_SIMULATOR/as_simulator_parser.h (100%)
rename {openair-cn => openair3}/NAS/TEST/AS_SIMULATOR/nas_data.c (100%)
rename {openair-cn => openair3}/NAS/TEST/AS_SIMULATOR/nas_data.h (100%)
rename {openair-cn => openair3}/NAS/TEST/AS_SIMULATOR/nas_process.c (100%)
rename {openair-cn => openair3}/NAS/TEST/AS_SIMULATOR/nas_process.h (100%)
rename {openair-cn => openair3}/NAS/TEST/COPYING (100%)
rename {openair-cn => openair3}/NAS/TEST/MSC/ActivatePDN.png (100%)
rename {openair-cn => openair3}/NAS/TEST/MSC/AuthenticationReject.png (100%)
rename {openair-cn => openair3}/NAS/TEST/MSC/COPYING (100%)
rename {openair-cn => openair3}/NAS/TEST/MSC/DeactivatePDN.png (100%)
rename {openair-cn => openair3}/NAS/TEST/MSC/InitialAttach.png (100%)
rename {openair-cn => openair3}/NAS/TEST/MSC/InitialAttachReject.png (100%)
rename {openair-cn => openair3}/NAS/TEST/MSC/NomalDetach.png (100%)
rename {openair-cn => openair3}/NAS/TEST/MSC/README (100%)
rename {openair-cn => openair3}/NAS/TEST/MSC/SwitchOffDetach.png (100%)
rename {openair-cn => openair3}/NAS/TEST/MSC/msc_gen.py (100%)
rename {openair-cn => openair3}/NAS/TEST/MSC/mscgen (100%)
rename {openair-cn => openair3}/NAS/TEST/NETWORK/COPYING (100%)
rename {openair-cn => openair3}/NAS/TEST/NETWORK/Makefile (100%)
rename {openair-cn => openair3}/NAS/TEST/NETWORK/README (100%)
rename {openair-cn => openair3}/NAS/TEST/NETWORK/network_parser.c (100%)
rename {openair-cn => openair3}/NAS/TEST/NETWORK/network_parser.h (100%)
rename {openair-cn => openair3}/NAS/TEST/NETWORK/network_simulator.c (100%)
rename {openair-cn => openair3}/NAS/TEST/USER/COPYING (100%)
rename {openair-cn => openair3}/NAS/TEST/USER/Makefile (100%)
rename {openair-cn => openair3}/NAS/TEST/USER/user_parser.c (100%)
rename {openair-cn => openair3}/NAS/TEST/USER/user_parser.h (100%)
rename {openair-cn => openair3}/NAS/TEST/USER/user_simulator.c (100%)
rename {openair-cn => openair3}/NAS/TOOLS/COPYING (100%)
rename {openair-cn => openair3}/NAS/TOOLS/Makefile (100%)
rename {openair-cn => openair3}/NAS/TOOLS/network.h (100%)
rename {openair-cn => openair3}/NAS/TOOLS/ue_data.c (100%)
rename {openair-cn => openair3}/NAS/TOOLS/usim_data.c (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/COPYING (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/Makefile (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/at_command.c (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/at_command.h (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/at_error.c (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/at_error.h (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/at_response.c (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/at_response.h (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/tst/Makefile (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/tst/at_parser.c (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/tst/at_parser.in (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/tst/at_parser.in.bis (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/tst/at_parser.out (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/tst/at_parser.out.bis (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/tst/smartcom.txt (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/user_api.c (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/user_api.h (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/user_indication.c (100%)
rename {openair-cn => openair3}/NAS/UE/API/USER/user_indication.h (100%)
rename {openair-cn => openair3}/NAS/UE/API/USIM/COPYING (100%)
rename {openair-cn => openair3}/NAS/UE/API/USIM/Makefile (100%)
rename {openair-cn => openair3}/NAS/UE/API/USIM/aka_functions.c (100%)
rename {openair-cn => openair3}/NAS/UE/API/USIM/aka_functions.h (100%)
rename {openair-cn => openair3}/NAS/UE/API/USIM/usim_api.c (100%)
rename {openair-cn => openair3}/NAS/UE/API/USIM/usim_api.h (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/Attach.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/Authentication.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/Detach.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/EmmStatusHdl.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/Identification.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/IdleMode.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/IdleMode.h (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/LowerLayer.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/LowerLayer.h (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/COPYING (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmDeregistered.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmDeregisteredAttachNeeded.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmDeregisteredAttemptingToAttach.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmDeregisteredInitiated.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmDeregisteredLimitedService.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmDeregisteredNoCellAvailable.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmDeregisteredNoImsi.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmDeregisteredNormalService.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmDeregisteredPlmnSearch.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmNull.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmRegistered.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmRegisteredAttemptingToUpdate.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmRegisteredImsiDetachInitiated.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmRegisteredInitiated.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmRegisteredLimitedService.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmRegisteredNoCellAvailable.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmRegisteredNormalService.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmRegisteredPlmnSearch.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmRegisteredUpdateNeeded.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmServiceRequestInitiated.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/EmmTrackingAreaUpdatingInitiated.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/emm_as.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/emm_as.h (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/emm_asDef.h (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/emm_esm.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/emm_esm.h (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/emm_esmDef.h (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/emm_fsm.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/emm_fsm.h (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/emm_recv.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/emm_recv.h (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/emm_reg.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/emm_reg.h (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/emm_regDef.h (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/emm_sap.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/emm_sap.h (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/emm_send.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SAP/emm_send.h (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/SecurityModeControl.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/ServiceRequestHdl.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/TrackingAreaUpdate.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/emmData.h (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/emm_main.c (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/emm_main.h (100%)
rename {openair-cn => openair3}/NAS/UE/EMM/emm_proc.h (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/DedicatedEpsBearerContextActivation.c (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/DefaultEpsBearerContextActivation.c (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/EpsBearerContextDeactivation.c (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/EsmStatusHdl.c (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/PdnConnectivity.c (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/PdnDisconnect.c (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/SAP/COPYING (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/SAP/esm_recv.c (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/SAP/esm_recv.h (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/SAP/esm_sap.c (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/SAP/esm_sap.h (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/SAP/esm_sapDef.h (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/SAP/esm_send.c (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/SAP/esm_send.h (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/esmData.h (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/esm_ebr.c (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/esm_ebr.h (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/esm_ebr_context.c (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/esm_ebr_context.h (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/esm_ip.c (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/esm_main.c (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/esm_main.h (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/esm_proc.h (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/esm_pt.c (100%)
rename {openair-cn => openair3}/NAS/UE/ESM/esm_pt.h (100%)
rename {openair-cn => openair3}/NAS/UE/UEprocess.c (100%)
rename {openair-cn => openair3}/NAS/UE/nas_itti_messaging.c (100%)
rename {openair-cn => openair3}/NAS/UE/nas_itti_messaging.h (100%)
rename {openair-cn => openair3}/NAS/UE/nas_network.c (100%)
rename {openair-cn => openair3}/NAS/UE/nas_network.h (100%)
rename {openair-cn => openair3}/NAS/UE/nas_parser.c (100%)
rename {openair-cn => openair3}/NAS/UE/nas_parser.h (100%)
rename {openair-cn => openair3}/NAS/UE/nas_proc.c (100%)
rename {openair-cn => openair3}/NAS/UE/nas_proc.h (100%)
rename {openair-cn => openair3}/NAS/UE/nas_ue_task.c (100%)
rename {openair-cn => openair3}/NAS/UE/nas_user.c (100%)
rename {openair-cn => openair3}/NAS/UE/nas_user.h (100%)
rename {openair-cn => openair3}/S1AP/COPYING (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/COPYING (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R10.5/COPYING (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R10.5/S1AP-CommonDataTypes.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R10.5/S1AP-Constants.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R10.5/S1AP-Containers.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R10.5/S1AP-IEs.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU-Contents.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU-Descriptions.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R8.10/COPYING (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R8.10/S1AP-CommonDataTypes.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R8.10/S1AP-Constants.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R8.10/S1AP-IEs.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R8.10/S1AP-PDU-Contents.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R8.10/S1AP-PDU.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R9.8/COPYING (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R9.8/S1AP-CommonDataTypes.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R9.8/S1AP-Constants.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R9.8/S1AP-Containers.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R9.8/S1AP-IEs.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R9.8/S1AP-PDU-Contents.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R9.8/S1AP-PDU-Descriptions.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/R9.8/S1AP-PDU.asn (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/README (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/asn1cpatch.p0 (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/asn1cpatch_2.p0 (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/ASN1/asn1tostruct.py (100%)
rename {openair-cn => openair3}/S1AP/MESSAGES/COPYING (100%)
rename {openair-cn => openair3}/S1AP/s1ap_common.c (100%)
rename {openair-cn => openair3}/S1AP/s1ap_common.h (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB.c (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB.h (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_context_management_procedures.c (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_context_management_procedures.h (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_decoder.c (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_decoder.h (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_default_values.h (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_defs.h (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_encoder.c (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_encoder.h (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_handlers.c (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_handlers.h (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_itti_messaging.c (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_itti_messaging.h (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_management_procedures.c (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_management_procedures.h (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_nas_procedures.c (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_nas_procedures.h (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_nnsf.c (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_nnsf.h (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_overload.c (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_overload.h (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_trace.c (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_trace.h (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_ue_context.c (100%)
rename {openair-cn => openair3}/S1AP/s1ap_eNB_ue_context.h (100%)
rename {openair-cn => openair3}/SCTP/COPYING (100%)
rename {openair-cn => openair3}/SCTP/sctp_common.c (100%)
rename {openair-cn => openair3}/SCTP/sctp_common.h (100%)
rename {openair-cn => openair3}/SCTP/sctp_default_values.h (100%)
rename {openair-cn => openair3}/SCTP/sctp_eNB_defs.h (100%)
rename {openair-cn => openair3}/SCTP/sctp_eNB_itti_messaging.c (100%)
rename {openair-cn => openair3}/SCTP/sctp_eNB_itti_messaging.h (100%)
rename {openair-cn => openair3}/SCTP/sctp_eNB_task.c (100%)
rename {openair-cn => openair3}/SCTP/sctp_eNB_task.h (100%)
rename {openair-cn => openair3}/SCTP/sctp_primitives_client.c (100%)
rename {openair-cn => openair3}/SCTP/sctp_primitives_client.h (100%)
rename {openair-cn => openair3}/SECU/COPYING (100%)
rename {openair-cn => openair3}/SECU/kdf.c (100%)
rename {openair-cn => openair3}/SECU/key_nas_deriver.c (100%)
rename {openair-cn => openair3}/SECU/key_nas_encryption.c (100%)
rename {openair-cn => openair3}/SECU/nas_stream_eea1.c (100%)
rename {openair-cn => openair3}/SECU/nas_stream_eea2.c (100%)
rename {openair-cn => openair3}/SECU/nas_stream_eia1.c (100%)
rename {openair-cn => openair3}/SECU/nas_stream_eia2.c (100%)
rename {openair-cn => openair3}/SECU/rijndael.c (100%)
rename {openair-cn => openair3}/SECU/rijndael.h (100%)
rename {openair-cn => openair3}/SECU/secu_defs.h (100%)
rename {openair-cn => openair3}/SECU/snow3g.c (100%)
rename {openair-cn => openair3}/SECU/snow3g.h (100%)
rename {openair-cn => openair3}/TEST/COPYING (100%)
rename {openair-cn => openair3}/TEST/EPC_TEST/TEST_1MME_1ENB_1UE_ATTACH_GUTI/enb1.conf (100%)
rename {openair-cn => openair3}/TEST/EPC_TEST/TEST_1MME_1ENB_1UE_ATTACH_GUTI/trace.pdml (100%)
rename {openair-cn => openair3}/TEST/EPC_TEST/generate_scenario.c (100%)
rename {openair-cn => openair3}/TEST/EPC_TEST/mme_test_s1_pcap2pdml (100%)
rename {openair-cn => openair3}/TEST/Makefile.am (100%)
rename {openair-cn => openair3}/TEST/oaisim_mme_client_test.c (100%)
rename {openair-cn => openair3}/TEST/oaisim_mme_itti_test.c (100%)
rename {openair-cn => openair3}/TEST/oaisim_mme_list_benchmark.c (100%)
rename {openair-cn => openair3}/TEST/oaisim_mme_s1ap_test.c (100%)
rename {openair-cn => openair3}/TEST/oaisim_mme_sctp_test.c (100%)
rename {openair-cn => openair3}/TEST/oaisim_mme_test_s1c.c (100%)
rename {openair-cn => openair3}/TEST/oaisim_mme_test_s1c.h (100%)
rename {openair-cn => openair3}/TEST/oaisim_mme_test_s1c_s1ap.c (100%)
rename {openair-cn => openair3}/TEST/oaisim_mme_test_s1c_s1ap.h (100%)
rename {openair-cn => openair3}/TEST/oaisim_mme_test_s1c_scenario.c (100%)
rename {openair-cn => openair3}/TEST/oaisim_mme_test_s1c_scenario.h (100%)
rename {openair-cn => openair3}/TEST/oaisim_mme_test_s1c_scenario1.c (100%)
rename {openair-cn => openair3}/TEST/test_aes128_cmac_encrypt.c (100%)
rename {openair-cn => openair3}/TEST/test_aes128_ctr_decrypt.c (100%)
rename {openair-cn => openair3}/TEST/test_aes128_ctr_encrypt.c (100%)
rename {openair-cn => openair3}/TEST/test_kdf.c (100%)
rename {openair-cn => openair3}/TEST/test_s1ap.c (100%)
rename {openair-cn => openair3}/TEST/test_secu.c (100%)
rename {openair-cn => openair3}/TEST/test_secu_kenb.c (100%)
rename {openair-cn => openair3}/TEST/test_secu_knas.c (100%)
rename {openair-cn => openair3}/TEST/test_secu_knas_encrypt_eea1.c (100%)
rename {openair-cn => openair3}/TEST/test_secu_knas_encrypt_eea2.c (100%)
rename {openair-cn => openair3}/TEST/test_secu_knas_encrypt_eia1.c (100%)
rename {openair-cn => openair3}/TEST/test_secu_knas_encrypt_eia2.c (100%)
rename {openair-cn => openair3}/TEST/test_secu_knas_stream_int.c (100%)
rename {openair-cn => openair3}/TEST/test_util.c (100%)
rename {openair-cn => openair3}/TEST/test_util.h (100%)
rename {openair-cn => openair3}/UDP/COPYING (100%)
rename {openair-cn => openair3}/UDP/udp_eNB_task.c (100%)
rename {openair-cn => openair3}/UDP/udp_eNB_task.h (100%)
rename {openair-cn => openair3}/UTILS/CONF/COPYING (100%)
rename {openair-cn => openair3}/UTILS/COPYING (100%)
rename {openair-cn => openair3}/UTILS/HASHTABLE/COPYING (100%)
rename {openair-cn => openair3}/UTILS/HASHTABLE/Makefile.am (100%)
rename {openair-cn => openair3}/UTILS/HASHTABLE/Makefile.eNB (100%)
rename {openair-cn => openair3}/UTILS/HASHTABLE/hashtable.c (100%)
rename {openair-cn => openair3}/UTILS/HASHTABLE/hashtable.h (100%)
rename {openair-cn => openair3}/UTILS/HASHTABLE/obj_hashtable.c (100%)
rename {openair-cn => openair3}/UTILS/HASHTABLE/obj_hashtable.h (100%)
rename {openair-cn => openair3}/UTILS/Makefile.am (100%)
rename {openair-cn => openair3}/UTILS/conversions.c (100%)
rename {openair-cn => openair3}/UTILS/conversions.h (100%)
rename {openair-cn => openair3}/UTILS/enum_string.c (100%)
rename {openair-cn => openair3}/UTILS/enum_string.h (100%)
rename {openair-cn => openair3}/UTILS/log.c (100%)
rename {openair-cn => openair3}/UTILS/log.h (100%)
rename {openair-cn => openair3}/UTILS/mcc_mnc_itu.c (100%)
rename {openair-cn => openair3}/UTILS/mcc_mnc_itu.h (100%)
rename {openair-cn => openair3}/UTILS/mme_config.c (100%)
rename {openair-cn => openair3}/UTILS/mme_config.h (100%)
rename {openair-cn => openair3}/UTILS/mme_default_values.h (100%)
rename {openair-cn => openair3}/UTILS/mme_parser.y (100%)
rename {openair-cn => openair3}/UTILS/mme_scanner.l (100%)
rename {openair-cn => openair3}/UTILS/queue.h (100%)
rename {openair-cn => openair3}/UTILS/tree.h (100%)
rename {openair-cn => openair3}/valgrind.sh (100%)
diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 18ef6108e2..af02027113 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -36,7 +36,7 @@ set (OPENAIR1_DIR ${OPENAIR_DIR}/openair1)
set (OPENAIR2_DIR ${OPENAIR_DIR}/openair2)
set (OPENAIR3_DIR ${OPENAIR_DIR}/openair3)
set (OPENAIR_TARGETS ${OPENAIR_DIR}/targets)
-set (OPENAIRCN_DIR ${OPENAIR_DIR}/openair-cn)
+set (OPENAIR3_DIR ${OPENAIR_DIR}/openair3)
set (OPENAIR_CMAKE ${OPENAIR_DIR}/cmake_targets)
set (OPENAIR_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY})
@@ -214,7 +214,7 @@ if (${ENABLE_ITTI})
${ITTI_DIR}/timer.c
)
set(ITTI_LIB ITTI)
- set(GTPU_need_ITTI ${OPENAIRCN_DIR}/GTPV1-U/gtpv1u_eNB.c)
+ set(GTPU_need_ITTI ${OPENAIR3_DIR}/GTPV1-U/gtpv1u_eNB.c)
endif (${ENABLE_ITTI})
add_boolean_option(RTAI False "Use RTAI")
@@ -278,7 +278,7 @@ add_custom_command (
##############
add_list1_option(S1AP_VERSION R10 "S1AP Asn.1 grammar version" R8 R9 R10)
-set(S1AP_DIR ${OPENAIRCN_DIR}/S1AP)
+set(S1AP_DIR ${OPENAIR3_DIR}/S1AP)
if (${S1AP_VERSION} STREQUAL "R10")
set (ASN1RELDIR R10.5)
add_definitions("-DUPDATE_RELEASE_9 -DUPDATE_RELEASE_10")
@@ -470,7 +470,7 @@ add_boolean_option(MESSAGE_CHART_GENERATOR_PHY False "trace some PHY exchang
########################
# Include order
##########################
-add_boolean_option(ENB_MODE True "Swap the include directories between openair2 and openair-cn" )
+add_boolean_option(ENB_MODE True "Swap the include directories between openair2 and openair3" )
##########################
# Emulation options
@@ -620,11 +620,11 @@ if(ENB_MODE)
include_directories("${OPENAIR2_DIR}/COMMON")
include_directories("${OPENAIR2_DIR}/UTIL")
include_directories("${OPENAIR2_DIR}/UTIL/LOG")
- include_directories("${OPENAIRCN_DIR}/COMMON")
- include_directories("${OPENAIRCN_DIR}/UTILS")
+ include_directories("${OPENAIR3_DIR}/COMMON")
+ include_directories("${OPENAIR3_DIR}/UTILS")
else()
- include_directories("${OPENAIRCN_DIR}/COMMON")
- include_directories("${OPENAIRCN_DIR}/UTILS")
+ include_directories("${OPENAIR3_DIR}/COMMON")
+ include_directories("${OPENAIR3_DIR}/UTILS")
include_directories("${OPENAIR2_DIR}/COMMON")
include_directories("${OPENAIR2_DIR}/UTIL")
include_directories("${OPENAIR2_DIR}/UTIL/LOG")
@@ -644,18 +644,18 @@ include_directories("${OPENAIR3_DIR}/RAL-LTE/LTE_RAL_ENB/INCLUDE")
include_directories("${OPENAIR3_DIR}/RAL-LTE/LTE_RAL_UE/INCLUDE")
include_directories("${OPENAIR_DIR}/common/utils")
include_directories("${OPENAIR_DIR}/common/utils/itti")
-include_directories("${OPENAIRCN_DIR}/NAS/COMMON")
-include_directories("${OPENAIRCN_DIR}/NAS/COMMON/API/NETWORK")
-include_directories("${OPENAIRCN_DIR}/NAS/COMMON/EMM/MSG")
-include_directories("${OPENAIRCN_DIR}/NAS/COMMON/ESM/MSG")
-include_directories("${OPENAIRCN_DIR}/NAS/COMMON/IES")
-include_directories("${OPENAIRCN_DIR}/NAS/COMMON/UTIL")
-include_directories("${OPENAIRCN_DIR}/SECU")
-include_directories("${OPENAIRCN_DIR}/SCTP")
-include_directories("${OPENAIRCN_DIR}/S1AP")
+include_directories("${OPENAIR3_DIR}/NAS/COMMON")
+include_directories("${OPENAIR3_DIR}/NAS/COMMON/API/NETWORK")
+include_directories("${OPENAIR3_DIR}/NAS/COMMON/EMM/MSG")
+include_directories("${OPENAIR3_DIR}/NAS/COMMON/ESM/MSG")
+include_directories("${OPENAIR3_DIR}/NAS/COMMON/IES")
+include_directories("${OPENAIR3_DIR}/NAS/COMMON/UTIL")
+include_directories("${OPENAIR3_DIR}/SECU")
+include_directories("${OPENAIR3_DIR}/SCTP")
+include_directories("${OPENAIR3_DIR}/S1AP")
include_directories("${OPENAIR2_DIR}/X2AP")
-include_directories("${OPENAIRCN_DIR}/UDP")
-include_directories("${OPENAIRCN_DIR}/GTPV1-U")
+include_directories("${OPENAIR3_DIR}/UDP")
+include_directories("${OPENAIR3_DIR}/GTPV1-U")
include_directories("${OPENAIR_DIR}/targets/COMMON")
include_directories("${OPENAIR_DIR}/targets/ARCH/COMMON")
include_directories("${OPENAIR_DIR}/targets/ARCH/EXMIMO/USERSPACE/LIB/")
@@ -675,8 +675,8 @@ include_directories("${OPENAIR2_DIR}/UTIL/CLI")
include_directories("${OPENAIR2_DIR}/UTIL/OPT")
include_directories("${OPENAIR2_DIR}/UTIL/OMV")
include_directories("${OPENAIR2_DIR}/RRC/LITE/MESSAGES")
-include_directories("${OPENAIRCN_DIR}/GTPV1-U/nw-gtpv1u/shared")
-include_directories("${OPENAIRCN_DIR}/GTPV1-U/nw-gtpv1u/include")
+include_directories("${OPENAIR3_DIR}/GTPV1-U/nw-gtpv1u/shared")
+include_directories("${OPENAIR3_DIR}/GTPV1-U/nw-gtpv1u/include")
include_directories("${OPENAIR_DIR}")
# Utilities Library
@@ -749,14 +749,14 @@ set(SECU_OSA_SRC
add_library(SECU_OSA ${SECU_OSA_SRC})
set(SECU_CN_SRC
- ${OPENAIRCN_DIR}/SECU/kdf.c
- ${OPENAIRCN_DIR}/SECU/rijndael.c
- ${OPENAIRCN_DIR}/SECU/snow3g.c
- ${OPENAIRCN_DIR}/SECU/key_nas_deriver.c
- ${OPENAIRCN_DIR}/SECU/nas_stream_eea1.c
- ${OPENAIRCN_DIR}/SECU/nas_stream_eia1.c
- ${OPENAIRCN_DIR}/SECU/nas_stream_eea2.c
- ${OPENAIRCN_DIR}/SECU/nas_stream_eia2.c
+ ${OPENAIR3_DIR}/SECU/kdf.c
+ ${OPENAIR3_DIR}/SECU/rijndael.c
+ ${OPENAIR3_DIR}/SECU/snow3g.c
+ ${OPENAIR3_DIR}/SECU/key_nas_deriver.c
+ ${OPENAIR3_DIR}/SECU/nas_stream_eea1.c
+ ${OPENAIR3_DIR}/SECU/nas_stream_eia1.c
+ ${OPENAIR3_DIR}/SECU/nas_stream_eea2.c
+ ${OPENAIR3_DIR}/SECU/nas_stream_eia2.c
)
add_library(SECU_CN ${SECU_CN_SRC})
@@ -988,14 +988,14 @@ endif()
##########################
add_library(CN_UTILS
- ${OPENAIRCN_DIR}/UTILS/conversions.c
- ${OPENAIRCN_DIR}/UTILS/enum_string.c
- ${OPENAIRCN_DIR}/UTILS/log.c
- ${OPENAIRCN_DIR}/UTILS/mme_config.c
- ${OPENAIRCN_DIR}/UTILS/mcc_mnc_itu.c
+ ${OPENAIR3_DIR}/UTILS/conversions.c
+ ${OPENAIR3_DIR}/UTILS/enum_string.c
+ ${OPENAIR3_DIR}/UTILS/log.c
+ ${OPENAIR3_DIR}/UTILS/mme_config.c
+ ${OPENAIR3_DIR}/UTILS/mcc_mnc_itu.c
)
-set(GTPV1U_DIR ${OPENAIRCN_DIR}/GTPV1-U)
+set(GTPV1U_DIR ${OPENAIR3_DIR}/GTPV1-U)
set (GTPV1U_SRC
${RRC_DIR}/rrc_eNB_GTPV1U.c
${GTPV1U_DIR}/nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c
@@ -1007,16 +1007,16 @@ set (GTPV1U_SRC
add_library(GTPV1U ${GTPV1U_SRC})
set(SCTP_SRC
- ${OPENAIRCN_DIR}/SCTP/sctp_common.c
- ${OPENAIRCN_DIR}/SCTP/sctp_eNB_task.c
- ${OPENAIRCN_DIR}/SCTP/sctp_eNB_itti_messaging.c
+ ${OPENAIR3_DIR}/SCTP/sctp_common.c
+ ${OPENAIR3_DIR}/SCTP/sctp_eNB_task.c
+ ${OPENAIR3_DIR}/SCTP/sctp_eNB_itti_messaging.c
)
add_library(SCTP_CLIENT ${SCTP_SRC})
-add_library(UDP ${OPENAIRCN_DIR}/UDP/udp_eNB_task.c)
+add_library(UDP ${OPENAIR3_DIR}/UDP/udp_eNB_task.c)
-set(NAS_SRC ${OPENAIRCN_DIR}/NAS/)
+set(NAS_SRC ${OPENAIR3_DIR}/NAS/)
set(libnas_api_OBJS
${NAS_SRC}COMMON/API/NETWORK/as_message.c
${NAS_SRC}COMMON/API/NETWORK/nas_message.c
@@ -1413,7 +1413,7 @@ add_executable(lte-softmodem
${OPENAIR_TARGETS}/COMMON/create_tasks.c
${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
- ${OPENAIRCN_DIR}/NAS/UE/nas_ue_task.c
+ ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
${GTPU_need_ITTI}
${HW_SOURCE}
${RTAI_SOURCE}
@@ -1496,22 +1496,22 @@ Message("-- HW_SOURCE=${HW_SOURCE}")
# USIM process
#################
#add_executable(usim
-# ${OPENAIRCN_DIR}/NAS/TOOLS/usim_data.c
-# ${OPENAIRCN_DIR}/NAS/USER/API/USIM/usim_api.c
-# ${OPENAIRCN_DIR}/NAS/USER/API/USIM/aka_functions.c
-# ${OPENAIRCN_DIR}/NAS/COMMON/UTIL/memory.c
-# ${OPENAIRCN_DIR}/NAS/COMMON/UTIL/nas_log.c
-# ${OPENAIRCN_DIR}/NAS/COMMON/UTIL/OctetString.c
-# ${OPENAIRCN_DIR}/NAS/COMMON/UTIL/TLVEncoder.c
+# ${OPENAIR3_DIR}/NAS/TOOLS/usim_data.c
+# ${OPENAIR3_DIR}/NAS/USER/API/USIM/usim_api.c
+# ${OPENAIR3_DIR}/NAS/USER/API/USIM/aka_functions.c
+# ${OPENAIR3_DIR}/NAS/COMMON/UTIL/memory.c
+# ${OPENAIR3_DIR}/NAS/COMMON/UTIL/nas_log.c
+# ${OPENAIR3_DIR}/NAS/COMMON/UTIL/OctetString.c
+# ${OPENAIR3_DIR}/NAS/COMMON/UTIL/TLVEncoder.c
# )
#target_link_libraries (usim ${NAS_LIB} UTIL ${ITTI_LIB} LFDS pthread rt nettle crypto m)
# ???
#####################
#add_executable(nvram
-# ${OPENAIRCN_DIR}/NAS/TOOLS/ue_data.c
-# ${OPENAIRCN_DIR}/NAS/COMMON/UTIL/memory.c
-# ${OPENAIRCN_DIR}/NAS/COMMON/UTIL/nas_log.c
+# ${OPENAIR3_DIR}/NAS/TOOLS/ue_data.c
+# ${OPENAIR3_DIR}/NAS/COMMON/UTIL/memory.c
+# ${OPENAIR3_DIR}/NAS/COMMON/UTIL/nas_log.c
# )
#target_link_libraries (nvram LIB_NAS_UE UTIL ${ITTI_LIB} LFDS pthread rt nettle crypto m)
@@ -1538,7 +1538,7 @@ add_executable(oaisim
${OPENAIR2_DIR}/RRC/NAS/nas_config.c
${OPENAIR2_DIR}/RRC/NAS/rb_config.c
${OPENAIR2_DIR}/UTIL/OMG/sumo.c
- ${OPENAIRCN_DIR}/NAS/UE/nas_ue_task.c
+ ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
${GTPU_need_ITTI}
${OPENAIR_TARGETS}/COMMON/create_tasks.c
${HW_SOURCE}
@@ -1611,12 +1611,12 @@ foreach(myExe dlsim ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syn
endforeach(myExe)
add_executable(test_epc_generate_scenario
- ${OPENAIRCN_DIR}/TEST/EPC_TEST/generate_scenario.c
+ ${OPENAIR3_DIR}/TEST/EPC_TEST/generate_scenario.c
${OPENAIR2_DIR}/ENB_APP/enb_config.h
${OPENAIR2_DIR}/COMMON/commonDef.h
${OPENAIR2_DIR}/COMMON/messages_def.h
${OPENAIR2_DIR}/COMMON/messages_types.h
- ${OPENAIRCN_DIR}/S1AP/s1ap_eNB_defs.h
+ ${OPENAIR3_DIR}/S1AP/s1ap_eNB_defs.h
${OPENAIR_BIN_DIR}/messages_xml.h
)
target_link_libraries (test_epc_generate_scenario
diff --git a/cmake_targets/at_commands/CMakeLists.txt b/cmake_targets/at_commands/CMakeLists.txt
index e03e876bd4..0b8bfed25b 100755
--- a/cmake_targets/at_commands/CMakeLists.txt
+++ b/cmake_targets/at_commands/CMakeLists.txt
@@ -47,11 +47,11 @@ endif( NOT DEFINED OPENAIR_DIR)
set(OPENAIR1_DIR ${OPENAIR_DIR}/openair1)
set(OPENAIR2_DIR ${OPENAIR_DIR}/openair2)
set(OPENAIR3_DIR ${OPENAIR_DIR}/openair3)
-set(OPENAIRCN_DIR ${OPENAIR_DIR}/openair-cn)
+set(OPENAIR3_DIR ${OPENAIR_DIR}/openair3)
set(OPENAIR_TARGETS ${OPENAIR_DIR}/targets)
set(OPENAIR_CMAKE_SCRIPTS ${OPENAIR_DIR}/cmake_targets/tools)
set(OPENAIR_BIN_DIR ${OPENAIR_DIR}/targets/bin)
-set(OPENAIR_NAS_DIR ${OPENAIR_DIR}/openair-cn/NAS)
+set(OPENAIR_NAS_DIR ${OPENAIR_DIR}/openair3/NAS)
set(CMAKE_MODULE_PATH "${OPENAIR_DIR}/cmake_targets/tools/MODULES" "${CMAKE_MODULE_PATH}")
@@ -131,20 +131,20 @@ add_boolean_option(NAS_MME False "NAS_UE and NAS_MME are incompa
# SECU LIB
################################################################################
set(secu_cn_SRC
- ${OPENAIRCN_DIR}/SECU/kdf.c
- ${OPENAIRCN_DIR}/SECU/rijndael.c
- ${OPENAIRCN_DIR}/SECU/snow3g.c
- ${OPENAIRCN_DIR}/SECU/key_nas_deriver.c
- ${OPENAIRCN_DIR}/SECU/nas_stream_eea1.c
- ${OPENAIRCN_DIR}/SECU/nas_stream_eia1.c
- ${OPENAIRCN_DIR}/SECU/nas_stream_eea2.c
- ${OPENAIRCN_DIR}/SECU/nas_stream_eia2.c
+ ${OPENAIR3_DIR}/SECU/kdf.c
+ ${OPENAIR3_DIR}/SECU/rijndael.c
+ ${OPENAIR3_DIR}/SECU/snow3g.c
+ ${OPENAIR3_DIR}/SECU/key_nas_deriver.c
+ ${OPENAIR3_DIR}/SECU/nas_stream_eea1.c
+ ${OPENAIR3_DIR}/SECU/nas_stream_eia1.c
+ ${OPENAIR3_DIR}/SECU/nas_stream_eea2.c
+ ${OPENAIR3_DIR}/SECU/nas_stream_eia2.c
)
add_library(secu_cn ${secu_cn_SRC})
target_include_directories(secu_cn PRIVATE
${OPENAIR_DIR}/common/utils/itti
${OPENAIR_DIR}/openair2/COMMON
- ${OPENAIRCN_DIR}/UTILS
+ ${OPENAIR3_DIR}/UTILS
)
################################################################################
@@ -657,8 +657,8 @@ target_include_directories(ies PRIVATE
################################################################################
include_directories(
${OPENAIR_DIR}/common/utils/msc
- ${OPENAIRCN_DIR}/COMMON
- ${OPENAIRCN_DIR}/SECU
+ ${OPENAIR3_DIR}/COMMON
+ ${OPENAIR3_DIR}/SECU
${OPENAIR_NAS_DIR}/src
${OPENAIR_NAS_DIR}/COMMON
${OPENAIR_NAS_DIR}/COMMON/API/NETWORK
diff --git a/cmake_targets/nas_sim_tools/CMakeLists.txt b/cmake_targets/nas_sim_tools/CMakeLists.txt
index 1894ba6697..732ede3f94 100644
--- a/cmake_targets/nas_sim_tools/CMakeLists.txt
+++ b/cmake_targets/nas_sim_tools/CMakeLists.txt
@@ -12,7 +12,7 @@ set(OPENAIR_DIR $ENV{OPENAIR_DIR})
set(OPENAIR1_DIR $ENV{OPENAIR_DIR}/openair1)
set(OPENAIR2_DIR $ENV{OPENAIR_DIR}/openair2)
set(OPENAIR3_DIR $ENV{OPENAIR_DIR}/openair3)
-set(OPENAIRCN_DIR $ENV{OPENAIR_DIR}/openair-cn)
+set(OPENAIR3_DIR $ENV{OPENAIR_DIR}/openair3)
set(OPENAIR_TARGETS $ENV{OPENAIR_DIR}/targets)
#set(EXECUTABLE_OUTPUT_PATH ${OPENAIR_DIR}/targets/bin)
@@ -20,30 +20,30 @@ set(OPENAIR_TARGETS $ENV{OPENAIR_DIR}/targets)
# Add .h files for dependancies
set(usim_SRC
- ${OPENAIR_DIR}/openair-cn/NAS/TOOLS/usim_data.c
- ${OPENAIR_DIR}/openair-cn/NAS/UE/API/USIM/usim_api.c
- ${OPENAIR_DIR}/openair-cn/NAS/UE/API/USIM/aka_functions.c
- ${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/memory.c
- ${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/nas_log.c
- ${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/OctetString.c
- ${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/TLVEncoder.c
+ ${OPENAIR_DIR}/openair3/NAS/TOOLS/usim_data.c
+ ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/usim_api.c
+ ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/aka_functions.c
+ ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/memory.c
+ ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/nas_log.c
+ ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/OctetString.c
+ ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/TLVEncoder.c
)
set(usim_HDR
- ${OPENAIR_DIR}/openair-cn/NAS/TOOLS/network.h
- ${OPENAIR_DIR}/openair-cn/NAS/UE/API/USIM/usim_api.h
- ${OPENAIR_DIR}/openair-cn/NAS/UE/API/USIM/aka_functions.h
- ${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/memory.h
- ${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/nas_log.h
- ${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/OctetString.h
- ${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/TLVEncoder.h
+ ${OPENAIR_DIR}/openair3/NAS/TOOLS/network.h
+ ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/usim_api.h
+ ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/aka_functions.h
+ ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/memory.h
+ ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/nas_log.h
+ ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/OctetString.h
+ ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/TLVEncoder.h
)
include_directories(
- ${OPENAIR_DIR}/openair-cn/NAS/COMMON
- ${OPENAIR_DIR}/openair-cn/NAS/UE/API/USIM
- ${OPENAIR_DIR}/openair-cn/NAS/UE/EMM/
- ${OPENAIR_DIR}/openair-cn/NAS/UE/ESM/
- ${OPENAIR_DIR}/openair-cn/NAS/COMMON/IES/
- ${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL
+ ${OPENAIR_DIR}/openair3/NAS/COMMON
+ ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM
+ ${OPENAIR_DIR}/openair3/NAS/UE/EMM/
+ ${OPENAIR_DIR}/openair3/NAS/UE/ESM/
+ ${OPENAIR_DIR}/openair3/NAS/COMMON/IES/
+ ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL
)
ADD_EXECUTABLE(usim ${usim_SRC} ${usim_HDR})
@@ -51,15 +51,15 @@ ADD_EXECUTABLE(usim ${usim_SRC} ${usim_HDR})
set(nvram_SRC
- ${OPENAIR_DIR}/openair-cn/NAS/TOOLS/ue_data.c
- ${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/memory.c
- ${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/nas_log.c
+ ${OPENAIR_DIR}/openair3/NAS/TOOLS/ue_data.c
+ ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/memory.c
+ ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/nas_log.c
)
set(nvram_HDR
- ${OPENAIR_DIR}/openair-cn/NAS/UE/EMM/emmData.h
- ${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/memory.h
- ${OPENAIR_DIR}/openair-cn/NAS/COMMON/userDef.h
+ ${OPENAIR_DIR}/openair3/NAS/UE/EMM/emmData.h
+ ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/memory.h
+ ${OPENAIR_DIR}/openair3/NAS/COMMON/userDef.h
)
ADD_EXECUTABLE(nvram ${nvram_SRC} ${nvram_HDR})
diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index 953c21d929..e77ded6142 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -271,8 +271,8 @@ install_asn1c_from_source(){
cd /tmp/asn1c-r1516
rm -rf /tmp/asn1c-r1516/*
svn co https://github.com/vlm/asn1c/trunk /tmp/asn1c-r1516 -r 1516 > /tmp/log_compile_asn1c
- patch -p0 < $OPENAIR_DIR/openair-cn/S1AP/MESSAGES/ASN1/asn1cpatch.p0 >> /tmp/log_compile_asn1c
- patch -p0 < $OPENAIR_DIR/openair-cn/S1AP/MESSAGES/ASN1/asn1cpatch_2.p0 >> /tmp/log_compile_asn1c
+ patch -p0 < $OPENAIR_DIR/openair3/S1AP/MESSAGES/ASN1/asn1cpatch.p0 >> /tmp/log_compile_asn1c
+ patch -p0 < $OPENAIR_DIR/openair3/S1AP/MESSAGES/ASN1/asn1cpatch_2.p0 >> /tmp/log_compile_asn1c
patch -p0 < $OPENAIR_DIR/openair2/RRC/LITE/MESSAGES/asn1c/asn1cpatch.p0 >> /tmp/log_compile_asn1c
./configure
make > /tmp/log_compile_asn1c 2>&1
@@ -311,13 +311,13 @@ set_openair_env(){
[ -f "/.$fullpath" ] || fullpath=`readlink -f $PWD/$fullpath`
openair_path=${fullpath%/cmake_targets/*}
openair_path=${openair_path%/targets/*}
- openair_path=${openair_path%/openair-cn/*}
+ openair_path=${openair_path%/openair3/*}
openair_path=${openair_path%/openair[123]/*}
export OPENAIR_DIR=$openair_path
export OPENAIR1_DIR=$openair_path/openair1
export OPENAIR2_DIR=$openair_path/openair2
export OPENAIR3_DIR=$openair_path/openair3
- export OPENAIRCN_DIR=$openair_path/openair-cn
+ export OPENAIR3_DIR=$openair_path/openair3
export OPENAIR_TARGETS=$openair_path/targets
}
diff --git a/cmake_targets/tools/indent_source_code b/cmake_targets/tools/indent_source_code
index 5e9f08f067..64de1c4c50 100755
--- a/cmake_targets/tools/indent_source_code
+++ b/cmake_targets/tools/indent_source_code
@@ -50,7 +50,7 @@ set_openair_env
#find $OPENAIR_DIR/openair1 -type f \( -name '*.c' -o -name '*.h' \) -exec sed --in-place 's/[[:space:]]\+$//' {} \+
#find $OPENAIR_DIR/openair2 -type f \( -name '*.c' -o -name '*.h' \) -exec sed --in-place 's/[[:space:]]\+$//' {} \+
#find $OPENAIR_DIR/openair3 -type f \( -name '*.c' -o -name '*.h' \) -exec sed --in-place 's/[[:space:]]\+$//' {} \+
- #find $OPENAIR_DIR/openair-cn -type f \( -name '*.c' -o -name '*.h' \) -exec sed --in-place 's/[[:space:]]\+$//' {} \+
+ #find $OPENAIR_DIR/openair3 -type f \( -name '*.c' -o -name '*.h' \) -exec sed --in-place 's/[[:space:]]\+$//' {} \+
#find $OPENAIR_DIR/targets -type f \( -name '*.c' -o -name '*.h' \) -exec sed --in-place 's/[[:space:]]\+$//' {} \+
# Style google not available on 14.04
@@ -65,8 +65,8 @@ set_openair_env
$OPENAIR_DIR/openair2/*.c \
$OPENAIR_DIR/openair3/*.h \
$OPENAIR_DIR/openair3/*.c \
- $OPENAIR_DIR/openair-cn/*.h \
- $OPENAIR_DIR/openair-cn/*.c \
+ $OPENAIR_DIR/openair3/*.h \
+ $OPENAIR_DIR/openair3/*.c \
$OPENAIR_DIR/targets/*.h \
$OPENAIR_DIR/targets/*.c
}
diff --git a/cmake_targets/tools/perf_oai.bash b/cmake_targets/tools/perf_oai.bash
index fe51ef1ee5..2254f64ea3 100755
--- a/cmake_targets/tools/perf_oai.bash
+++ b/cmake_targets/tools/perf_oai.bash
@@ -736,7 +736,7 @@ function main()
cecho "OPENAIR1_DIR = $OPENAIR1_DIR" $green
cecho "OPENAIR2_DIR = $OPENAIR2_DIR" $green
cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
- cecho "OPENAIRCN_DIR = $OPENAIRCN_DIR" $green
+ cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
cecho "OPENAIR_TARGETS = $OPENAIR_TARGETS" $green
@@ -744,7 +744,7 @@ function main()
echo "OPENAIR1_DIR = $OPENAIR1_DIR" >> results/${oai_exp_date}
echo "OPENAIR2_DIR = $OPENAIR2_DIR" >> results/${oai_exp_date}
echo "OPENAIR3_DIR = $OPENAIR3_DIR" >> results/${oai_exp_date}
- echo "OPENAIRCN_DIR = $OPENAIRCN_DIR" >> results/${oai_exp_date}
+ echo "OPENAIR3_DIR = $OPENAIR3_DIR" >> results/${oai_exp_date}
echo "OPENAIR_TARGETS = $OPENAIR_TARGETS" >> results/${oai_exp_date}
diff --git a/oaienv b/oaienv
index 4aae35ca5b..383c75a4b1 100644
--- a/oaienv
+++ b/oaienv
@@ -4,7 +4,6 @@ export OPENAIR_DIR=$(pwd)
export OPENAIR1_DIR=$OPENAIR_HOME/openair1
export OPENAIR2_DIR=$OPENAIR_HOME/openair2
export OPENAIR3_DIR=$OPENAIR_HOME/openair3
-export OPENAIRCN_DIR=$OPENAIR_HOME/openair-cn
export OPENAIR_TARGETS=$OPENAIR_HOME/targets
export OPENAIRITS_DIR=$OPENAIR_HOME/openairITS
@@ -17,4 +16,3 @@ alias oait='cd $OPENAIR_TARGETS'
alias oailte='cd $OPENAIR_TARGETS/RT/USER'
alias oais='cd $OPENAIR_TARGETS/SIMU/USER'
alias oaiex='cd $OPENAIR_TARGETS/SIMU/EXAMPLES'
-alias oaicn='cd OPENAIRCN_DIR'
diff --git a/openair-cn/COMMON/as_message.h b/openair3/COMMON/as_message.h
similarity index 100%
rename from openair-cn/COMMON/as_message.h
rename to openair3/COMMON/as_message.h
diff --git a/openair-cn/COMMON/common_types.h b/openair3/COMMON/common_types.h
similarity index 100%
rename from openair-cn/COMMON/common_types.h
rename to openair3/COMMON/common_types.h
diff --git a/openair-cn/COMMON/gtpv1_u_messages_def.h b/openair3/COMMON/gtpv1_u_messages_def.h
similarity index 100%
rename from openair-cn/COMMON/gtpv1_u_messages_def.h
rename to openair3/COMMON/gtpv1_u_messages_def.h
diff --git a/openair-cn/COMMON/gtpv1_u_messages_types.h b/openair3/COMMON/gtpv1_u_messages_types.h
similarity index 100%
rename from openair-cn/COMMON/gtpv1_u_messages_types.h
rename to openair3/COMMON/gtpv1_u_messages_types.h
diff --git a/openair-cn/COMMON/intertask_interface_conf.h b/openair3/COMMON/intertask_interface_conf.h
similarity index 100%
rename from openair-cn/COMMON/intertask_interface_conf.h
rename to openair3/COMMON/intertask_interface_conf.h
diff --git a/openair-cn/COMMON/messages_def.h b/openair3/COMMON/messages_def.h
similarity index 100%
rename from openair-cn/COMMON/messages_def.h
rename to openair3/COMMON/messages_def.h
diff --git a/openair-cn/COMMON/messages_types.h b/openair3/COMMON/messages_types.h
similarity index 100%
rename from openair-cn/COMMON/messages_types.h
rename to openair3/COMMON/messages_types.h
diff --git a/openair-cn/COMMON/nas_messages_def.h b/openair3/COMMON/nas_messages_def.h
similarity index 100%
rename from openair-cn/COMMON/nas_messages_def.h
rename to openair3/COMMON/nas_messages_def.h
diff --git a/openair-cn/COMMON/nas_messages_types.h b/openair3/COMMON/nas_messages_types.h
similarity index 100%
rename from openair-cn/COMMON/nas_messages_types.h
rename to openair3/COMMON/nas_messages_types.h
diff --git a/openair-cn/COMMON/s1ap_messages_def.h b/openair3/COMMON/s1ap_messages_def.h
similarity index 100%
rename from openair-cn/COMMON/s1ap_messages_def.h
rename to openair3/COMMON/s1ap_messages_def.h
diff --git a/openair-cn/COMMON/s1ap_messages_types.h b/openair3/COMMON/s1ap_messages_types.h
similarity index 100%
rename from openair-cn/COMMON/s1ap_messages_types.h
rename to openair3/COMMON/s1ap_messages_types.h
diff --git a/openair-cn/COMMON/sctp_messages_def.h b/openair3/COMMON/sctp_messages_def.h
similarity index 100%
rename from openair-cn/COMMON/sctp_messages_def.h
rename to openair3/COMMON/sctp_messages_def.h
diff --git a/openair-cn/COMMON/sctp_messages_types.h b/openair3/COMMON/sctp_messages_types.h
similarity index 100%
rename from openair-cn/COMMON/sctp_messages_types.h
rename to openair3/COMMON/sctp_messages_types.h
diff --git a/openair-cn/COMMON/security_types.h b/openair3/COMMON/security_types.h
similarity index 100%
rename from openair-cn/COMMON/security_types.h
rename to openair3/COMMON/security_types.h
diff --git a/openair-cn/COMMON/tasks_def.h b/openair3/COMMON/tasks_def.h
similarity index 100%
rename from openair-cn/COMMON/tasks_def.h
rename to openair3/COMMON/tasks_def.h
diff --git a/openair-cn/COMMON/udp_messages_def.h b/openair3/COMMON/udp_messages_def.h
similarity index 100%
rename from openair-cn/COMMON/udp_messages_def.h
rename to openair3/COMMON/udp_messages_def.h
diff --git a/openair-cn/COMMON/udp_messages_types.h b/openair3/COMMON/udp_messages_types.h
similarity index 100%
rename from openair-cn/COMMON/udp_messages_types.h
rename to openair3/COMMON/udp_messages_types.h
diff --git a/openair-cn/COPYING b/openair3/COPYING
similarity index 100%
rename from openair-cn/COPYING
rename to openair3/COPYING
diff --git a/openair-cn/DOCS/COPYING b/openair3/DOCS/COPYING
similarity index 100%
rename from openair-cn/DOCS/COPYING
rename to openair3/DOCS/COPYING
diff --git a/openair-cn/DOCS/DOXYGEN/COPYING b/openair3/DOCS/DOXYGEN/COPYING
similarity index 100%
rename from openair-cn/DOCS/DOXYGEN/COPYING
rename to openair3/DOCS/DOXYGEN/COPYING
diff --git a/openair-cn/DOCS/DOXYGEN/Doxyfile.in b/openair3/DOCS/DOXYGEN/Doxyfile.in
similarity index 100%
rename from openair-cn/DOCS/DOXYGEN/Doxyfile.in
rename to openair3/DOCS/DOXYGEN/Doxyfile.in
diff --git a/openair-cn/DOCS/DOXYGEN/Makefile.am b/openair3/DOCS/DOXYGEN/Makefile.am
similarity index 100%
rename from openair-cn/DOCS/DOXYGEN/Makefile.am
rename to openair3/DOCS/DOXYGEN/Makefile.am
diff --git a/openair-cn/DOCS/Latex/COPYING b/openair3/DOCS/Latex/COPYING
similarity index 100%
rename from openair-cn/DOCS/Latex/COPYING
rename to openair3/DOCS/Latex/COPYING
diff --git a/openair-cn/DOCS/Latex/DefaultBearer/COPYING b/openair3/DOCS/Latex/DefaultBearer/COPYING
similarity index 100%
rename from openair-cn/DOCS/Latex/DefaultBearer/COPYING
rename to openair3/DOCS/Latex/DefaultBearer/COPYING
diff --git a/openair-cn/DOCS/Latex/DefaultBearer/DefaultBearer.pdf b/openair3/DOCS/Latex/DefaultBearer/DefaultBearer.pdf
similarity index 100%
rename from openair-cn/DOCS/Latex/DefaultBearer/DefaultBearer.pdf
rename to openair3/DOCS/Latex/DefaultBearer/DefaultBearer.pdf
diff --git a/openair-cn/DOCS/Latex/DefaultBearer/DefaultBearer.tex b/openair3/DOCS/Latex/DefaultBearer/DefaultBearer.tex
similarity index 100%
rename from openair-cn/DOCS/Latex/DefaultBearer/DefaultBearer.tex
rename to openair3/DOCS/Latex/DefaultBearer/DefaultBearer.tex
diff --git a/openair-cn/DOCS/Latex/EPC/COPYING b/openair3/DOCS/Latex/EPC/COPYING
similarity index 100%
rename from openair-cn/DOCS/Latex/EPC/COPYING
rename to openair3/DOCS/Latex/EPC/COPYING
diff --git a/openair-cn/DOCS/Latex/EPC/EPC.pdf b/openair3/DOCS/Latex/EPC/EPC.pdf
similarity index 100%
rename from openair-cn/DOCS/Latex/EPC/EPC.pdf
rename to openair3/DOCS/Latex/EPC/EPC.pdf
diff --git a/openair-cn/DOCS/Latex/EPC/EPC.tex b/openair3/DOCS/Latex/EPC/EPC.tex
similarity index 100%
rename from openair-cn/DOCS/Latex/EPC/EPC.tex
rename to openair3/DOCS/Latex/EPC/EPC.tex
diff --git a/openair-cn/DOCS/Latex/EPC/Makefile b/openair3/DOCS/Latex/EPC/Makefile
similarity index 100%
rename from openair-cn/DOCS/Latex/EPC/Makefile
rename to openair3/DOCS/Latex/EPC/Makefile
diff --git a/openair-cn/DOCS/Makefile.am b/openair3/DOCS/Makefile.am
similarity index 100%
rename from openair-cn/DOCS/Makefile.am
rename to openair3/DOCS/Makefile.am
diff --git a/openair-cn/GTPV1-U/Makefile.am b/openair3/GTPV1-U/Makefile.am
similarity index 100%
rename from openair-cn/GTPV1-U/Makefile.am
rename to openair3/GTPV1-U/Makefile.am
diff --git a/openair-cn/GTPV1-U/Makefile.eNB b/openair3/GTPV1-U/Makefile.eNB
similarity index 100%
rename from openair-cn/GTPV1-U/Makefile.eNB
rename to openair3/GTPV1-U/Makefile.eNB
diff --git a/openair-cn/GTPV1-U/gtpv1u.h b/openair3/GTPV1-U/gtpv1u.h
similarity index 100%
rename from openair-cn/GTPV1-U/gtpv1u.h
rename to openair3/GTPV1-U/gtpv1u.h
diff --git a/openair-cn/GTPV1-U/gtpv1u_eNB.c b/openair3/GTPV1-U/gtpv1u_eNB.c
similarity index 100%
rename from openair-cn/GTPV1-U/gtpv1u_eNB.c
rename to openair3/GTPV1-U/gtpv1u_eNB.c
diff --git a/openair-cn/GTPV1-U/gtpv1u_eNB_defs.h b/openair3/GTPV1-U/gtpv1u_eNB_defs.h
similarity index 100%
rename from openair-cn/GTPV1-U/gtpv1u_eNB_defs.h
rename to openair3/GTPV1-U/gtpv1u_eNB_defs.h
diff --git a/openair-cn/GTPV1-U/gtpv1u_eNB_task.h b/openair3/GTPV1-U/gtpv1u_eNB_task.h
similarity index 100%
rename from openair-cn/GTPV1-U/gtpv1u_eNB_task.h
rename to openair3/GTPV1-U/gtpv1u_eNB_task.h
diff --git a/openair-cn/GTPV1-U/gtpv1u_sgw_defs.h b/openair3/GTPV1-U/gtpv1u_sgw_defs.h
similarity index 100%
rename from openair-cn/GTPV1-U/gtpv1u_sgw_defs.h
rename to openair3/GTPV1-U/gtpv1u_sgw_defs.h
diff --git a/openair-cn/GTPV1-U/gtpv1u_task.c b/openair3/GTPV1-U/gtpv1u_task.c
similarity index 100%
rename from openair-cn/GTPV1-U/gtpv1u_task.c
rename to openair3/GTPV1-U/gtpv1u_task.c
diff --git a/openair-cn/GTPV1-U/gtpv1u_teid_pool.c b/openair3/GTPV1-U/gtpv1u_teid_pool.c
similarity index 100%
rename from openair-cn/GTPV1-U/gtpv1u_teid_pool.c
rename to openair3/GTPV1-U/gtpv1u_teid_pool.c
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/AUTHORS b/openair3/GTPV1-U/nw-gtpv1u/AUTHORS
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/AUTHORS
rename to openair3/GTPV1-U/nw-gtpv1u/AUTHORS
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/COPYING b/openair3/GTPV1-U/nw-gtpv1u/COPYING
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/COPYING
rename to openair3/GTPV1-U/nw-gtpv1u/COPYING
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/ChangeLog b/openair3/GTPV1-U/nw-gtpv1u/ChangeLog
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/ChangeLog
rename to openair3/GTPV1-U/nw-gtpv1u/ChangeLog
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/NEWS b/openair3/GTPV1-U/nw-gtpv1u/NEWS
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/NEWS
rename to openair3/GTPV1-U/nw-gtpv1u/NEWS
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/README b/openair3/GTPV1-U/nw-gtpv1u/README
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/README
rename to openair3/GTPV1-U/nw-gtpv1u/README
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/include/NwGtpv1uLog.h b/openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uLog.h
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/include/NwGtpv1uLog.h
rename to openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uLog.h
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/include/NwGtpv1uPrivate.h b/openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uPrivate.h
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/include/NwGtpv1uPrivate.h
rename to openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uPrivate.h
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/include/NwGtpv1uTrxn.h b/openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uTrxn.h
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/include/NwGtpv1uTrxn.h
rename to openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uTrxn.h
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/include/NwGtpv1uTunnelEndPoint.h b/openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uTunnelEndPoint.h
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/include/NwGtpv1uTunnelEndPoint.h
rename to openair3/GTPV1-U/nw-gtpv1u/include/NwGtpv1uTunnelEndPoint.h
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/shared/NwGtpv1u.h b/openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1u.h
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/shared/NwGtpv1u.h
rename to openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1u.h
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uError.h b/openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uError.h
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uError.h
rename to openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uError.h
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uIe.h b/openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uIe.h
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uIe.h
rename to openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uIe.h
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uMsg.h b/openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uMsg.h
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uMsg.h
rename to openair3/GTPV1-U/nw-gtpv1u/shared/NwGtpv1uMsg.h
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/shared/NwLog.h b/openair3/GTPV1-U/nw-gtpv1u/shared/NwLog.h
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/shared/NwLog.h
rename to openair3/GTPV1-U/nw-gtpv1u/shared/NwLog.h
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/shared/NwTypes.h b/openair3/GTPV1-U/nw-gtpv1u/shared/NwTypes.h
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/shared/NwTypes.h
rename to openair3/GTPV1-U/nw-gtpv1u/shared/NwTypes.h
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/shared/NwUtils.h b/openair3/GTPV1-U/nw-gtpv1u/shared/NwUtils.h
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/shared/NwUtils.h
rename to openair3/GTPV1-U/nw-gtpv1u/shared/NwUtils.h
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c b/openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c
rename to openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c b/openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c
rename to openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTrxn.c b/openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTrxn.c
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTrxn.c
rename to openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTrxn.c
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c b/openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c
rename to openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/test-app/Makefile.am b/openair3/GTPV1-U/nw-gtpv1u/test-app/Makefile.am
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/test-app/Makefile.am
rename to openair3/GTPV1-U/nw-gtpv1u/test-app/Makefile.am
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/test-app/Makefile.in b/openair3/GTPV1-U/nw-gtpv1u/test-app/Makefile.in
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/test-app/Makefile.in
rename to openair3/GTPV1-U/nw-gtpv1u/test-app/Makefile.in
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/Makefile.am b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/Makefile.am
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/Makefile.am
rename to openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/Makefile.am
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/Makefile.in b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/Makefile.in
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/Makefile.in
rename to openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/Makefile.in
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwEvt.h b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwEvt.h
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwEvt.h
rename to openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwEvt.h
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniLogMgrEntity.c b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniLogMgrEntity.c
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniLogMgrEntity.c
rename to openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniLogMgrEntity.c
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniLogMgrEntity.h b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniLogMgrEntity.h
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniLogMgrEntity.h
rename to openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniLogMgrEntity.h
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniTmrMgrEntity.c b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniTmrMgrEntity.c
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniTmrMgrEntity.c
rename to openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniTmrMgrEntity.c
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniTmrMgrEntity.h b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniTmrMgrEntity.h
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniTmrMgrEntity.h
rename to openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniTmrMgrEntity.h
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUdpEntity.c b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUdpEntity.c
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUdpEntity.c
rename to openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUdpEntity.c
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUdpEntity.h b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUdpEntity.h
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUdpEntity.h
rename to openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUdpEntity.h
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUlpEntity.c b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUlpEntity.c
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUlpEntity.c
rename to openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUlpEntity.c
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUlpEntity.h b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUlpEntity.h
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUlpEntity.h
rename to openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/NwMiniUlpEntity.h
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/helloworld.c b/openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/helloworld.c
similarity index 100%
rename from openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/helloworld.c
rename to openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld/helloworld.c
diff --git a/openair-cn/INTERTASK_INTERFACE b/openair3/INTERTASK_INTERFACE
similarity index 100%
rename from openair-cn/INTERTASK_INTERFACE
rename to openair3/INTERTASK_INTERFACE
diff --git a/openair-cn/NAS/COMMON/API/NETWORK/COPYING b/openair3/NAS/COMMON/API/NETWORK/COPYING
similarity index 100%
rename from openair-cn/NAS/COMMON/API/NETWORK/COPYING
rename to openair3/NAS/COMMON/API/NETWORK/COPYING
diff --git a/openair-cn/NAS/COMMON/API/NETWORK/Makefile b/openair3/NAS/COMMON/API/NETWORK/Makefile
similarity index 100%
rename from openair-cn/NAS/COMMON/API/NETWORK/Makefile
rename to openair3/NAS/COMMON/API/NETWORK/Makefile
diff --git a/openair-cn/NAS/COMMON/API/NETWORK/as_message.c b/openair3/NAS/COMMON/API/NETWORK/as_message.c
similarity index 100%
rename from openair-cn/NAS/COMMON/API/NETWORK/as_message.c
rename to openair3/NAS/COMMON/API/NETWORK/as_message.c
diff --git a/openair-cn/NAS/COMMON/API/NETWORK/as_message.h b/openair3/NAS/COMMON/API/NETWORK/as_message.h
similarity index 100%
rename from openair-cn/NAS/COMMON/API/NETWORK/as_message.h
rename to openair3/NAS/COMMON/API/NETWORK/as_message.h
diff --git a/openair-cn/NAS/COMMON/API/NETWORK/l2_message.h b/openair3/NAS/COMMON/API/NETWORK/l2_message.h
similarity index 100%
rename from openair-cn/NAS/COMMON/API/NETWORK/l2_message.h
rename to openair3/NAS/COMMON/API/NETWORK/l2_message.h
diff --git a/openair-cn/NAS/COMMON/API/NETWORK/nas_message.c b/openair3/NAS/COMMON/API/NETWORK/nas_message.c
similarity index 100%
rename from openair-cn/NAS/COMMON/API/NETWORK/nas_message.c
rename to openair3/NAS/COMMON/API/NETWORK/nas_message.c
diff --git a/openair-cn/NAS/COMMON/API/NETWORK/nas_message.h b/openair3/NAS/COMMON/API/NETWORK/nas_message.h
similarity index 100%
rename from openair-cn/NAS/COMMON/API/NETWORK/nas_message.h
rename to openair3/NAS/COMMON/API/NETWORK/nas_message.h
diff --git a/openair-cn/NAS/COMMON/API/NETWORK/network_api.c b/openair3/NAS/COMMON/API/NETWORK/network_api.c
similarity index 100%
rename from openair-cn/NAS/COMMON/API/NETWORK/network_api.c
rename to openair3/NAS/COMMON/API/NETWORK/network_api.c
diff --git a/openair-cn/NAS/COMMON/API/NETWORK/network_api.h b/openair3/NAS/COMMON/API/NETWORK/network_api.h
similarity index 100%
rename from openair-cn/NAS/COMMON/API/NETWORK/network_api.h
rename to openair3/NAS/COMMON/API/NETWORK/network_api.h
diff --git a/openair-cn/NAS/COMMON/COPYING b/openair3/NAS/COMMON/COPYING
similarity index 100%
rename from openair-cn/NAS/COMMON/COPYING
rename to openair3/NAS/COMMON/COPYING
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/AttachAccept.c b/openair3/NAS/COMMON/EMM/MSG/AttachAccept.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/AttachAccept.c
rename to openair3/NAS/COMMON/EMM/MSG/AttachAccept.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/AttachAccept.h b/openair3/NAS/COMMON/EMM/MSG/AttachAccept.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/AttachAccept.h
rename to openair3/NAS/COMMON/EMM/MSG/AttachAccept.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/AttachComplete.c b/openair3/NAS/COMMON/EMM/MSG/AttachComplete.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/AttachComplete.c
rename to openair3/NAS/COMMON/EMM/MSG/AttachComplete.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/AttachComplete.h b/openair3/NAS/COMMON/EMM/MSG/AttachComplete.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/AttachComplete.h
rename to openair3/NAS/COMMON/EMM/MSG/AttachComplete.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/AttachReject.c b/openair3/NAS/COMMON/EMM/MSG/AttachReject.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/AttachReject.c
rename to openair3/NAS/COMMON/EMM/MSG/AttachReject.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/AttachReject.h b/openair3/NAS/COMMON/EMM/MSG/AttachReject.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/AttachReject.h
rename to openair3/NAS/COMMON/EMM/MSG/AttachReject.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/AttachRequest.c b/openair3/NAS/COMMON/EMM/MSG/AttachRequest.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/AttachRequest.c
rename to openair3/NAS/COMMON/EMM/MSG/AttachRequest.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/AttachRequest.h b/openair3/NAS/COMMON/EMM/MSG/AttachRequest.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/AttachRequest.h
rename to openair3/NAS/COMMON/EMM/MSG/AttachRequest.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/AuthenticationFailure.c b/openair3/NAS/COMMON/EMM/MSG/AuthenticationFailure.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/AuthenticationFailure.c
rename to openair3/NAS/COMMON/EMM/MSG/AuthenticationFailure.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/AuthenticationFailure.h b/openair3/NAS/COMMON/EMM/MSG/AuthenticationFailure.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/AuthenticationFailure.h
rename to openair3/NAS/COMMON/EMM/MSG/AuthenticationFailure.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/AuthenticationReject.c b/openair3/NAS/COMMON/EMM/MSG/AuthenticationReject.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/AuthenticationReject.c
rename to openair3/NAS/COMMON/EMM/MSG/AuthenticationReject.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/AuthenticationReject.h b/openair3/NAS/COMMON/EMM/MSG/AuthenticationReject.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/AuthenticationReject.h
rename to openair3/NAS/COMMON/EMM/MSG/AuthenticationReject.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/AuthenticationRequest.c b/openair3/NAS/COMMON/EMM/MSG/AuthenticationRequest.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/AuthenticationRequest.c
rename to openair3/NAS/COMMON/EMM/MSG/AuthenticationRequest.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/AuthenticationRequest.h b/openair3/NAS/COMMON/EMM/MSG/AuthenticationRequest.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/AuthenticationRequest.h
rename to openair3/NAS/COMMON/EMM/MSG/AuthenticationRequest.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/AuthenticationResponse.c b/openair3/NAS/COMMON/EMM/MSG/AuthenticationResponse.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/AuthenticationResponse.c
rename to openair3/NAS/COMMON/EMM/MSG/AuthenticationResponse.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/AuthenticationResponse.h b/openair3/NAS/COMMON/EMM/MSG/AuthenticationResponse.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/AuthenticationResponse.h
rename to openair3/NAS/COMMON/EMM/MSG/AuthenticationResponse.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/COPYING b/openair3/NAS/COMMON/EMM/MSG/COPYING
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/COPYING
rename to openair3/NAS/COMMON/EMM/MSG/COPYING
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/CsServiceNotification.c b/openair3/NAS/COMMON/EMM/MSG/CsServiceNotification.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/CsServiceNotification.c
rename to openair3/NAS/COMMON/EMM/MSG/CsServiceNotification.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/CsServiceNotification.h b/openair3/NAS/COMMON/EMM/MSG/CsServiceNotification.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/CsServiceNotification.h
rename to openair3/NAS/COMMON/EMM/MSG/CsServiceNotification.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/DetachAccept.c b/openair3/NAS/COMMON/EMM/MSG/DetachAccept.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/DetachAccept.c
rename to openair3/NAS/COMMON/EMM/MSG/DetachAccept.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/DetachAccept.h b/openair3/NAS/COMMON/EMM/MSG/DetachAccept.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/DetachAccept.h
rename to openair3/NAS/COMMON/EMM/MSG/DetachAccept.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/DetachRequest.c b/openair3/NAS/COMMON/EMM/MSG/DetachRequest.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/DetachRequest.c
rename to openair3/NAS/COMMON/EMM/MSG/DetachRequest.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/DetachRequest.h b/openair3/NAS/COMMON/EMM/MSG/DetachRequest.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/DetachRequest.h
rename to openair3/NAS/COMMON/EMM/MSG/DetachRequest.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/DownlinkNasTransport.c b/openair3/NAS/COMMON/EMM/MSG/DownlinkNasTransport.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/DownlinkNasTransport.c
rename to openair3/NAS/COMMON/EMM/MSG/DownlinkNasTransport.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/DownlinkNasTransport.h b/openair3/NAS/COMMON/EMM/MSG/DownlinkNasTransport.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/DownlinkNasTransport.h
rename to openair3/NAS/COMMON/EMM/MSG/DownlinkNasTransport.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/EmmInformation.c b/openair3/NAS/COMMON/EMM/MSG/EmmInformation.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/EmmInformation.c
rename to openair3/NAS/COMMON/EMM/MSG/EmmInformation.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/EmmInformation.h b/openair3/NAS/COMMON/EMM/MSG/EmmInformation.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/EmmInformation.h
rename to openair3/NAS/COMMON/EMM/MSG/EmmInformation.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/EmmStatus.c b/openair3/NAS/COMMON/EMM/MSG/EmmStatus.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/EmmStatus.c
rename to openair3/NAS/COMMON/EMM/MSG/EmmStatus.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/EmmStatus.h b/openair3/NAS/COMMON/EMM/MSG/EmmStatus.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/EmmStatus.h
rename to openair3/NAS/COMMON/EMM/MSG/EmmStatus.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/ExtendedServiceRequest.c b/openair3/NAS/COMMON/EMM/MSG/ExtendedServiceRequest.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/ExtendedServiceRequest.c
rename to openair3/NAS/COMMON/EMM/MSG/ExtendedServiceRequest.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/ExtendedServiceRequest.h b/openair3/NAS/COMMON/EMM/MSG/ExtendedServiceRequest.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/ExtendedServiceRequest.h
rename to openair3/NAS/COMMON/EMM/MSG/ExtendedServiceRequest.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/GutiReallocationCommand.c b/openair3/NAS/COMMON/EMM/MSG/GutiReallocationCommand.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/GutiReallocationCommand.c
rename to openair3/NAS/COMMON/EMM/MSG/GutiReallocationCommand.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/GutiReallocationCommand.h b/openair3/NAS/COMMON/EMM/MSG/GutiReallocationCommand.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/GutiReallocationCommand.h
rename to openair3/NAS/COMMON/EMM/MSG/GutiReallocationCommand.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/GutiReallocationComplete.c b/openair3/NAS/COMMON/EMM/MSG/GutiReallocationComplete.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/GutiReallocationComplete.c
rename to openair3/NAS/COMMON/EMM/MSG/GutiReallocationComplete.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/GutiReallocationComplete.h b/openair3/NAS/COMMON/EMM/MSG/GutiReallocationComplete.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/GutiReallocationComplete.h
rename to openair3/NAS/COMMON/EMM/MSG/GutiReallocationComplete.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/IdentityRequest.c b/openair3/NAS/COMMON/EMM/MSG/IdentityRequest.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/IdentityRequest.c
rename to openair3/NAS/COMMON/EMM/MSG/IdentityRequest.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/IdentityRequest.h b/openair3/NAS/COMMON/EMM/MSG/IdentityRequest.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/IdentityRequest.h
rename to openair3/NAS/COMMON/EMM/MSG/IdentityRequest.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/IdentityResponse.c b/openair3/NAS/COMMON/EMM/MSG/IdentityResponse.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/IdentityResponse.c
rename to openair3/NAS/COMMON/EMM/MSG/IdentityResponse.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/IdentityResponse.h b/openair3/NAS/COMMON/EMM/MSG/IdentityResponse.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/IdentityResponse.h
rename to openair3/NAS/COMMON/EMM/MSG/IdentityResponse.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/Makefile b/openair3/NAS/COMMON/EMM/MSG/Makefile
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/Makefile
rename to openair3/NAS/COMMON/EMM/MSG/Makefile
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/NASSecurityModeCommand.h b/openair3/NAS/COMMON/EMM/MSG/NASSecurityModeCommand.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/NASSecurityModeCommand.h
rename to openair3/NAS/COMMON/EMM/MSG/NASSecurityModeCommand.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/NASSecurityModeComplete.h b/openair3/NAS/COMMON/EMM/MSG/NASSecurityModeComplete.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/NASSecurityModeComplete.h
rename to openair3/NAS/COMMON/EMM/MSG/NASSecurityModeComplete.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/SecurityModeCommand.c b/openair3/NAS/COMMON/EMM/MSG/SecurityModeCommand.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/SecurityModeCommand.c
rename to openair3/NAS/COMMON/EMM/MSG/SecurityModeCommand.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/SecurityModeComplete.c b/openair3/NAS/COMMON/EMM/MSG/SecurityModeComplete.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/SecurityModeComplete.c
rename to openair3/NAS/COMMON/EMM/MSG/SecurityModeComplete.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/SecurityModeReject.c b/openair3/NAS/COMMON/EMM/MSG/SecurityModeReject.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/SecurityModeReject.c
rename to openair3/NAS/COMMON/EMM/MSG/SecurityModeReject.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/SecurityModeReject.h b/openair3/NAS/COMMON/EMM/MSG/SecurityModeReject.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/SecurityModeReject.h
rename to openair3/NAS/COMMON/EMM/MSG/SecurityModeReject.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/ServiceReject.c b/openair3/NAS/COMMON/EMM/MSG/ServiceReject.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/ServiceReject.c
rename to openair3/NAS/COMMON/EMM/MSG/ServiceReject.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/ServiceReject.h b/openair3/NAS/COMMON/EMM/MSG/ServiceReject.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/ServiceReject.h
rename to openair3/NAS/COMMON/EMM/MSG/ServiceReject.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/ServiceRequest.c b/openair3/NAS/COMMON/EMM/MSG/ServiceRequest.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/ServiceRequest.c
rename to openair3/NAS/COMMON/EMM/MSG/ServiceRequest.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/ServiceRequest.h b/openair3/NAS/COMMON/EMM/MSG/ServiceRequest.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/ServiceRequest.h
rename to openair3/NAS/COMMON/EMM/MSG/ServiceRequest.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/TrackingAreaUpdateAccept.c b/openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateAccept.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/TrackingAreaUpdateAccept.c
rename to openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateAccept.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/TrackingAreaUpdateAccept.h b/openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateAccept.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/TrackingAreaUpdateAccept.h
rename to openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateAccept.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/TrackingAreaUpdateComplete.c b/openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateComplete.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/TrackingAreaUpdateComplete.c
rename to openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateComplete.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/TrackingAreaUpdateComplete.h b/openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateComplete.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/TrackingAreaUpdateComplete.h
rename to openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateComplete.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/TrackingAreaUpdateReject.c b/openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateReject.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/TrackingAreaUpdateReject.c
rename to openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateReject.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/TrackingAreaUpdateReject.h b/openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateReject.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/TrackingAreaUpdateReject.h
rename to openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateReject.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/TrackingAreaUpdateRequest.c b/openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateRequest.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/TrackingAreaUpdateRequest.c
rename to openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateRequest.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/TrackingAreaUpdateRequest.h b/openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateRequest.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/TrackingAreaUpdateRequest.h
rename to openair3/NAS/COMMON/EMM/MSG/TrackingAreaUpdateRequest.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/UplinkNasTransport.c b/openair3/NAS/COMMON/EMM/MSG/UplinkNasTransport.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/UplinkNasTransport.c
rename to openair3/NAS/COMMON/EMM/MSG/UplinkNasTransport.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/UplinkNasTransport.h b/openair3/NAS/COMMON/EMM/MSG/UplinkNasTransport.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/UplinkNasTransport.h
rename to openair3/NAS/COMMON/EMM/MSG/UplinkNasTransport.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/emm_cause.h b/openair3/NAS/COMMON/EMM/MSG/emm_cause.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/emm_cause.h
rename to openair3/NAS/COMMON/EMM/MSG/emm_cause.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/emm_msg.c b/openair3/NAS/COMMON/EMM/MSG/emm_msg.c
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/emm_msg.c
rename to openair3/NAS/COMMON/EMM/MSG/emm_msg.c
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/emm_msg.h b/openair3/NAS/COMMON/EMM/MSG/emm_msg.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/emm_msg.h
rename to openair3/NAS/COMMON/EMM/MSG/emm_msg.h
diff --git a/openair-cn/NAS/COMMON/EMM/MSG/emm_msgDef.h b/openair3/NAS/COMMON/EMM/MSG/emm_msgDef.h
similarity index 100%
rename from openair-cn/NAS/COMMON/EMM/MSG/emm_msgDef.h
rename to openair3/NAS/COMMON/EMM/MSG/emm_msgDef.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.c b/openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.c
rename to openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.h b/openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.h
rename to openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.c b/openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.c
rename to openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.h b/openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.h
rename to openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextRequest.c b/openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextRequest.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextRequest.c
rename to openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextRequest.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextRequest.h b/openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextRequest.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextRequest.h
rename to openair3/NAS/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextRequest.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextAccept.c b/openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextAccept.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextAccept.c
rename to openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextAccept.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextAccept.h b/openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextAccept.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextAccept.h
rename to openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextAccept.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextReject.c b/openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextReject.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextReject.c
rename to openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextReject.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextReject.h b/openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextReject.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextReject.h
rename to openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextReject.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.c b/openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.c
rename to openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.h b/openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.h
rename to openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/BearerResourceAllocationReject.c b/openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationReject.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/BearerResourceAllocationReject.c
rename to openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationReject.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/BearerResourceAllocationReject.h b/openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationReject.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/BearerResourceAllocationReject.h
rename to openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationReject.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/BearerResourceAllocationRequest.c b/openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationRequest.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/BearerResourceAllocationRequest.c
rename to openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationRequest.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/BearerResourceAllocationRequest.h b/openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationRequest.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/BearerResourceAllocationRequest.h
rename to openair3/NAS/COMMON/ESM/MSG/BearerResourceAllocationRequest.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/BearerResourceModificationReject.c b/openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationReject.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/BearerResourceModificationReject.c
rename to openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationReject.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/BearerResourceModificationReject.h b/openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationReject.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/BearerResourceModificationReject.h
rename to openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationReject.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/BearerResourceModificationRequest.c b/openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationRequest.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/BearerResourceModificationRequest.c
rename to openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationRequest.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/BearerResourceModificationRequest.h b/openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationRequest.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/BearerResourceModificationRequest.h
rename to openair3/NAS/COMMON/ESM/MSG/BearerResourceModificationRequest.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/COPYING b/openair3/NAS/COMMON/ESM/MSG/COPYING
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/COPYING
rename to openair3/NAS/COMMON/ESM/MSG/COPYING
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextAccept.c b/openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextAccept.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextAccept.c
rename to openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextAccept.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextAccept.h b/openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextAccept.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextAccept.h
rename to openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextAccept.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextRequest.c b/openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextRequest.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextRequest.c
rename to openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextRequest.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextRequest.h b/openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextRequest.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextRequest.h
rename to openair3/NAS/COMMON/ESM/MSG/DeactivateEpsBearerContextRequest.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/EsmInformationRequest.c b/openair3/NAS/COMMON/ESM/MSG/EsmInformationRequest.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/EsmInformationRequest.c
rename to openair3/NAS/COMMON/ESM/MSG/EsmInformationRequest.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/EsmInformationRequest.h b/openair3/NAS/COMMON/ESM/MSG/EsmInformationRequest.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/EsmInformationRequest.h
rename to openair3/NAS/COMMON/ESM/MSG/EsmInformationRequest.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/EsmInformationResponse.c b/openair3/NAS/COMMON/ESM/MSG/EsmInformationResponse.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/EsmInformationResponse.c
rename to openair3/NAS/COMMON/ESM/MSG/EsmInformationResponse.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/EsmInformationResponse.h b/openair3/NAS/COMMON/ESM/MSG/EsmInformationResponse.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/EsmInformationResponse.h
rename to openair3/NAS/COMMON/ESM/MSG/EsmInformationResponse.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/EsmStatus.c b/openair3/NAS/COMMON/ESM/MSG/EsmStatus.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/EsmStatus.c
rename to openair3/NAS/COMMON/ESM/MSG/EsmStatus.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/EsmStatus.h b/openair3/NAS/COMMON/ESM/MSG/EsmStatus.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/EsmStatus.h
rename to openair3/NAS/COMMON/ESM/MSG/EsmStatus.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/Makefile b/openair3/NAS/COMMON/ESM/MSG/Makefile
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/Makefile
rename to openair3/NAS/COMMON/ESM/MSG/Makefile
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextAccept.c b/openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextAccept.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextAccept.c
rename to openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextAccept.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextAccept.h b/openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextAccept.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextAccept.h
rename to openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextAccept.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextReject.c b/openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextReject.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextReject.c
rename to openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextReject.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextReject.h b/openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextReject.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextReject.h
rename to openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextReject.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextRequest.c b/openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextRequest.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextRequest.c
rename to openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextRequest.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextRequest.h b/openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextRequest.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextRequest.h
rename to openair3/NAS/COMMON/ESM/MSG/ModifyEpsBearerContextRequest.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/PdnConnectivityReject.c b/openair3/NAS/COMMON/ESM/MSG/PdnConnectivityReject.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/PdnConnectivityReject.c
rename to openair3/NAS/COMMON/ESM/MSG/PdnConnectivityReject.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/PdnConnectivityReject.h b/openair3/NAS/COMMON/ESM/MSG/PdnConnectivityReject.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/PdnConnectivityReject.h
rename to openair3/NAS/COMMON/ESM/MSG/PdnConnectivityReject.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/PdnConnectivityRequest.c b/openair3/NAS/COMMON/ESM/MSG/PdnConnectivityRequest.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/PdnConnectivityRequest.c
rename to openair3/NAS/COMMON/ESM/MSG/PdnConnectivityRequest.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/PdnConnectivityRequest.h b/openair3/NAS/COMMON/ESM/MSG/PdnConnectivityRequest.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/PdnConnectivityRequest.h
rename to openair3/NAS/COMMON/ESM/MSG/PdnConnectivityRequest.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/PdnDisconnectReject.c b/openair3/NAS/COMMON/ESM/MSG/PdnDisconnectReject.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/PdnDisconnectReject.c
rename to openair3/NAS/COMMON/ESM/MSG/PdnDisconnectReject.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/PdnDisconnectReject.h b/openair3/NAS/COMMON/ESM/MSG/PdnDisconnectReject.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/PdnDisconnectReject.h
rename to openair3/NAS/COMMON/ESM/MSG/PdnDisconnectReject.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/PdnDisconnectRequest.c b/openair3/NAS/COMMON/ESM/MSG/PdnDisconnectRequest.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/PdnDisconnectRequest.c
rename to openair3/NAS/COMMON/ESM/MSG/PdnDisconnectRequest.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/PdnDisconnectRequest.h b/openair3/NAS/COMMON/ESM/MSG/PdnDisconnectRequest.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/PdnDisconnectRequest.h
rename to openair3/NAS/COMMON/ESM/MSG/PdnDisconnectRequest.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/esm_cause.h b/openair3/NAS/COMMON/ESM/MSG/esm_cause.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/esm_cause.h
rename to openair3/NAS/COMMON/ESM/MSG/esm_cause.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/esm_msg.c b/openair3/NAS/COMMON/ESM/MSG/esm_msg.c
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/esm_msg.c
rename to openair3/NAS/COMMON/ESM/MSG/esm_msg.c
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/esm_msg.h b/openair3/NAS/COMMON/ESM/MSG/esm_msg.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/esm_msg.h
rename to openair3/NAS/COMMON/ESM/MSG/esm_msg.h
diff --git a/openair-cn/NAS/COMMON/ESM/MSG/esm_msgDef.h b/openair3/NAS/COMMON/ESM/MSG/esm_msgDef.h
similarity index 100%
rename from openair-cn/NAS/COMMON/ESM/MSG/esm_msgDef.h
rename to openair3/NAS/COMMON/ESM/MSG/esm_msgDef.h
diff --git a/openair-cn/NAS/COMMON/IES/AccessPointName.c b/openair3/NAS/COMMON/IES/AccessPointName.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/AccessPointName.c
rename to openair3/NAS/COMMON/IES/AccessPointName.c
diff --git a/openair-cn/NAS/COMMON/IES/AccessPointName.h b/openair3/NAS/COMMON/IES/AccessPointName.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/AccessPointName.h
rename to openair3/NAS/COMMON/IES/AccessPointName.h
diff --git a/openair-cn/NAS/COMMON/IES/AdditionalUpdateResult.c b/openair3/NAS/COMMON/IES/AdditionalUpdateResult.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/AdditionalUpdateResult.c
rename to openair3/NAS/COMMON/IES/AdditionalUpdateResult.c
diff --git a/openair-cn/NAS/COMMON/IES/AdditionalUpdateResult.h b/openair3/NAS/COMMON/IES/AdditionalUpdateResult.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/AdditionalUpdateResult.h
rename to openair3/NAS/COMMON/IES/AdditionalUpdateResult.h
diff --git a/openair-cn/NAS/COMMON/IES/AdditionalUpdateType.c b/openair3/NAS/COMMON/IES/AdditionalUpdateType.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/AdditionalUpdateType.c
rename to openair3/NAS/COMMON/IES/AdditionalUpdateType.c
diff --git a/openair-cn/NAS/COMMON/IES/AdditionalUpdateType.h b/openair3/NAS/COMMON/IES/AdditionalUpdateType.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/AdditionalUpdateType.h
rename to openair3/NAS/COMMON/IES/AdditionalUpdateType.h
diff --git a/openair-cn/NAS/COMMON/IES/ApnAggregateMaximumBitRate.c b/openair3/NAS/COMMON/IES/ApnAggregateMaximumBitRate.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/ApnAggregateMaximumBitRate.c
rename to openair3/NAS/COMMON/IES/ApnAggregateMaximumBitRate.c
diff --git a/openair-cn/NAS/COMMON/IES/ApnAggregateMaximumBitRate.h b/openair3/NAS/COMMON/IES/ApnAggregateMaximumBitRate.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/ApnAggregateMaximumBitRate.h
rename to openair3/NAS/COMMON/IES/ApnAggregateMaximumBitRate.h
diff --git a/openair-cn/NAS/COMMON/IES/AuthenticationFailureParameter.c b/openair3/NAS/COMMON/IES/AuthenticationFailureParameter.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/AuthenticationFailureParameter.c
rename to openair3/NAS/COMMON/IES/AuthenticationFailureParameter.c
diff --git a/openair-cn/NAS/COMMON/IES/AuthenticationFailureParameter.h b/openair3/NAS/COMMON/IES/AuthenticationFailureParameter.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/AuthenticationFailureParameter.h
rename to openair3/NAS/COMMON/IES/AuthenticationFailureParameter.h
diff --git a/openair-cn/NAS/COMMON/IES/AuthenticationParameterAutn.c b/openair3/NAS/COMMON/IES/AuthenticationParameterAutn.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/AuthenticationParameterAutn.c
rename to openair3/NAS/COMMON/IES/AuthenticationParameterAutn.c
diff --git a/openair-cn/NAS/COMMON/IES/AuthenticationParameterAutn.h b/openair3/NAS/COMMON/IES/AuthenticationParameterAutn.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/AuthenticationParameterAutn.h
rename to openair3/NAS/COMMON/IES/AuthenticationParameterAutn.h
diff --git a/openair-cn/NAS/COMMON/IES/AuthenticationParameterRand.c b/openair3/NAS/COMMON/IES/AuthenticationParameterRand.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/AuthenticationParameterRand.c
rename to openair3/NAS/COMMON/IES/AuthenticationParameterRand.c
diff --git a/openair-cn/NAS/COMMON/IES/AuthenticationParameterRand.h b/openair3/NAS/COMMON/IES/AuthenticationParameterRand.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/AuthenticationParameterRand.h
rename to openair3/NAS/COMMON/IES/AuthenticationParameterRand.h
diff --git a/openair-cn/NAS/COMMON/IES/AuthenticationResponseParameter.c b/openair3/NAS/COMMON/IES/AuthenticationResponseParameter.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/AuthenticationResponseParameter.c
rename to openair3/NAS/COMMON/IES/AuthenticationResponseParameter.c
diff --git a/openair-cn/NAS/COMMON/IES/AuthenticationResponseParameter.h b/openair3/NAS/COMMON/IES/AuthenticationResponseParameter.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/AuthenticationResponseParameter.h
rename to openair3/NAS/COMMON/IES/AuthenticationResponseParameter.h
diff --git a/openair-cn/NAS/COMMON/IES/COPYING b/openair3/NAS/COMMON/IES/COPYING
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/COPYING
rename to openair3/NAS/COMMON/IES/COPYING
diff --git a/openair-cn/NAS/COMMON/IES/CipheringKeySequenceNumber.c b/openair3/NAS/COMMON/IES/CipheringKeySequenceNumber.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/CipheringKeySequenceNumber.c
rename to openair3/NAS/COMMON/IES/CipheringKeySequenceNumber.c
diff --git a/openair-cn/NAS/COMMON/IES/CipheringKeySequenceNumber.h b/openair3/NAS/COMMON/IES/CipheringKeySequenceNumber.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/CipheringKeySequenceNumber.h
rename to openair3/NAS/COMMON/IES/CipheringKeySequenceNumber.h
diff --git a/openair-cn/NAS/COMMON/IES/Cli.c b/openair3/NAS/COMMON/IES/Cli.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/Cli.c
rename to openair3/NAS/COMMON/IES/Cli.c
diff --git a/openair-cn/NAS/COMMON/IES/Cli.h b/openair3/NAS/COMMON/IES/Cli.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/Cli.h
rename to openair3/NAS/COMMON/IES/Cli.h
diff --git a/openair-cn/NAS/COMMON/IES/CsfbResponse.c b/openair3/NAS/COMMON/IES/CsfbResponse.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/CsfbResponse.c
rename to openair3/NAS/COMMON/IES/CsfbResponse.c
diff --git a/openair-cn/NAS/COMMON/IES/CsfbResponse.h b/openair3/NAS/COMMON/IES/CsfbResponse.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/CsfbResponse.h
rename to openair3/NAS/COMMON/IES/CsfbResponse.h
diff --git a/openair-cn/NAS/COMMON/IES/DaylightSavingTime.c b/openair3/NAS/COMMON/IES/DaylightSavingTime.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/DaylightSavingTime.c
rename to openair3/NAS/COMMON/IES/DaylightSavingTime.c
diff --git a/openair-cn/NAS/COMMON/IES/DaylightSavingTime.h b/openair3/NAS/COMMON/IES/DaylightSavingTime.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/DaylightSavingTime.h
rename to openair3/NAS/COMMON/IES/DaylightSavingTime.h
diff --git a/openair-cn/NAS/COMMON/IES/DetachType.c b/openair3/NAS/COMMON/IES/DetachType.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/DetachType.c
rename to openair3/NAS/COMMON/IES/DetachType.c
diff --git a/openair-cn/NAS/COMMON/IES/DetachType.h b/openair3/NAS/COMMON/IES/DetachType.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/DetachType.h
rename to openair3/NAS/COMMON/IES/DetachType.h
diff --git a/openair-cn/NAS/COMMON/IES/DrxParameter.c b/openair3/NAS/COMMON/IES/DrxParameter.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/DrxParameter.c
rename to openair3/NAS/COMMON/IES/DrxParameter.c
diff --git a/openair-cn/NAS/COMMON/IES/DrxParameter.h b/openair3/NAS/COMMON/IES/DrxParameter.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/DrxParameter.h
rename to openair3/NAS/COMMON/IES/DrxParameter.h
diff --git a/openair-cn/NAS/COMMON/IES/EmergencyNumberList.c b/openair3/NAS/COMMON/IES/EmergencyNumberList.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EmergencyNumberList.c
rename to openair3/NAS/COMMON/IES/EmergencyNumberList.c
diff --git a/openair-cn/NAS/COMMON/IES/EmergencyNumberList.h b/openair3/NAS/COMMON/IES/EmergencyNumberList.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EmergencyNumberList.h
rename to openair3/NAS/COMMON/IES/EmergencyNumberList.h
diff --git a/openair-cn/NAS/COMMON/IES/EmmCause.c b/openair3/NAS/COMMON/IES/EmmCause.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EmmCause.c
rename to openair3/NAS/COMMON/IES/EmmCause.c
diff --git a/openair-cn/NAS/COMMON/IES/EmmCause.h b/openair3/NAS/COMMON/IES/EmmCause.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EmmCause.h
rename to openair3/NAS/COMMON/IES/EmmCause.h
diff --git a/openair-cn/NAS/COMMON/IES/EpsAttachResult.c b/openair3/NAS/COMMON/IES/EpsAttachResult.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EpsAttachResult.c
rename to openair3/NAS/COMMON/IES/EpsAttachResult.c
diff --git a/openair-cn/NAS/COMMON/IES/EpsAttachResult.h b/openair3/NAS/COMMON/IES/EpsAttachResult.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EpsAttachResult.h
rename to openair3/NAS/COMMON/IES/EpsAttachResult.h
diff --git a/openair-cn/NAS/COMMON/IES/EpsAttachType.c b/openair3/NAS/COMMON/IES/EpsAttachType.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EpsAttachType.c
rename to openair3/NAS/COMMON/IES/EpsAttachType.c
diff --git a/openair-cn/NAS/COMMON/IES/EpsAttachType.h b/openair3/NAS/COMMON/IES/EpsAttachType.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EpsAttachType.h
rename to openair3/NAS/COMMON/IES/EpsAttachType.h
diff --git a/openair-cn/NAS/COMMON/IES/EpsBearerContextStatus.c b/openair3/NAS/COMMON/IES/EpsBearerContextStatus.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EpsBearerContextStatus.c
rename to openair3/NAS/COMMON/IES/EpsBearerContextStatus.c
diff --git a/openair-cn/NAS/COMMON/IES/EpsBearerContextStatus.h b/openair3/NAS/COMMON/IES/EpsBearerContextStatus.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EpsBearerContextStatus.h
rename to openair3/NAS/COMMON/IES/EpsBearerContextStatus.h
diff --git a/openair-cn/NAS/COMMON/IES/EpsBearerIdentity.c b/openair3/NAS/COMMON/IES/EpsBearerIdentity.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EpsBearerIdentity.c
rename to openair3/NAS/COMMON/IES/EpsBearerIdentity.c
diff --git a/openair-cn/NAS/COMMON/IES/EpsBearerIdentity.h b/openair3/NAS/COMMON/IES/EpsBearerIdentity.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EpsBearerIdentity.h
rename to openair3/NAS/COMMON/IES/EpsBearerIdentity.h
diff --git a/openair-cn/NAS/COMMON/IES/EpsMobileIdentity.c b/openair3/NAS/COMMON/IES/EpsMobileIdentity.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EpsMobileIdentity.c
rename to openair3/NAS/COMMON/IES/EpsMobileIdentity.c
diff --git a/openair-cn/NAS/COMMON/IES/EpsMobileIdentity.h b/openair3/NAS/COMMON/IES/EpsMobileIdentity.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EpsMobileIdentity.h
rename to openair3/NAS/COMMON/IES/EpsMobileIdentity.h
diff --git a/openair-cn/NAS/COMMON/IES/EpsNetworkFeatureSupport.c b/openair3/NAS/COMMON/IES/EpsNetworkFeatureSupport.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EpsNetworkFeatureSupport.c
rename to openair3/NAS/COMMON/IES/EpsNetworkFeatureSupport.c
diff --git a/openair-cn/NAS/COMMON/IES/EpsNetworkFeatureSupport.h b/openair3/NAS/COMMON/IES/EpsNetworkFeatureSupport.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EpsNetworkFeatureSupport.h
rename to openair3/NAS/COMMON/IES/EpsNetworkFeatureSupport.h
diff --git a/openair-cn/NAS/COMMON/IES/EpsQualityOfService.c b/openair3/NAS/COMMON/IES/EpsQualityOfService.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EpsQualityOfService.c
rename to openair3/NAS/COMMON/IES/EpsQualityOfService.c
diff --git a/openair-cn/NAS/COMMON/IES/EpsQualityOfService.h b/openair3/NAS/COMMON/IES/EpsQualityOfService.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EpsQualityOfService.h
rename to openair3/NAS/COMMON/IES/EpsQualityOfService.h
diff --git a/openair-cn/NAS/COMMON/IES/EpsUpdateResult.c b/openair3/NAS/COMMON/IES/EpsUpdateResult.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EpsUpdateResult.c
rename to openair3/NAS/COMMON/IES/EpsUpdateResult.c
diff --git a/openair-cn/NAS/COMMON/IES/EpsUpdateResult.h b/openair3/NAS/COMMON/IES/EpsUpdateResult.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EpsUpdateResult.h
rename to openair3/NAS/COMMON/IES/EpsUpdateResult.h
diff --git a/openair-cn/NAS/COMMON/IES/EpsUpdateType.c b/openair3/NAS/COMMON/IES/EpsUpdateType.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EpsUpdateType.c
rename to openair3/NAS/COMMON/IES/EpsUpdateType.c
diff --git a/openair-cn/NAS/COMMON/IES/EpsUpdateType.h b/openair3/NAS/COMMON/IES/EpsUpdateType.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EpsUpdateType.h
rename to openair3/NAS/COMMON/IES/EpsUpdateType.h
diff --git a/openair-cn/NAS/COMMON/IES/EsmCause.c b/openair3/NAS/COMMON/IES/EsmCause.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EsmCause.c
rename to openair3/NAS/COMMON/IES/EsmCause.c
diff --git a/openair-cn/NAS/COMMON/IES/EsmCause.h b/openair3/NAS/COMMON/IES/EsmCause.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EsmCause.h
rename to openair3/NAS/COMMON/IES/EsmCause.h
diff --git a/openair-cn/NAS/COMMON/IES/EsmInformationTransferFlag.c b/openair3/NAS/COMMON/IES/EsmInformationTransferFlag.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EsmInformationTransferFlag.c
rename to openair3/NAS/COMMON/IES/EsmInformationTransferFlag.c
diff --git a/openair-cn/NAS/COMMON/IES/EsmInformationTransferFlag.h b/openair3/NAS/COMMON/IES/EsmInformationTransferFlag.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EsmInformationTransferFlag.h
rename to openair3/NAS/COMMON/IES/EsmInformationTransferFlag.h
diff --git a/openair-cn/NAS/COMMON/IES/EsmMessageContainer.c b/openair3/NAS/COMMON/IES/EsmMessageContainer.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EsmMessageContainer.c
rename to openair3/NAS/COMMON/IES/EsmMessageContainer.c
diff --git a/openair-cn/NAS/COMMON/IES/EsmMessageContainer.h b/openair3/NAS/COMMON/IES/EsmMessageContainer.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/EsmMessageContainer.h
rename to openair3/NAS/COMMON/IES/EsmMessageContainer.h
diff --git a/openair-cn/NAS/COMMON/IES/GprsTimer.c b/openair3/NAS/COMMON/IES/GprsTimer.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/GprsTimer.c
rename to openair3/NAS/COMMON/IES/GprsTimer.c
diff --git a/openair-cn/NAS/COMMON/IES/GprsTimer.h b/openair3/NAS/COMMON/IES/GprsTimer.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/GprsTimer.h
rename to openair3/NAS/COMMON/IES/GprsTimer.h
diff --git a/openair-cn/NAS/COMMON/IES/GutiType.c b/openair3/NAS/COMMON/IES/GutiType.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/GutiType.c
rename to openair3/NAS/COMMON/IES/GutiType.c
diff --git a/openair-cn/NAS/COMMON/IES/GutiType.h b/openair3/NAS/COMMON/IES/GutiType.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/GutiType.h
rename to openair3/NAS/COMMON/IES/GutiType.h
diff --git a/openair-cn/NAS/COMMON/IES/IdentityType2.c b/openair3/NAS/COMMON/IES/IdentityType2.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/IdentityType2.c
rename to openair3/NAS/COMMON/IES/IdentityType2.c
diff --git a/openair-cn/NAS/COMMON/IES/IdentityType2.h b/openair3/NAS/COMMON/IES/IdentityType2.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/IdentityType2.h
rename to openair3/NAS/COMMON/IES/IdentityType2.h
diff --git a/openair-cn/NAS/COMMON/IES/ImeisvRequest.c b/openair3/NAS/COMMON/IES/ImeisvRequest.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/ImeisvRequest.c
rename to openair3/NAS/COMMON/IES/ImeisvRequest.c
diff --git a/openair-cn/NAS/COMMON/IES/ImeisvRequest.h b/openair3/NAS/COMMON/IES/ImeisvRequest.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/ImeisvRequest.h
rename to openair3/NAS/COMMON/IES/ImeisvRequest.h
diff --git a/openair-cn/NAS/COMMON/IES/KsiAndSequenceNumber.c b/openair3/NAS/COMMON/IES/KsiAndSequenceNumber.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/KsiAndSequenceNumber.c
rename to openair3/NAS/COMMON/IES/KsiAndSequenceNumber.c
diff --git a/openair-cn/NAS/COMMON/IES/KsiAndSequenceNumber.h b/openair3/NAS/COMMON/IES/KsiAndSequenceNumber.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/KsiAndSequenceNumber.h
rename to openair3/NAS/COMMON/IES/KsiAndSequenceNumber.h
diff --git a/openair-cn/NAS/COMMON/IES/LcsClientIdentity.c b/openair3/NAS/COMMON/IES/LcsClientIdentity.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/LcsClientIdentity.c
rename to openair3/NAS/COMMON/IES/LcsClientIdentity.c
diff --git a/openair-cn/NAS/COMMON/IES/LcsClientIdentity.h b/openair3/NAS/COMMON/IES/LcsClientIdentity.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/LcsClientIdentity.h
rename to openair3/NAS/COMMON/IES/LcsClientIdentity.h
diff --git a/openair-cn/NAS/COMMON/IES/LcsIndicator.c b/openair3/NAS/COMMON/IES/LcsIndicator.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/LcsIndicator.c
rename to openair3/NAS/COMMON/IES/LcsIndicator.c
diff --git a/openair-cn/NAS/COMMON/IES/LcsIndicator.h b/openair3/NAS/COMMON/IES/LcsIndicator.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/LcsIndicator.h
rename to openair3/NAS/COMMON/IES/LcsIndicator.h
diff --git a/openair-cn/NAS/COMMON/IES/LinkedEpsBearerIdentity.c b/openair3/NAS/COMMON/IES/LinkedEpsBearerIdentity.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/LinkedEpsBearerIdentity.c
rename to openair3/NAS/COMMON/IES/LinkedEpsBearerIdentity.c
diff --git a/openair-cn/NAS/COMMON/IES/LinkedEpsBearerIdentity.h b/openair3/NAS/COMMON/IES/LinkedEpsBearerIdentity.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/LinkedEpsBearerIdentity.h
rename to openair3/NAS/COMMON/IES/LinkedEpsBearerIdentity.h
diff --git a/openair-cn/NAS/COMMON/IES/LlcServiceAccessPointIdentifier.c b/openair3/NAS/COMMON/IES/LlcServiceAccessPointIdentifier.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/LlcServiceAccessPointIdentifier.c
rename to openair3/NAS/COMMON/IES/LlcServiceAccessPointIdentifier.c
diff --git a/openair-cn/NAS/COMMON/IES/LlcServiceAccessPointIdentifier.h b/openair3/NAS/COMMON/IES/LlcServiceAccessPointIdentifier.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/LlcServiceAccessPointIdentifier.h
rename to openair3/NAS/COMMON/IES/LlcServiceAccessPointIdentifier.h
diff --git a/openair-cn/NAS/COMMON/IES/LocationAreaIdentification.c b/openair3/NAS/COMMON/IES/LocationAreaIdentification.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/LocationAreaIdentification.c
rename to openair3/NAS/COMMON/IES/LocationAreaIdentification.c
diff --git a/openair-cn/NAS/COMMON/IES/LocationAreaIdentification.h b/openair3/NAS/COMMON/IES/LocationAreaIdentification.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/LocationAreaIdentification.h
rename to openair3/NAS/COMMON/IES/LocationAreaIdentification.h
diff --git a/openair-cn/NAS/COMMON/IES/Makefile b/openair3/NAS/COMMON/IES/Makefile
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/Makefile
rename to openair3/NAS/COMMON/IES/Makefile
diff --git a/openair-cn/NAS/COMMON/IES/MessageType.c b/openair3/NAS/COMMON/IES/MessageType.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/MessageType.c
rename to openair3/NAS/COMMON/IES/MessageType.c
diff --git a/openair-cn/NAS/COMMON/IES/MessageType.h b/openair3/NAS/COMMON/IES/MessageType.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/MessageType.h
rename to openair3/NAS/COMMON/IES/MessageType.h
diff --git a/openair-cn/NAS/COMMON/IES/MobileIdentity.c b/openair3/NAS/COMMON/IES/MobileIdentity.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/MobileIdentity.c
rename to openair3/NAS/COMMON/IES/MobileIdentity.c
diff --git a/openair-cn/NAS/COMMON/IES/MobileIdentity.h b/openair3/NAS/COMMON/IES/MobileIdentity.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/MobileIdentity.h
rename to openair3/NAS/COMMON/IES/MobileIdentity.h
diff --git a/openair-cn/NAS/COMMON/IES/MobileStationClassmark2.c b/openair3/NAS/COMMON/IES/MobileStationClassmark2.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/MobileStationClassmark2.c
rename to openair3/NAS/COMMON/IES/MobileStationClassmark2.c
diff --git a/openair-cn/NAS/COMMON/IES/MobileStationClassmark2.h b/openair3/NAS/COMMON/IES/MobileStationClassmark2.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/MobileStationClassmark2.h
rename to openair3/NAS/COMMON/IES/MobileStationClassmark2.h
diff --git a/openair-cn/NAS/COMMON/IES/MobileStationClassmark3.c b/openair3/NAS/COMMON/IES/MobileStationClassmark3.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/MobileStationClassmark3.c
rename to openair3/NAS/COMMON/IES/MobileStationClassmark3.c
diff --git a/openair-cn/NAS/COMMON/IES/MobileStationClassmark3.h b/openair3/NAS/COMMON/IES/MobileStationClassmark3.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/MobileStationClassmark3.h
rename to openair3/NAS/COMMON/IES/MobileStationClassmark3.h
diff --git a/openair-cn/NAS/COMMON/IES/MsNetworkCapability.c b/openair3/NAS/COMMON/IES/MsNetworkCapability.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/MsNetworkCapability.c
rename to openair3/NAS/COMMON/IES/MsNetworkCapability.c
diff --git a/openair-cn/NAS/COMMON/IES/MsNetworkCapability.h b/openair3/NAS/COMMON/IES/MsNetworkCapability.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/MsNetworkCapability.h
rename to openair3/NAS/COMMON/IES/MsNetworkCapability.h
diff --git a/openair-cn/NAS/COMMON/IES/MsNetworkFeatureSupport.c b/openair3/NAS/COMMON/IES/MsNetworkFeatureSupport.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/MsNetworkFeatureSupport.c
rename to openair3/NAS/COMMON/IES/MsNetworkFeatureSupport.c
diff --git a/openair-cn/NAS/COMMON/IES/MsNetworkFeatureSupport.h b/openair3/NAS/COMMON/IES/MsNetworkFeatureSupport.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/MsNetworkFeatureSupport.h
rename to openair3/NAS/COMMON/IES/MsNetworkFeatureSupport.h
diff --git a/openair-cn/NAS/COMMON/IES/NasKeySetIdentifier.c b/openair3/NAS/COMMON/IES/NasKeySetIdentifier.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/NasKeySetIdentifier.c
rename to openair3/NAS/COMMON/IES/NasKeySetIdentifier.c
diff --git a/openair-cn/NAS/COMMON/IES/NasKeySetIdentifier.h b/openair3/NAS/COMMON/IES/NasKeySetIdentifier.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/NasKeySetIdentifier.h
rename to openair3/NAS/COMMON/IES/NasKeySetIdentifier.h
diff --git a/openair-cn/NAS/COMMON/IES/NasMessageContainer.c b/openair3/NAS/COMMON/IES/NasMessageContainer.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/NasMessageContainer.c
rename to openair3/NAS/COMMON/IES/NasMessageContainer.c
diff --git a/openair-cn/NAS/COMMON/IES/NasMessageContainer.h b/openair3/NAS/COMMON/IES/NasMessageContainer.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/NasMessageContainer.h
rename to openair3/NAS/COMMON/IES/NasMessageContainer.h
diff --git a/openair-cn/NAS/COMMON/IES/NasRequestType.c b/openair3/NAS/COMMON/IES/NasRequestType.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/NasRequestType.c
rename to openair3/NAS/COMMON/IES/NasRequestType.c
diff --git a/openair-cn/NAS/COMMON/IES/NasRequestType.h b/openair3/NAS/COMMON/IES/NasRequestType.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/NasRequestType.h
rename to openair3/NAS/COMMON/IES/NasRequestType.h
diff --git a/openair-cn/NAS/COMMON/IES/NasSecurityAlgorithms.c b/openair3/NAS/COMMON/IES/NasSecurityAlgorithms.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/NasSecurityAlgorithms.c
rename to openair3/NAS/COMMON/IES/NasSecurityAlgorithms.c
diff --git a/openair-cn/NAS/COMMON/IES/NasSecurityAlgorithms.h b/openair3/NAS/COMMON/IES/NasSecurityAlgorithms.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/NasSecurityAlgorithms.h
rename to openair3/NAS/COMMON/IES/NasSecurityAlgorithms.h
diff --git a/openair-cn/NAS/COMMON/IES/NetworkName.c b/openair3/NAS/COMMON/IES/NetworkName.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/NetworkName.c
rename to openair3/NAS/COMMON/IES/NetworkName.c
diff --git a/openair-cn/NAS/COMMON/IES/NetworkName.h b/openair3/NAS/COMMON/IES/NetworkName.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/NetworkName.h
rename to openair3/NAS/COMMON/IES/NetworkName.h
diff --git a/openair-cn/NAS/COMMON/IES/Nonce.c b/openair3/NAS/COMMON/IES/Nonce.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/Nonce.c
rename to openair3/NAS/COMMON/IES/Nonce.c
diff --git a/openair-cn/NAS/COMMON/IES/Nonce.h b/openair3/NAS/COMMON/IES/Nonce.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/Nonce.h
rename to openair3/NAS/COMMON/IES/Nonce.h
diff --git a/openair-cn/NAS/COMMON/IES/PTmsiSignature.c b/openair3/NAS/COMMON/IES/PTmsiSignature.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/PTmsiSignature.c
rename to openair3/NAS/COMMON/IES/PTmsiSignature.c
diff --git a/openair-cn/NAS/COMMON/IES/PTmsiSignature.h b/openair3/NAS/COMMON/IES/PTmsiSignature.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/PTmsiSignature.h
rename to openair3/NAS/COMMON/IES/PTmsiSignature.h
diff --git a/openair-cn/NAS/COMMON/IES/PacketFlowIdentifier.c b/openair3/NAS/COMMON/IES/PacketFlowIdentifier.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/PacketFlowIdentifier.c
rename to openair3/NAS/COMMON/IES/PacketFlowIdentifier.c
diff --git a/openair-cn/NAS/COMMON/IES/PacketFlowIdentifier.h b/openair3/NAS/COMMON/IES/PacketFlowIdentifier.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/PacketFlowIdentifier.h
rename to openair3/NAS/COMMON/IES/PacketFlowIdentifier.h
diff --git a/openair-cn/NAS/COMMON/IES/PagingIdentity.c b/openair3/NAS/COMMON/IES/PagingIdentity.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/PagingIdentity.c
rename to openair3/NAS/COMMON/IES/PagingIdentity.c
diff --git a/openair-cn/NAS/COMMON/IES/PagingIdentity.h b/openair3/NAS/COMMON/IES/PagingIdentity.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/PagingIdentity.h
rename to openair3/NAS/COMMON/IES/PagingIdentity.h
diff --git a/openair-cn/NAS/COMMON/IES/PdnAddress.c b/openair3/NAS/COMMON/IES/PdnAddress.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/PdnAddress.c
rename to openair3/NAS/COMMON/IES/PdnAddress.c
diff --git a/openair-cn/NAS/COMMON/IES/PdnAddress.h b/openair3/NAS/COMMON/IES/PdnAddress.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/PdnAddress.h
rename to openair3/NAS/COMMON/IES/PdnAddress.h
diff --git a/openair-cn/NAS/COMMON/IES/PdnType.c b/openair3/NAS/COMMON/IES/PdnType.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/PdnType.c
rename to openair3/NAS/COMMON/IES/PdnType.c
diff --git a/openair-cn/NAS/COMMON/IES/PdnType.h b/openair3/NAS/COMMON/IES/PdnType.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/PdnType.h
rename to openair3/NAS/COMMON/IES/PdnType.h
diff --git a/openair-cn/NAS/COMMON/IES/PlmnList.c b/openair3/NAS/COMMON/IES/PlmnList.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/PlmnList.c
rename to openair3/NAS/COMMON/IES/PlmnList.c
diff --git a/openair-cn/NAS/COMMON/IES/PlmnList.h b/openair3/NAS/COMMON/IES/PlmnList.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/PlmnList.h
rename to openair3/NAS/COMMON/IES/PlmnList.h
diff --git a/openair-cn/NAS/COMMON/IES/ProcedureTransactionIdentity.c b/openair3/NAS/COMMON/IES/ProcedureTransactionIdentity.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/ProcedureTransactionIdentity.c
rename to openair3/NAS/COMMON/IES/ProcedureTransactionIdentity.c
diff --git a/openair-cn/NAS/COMMON/IES/ProcedureTransactionIdentity.h b/openair3/NAS/COMMON/IES/ProcedureTransactionIdentity.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/ProcedureTransactionIdentity.h
rename to openair3/NAS/COMMON/IES/ProcedureTransactionIdentity.h
diff --git a/openair-cn/NAS/COMMON/IES/ProtocolConfigurationOptions.c b/openair3/NAS/COMMON/IES/ProtocolConfigurationOptions.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/ProtocolConfigurationOptions.c
rename to openair3/NAS/COMMON/IES/ProtocolConfigurationOptions.c
diff --git a/openair-cn/NAS/COMMON/IES/ProtocolConfigurationOptions.h b/openair3/NAS/COMMON/IES/ProtocolConfigurationOptions.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/ProtocolConfigurationOptions.h
rename to openair3/NAS/COMMON/IES/ProtocolConfigurationOptions.h
diff --git a/openair-cn/NAS/COMMON/IES/ProtocolDiscriminator.c b/openair3/NAS/COMMON/IES/ProtocolDiscriminator.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/ProtocolDiscriminator.c
rename to openair3/NAS/COMMON/IES/ProtocolDiscriminator.c
diff --git a/openair-cn/NAS/COMMON/IES/ProtocolDiscriminator.h b/openair3/NAS/COMMON/IES/ProtocolDiscriminator.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/ProtocolDiscriminator.h
rename to openair3/NAS/COMMON/IES/ProtocolDiscriminator.h
diff --git a/openair-cn/NAS/COMMON/IES/QualityOfService.c b/openair3/NAS/COMMON/IES/QualityOfService.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/QualityOfService.c
rename to openair3/NAS/COMMON/IES/QualityOfService.c
diff --git a/openair-cn/NAS/COMMON/IES/QualityOfService.h b/openair3/NAS/COMMON/IES/QualityOfService.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/QualityOfService.h
rename to openair3/NAS/COMMON/IES/QualityOfService.h
diff --git a/openair-cn/NAS/COMMON/IES/RadioPriority.c b/openair3/NAS/COMMON/IES/RadioPriority.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/RadioPriority.c
rename to openair3/NAS/COMMON/IES/RadioPriority.c
diff --git a/openair-cn/NAS/COMMON/IES/RadioPriority.h b/openair3/NAS/COMMON/IES/RadioPriority.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/RadioPriority.h
rename to openair3/NAS/COMMON/IES/RadioPriority.h
diff --git a/openair-cn/NAS/COMMON/IES/SecurityHeaderType.c b/openair3/NAS/COMMON/IES/SecurityHeaderType.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/SecurityHeaderType.c
rename to openair3/NAS/COMMON/IES/SecurityHeaderType.c
diff --git a/openair-cn/NAS/COMMON/IES/SecurityHeaderType.h b/openair3/NAS/COMMON/IES/SecurityHeaderType.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/SecurityHeaderType.h
rename to openair3/NAS/COMMON/IES/SecurityHeaderType.h
diff --git a/openair-cn/NAS/COMMON/IES/ServiceType.c b/openair3/NAS/COMMON/IES/ServiceType.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/ServiceType.c
rename to openair3/NAS/COMMON/IES/ServiceType.c
diff --git a/openair-cn/NAS/COMMON/IES/ServiceType.h b/openair3/NAS/COMMON/IES/ServiceType.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/ServiceType.h
rename to openair3/NAS/COMMON/IES/ServiceType.h
diff --git a/openair-cn/NAS/COMMON/IES/ShortMac.c b/openair3/NAS/COMMON/IES/ShortMac.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/ShortMac.c
rename to openair3/NAS/COMMON/IES/ShortMac.c
diff --git a/openair-cn/NAS/COMMON/IES/ShortMac.h b/openair3/NAS/COMMON/IES/ShortMac.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/ShortMac.h
rename to openair3/NAS/COMMON/IES/ShortMac.h
diff --git a/openair-cn/NAS/COMMON/IES/SsCode.c b/openair3/NAS/COMMON/IES/SsCode.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/SsCode.c
rename to openair3/NAS/COMMON/IES/SsCode.c
diff --git a/openair-cn/NAS/COMMON/IES/SsCode.h b/openair3/NAS/COMMON/IES/SsCode.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/SsCode.h
rename to openair3/NAS/COMMON/IES/SsCode.h
diff --git a/openair-cn/NAS/COMMON/IES/SupportedCodecList.c b/openair3/NAS/COMMON/IES/SupportedCodecList.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/SupportedCodecList.c
rename to openair3/NAS/COMMON/IES/SupportedCodecList.c
diff --git a/openair-cn/NAS/COMMON/IES/SupportedCodecList.h b/openair3/NAS/COMMON/IES/SupportedCodecList.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/SupportedCodecList.h
rename to openair3/NAS/COMMON/IES/SupportedCodecList.h
diff --git a/openair-cn/NAS/COMMON/IES/TimeZone.c b/openair3/NAS/COMMON/IES/TimeZone.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/TimeZone.c
rename to openair3/NAS/COMMON/IES/TimeZone.c
diff --git a/openair-cn/NAS/COMMON/IES/TimeZone.h b/openair3/NAS/COMMON/IES/TimeZone.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/TimeZone.h
rename to openair3/NAS/COMMON/IES/TimeZone.h
diff --git a/openair-cn/NAS/COMMON/IES/TimeZoneAndTime.c b/openair3/NAS/COMMON/IES/TimeZoneAndTime.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/TimeZoneAndTime.c
rename to openair3/NAS/COMMON/IES/TimeZoneAndTime.c
diff --git a/openair-cn/NAS/COMMON/IES/TimeZoneAndTime.h b/openair3/NAS/COMMON/IES/TimeZoneAndTime.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/TimeZoneAndTime.h
rename to openair3/NAS/COMMON/IES/TimeZoneAndTime.h
diff --git a/openair-cn/NAS/COMMON/IES/TmsiStatus.c b/openair3/NAS/COMMON/IES/TmsiStatus.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/TmsiStatus.c
rename to openair3/NAS/COMMON/IES/TmsiStatus.c
diff --git a/openair-cn/NAS/COMMON/IES/TmsiStatus.h b/openair3/NAS/COMMON/IES/TmsiStatus.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/TmsiStatus.h
rename to openair3/NAS/COMMON/IES/TmsiStatus.h
diff --git a/openair-cn/NAS/COMMON/IES/TrackingAreaIdentity.c b/openair3/NAS/COMMON/IES/TrackingAreaIdentity.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/TrackingAreaIdentity.c
rename to openair3/NAS/COMMON/IES/TrackingAreaIdentity.c
diff --git a/openair-cn/NAS/COMMON/IES/TrackingAreaIdentity.h b/openair3/NAS/COMMON/IES/TrackingAreaIdentity.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/TrackingAreaIdentity.h
rename to openair3/NAS/COMMON/IES/TrackingAreaIdentity.h
diff --git a/openair-cn/NAS/COMMON/IES/TrackingAreaIdentityList.c b/openair3/NAS/COMMON/IES/TrackingAreaIdentityList.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/TrackingAreaIdentityList.c
rename to openair3/NAS/COMMON/IES/TrackingAreaIdentityList.c
diff --git a/openair-cn/NAS/COMMON/IES/TrackingAreaIdentityList.h b/openair3/NAS/COMMON/IES/TrackingAreaIdentityList.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/TrackingAreaIdentityList.h
rename to openair3/NAS/COMMON/IES/TrackingAreaIdentityList.h
diff --git a/openair-cn/NAS/COMMON/IES/TrafficFlowAggregateDescription.c b/openair3/NAS/COMMON/IES/TrafficFlowAggregateDescription.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/TrafficFlowAggregateDescription.c
rename to openair3/NAS/COMMON/IES/TrafficFlowAggregateDescription.c
diff --git a/openair-cn/NAS/COMMON/IES/TrafficFlowAggregateDescription.h b/openair3/NAS/COMMON/IES/TrafficFlowAggregateDescription.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/TrafficFlowAggregateDescription.h
rename to openair3/NAS/COMMON/IES/TrafficFlowAggregateDescription.h
diff --git a/openair-cn/NAS/COMMON/IES/TrafficFlowTemplate.c b/openair3/NAS/COMMON/IES/TrafficFlowTemplate.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/TrafficFlowTemplate.c
rename to openair3/NAS/COMMON/IES/TrafficFlowTemplate.c
diff --git a/openair-cn/NAS/COMMON/IES/TrafficFlowTemplate.h b/openair3/NAS/COMMON/IES/TrafficFlowTemplate.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/TrafficFlowTemplate.h
rename to openair3/NAS/COMMON/IES/TrafficFlowTemplate.h
diff --git a/openair-cn/NAS/COMMON/IES/TransactionIdentifier.c b/openair3/NAS/COMMON/IES/TransactionIdentifier.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/TransactionIdentifier.c
rename to openair3/NAS/COMMON/IES/TransactionIdentifier.c
diff --git a/openair-cn/NAS/COMMON/IES/TransactionIdentifier.h b/openair3/NAS/COMMON/IES/TransactionIdentifier.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/TransactionIdentifier.h
rename to openair3/NAS/COMMON/IES/TransactionIdentifier.h
diff --git a/openair-cn/NAS/COMMON/IES/UeNetworkCapability.c b/openair3/NAS/COMMON/IES/UeNetworkCapability.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/UeNetworkCapability.c
rename to openair3/NAS/COMMON/IES/UeNetworkCapability.c
diff --git a/openair-cn/NAS/COMMON/IES/UeNetworkCapability.h b/openair3/NAS/COMMON/IES/UeNetworkCapability.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/UeNetworkCapability.h
rename to openair3/NAS/COMMON/IES/UeNetworkCapability.h
diff --git a/openair-cn/NAS/COMMON/IES/UeRadioCapabilityInformationUpdateNeeded.c b/openair3/NAS/COMMON/IES/UeRadioCapabilityInformationUpdateNeeded.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/UeRadioCapabilityInformationUpdateNeeded.c
rename to openair3/NAS/COMMON/IES/UeRadioCapabilityInformationUpdateNeeded.c
diff --git a/openair-cn/NAS/COMMON/IES/UeRadioCapabilityInformationUpdateNeeded.h b/openair3/NAS/COMMON/IES/UeRadioCapabilityInformationUpdateNeeded.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/UeRadioCapabilityInformationUpdateNeeded.h
rename to openair3/NAS/COMMON/IES/UeRadioCapabilityInformationUpdateNeeded.h
diff --git a/openair-cn/NAS/COMMON/IES/UeSecurityCapability.c b/openair3/NAS/COMMON/IES/UeSecurityCapability.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/UeSecurityCapability.c
rename to openair3/NAS/COMMON/IES/UeSecurityCapability.c
diff --git a/openair-cn/NAS/COMMON/IES/UeSecurityCapability.h b/openair3/NAS/COMMON/IES/UeSecurityCapability.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/UeSecurityCapability.h
rename to openair3/NAS/COMMON/IES/UeSecurityCapability.h
diff --git a/openair-cn/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.c b/openair3/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.c
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.c
rename to openair3/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.c
diff --git a/openair-cn/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.h b/openair3/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.h
similarity index 100%
rename from openair-cn/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.h
rename to openair3/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.h
diff --git a/openair-cn/NAS/COMMON/UTIL/COPYING b/openair3/NAS/COMMON/UTIL/COPYING
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/COPYING
rename to openair3/NAS/COMMON/UTIL/COPYING
diff --git a/openair-cn/NAS/COMMON/UTIL/Makefile b/openair3/NAS/COMMON/UTIL/Makefile
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/Makefile
rename to openair3/NAS/COMMON/UTIL/Makefile
diff --git a/openair-cn/NAS/COMMON/UTIL/OctetString.c b/openair3/NAS/COMMON/UTIL/OctetString.c
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/OctetString.c
rename to openair3/NAS/COMMON/UTIL/OctetString.c
diff --git a/openair-cn/NAS/COMMON/UTIL/OctetString.h b/openair3/NAS/COMMON/UTIL/OctetString.h
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/OctetString.h
rename to openair3/NAS/COMMON/UTIL/OctetString.h
diff --git a/openair-cn/NAS/COMMON/UTIL/TLVDecoder.c b/openair3/NAS/COMMON/UTIL/TLVDecoder.c
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/TLVDecoder.c
rename to openair3/NAS/COMMON/UTIL/TLVDecoder.c
diff --git a/openair-cn/NAS/COMMON/UTIL/TLVDecoder.h b/openair3/NAS/COMMON/UTIL/TLVDecoder.h
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/TLVDecoder.h
rename to openair3/NAS/COMMON/UTIL/TLVDecoder.h
diff --git a/openair-cn/NAS/COMMON/UTIL/TLVEncoder.c b/openair3/NAS/COMMON/UTIL/TLVEncoder.c
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/TLVEncoder.c
rename to openair3/NAS/COMMON/UTIL/TLVEncoder.c
diff --git a/openair-cn/NAS/COMMON/UTIL/TLVEncoder.h b/openair3/NAS/COMMON/UTIL/TLVEncoder.h
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/TLVEncoder.h
rename to openair3/NAS/COMMON/UTIL/TLVEncoder.h
diff --git a/openair-cn/NAS/COMMON/UTIL/device.c b/openair3/NAS/COMMON/UTIL/device.c
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/device.c
rename to openair3/NAS/COMMON/UTIL/device.c
diff --git a/openair-cn/NAS/COMMON/UTIL/device.h b/openair3/NAS/COMMON/UTIL/device.h
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/device.h
rename to openair3/NAS/COMMON/UTIL/device.h
diff --git a/openair-cn/NAS/COMMON/UTIL/memory.c b/openair3/NAS/COMMON/UTIL/memory.c
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/memory.c
rename to openair3/NAS/COMMON/UTIL/memory.c
diff --git a/openair-cn/NAS/COMMON/UTIL/memory.h b/openair3/NAS/COMMON/UTIL/memory.h
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/memory.h
rename to openair3/NAS/COMMON/UTIL/memory.h
diff --git a/openair-cn/NAS/COMMON/UTIL/nas_log.c b/openair3/NAS/COMMON/UTIL/nas_log.c
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/nas_log.c
rename to openair3/NAS/COMMON/UTIL/nas_log.c
diff --git a/openair-cn/NAS/COMMON/UTIL/nas_log.h b/openair3/NAS/COMMON/UTIL/nas_log.h
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/nas_log.h
rename to openair3/NAS/COMMON/UTIL/nas_log.h
diff --git a/openair-cn/NAS/COMMON/UTIL/nas_timer.c b/openair3/NAS/COMMON/UTIL/nas_timer.c
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/nas_timer.c
rename to openair3/NAS/COMMON/UTIL/nas_timer.c
diff --git a/openair-cn/NAS/COMMON/UTIL/nas_timer.h b/openair3/NAS/COMMON/UTIL/nas_timer.h
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/nas_timer.h
rename to openair3/NAS/COMMON/UTIL/nas_timer.h
diff --git a/openair-cn/NAS/COMMON/UTIL/parser.c b/openair3/NAS/COMMON/UTIL/parser.c
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/parser.c
rename to openair3/NAS/COMMON/UTIL/parser.c
diff --git a/openair-cn/NAS/COMMON/UTIL/parser.h b/openair3/NAS/COMMON/UTIL/parser.h
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/parser.h
rename to openair3/NAS/COMMON/UTIL/parser.h
diff --git a/openair-cn/NAS/COMMON/UTIL/socket.c b/openair3/NAS/COMMON/UTIL/socket.c
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/socket.c
rename to openair3/NAS/COMMON/UTIL/socket.c
diff --git a/openair-cn/NAS/COMMON/UTIL/socket.h b/openair3/NAS/COMMON/UTIL/socket.h
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/socket.h
rename to openair3/NAS/COMMON/UTIL/socket.h
diff --git a/openair-cn/NAS/COMMON/UTIL/stty.c b/openair3/NAS/COMMON/UTIL/stty.c
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/stty.c
rename to openair3/NAS/COMMON/UTIL/stty.c
diff --git a/openair-cn/NAS/COMMON/UTIL/tst/Makefile b/openair3/NAS/COMMON/UTIL/tst/Makefile
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/tst/Makefile
rename to openair3/NAS/COMMON/UTIL/tst/Makefile
diff --git a/openair-cn/NAS/COMMON/UTIL/tst/timer.c b/openair3/NAS/COMMON/UTIL/tst/timer.c
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/tst/timer.c
rename to openair3/NAS/COMMON/UTIL/tst/timer.c
diff --git a/openair-cn/NAS/COMMON/UTIL/tst/timer_debug.txt b/openair3/NAS/COMMON/UTIL/tst/timer_debug.txt
similarity index 100%
rename from openair-cn/NAS/COMMON/UTIL/tst/timer_debug.txt
rename to openair3/NAS/COMMON/UTIL/tst/timer_debug.txt
diff --git a/openair-cn/NAS/COMMON/commonDef.h b/openair3/NAS/COMMON/commonDef.h
similarity index 100%
rename from openair-cn/NAS/COMMON/commonDef.h
rename to openair3/NAS/COMMON/commonDef.h
diff --git a/openair-cn/NAS/COMMON/networkDef.h b/openair3/NAS/COMMON/networkDef.h
similarity index 100%
rename from openair-cn/NAS/COMMON/networkDef.h
rename to openair3/NAS/COMMON/networkDef.h
diff --git a/openair-cn/NAS/COMMON/securityDef.h b/openair3/NAS/COMMON/securityDef.h
similarity index 100%
rename from openair-cn/NAS/COMMON/securityDef.h
rename to openair3/NAS/COMMON/securityDef.h
diff --git a/openair-cn/NAS/COMMON/userDef.h b/openair3/NAS/COMMON/userDef.h
similarity index 100%
rename from openair-cn/NAS/COMMON/userDef.h
rename to openair3/NAS/COMMON/userDef.h
diff --git a/openair-cn/NAS/COPYING b/openair3/NAS/COPYING
similarity index 100%
rename from openair-cn/NAS/COPYING
rename to openair3/NAS/COPYING
diff --git a/openair-cn/NAS/TEST/AS_SIMULATOR/COPYING b/openair3/NAS/TEST/AS_SIMULATOR/COPYING
similarity index 100%
rename from openair-cn/NAS/TEST/AS_SIMULATOR/COPYING
rename to openair3/NAS/TEST/AS_SIMULATOR/COPYING
diff --git a/openair-cn/NAS/TEST/AS_SIMULATOR/Makefile b/openair3/NAS/TEST/AS_SIMULATOR/Makefile
similarity index 100%
rename from openair-cn/NAS/TEST/AS_SIMULATOR/Makefile
rename to openair3/NAS/TEST/AS_SIMULATOR/Makefile
diff --git a/openair-cn/NAS/TEST/AS_SIMULATOR/as_data.c b/openair3/NAS/TEST/AS_SIMULATOR/as_data.c
similarity index 100%
rename from openair-cn/NAS/TEST/AS_SIMULATOR/as_data.c
rename to openair3/NAS/TEST/AS_SIMULATOR/as_data.c
diff --git a/openair-cn/NAS/TEST/AS_SIMULATOR/as_data.h b/openair3/NAS/TEST/AS_SIMULATOR/as_data.h
similarity index 100%
rename from openair-cn/NAS/TEST/AS_SIMULATOR/as_data.h
rename to openair3/NAS/TEST/AS_SIMULATOR/as_data.h
diff --git a/openair-cn/NAS/TEST/AS_SIMULATOR/as_process.c b/openair3/NAS/TEST/AS_SIMULATOR/as_process.c
similarity index 100%
rename from openair-cn/NAS/TEST/AS_SIMULATOR/as_process.c
rename to openair3/NAS/TEST/AS_SIMULATOR/as_process.c
diff --git a/openair-cn/NAS/TEST/AS_SIMULATOR/as_process.h b/openair3/NAS/TEST/AS_SIMULATOR/as_process.h
similarity index 100%
rename from openair-cn/NAS/TEST/AS_SIMULATOR/as_process.h
rename to openair3/NAS/TEST/AS_SIMULATOR/as_process.h
diff --git a/openair-cn/NAS/TEST/AS_SIMULATOR/as_simulator.c b/openair3/NAS/TEST/AS_SIMULATOR/as_simulator.c
similarity index 100%
rename from openair-cn/NAS/TEST/AS_SIMULATOR/as_simulator.c
rename to openair3/NAS/TEST/AS_SIMULATOR/as_simulator.c
diff --git a/openair-cn/NAS/TEST/AS_SIMULATOR/as_simulator_parser.c b/openair3/NAS/TEST/AS_SIMULATOR/as_simulator_parser.c
similarity index 100%
rename from openair-cn/NAS/TEST/AS_SIMULATOR/as_simulator_parser.c
rename to openair3/NAS/TEST/AS_SIMULATOR/as_simulator_parser.c
diff --git a/openair-cn/NAS/TEST/AS_SIMULATOR/as_simulator_parser.h b/openair3/NAS/TEST/AS_SIMULATOR/as_simulator_parser.h
similarity index 100%
rename from openair-cn/NAS/TEST/AS_SIMULATOR/as_simulator_parser.h
rename to openair3/NAS/TEST/AS_SIMULATOR/as_simulator_parser.h
diff --git a/openair-cn/NAS/TEST/AS_SIMULATOR/nas_data.c b/openair3/NAS/TEST/AS_SIMULATOR/nas_data.c
similarity index 100%
rename from openair-cn/NAS/TEST/AS_SIMULATOR/nas_data.c
rename to openair3/NAS/TEST/AS_SIMULATOR/nas_data.c
diff --git a/openair-cn/NAS/TEST/AS_SIMULATOR/nas_data.h b/openair3/NAS/TEST/AS_SIMULATOR/nas_data.h
similarity index 100%
rename from openair-cn/NAS/TEST/AS_SIMULATOR/nas_data.h
rename to openair3/NAS/TEST/AS_SIMULATOR/nas_data.h
diff --git a/openair-cn/NAS/TEST/AS_SIMULATOR/nas_process.c b/openair3/NAS/TEST/AS_SIMULATOR/nas_process.c
similarity index 100%
rename from openair-cn/NAS/TEST/AS_SIMULATOR/nas_process.c
rename to openair3/NAS/TEST/AS_SIMULATOR/nas_process.c
diff --git a/openair-cn/NAS/TEST/AS_SIMULATOR/nas_process.h b/openair3/NAS/TEST/AS_SIMULATOR/nas_process.h
similarity index 100%
rename from openair-cn/NAS/TEST/AS_SIMULATOR/nas_process.h
rename to openair3/NAS/TEST/AS_SIMULATOR/nas_process.h
diff --git a/openair-cn/NAS/TEST/COPYING b/openair3/NAS/TEST/COPYING
similarity index 100%
rename from openair-cn/NAS/TEST/COPYING
rename to openair3/NAS/TEST/COPYING
diff --git a/openair-cn/NAS/TEST/MSC/ActivatePDN.png b/openair3/NAS/TEST/MSC/ActivatePDN.png
similarity index 100%
rename from openair-cn/NAS/TEST/MSC/ActivatePDN.png
rename to openair3/NAS/TEST/MSC/ActivatePDN.png
diff --git a/openair-cn/NAS/TEST/MSC/AuthenticationReject.png b/openair3/NAS/TEST/MSC/AuthenticationReject.png
similarity index 100%
rename from openair-cn/NAS/TEST/MSC/AuthenticationReject.png
rename to openair3/NAS/TEST/MSC/AuthenticationReject.png
diff --git a/openair-cn/NAS/TEST/MSC/COPYING b/openair3/NAS/TEST/MSC/COPYING
similarity index 100%
rename from openair-cn/NAS/TEST/MSC/COPYING
rename to openair3/NAS/TEST/MSC/COPYING
diff --git a/openair-cn/NAS/TEST/MSC/DeactivatePDN.png b/openair3/NAS/TEST/MSC/DeactivatePDN.png
similarity index 100%
rename from openair-cn/NAS/TEST/MSC/DeactivatePDN.png
rename to openair3/NAS/TEST/MSC/DeactivatePDN.png
diff --git a/openair-cn/NAS/TEST/MSC/InitialAttach.png b/openair3/NAS/TEST/MSC/InitialAttach.png
similarity index 100%
rename from openair-cn/NAS/TEST/MSC/InitialAttach.png
rename to openair3/NAS/TEST/MSC/InitialAttach.png
diff --git a/openair-cn/NAS/TEST/MSC/InitialAttachReject.png b/openair3/NAS/TEST/MSC/InitialAttachReject.png
similarity index 100%
rename from openair-cn/NAS/TEST/MSC/InitialAttachReject.png
rename to openair3/NAS/TEST/MSC/InitialAttachReject.png
diff --git a/openair-cn/NAS/TEST/MSC/NomalDetach.png b/openair3/NAS/TEST/MSC/NomalDetach.png
similarity index 100%
rename from openair-cn/NAS/TEST/MSC/NomalDetach.png
rename to openair3/NAS/TEST/MSC/NomalDetach.png
diff --git a/openair-cn/NAS/TEST/MSC/README b/openair3/NAS/TEST/MSC/README
similarity index 100%
rename from openair-cn/NAS/TEST/MSC/README
rename to openair3/NAS/TEST/MSC/README
diff --git a/openair-cn/NAS/TEST/MSC/SwitchOffDetach.png b/openair3/NAS/TEST/MSC/SwitchOffDetach.png
similarity index 100%
rename from openair-cn/NAS/TEST/MSC/SwitchOffDetach.png
rename to openair3/NAS/TEST/MSC/SwitchOffDetach.png
diff --git a/openair-cn/NAS/TEST/MSC/msc_gen.py b/openair3/NAS/TEST/MSC/msc_gen.py
similarity index 100%
rename from openair-cn/NAS/TEST/MSC/msc_gen.py
rename to openair3/NAS/TEST/MSC/msc_gen.py
diff --git a/openair-cn/NAS/TEST/MSC/mscgen b/openair3/NAS/TEST/MSC/mscgen
similarity index 100%
rename from openair-cn/NAS/TEST/MSC/mscgen
rename to openair3/NAS/TEST/MSC/mscgen
diff --git a/openair-cn/NAS/TEST/NETWORK/COPYING b/openair3/NAS/TEST/NETWORK/COPYING
similarity index 100%
rename from openair-cn/NAS/TEST/NETWORK/COPYING
rename to openair3/NAS/TEST/NETWORK/COPYING
diff --git a/openair-cn/NAS/TEST/NETWORK/Makefile b/openair3/NAS/TEST/NETWORK/Makefile
similarity index 100%
rename from openair-cn/NAS/TEST/NETWORK/Makefile
rename to openair3/NAS/TEST/NETWORK/Makefile
diff --git a/openair-cn/NAS/TEST/NETWORK/README b/openair3/NAS/TEST/NETWORK/README
similarity index 100%
rename from openair-cn/NAS/TEST/NETWORK/README
rename to openair3/NAS/TEST/NETWORK/README
diff --git a/openair-cn/NAS/TEST/NETWORK/network_parser.c b/openair3/NAS/TEST/NETWORK/network_parser.c
similarity index 100%
rename from openair-cn/NAS/TEST/NETWORK/network_parser.c
rename to openair3/NAS/TEST/NETWORK/network_parser.c
diff --git a/openair-cn/NAS/TEST/NETWORK/network_parser.h b/openair3/NAS/TEST/NETWORK/network_parser.h
similarity index 100%
rename from openair-cn/NAS/TEST/NETWORK/network_parser.h
rename to openair3/NAS/TEST/NETWORK/network_parser.h
diff --git a/openair-cn/NAS/TEST/NETWORK/network_simulator.c b/openair3/NAS/TEST/NETWORK/network_simulator.c
similarity index 100%
rename from openair-cn/NAS/TEST/NETWORK/network_simulator.c
rename to openair3/NAS/TEST/NETWORK/network_simulator.c
diff --git a/openair-cn/NAS/TEST/USER/COPYING b/openair3/NAS/TEST/USER/COPYING
similarity index 100%
rename from openair-cn/NAS/TEST/USER/COPYING
rename to openair3/NAS/TEST/USER/COPYING
diff --git a/openair-cn/NAS/TEST/USER/Makefile b/openair3/NAS/TEST/USER/Makefile
similarity index 100%
rename from openair-cn/NAS/TEST/USER/Makefile
rename to openair3/NAS/TEST/USER/Makefile
diff --git a/openair-cn/NAS/TEST/USER/user_parser.c b/openair3/NAS/TEST/USER/user_parser.c
similarity index 100%
rename from openair-cn/NAS/TEST/USER/user_parser.c
rename to openair3/NAS/TEST/USER/user_parser.c
diff --git a/openair-cn/NAS/TEST/USER/user_parser.h b/openair3/NAS/TEST/USER/user_parser.h
similarity index 100%
rename from openair-cn/NAS/TEST/USER/user_parser.h
rename to openair3/NAS/TEST/USER/user_parser.h
diff --git a/openair-cn/NAS/TEST/USER/user_simulator.c b/openair3/NAS/TEST/USER/user_simulator.c
similarity index 100%
rename from openair-cn/NAS/TEST/USER/user_simulator.c
rename to openair3/NAS/TEST/USER/user_simulator.c
diff --git a/openair-cn/NAS/TOOLS/COPYING b/openair3/NAS/TOOLS/COPYING
similarity index 100%
rename from openair-cn/NAS/TOOLS/COPYING
rename to openair3/NAS/TOOLS/COPYING
diff --git a/openair-cn/NAS/TOOLS/Makefile b/openair3/NAS/TOOLS/Makefile
similarity index 100%
rename from openair-cn/NAS/TOOLS/Makefile
rename to openair3/NAS/TOOLS/Makefile
diff --git a/openair-cn/NAS/TOOLS/network.h b/openair3/NAS/TOOLS/network.h
similarity index 100%
rename from openair-cn/NAS/TOOLS/network.h
rename to openair3/NAS/TOOLS/network.h
diff --git a/openair-cn/NAS/TOOLS/ue_data.c b/openair3/NAS/TOOLS/ue_data.c
similarity index 100%
rename from openair-cn/NAS/TOOLS/ue_data.c
rename to openair3/NAS/TOOLS/ue_data.c
diff --git a/openair-cn/NAS/TOOLS/usim_data.c b/openair3/NAS/TOOLS/usim_data.c
similarity index 100%
rename from openair-cn/NAS/TOOLS/usim_data.c
rename to openair3/NAS/TOOLS/usim_data.c
diff --git a/openair-cn/NAS/UE/API/USER/COPYING b/openair3/NAS/UE/API/USER/COPYING
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/COPYING
rename to openair3/NAS/UE/API/USER/COPYING
diff --git a/openair-cn/NAS/UE/API/USER/Makefile b/openair3/NAS/UE/API/USER/Makefile
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/Makefile
rename to openair3/NAS/UE/API/USER/Makefile
diff --git a/openair-cn/NAS/UE/API/USER/at_command.c b/openair3/NAS/UE/API/USER/at_command.c
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/at_command.c
rename to openair3/NAS/UE/API/USER/at_command.c
diff --git a/openair-cn/NAS/UE/API/USER/at_command.h b/openair3/NAS/UE/API/USER/at_command.h
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/at_command.h
rename to openair3/NAS/UE/API/USER/at_command.h
diff --git a/openair-cn/NAS/UE/API/USER/at_error.c b/openair3/NAS/UE/API/USER/at_error.c
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/at_error.c
rename to openair3/NAS/UE/API/USER/at_error.c
diff --git a/openair-cn/NAS/UE/API/USER/at_error.h b/openair3/NAS/UE/API/USER/at_error.h
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/at_error.h
rename to openair3/NAS/UE/API/USER/at_error.h
diff --git a/openair-cn/NAS/UE/API/USER/at_response.c b/openair3/NAS/UE/API/USER/at_response.c
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/at_response.c
rename to openair3/NAS/UE/API/USER/at_response.c
diff --git a/openair-cn/NAS/UE/API/USER/at_response.h b/openair3/NAS/UE/API/USER/at_response.h
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/at_response.h
rename to openair3/NAS/UE/API/USER/at_response.h
diff --git a/openair-cn/NAS/UE/API/USER/tst/Makefile b/openair3/NAS/UE/API/USER/tst/Makefile
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/tst/Makefile
rename to openair3/NAS/UE/API/USER/tst/Makefile
diff --git a/openair-cn/NAS/UE/API/USER/tst/at_parser.c b/openair3/NAS/UE/API/USER/tst/at_parser.c
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/tst/at_parser.c
rename to openair3/NAS/UE/API/USER/tst/at_parser.c
diff --git a/openair-cn/NAS/UE/API/USER/tst/at_parser.in b/openair3/NAS/UE/API/USER/tst/at_parser.in
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/tst/at_parser.in
rename to openair3/NAS/UE/API/USER/tst/at_parser.in
diff --git a/openair-cn/NAS/UE/API/USER/tst/at_parser.in.bis b/openair3/NAS/UE/API/USER/tst/at_parser.in.bis
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/tst/at_parser.in.bis
rename to openair3/NAS/UE/API/USER/tst/at_parser.in.bis
diff --git a/openair-cn/NAS/UE/API/USER/tst/at_parser.out b/openair3/NAS/UE/API/USER/tst/at_parser.out
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/tst/at_parser.out
rename to openair3/NAS/UE/API/USER/tst/at_parser.out
diff --git a/openair-cn/NAS/UE/API/USER/tst/at_parser.out.bis b/openair3/NAS/UE/API/USER/tst/at_parser.out.bis
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/tst/at_parser.out.bis
rename to openair3/NAS/UE/API/USER/tst/at_parser.out.bis
diff --git a/openair-cn/NAS/UE/API/USER/tst/smartcom.txt b/openair3/NAS/UE/API/USER/tst/smartcom.txt
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/tst/smartcom.txt
rename to openair3/NAS/UE/API/USER/tst/smartcom.txt
diff --git a/openair-cn/NAS/UE/API/USER/user_api.c b/openair3/NAS/UE/API/USER/user_api.c
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/user_api.c
rename to openair3/NAS/UE/API/USER/user_api.c
diff --git a/openair-cn/NAS/UE/API/USER/user_api.h b/openair3/NAS/UE/API/USER/user_api.h
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/user_api.h
rename to openair3/NAS/UE/API/USER/user_api.h
diff --git a/openair-cn/NAS/UE/API/USER/user_indication.c b/openair3/NAS/UE/API/USER/user_indication.c
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/user_indication.c
rename to openair3/NAS/UE/API/USER/user_indication.c
diff --git a/openair-cn/NAS/UE/API/USER/user_indication.h b/openair3/NAS/UE/API/USER/user_indication.h
similarity index 100%
rename from openair-cn/NAS/UE/API/USER/user_indication.h
rename to openair3/NAS/UE/API/USER/user_indication.h
diff --git a/openair-cn/NAS/UE/API/USIM/COPYING b/openair3/NAS/UE/API/USIM/COPYING
similarity index 100%
rename from openair-cn/NAS/UE/API/USIM/COPYING
rename to openair3/NAS/UE/API/USIM/COPYING
diff --git a/openair-cn/NAS/UE/API/USIM/Makefile b/openair3/NAS/UE/API/USIM/Makefile
similarity index 100%
rename from openair-cn/NAS/UE/API/USIM/Makefile
rename to openair3/NAS/UE/API/USIM/Makefile
diff --git a/openair-cn/NAS/UE/API/USIM/aka_functions.c b/openair3/NAS/UE/API/USIM/aka_functions.c
similarity index 100%
rename from openair-cn/NAS/UE/API/USIM/aka_functions.c
rename to openair3/NAS/UE/API/USIM/aka_functions.c
diff --git a/openair-cn/NAS/UE/API/USIM/aka_functions.h b/openair3/NAS/UE/API/USIM/aka_functions.h
similarity index 100%
rename from openair-cn/NAS/UE/API/USIM/aka_functions.h
rename to openair3/NAS/UE/API/USIM/aka_functions.h
diff --git a/openair-cn/NAS/UE/API/USIM/usim_api.c b/openair3/NAS/UE/API/USIM/usim_api.c
similarity index 100%
rename from openair-cn/NAS/UE/API/USIM/usim_api.c
rename to openair3/NAS/UE/API/USIM/usim_api.c
diff --git a/openair-cn/NAS/UE/API/USIM/usim_api.h b/openair3/NAS/UE/API/USIM/usim_api.h
similarity index 100%
rename from openair-cn/NAS/UE/API/USIM/usim_api.h
rename to openair3/NAS/UE/API/USIM/usim_api.h
diff --git a/openair-cn/NAS/UE/EMM/Attach.c b/openair3/NAS/UE/EMM/Attach.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/Attach.c
rename to openair3/NAS/UE/EMM/Attach.c
diff --git a/openair-cn/NAS/UE/EMM/Authentication.c b/openair3/NAS/UE/EMM/Authentication.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/Authentication.c
rename to openair3/NAS/UE/EMM/Authentication.c
diff --git a/openair-cn/NAS/UE/EMM/Detach.c b/openair3/NAS/UE/EMM/Detach.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/Detach.c
rename to openair3/NAS/UE/EMM/Detach.c
diff --git a/openair-cn/NAS/UE/EMM/EmmStatusHdl.c b/openair3/NAS/UE/EMM/EmmStatusHdl.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/EmmStatusHdl.c
rename to openair3/NAS/UE/EMM/EmmStatusHdl.c
diff --git a/openair-cn/NAS/UE/EMM/Identification.c b/openair3/NAS/UE/EMM/Identification.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/Identification.c
rename to openair3/NAS/UE/EMM/Identification.c
diff --git a/openair-cn/NAS/UE/EMM/IdleMode.c b/openair3/NAS/UE/EMM/IdleMode.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/IdleMode.c
rename to openair3/NAS/UE/EMM/IdleMode.c
diff --git a/openair-cn/NAS/UE/EMM/IdleMode.h b/openair3/NAS/UE/EMM/IdleMode.h
similarity index 100%
rename from openair-cn/NAS/UE/EMM/IdleMode.h
rename to openair3/NAS/UE/EMM/IdleMode.h
diff --git a/openair-cn/NAS/UE/EMM/LowerLayer.c b/openair3/NAS/UE/EMM/LowerLayer.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/LowerLayer.c
rename to openair3/NAS/UE/EMM/LowerLayer.c
diff --git a/openair-cn/NAS/UE/EMM/LowerLayer.h b/openair3/NAS/UE/EMM/LowerLayer.h
similarity index 100%
rename from openair-cn/NAS/UE/EMM/LowerLayer.h
rename to openair3/NAS/UE/EMM/LowerLayer.h
diff --git a/openair-cn/NAS/UE/EMM/SAP/COPYING b/openair3/NAS/UE/EMM/SAP/COPYING
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/COPYING
rename to openair3/NAS/UE/EMM/SAP/COPYING
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmDeregistered.c b/openair3/NAS/UE/EMM/SAP/EmmDeregistered.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmDeregistered.c
rename to openair3/NAS/UE/EMM/SAP/EmmDeregistered.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmDeregisteredAttachNeeded.c b/openair3/NAS/UE/EMM/SAP/EmmDeregisteredAttachNeeded.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmDeregisteredAttachNeeded.c
rename to openair3/NAS/UE/EMM/SAP/EmmDeregisteredAttachNeeded.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmDeregisteredAttemptingToAttach.c b/openair3/NAS/UE/EMM/SAP/EmmDeregisteredAttemptingToAttach.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmDeregisteredAttemptingToAttach.c
rename to openair3/NAS/UE/EMM/SAP/EmmDeregisteredAttemptingToAttach.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmDeregisteredInitiated.c b/openair3/NAS/UE/EMM/SAP/EmmDeregisteredInitiated.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmDeregisteredInitiated.c
rename to openair3/NAS/UE/EMM/SAP/EmmDeregisteredInitiated.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmDeregisteredLimitedService.c b/openair3/NAS/UE/EMM/SAP/EmmDeregisteredLimitedService.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmDeregisteredLimitedService.c
rename to openair3/NAS/UE/EMM/SAP/EmmDeregisteredLimitedService.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmDeregisteredNoCellAvailable.c b/openair3/NAS/UE/EMM/SAP/EmmDeregisteredNoCellAvailable.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmDeregisteredNoCellAvailable.c
rename to openair3/NAS/UE/EMM/SAP/EmmDeregisteredNoCellAvailable.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmDeregisteredNoImsi.c b/openair3/NAS/UE/EMM/SAP/EmmDeregisteredNoImsi.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmDeregisteredNoImsi.c
rename to openair3/NAS/UE/EMM/SAP/EmmDeregisteredNoImsi.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmDeregisteredNormalService.c b/openair3/NAS/UE/EMM/SAP/EmmDeregisteredNormalService.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmDeregisteredNormalService.c
rename to openair3/NAS/UE/EMM/SAP/EmmDeregisteredNormalService.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmDeregisteredPlmnSearch.c b/openair3/NAS/UE/EMM/SAP/EmmDeregisteredPlmnSearch.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmDeregisteredPlmnSearch.c
rename to openair3/NAS/UE/EMM/SAP/EmmDeregisteredPlmnSearch.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmNull.c b/openair3/NAS/UE/EMM/SAP/EmmNull.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmNull.c
rename to openair3/NAS/UE/EMM/SAP/EmmNull.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmRegistered.c b/openair3/NAS/UE/EMM/SAP/EmmRegistered.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmRegistered.c
rename to openair3/NAS/UE/EMM/SAP/EmmRegistered.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmRegisteredAttemptingToUpdate.c b/openair3/NAS/UE/EMM/SAP/EmmRegisteredAttemptingToUpdate.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmRegisteredAttemptingToUpdate.c
rename to openair3/NAS/UE/EMM/SAP/EmmRegisteredAttemptingToUpdate.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmRegisteredImsiDetachInitiated.c b/openair3/NAS/UE/EMM/SAP/EmmRegisteredImsiDetachInitiated.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmRegisteredImsiDetachInitiated.c
rename to openair3/NAS/UE/EMM/SAP/EmmRegisteredImsiDetachInitiated.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmRegisteredInitiated.c b/openair3/NAS/UE/EMM/SAP/EmmRegisteredInitiated.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmRegisteredInitiated.c
rename to openair3/NAS/UE/EMM/SAP/EmmRegisteredInitiated.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmRegisteredLimitedService.c b/openair3/NAS/UE/EMM/SAP/EmmRegisteredLimitedService.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmRegisteredLimitedService.c
rename to openair3/NAS/UE/EMM/SAP/EmmRegisteredLimitedService.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmRegisteredNoCellAvailable.c b/openair3/NAS/UE/EMM/SAP/EmmRegisteredNoCellAvailable.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmRegisteredNoCellAvailable.c
rename to openair3/NAS/UE/EMM/SAP/EmmRegisteredNoCellAvailable.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmRegisteredNormalService.c b/openair3/NAS/UE/EMM/SAP/EmmRegisteredNormalService.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmRegisteredNormalService.c
rename to openair3/NAS/UE/EMM/SAP/EmmRegisteredNormalService.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmRegisteredPlmnSearch.c b/openair3/NAS/UE/EMM/SAP/EmmRegisteredPlmnSearch.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmRegisteredPlmnSearch.c
rename to openair3/NAS/UE/EMM/SAP/EmmRegisteredPlmnSearch.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmRegisteredUpdateNeeded.c b/openair3/NAS/UE/EMM/SAP/EmmRegisteredUpdateNeeded.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmRegisteredUpdateNeeded.c
rename to openair3/NAS/UE/EMM/SAP/EmmRegisteredUpdateNeeded.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmServiceRequestInitiated.c b/openair3/NAS/UE/EMM/SAP/EmmServiceRequestInitiated.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmServiceRequestInitiated.c
rename to openair3/NAS/UE/EMM/SAP/EmmServiceRequestInitiated.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/EmmTrackingAreaUpdatingInitiated.c b/openair3/NAS/UE/EMM/SAP/EmmTrackingAreaUpdatingInitiated.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/EmmTrackingAreaUpdatingInitiated.c
rename to openair3/NAS/UE/EMM/SAP/EmmTrackingAreaUpdatingInitiated.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/emm_as.c b/openair3/NAS/UE/EMM/SAP/emm_as.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/emm_as.c
rename to openair3/NAS/UE/EMM/SAP/emm_as.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/emm_as.h b/openair3/NAS/UE/EMM/SAP/emm_as.h
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/emm_as.h
rename to openair3/NAS/UE/EMM/SAP/emm_as.h
diff --git a/openair-cn/NAS/UE/EMM/SAP/emm_asDef.h b/openair3/NAS/UE/EMM/SAP/emm_asDef.h
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/emm_asDef.h
rename to openair3/NAS/UE/EMM/SAP/emm_asDef.h
diff --git a/openair-cn/NAS/UE/EMM/SAP/emm_esm.c b/openair3/NAS/UE/EMM/SAP/emm_esm.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/emm_esm.c
rename to openair3/NAS/UE/EMM/SAP/emm_esm.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/emm_esm.h b/openair3/NAS/UE/EMM/SAP/emm_esm.h
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/emm_esm.h
rename to openair3/NAS/UE/EMM/SAP/emm_esm.h
diff --git a/openair-cn/NAS/UE/EMM/SAP/emm_esmDef.h b/openair3/NAS/UE/EMM/SAP/emm_esmDef.h
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/emm_esmDef.h
rename to openair3/NAS/UE/EMM/SAP/emm_esmDef.h
diff --git a/openair-cn/NAS/UE/EMM/SAP/emm_fsm.c b/openair3/NAS/UE/EMM/SAP/emm_fsm.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/emm_fsm.c
rename to openair3/NAS/UE/EMM/SAP/emm_fsm.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/emm_fsm.h b/openair3/NAS/UE/EMM/SAP/emm_fsm.h
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/emm_fsm.h
rename to openair3/NAS/UE/EMM/SAP/emm_fsm.h
diff --git a/openair-cn/NAS/UE/EMM/SAP/emm_recv.c b/openair3/NAS/UE/EMM/SAP/emm_recv.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/emm_recv.c
rename to openair3/NAS/UE/EMM/SAP/emm_recv.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/emm_recv.h b/openair3/NAS/UE/EMM/SAP/emm_recv.h
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/emm_recv.h
rename to openair3/NAS/UE/EMM/SAP/emm_recv.h
diff --git a/openair-cn/NAS/UE/EMM/SAP/emm_reg.c b/openair3/NAS/UE/EMM/SAP/emm_reg.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/emm_reg.c
rename to openair3/NAS/UE/EMM/SAP/emm_reg.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/emm_reg.h b/openair3/NAS/UE/EMM/SAP/emm_reg.h
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/emm_reg.h
rename to openair3/NAS/UE/EMM/SAP/emm_reg.h
diff --git a/openair-cn/NAS/UE/EMM/SAP/emm_regDef.h b/openair3/NAS/UE/EMM/SAP/emm_regDef.h
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/emm_regDef.h
rename to openair3/NAS/UE/EMM/SAP/emm_regDef.h
diff --git a/openair-cn/NAS/UE/EMM/SAP/emm_sap.c b/openair3/NAS/UE/EMM/SAP/emm_sap.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/emm_sap.c
rename to openair3/NAS/UE/EMM/SAP/emm_sap.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/emm_sap.h b/openair3/NAS/UE/EMM/SAP/emm_sap.h
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/emm_sap.h
rename to openair3/NAS/UE/EMM/SAP/emm_sap.h
diff --git a/openair-cn/NAS/UE/EMM/SAP/emm_send.c b/openair3/NAS/UE/EMM/SAP/emm_send.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/emm_send.c
rename to openair3/NAS/UE/EMM/SAP/emm_send.c
diff --git a/openair-cn/NAS/UE/EMM/SAP/emm_send.h b/openair3/NAS/UE/EMM/SAP/emm_send.h
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SAP/emm_send.h
rename to openair3/NAS/UE/EMM/SAP/emm_send.h
diff --git a/openair-cn/NAS/UE/EMM/SecurityModeControl.c b/openair3/NAS/UE/EMM/SecurityModeControl.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/SecurityModeControl.c
rename to openair3/NAS/UE/EMM/SecurityModeControl.c
diff --git a/openair-cn/NAS/UE/EMM/ServiceRequestHdl.c b/openair3/NAS/UE/EMM/ServiceRequestHdl.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/ServiceRequestHdl.c
rename to openair3/NAS/UE/EMM/ServiceRequestHdl.c
diff --git a/openair-cn/NAS/UE/EMM/TrackingAreaUpdate.c b/openair3/NAS/UE/EMM/TrackingAreaUpdate.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/TrackingAreaUpdate.c
rename to openair3/NAS/UE/EMM/TrackingAreaUpdate.c
diff --git a/openair-cn/NAS/UE/EMM/emmData.h b/openair3/NAS/UE/EMM/emmData.h
similarity index 100%
rename from openair-cn/NAS/UE/EMM/emmData.h
rename to openair3/NAS/UE/EMM/emmData.h
diff --git a/openair-cn/NAS/UE/EMM/emm_main.c b/openair3/NAS/UE/EMM/emm_main.c
similarity index 100%
rename from openair-cn/NAS/UE/EMM/emm_main.c
rename to openair3/NAS/UE/EMM/emm_main.c
diff --git a/openair-cn/NAS/UE/EMM/emm_main.h b/openair3/NAS/UE/EMM/emm_main.h
similarity index 100%
rename from openair-cn/NAS/UE/EMM/emm_main.h
rename to openair3/NAS/UE/EMM/emm_main.h
diff --git a/openair-cn/NAS/UE/EMM/emm_proc.h b/openair3/NAS/UE/EMM/emm_proc.h
similarity index 100%
rename from openair-cn/NAS/UE/EMM/emm_proc.h
rename to openair3/NAS/UE/EMM/emm_proc.h
diff --git a/openair-cn/NAS/UE/ESM/DedicatedEpsBearerContextActivation.c b/openair3/NAS/UE/ESM/DedicatedEpsBearerContextActivation.c
similarity index 100%
rename from openair-cn/NAS/UE/ESM/DedicatedEpsBearerContextActivation.c
rename to openair3/NAS/UE/ESM/DedicatedEpsBearerContextActivation.c
diff --git a/openair-cn/NAS/UE/ESM/DefaultEpsBearerContextActivation.c b/openair3/NAS/UE/ESM/DefaultEpsBearerContextActivation.c
similarity index 100%
rename from openair-cn/NAS/UE/ESM/DefaultEpsBearerContextActivation.c
rename to openair3/NAS/UE/ESM/DefaultEpsBearerContextActivation.c
diff --git a/openair-cn/NAS/UE/ESM/EpsBearerContextDeactivation.c b/openair3/NAS/UE/ESM/EpsBearerContextDeactivation.c
similarity index 100%
rename from openair-cn/NAS/UE/ESM/EpsBearerContextDeactivation.c
rename to openair3/NAS/UE/ESM/EpsBearerContextDeactivation.c
diff --git a/openair-cn/NAS/UE/ESM/EsmStatusHdl.c b/openair3/NAS/UE/ESM/EsmStatusHdl.c
similarity index 100%
rename from openair-cn/NAS/UE/ESM/EsmStatusHdl.c
rename to openair3/NAS/UE/ESM/EsmStatusHdl.c
diff --git a/openair-cn/NAS/UE/ESM/PdnConnectivity.c b/openair3/NAS/UE/ESM/PdnConnectivity.c
similarity index 100%
rename from openair-cn/NAS/UE/ESM/PdnConnectivity.c
rename to openair3/NAS/UE/ESM/PdnConnectivity.c
diff --git a/openair-cn/NAS/UE/ESM/PdnDisconnect.c b/openair3/NAS/UE/ESM/PdnDisconnect.c
similarity index 100%
rename from openair-cn/NAS/UE/ESM/PdnDisconnect.c
rename to openair3/NAS/UE/ESM/PdnDisconnect.c
diff --git a/openair-cn/NAS/UE/ESM/SAP/COPYING b/openair3/NAS/UE/ESM/SAP/COPYING
similarity index 100%
rename from openair-cn/NAS/UE/ESM/SAP/COPYING
rename to openair3/NAS/UE/ESM/SAP/COPYING
diff --git a/openair-cn/NAS/UE/ESM/SAP/esm_recv.c b/openair3/NAS/UE/ESM/SAP/esm_recv.c
similarity index 100%
rename from openair-cn/NAS/UE/ESM/SAP/esm_recv.c
rename to openair3/NAS/UE/ESM/SAP/esm_recv.c
diff --git a/openair-cn/NAS/UE/ESM/SAP/esm_recv.h b/openair3/NAS/UE/ESM/SAP/esm_recv.h
similarity index 100%
rename from openair-cn/NAS/UE/ESM/SAP/esm_recv.h
rename to openair3/NAS/UE/ESM/SAP/esm_recv.h
diff --git a/openair-cn/NAS/UE/ESM/SAP/esm_sap.c b/openair3/NAS/UE/ESM/SAP/esm_sap.c
similarity index 100%
rename from openair-cn/NAS/UE/ESM/SAP/esm_sap.c
rename to openair3/NAS/UE/ESM/SAP/esm_sap.c
diff --git a/openair-cn/NAS/UE/ESM/SAP/esm_sap.h b/openair3/NAS/UE/ESM/SAP/esm_sap.h
similarity index 100%
rename from openair-cn/NAS/UE/ESM/SAP/esm_sap.h
rename to openair3/NAS/UE/ESM/SAP/esm_sap.h
diff --git a/openair-cn/NAS/UE/ESM/SAP/esm_sapDef.h b/openair3/NAS/UE/ESM/SAP/esm_sapDef.h
similarity index 100%
rename from openair-cn/NAS/UE/ESM/SAP/esm_sapDef.h
rename to openair3/NAS/UE/ESM/SAP/esm_sapDef.h
diff --git a/openair-cn/NAS/UE/ESM/SAP/esm_send.c b/openair3/NAS/UE/ESM/SAP/esm_send.c
similarity index 100%
rename from openair-cn/NAS/UE/ESM/SAP/esm_send.c
rename to openair3/NAS/UE/ESM/SAP/esm_send.c
diff --git a/openair-cn/NAS/UE/ESM/SAP/esm_send.h b/openair3/NAS/UE/ESM/SAP/esm_send.h
similarity index 100%
rename from openair-cn/NAS/UE/ESM/SAP/esm_send.h
rename to openair3/NAS/UE/ESM/SAP/esm_send.h
diff --git a/openair-cn/NAS/UE/ESM/esmData.h b/openair3/NAS/UE/ESM/esmData.h
similarity index 100%
rename from openair-cn/NAS/UE/ESM/esmData.h
rename to openair3/NAS/UE/ESM/esmData.h
diff --git a/openair-cn/NAS/UE/ESM/esm_ebr.c b/openair3/NAS/UE/ESM/esm_ebr.c
similarity index 100%
rename from openair-cn/NAS/UE/ESM/esm_ebr.c
rename to openair3/NAS/UE/ESM/esm_ebr.c
diff --git a/openair-cn/NAS/UE/ESM/esm_ebr.h b/openair3/NAS/UE/ESM/esm_ebr.h
similarity index 100%
rename from openair-cn/NAS/UE/ESM/esm_ebr.h
rename to openair3/NAS/UE/ESM/esm_ebr.h
diff --git a/openair-cn/NAS/UE/ESM/esm_ebr_context.c b/openair3/NAS/UE/ESM/esm_ebr_context.c
similarity index 100%
rename from openair-cn/NAS/UE/ESM/esm_ebr_context.c
rename to openair3/NAS/UE/ESM/esm_ebr_context.c
diff --git a/openair-cn/NAS/UE/ESM/esm_ebr_context.h b/openair3/NAS/UE/ESM/esm_ebr_context.h
similarity index 100%
rename from openair-cn/NAS/UE/ESM/esm_ebr_context.h
rename to openair3/NAS/UE/ESM/esm_ebr_context.h
diff --git a/openair-cn/NAS/UE/ESM/esm_ip.c b/openair3/NAS/UE/ESM/esm_ip.c
similarity index 100%
rename from openair-cn/NAS/UE/ESM/esm_ip.c
rename to openair3/NAS/UE/ESM/esm_ip.c
diff --git a/openair-cn/NAS/UE/ESM/esm_main.c b/openair3/NAS/UE/ESM/esm_main.c
similarity index 100%
rename from openair-cn/NAS/UE/ESM/esm_main.c
rename to openair3/NAS/UE/ESM/esm_main.c
diff --git a/openair-cn/NAS/UE/ESM/esm_main.h b/openair3/NAS/UE/ESM/esm_main.h
similarity index 100%
rename from openair-cn/NAS/UE/ESM/esm_main.h
rename to openair3/NAS/UE/ESM/esm_main.h
diff --git a/openair-cn/NAS/UE/ESM/esm_proc.h b/openair3/NAS/UE/ESM/esm_proc.h
similarity index 100%
rename from openair-cn/NAS/UE/ESM/esm_proc.h
rename to openair3/NAS/UE/ESM/esm_proc.h
diff --git a/openair-cn/NAS/UE/ESM/esm_pt.c b/openair3/NAS/UE/ESM/esm_pt.c
similarity index 100%
rename from openair-cn/NAS/UE/ESM/esm_pt.c
rename to openair3/NAS/UE/ESM/esm_pt.c
diff --git a/openair-cn/NAS/UE/ESM/esm_pt.h b/openair3/NAS/UE/ESM/esm_pt.h
similarity index 100%
rename from openair-cn/NAS/UE/ESM/esm_pt.h
rename to openair3/NAS/UE/ESM/esm_pt.h
diff --git a/openair-cn/NAS/UE/UEprocess.c b/openair3/NAS/UE/UEprocess.c
similarity index 100%
rename from openair-cn/NAS/UE/UEprocess.c
rename to openair3/NAS/UE/UEprocess.c
diff --git a/openair-cn/NAS/UE/nas_itti_messaging.c b/openair3/NAS/UE/nas_itti_messaging.c
similarity index 100%
rename from openair-cn/NAS/UE/nas_itti_messaging.c
rename to openair3/NAS/UE/nas_itti_messaging.c
diff --git a/openair-cn/NAS/UE/nas_itti_messaging.h b/openair3/NAS/UE/nas_itti_messaging.h
similarity index 100%
rename from openair-cn/NAS/UE/nas_itti_messaging.h
rename to openair3/NAS/UE/nas_itti_messaging.h
diff --git a/openair-cn/NAS/UE/nas_network.c b/openair3/NAS/UE/nas_network.c
similarity index 100%
rename from openair-cn/NAS/UE/nas_network.c
rename to openair3/NAS/UE/nas_network.c
diff --git a/openair-cn/NAS/UE/nas_network.h b/openair3/NAS/UE/nas_network.h
similarity index 100%
rename from openair-cn/NAS/UE/nas_network.h
rename to openair3/NAS/UE/nas_network.h
diff --git a/openair-cn/NAS/UE/nas_parser.c b/openair3/NAS/UE/nas_parser.c
similarity index 100%
rename from openair-cn/NAS/UE/nas_parser.c
rename to openair3/NAS/UE/nas_parser.c
diff --git a/openair-cn/NAS/UE/nas_parser.h b/openair3/NAS/UE/nas_parser.h
similarity index 100%
rename from openair-cn/NAS/UE/nas_parser.h
rename to openair3/NAS/UE/nas_parser.h
diff --git a/openair-cn/NAS/UE/nas_proc.c b/openair3/NAS/UE/nas_proc.c
similarity index 100%
rename from openair-cn/NAS/UE/nas_proc.c
rename to openair3/NAS/UE/nas_proc.c
diff --git a/openair-cn/NAS/UE/nas_proc.h b/openair3/NAS/UE/nas_proc.h
similarity index 100%
rename from openair-cn/NAS/UE/nas_proc.h
rename to openair3/NAS/UE/nas_proc.h
diff --git a/openair-cn/NAS/UE/nas_ue_task.c b/openair3/NAS/UE/nas_ue_task.c
similarity index 100%
rename from openair-cn/NAS/UE/nas_ue_task.c
rename to openair3/NAS/UE/nas_ue_task.c
diff --git a/openair-cn/NAS/UE/nas_user.c b/openair3/NAS/UE/nas_user.c
similarity index 100%
rename from openair-cn/NAS/UE/nas_user.c
rename to openair3/NAS/UE/nas_user.c
diff --git a/openair-cn/NAS/UE/nas_user.h b/openair3/NAS/UE/nas_user.h
similarity index 100%
rename from openair-cn/NAS/UE/nas_user.h
rename to openair3/NAS/UE/nas_user.h
diff --git a/openair-cn/S1AP/COPYING b/openair3/S1AP/COPYING
similarity index 100%
rename from openair-cn/S1AP/COPYING
rename to openair3/S1AP/COPYING
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/COPYING b/openair3/S1AP/MESSAGES/ASN1/COPYING
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/COPYING
rename to openair3/S1AP/MESSAGES/ASN1/COPYING
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/COPYING b/openair3/S1AP/MESSAGES/ASN1/R10.5/COPYING
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R10.5/COPYING
rename to openair3/S1AP/MESSAGES/ASN1/R10.5/COPYING
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-CommonDataTypes.asn b/openair3/S1AP/MESSAGES/ASN1/R10.5/S1AP-CommonDataTypes.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-CommonDataTypes.asn
rename to openair3/S1AP/MESSAGES/ASN1/R10.5/S1AP-CommonDataTypes.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-Constants.asn b/openair3/S1AP/MESSAGES/ASN1/R10.5/S1AP-Constants.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-Constants.asn
rename to openair3/S1AP/MESSAGES/ASN1/R10.5/S1AP-Constants.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-Containers.asn b/openair3/S1AP/MESSAGES/ASN1/R10.5/S1AP-Containers.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-Containers.asn
rename to openair3/S1AP/MESSAGES/ASN1/R10.5/S1AP-Containers.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-IEs.asn b/openair3/S1AP/MESSAGES/ASN1/R10.5/S1AP-IEs.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-IEs.asn
rename to openair3/S1AP/MESSAGES/ASN1/R10.5/S1AP-IEs.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU-Contents.asn b/openair3/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU-Contents.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU-Contents.asn
rename to openair3/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU-Contents.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU-Descriptions.asn b/openair3/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU-Descriptions.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU-Descriptions.asn
rename to openair3/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU-Descriptions.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU.asn b/openair3/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU.asn
rename to openair3/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R8.10/COPYING b/openair3/S1AP/MESSAGES/ASN1/R8.10/COPYING
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R8.10/COPYING
rename to openair3/S1AP/MESSAGES/ASN1/R8.10/COPYING
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R8.10/S1AP-CommonDataTypes.asn b/openair3/S1AP/MESSAGES/ASN1/R8.10/S1AP-CommonDataTypes.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R8.10/S1AP-CommonDataTypes.asn
rename to openair3/S1AP/MESSAGES/ASN1/R8.10/S1AP-CommonDataTypes.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R8.10/S1AP-Constants.asn b/openair3/S1AP/MESSAGES/ASN1/R8.10/S1AP-Constants.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R8.10/S1AP-Constants.asn
rename to openair3/S1AP/MESSAGES/ASN1/R8.10/S1AP-Constants.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R8.10/S1AP-IEs.asn b/openair3/S1AP/MESSAGES/ASN1/R8.10/S1AP-IEs.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R8.10/S1AP-IEs.asn
rename to openair3/S1AP/MESSAGES/ASN1/R8.10/S1AP-IEs.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R8.10/S1AP-PDU-Contents.asn b/openair3/S1AP/MESSAGES/ASN1/R8.10/S1AP-PDU-Contents.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R8.10/S1AP-PDU-Contents.asn
rename to openair3/S1AP/MESSAGES/ASN1/R8.10/S1AP-PDU-Contents.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R8.10/S1AP-PDU.asn b/openair3/S1AP/MESSAGES/ASN1/R8.10/S1AP-PDU.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R8.10/S1AP-PDU.asn
rename to openair3/S1AP/MESSAGES/ASN1/R8.10/S1AP-PDU.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R9.8/COPYING b/openair3/S1AP/MESSAGES/ASN1/R9.8/COPYING
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R9.8/COPYING
rename to openair3/S1AP/MESSAGES/ASN1/R9.8/COPYING
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R9.8/S1AP-CommonDataTypes.asn b/openair3/S1AP/MESSAGES/ASN1/R9.8/S1AP-CommonDataTypes.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R9.8/S1AP-CommonDataTypes.asn
rename to openair3/S1AP/MESSAGES/ASN1/R9.8/S1AP-CommonDataTypes.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R9.8/S1AP-Constants.asn b/openair3/S1AP/MESSAGES/ASN1/R9.8/S1AP-Constants.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R9.8/S1AP-Constants.asn
rename to openair3/S1AP/MESSAGES/ASN1/R9.8/S1AP-Constants.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R9.8/S1AP-Containers.asn b/openair3/S1AP/MESSAGES/ASN1/R9.8/S1AP-Containers.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R9.8/S1AP-Containers.asn
rename to openair3/S1AP/MESSAGES/ASN1/R9.8/S1AP-Containers.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R9.8/S1AP-IEs.asn b/openair3/S1AP/MESSAGES/ASN1/R9.8/S1AP-IEs.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R9.8/S1AP-IEs.asn
rename to openair3/S1AP/MESSAGES/ASN1/R9.8/S1AP-IEs.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R9.8/S1AP-PDU-Contents.asn b/openair3/S1AP/MESSAGES/ASN1/R9.8/S1AP-PDU-Contents.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R9.8/S1AP-PDU-Contents.asn
rename to openair3/S1AP/MESSAGES/ASN1/R9.8/S1AP-PDU-Contents.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R9.8/S1AP-PDU-Descriptions.asn b/openair3/S1AP/MESSAGES/ASN1/R9.8/S1AP-PDU-Descriptions.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R9.8/S1AP-PDU-Descriptions.asn
rename to openair3/S1AP/MESSAGES/ASN1/R9.8/S1AP-PDU-Descriptions.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R9.8/S1AP-PDU.asn b/openair3/S1AP/MESSAGES/ASN1/R9.8/S1AP-PDU.asn
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/R9.8/S1AP-PDU.asn
rename to openair3/S1AP/MESSAGES/ASN1/R9.8/S1AP-PDU.asn
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/README b/openair3/S1AP/MESSAGES/ASN1/README
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/README
rename to openair3/S1AP/MESSAGES/ASN1/README
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/asn1cpatch.p0 b/openair3/S1AP/MESSAGES/ASN1/asn1cpatch.p0
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/asn1cpatch.p0
rename to openair3/S1AP/MESSAGES/ASN1/asn1cpatch.p0
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/asn1cpatch_2.p0 b/openair3/S1AP/MESSAGES/ASN1/asn1cpatch_2.p0
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/asn1cpatch_2.p0
rename to openair3/S1AP/MESSAGES/ASN1/asn1cpatch_2.p0
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/asn1tostruct.py b/openair3/S1AP/MESSAGES/ASN1/asn1tostruct.py
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/ASN1/asn1tostruct.py
rename to openair3/S1AP/MESSAGES/ASN1/asn1tostruct.py
diff --git a/openair-cn/S1AP/MESSAGES/COPYING b/openair3/S1AP/MESSAGES/COPYING
similarity index 100%
rename from openair-cn/S1AP/MESSAGES/COPYING
rename to openair3/S1AP/MESSAGES/COPYING
diff --git a/openair-cn/S1AP/s1ap_common.c b/openair3/S1AP/s1ap_common.c
similarity index 100%
rename from openair-cn/S1AP/s1ap_common.c
rename to openair3/S1AP/s1ap_common.c
diff --git a/openair-cn/S1AP/s1ap_common.h b/openair3/S1AP/s1ap_common.h
similarity index 100%
rename from openair-cn/S1AP/s1ap_common.h
rename to openair3/S1AP/s1ap_common.h
diff --git a/openair-cn/S1AP/s1ap_eNB.c b/openair3/S1AP/s1ap_eNB.c
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB.c
rename to openair3/S1AP/s1ap_eNB.c
diff --git a/openair-cn/S1AP/s1ap_eNB.h b/openair3/S1AP/s1ap_eNB.h
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB.h
rename to openair3/S1AP/s1ap_eNB.h
diff --git a/openair-cn/S1AP/s1ap_eNB_context_management_procedures.c b/openair3/S1AP/s1ap_eNB_context_management_procedures.c
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_context_management_procedures.c
rename to openair3/S1AP/s1ap_eNB_context_management_procedures.c
diff --git a/openair-cn/S1AP/s1ap_eNB_context_management_procedures.h b/openair3/S1AP/s1ap_eNB_context_management_procedures.h
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_context_management_procedures.h
rename to openair3/S1AP/s1ap_eNB_context_management_procedures.h
diff --git a/openair-cn/S1AP/s1ap_eNB_decoder.c b/openair3/S1AP/s1ap_eNB_decoder.c
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_decoder.c
rename to openair3/S1AP/s1ap_eNB_decoder.c
diff --git a/openair-cn/S1AP/s1ap_eNB_decoder.h b/openair3/S1AP/s1ap_eNB_decoder.h
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_decoder.h
rename to openair3/S1AP/s1ap_eNB_decoder.h
diff --git a/openair-cn/S1AP/s1ap_eNB_default_values.h b/openair3/S1AP/s1ap_eNB_default_values.h
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_default_values.h
rename to openair3/S1AP/s1ap_eNB_default_values.h
diff --git a/openair-cn/S1AP/s1ap_eNB_defs.h b/openair3/S1AP/s1ap_eNB_defs.h
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_defs.h
rename to openair3/S1AP/s1ap_eNB_defs.h
diff --git a/openair-cn/S1AP/s1ap_eNB_encoder.c b/openair3/S1AP/s1ap_eNB_encoder.c
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_encoder.c
rename to openair3/S1AP/s1ap_eNB_encoder.c
diff --git a/openair-cn/S1AP/s1ap_eNB_encoder.h b/openair3/S1AP/s1ap_eNB_encoder.h
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_encoder.h
rename to openair3/S1AP/s1ap_eNB_encoder.h
diff --git a/openair-cn/S1AP/s1ap_eNB_handlers.c b/openair3/S1AP/s1ap_eNB_handlers.c
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_handlers.c
rename to openair3/S1AP/s1ap_eNB_handlers.c
diff --git a/openair-cn/S1AP/s1ap_eNB_handlers.h b/openair3/S1AP/s1ap_eNB_handlers.h
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_handlers.h
rename to openair3/S1AP/s1ap_eNB_handlers.h
diff --git a/openair-cn/S1AP/s1ap_eNB_itti_messaging.c b/openair3/S1AP/s1ap_eNB_itti_messaging.c
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_itti_messaging.c
rename to openair3/S1AP/s1ap_eNB_itti_messaging.c
diff --git a/openair-cn/S1AP/s1ap_eNB_itti_messaging.h b/openair3/S1AP/s1ap_eNB_itti_messaging.h
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_itti_messaging.h
rename to openair3/S1AP/s1ap_eNB_itti_messaging.h
diff --git a/openair-cn/S1AP/s1ap_eNB_management_procedures.c b/openair3/S1AP/s1ap_eNB_management_procedures.c
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_management_procedures.c
rename to openair3/S1AP/s1ap_eNB_management_procedures.c
diff --git a/openair-cn/S1AP/s1ap_eNB_management_procedures.h b/openair3/S1AP/s1ap_eNB_management_procedures.h
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_management_procedures.h
rename to openair3/S1AP/s1ap_eNB_management_procedures.h
diff --git a/openair-cn/S1AP/s1ap_eNB_nas_procedures.c b/openair3/S1AP/s1ap_eNB_nas_procedures.c
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_nas_procedures.c
rename to openair3/S1AP/s1ap_eNB_nas_procedures.c
diff --git a/openair-cn/S1AP/s1ap_eNB_nas_procedures.h b/openair3/S1AP/s1ap_eNB_nas_procedures.h
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_nas_procedures.h
rename to openair3/S1AP/s1ap_eNB_nas_procedures.h
diff --git a/openair-cn/S1AP/s1ap_eNB_nnsf.c b/openair3/S1AP/s1ap_eNB_nnsf.c
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_nnsf.c
rename to openair3/S1AP/s1ap_eNB_nnsf.c
diff --git a/openair-cn/S1AP/s1ap_eNB_nnsf.h b/openair3/S1AP/s1ap_eNB_nnsf.h
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_nnsf.h
rename to openair3/S1AP/s1ap_eNB_nnsf.h
diff --git a/openair-cn/S1AP/s1ap_eNB_overload.c b/openair3/S1AP/s1ap_eNB_overload.c
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_overload.c
rename to openair3/S1AP/s1ap_eNB_overload.c
diff --git a/openair-cn/S1AP/s1ap_eNB_overload.h b/openair3/S1AP/s1ap_eNB_overload.h
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_overload.h
rename to openair3/S1AP/s1ap_eNB_overload.h
diff --git a/openair-cn/S1AP/s1ap_eNB_trace.c b/openair3/S1AP/s1ap_eNB_trace.c
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_trace.c
rename to openair3/S1AP/s1ap_eNB_trace.c
diff --git a/openair-cn/S1AP/s1ap_eNB_trace.h b/openair3/S1AP/s1ap_eNB_trace.h
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_trace.h
rename to openair3/S1AP/s1ap_eNB_trace.h
diff --git a/openair-cn/S1AP/s1ap_eNB_ue_context.c b/openair3/S1AP/s1ap_eNB_ue_context.c
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_ue_context.c
rename to openair3/S1AP/s1ap_eNB_ue_context.c
diff --git a/openair-cn/S1AP/s1ap_eNB_ue_context.h b/openair3/S1AP/s1ap_eNB_ue_context.h
similarity index 100%
rename from openair-cn/S1AP/s1ap_eNB_ue_context.h
rename to openair3/S1AP/s1ap_eNB_ue_context.h
diff --git a/openair-cn/SCTP/COPYING b/openair3/SCTP/COPYING
similarity index 100%
rename from openair-cn/SCTP/COPYING
rename to openair3/SCTP/COPYING
diff --git a/openair-cn/SCTP/sctp_common.c b/openair3/SCTP/sctp_common.c
similarity index 100%
rename from openair-cn/SCTP/sctp_common.c
rename to openair3/SCTP/sctp_common.c
diff --git a/openair-cn/SCTP/sctp_common.h b/openair3/SCTP/sctp_common.h
similarity index 100%
rename from openair-cn/SCTP/sctp_common.h
rename to openair3/SCTP/sctp_common.h
diff --git a/openair-cn/SCTP/sctp_default_values.h b/openair3/SCTP/sctp_default_values.h
similarity index 100%
rename from openair-cn/SCTP/sctp_default_values.h
rename to openair3/SCTP/sctp_default_values.h
diff --git a/openair-cn/SCTP/sctp_eNB_defs.h b/openair3/SCTP/sctp_eNB_defs.h
similarity index 100%
rename from openair-cn/SCTP/sctp_eNB_defs.h
rename to openair3/SCTP/sctp_eNB_defs.h
diff --git a/openair-cn/SCTP/sctp_eNB_itti_messaging.c b/openair3/SCTP/sctp_eNB_itti_messaging.c
similarity index 100%
rename from openair-cn/SCTP/sctp_eNB_itti_messaging.c
rename to openair3/SCTP/sctp_eNB_itti_messaging.c
diff --git a/openair-cn/SCTP/sctp_eNB_itti_messaging.h b/openair3/SCTP/sctp_eNB_itti_messaging.h
similarity index 100%
rename from openair-cn/SCTP/sctp_eNB_itti_messaging.h
rename to openair3/SCTP/sctp_eNB_itti_messaging.h
diff --git a/openair-cn/SCTP/sctp_eNB_task.c b/openair3/SCTP/sctp_eNB_task.c
similarity index 100%
rename from openair-cn/SCTP/sctp_eNB_task.c
rename to openair3/SCTP/sctp_eNB_task.c
diff --git a/openair-cn/SCTP/sctp_eNB_task.h b/openair3/SCTP/sctp_eNB_task.h
similarity index 100%
rename from openair-cn/SCTP/sctp_eNB_task.h
rename to openair3/SCTP/sctp_eNB_task.h
diff --git a/openair-cn/SCTP/sctp_primitives_client.c b/openair3/SCTP/sctp_primitives_client.c
similarity index 100%
rename from openair-cn/SCTP/sctp_primitives_client.c
rename to openair3/SCTP/sctp_primitives_client.c
diff --git a/openair-cn/SCTP/sctp_primitives_client.h b/openair3/SCTP/sctp_primitives_client.h
similarity index 100%
rename from openair-cn/SCTP/sctp_primitives_client.h
rename to openair3/SCTP/sctp_primitives_client.h
diff --git a/openair-cn/SECU/COPYING b/openair3/SECU/COPYING
similarity index 100%
rename from openair-cn/SECU/COPYING
rename to openair3/SECU/COPYING
diff --git a/openair-cn/SECU/kdf.c b/openair3/SECU/kdf.c
similarity index 100%
rename from openair-cn/SECU/kdf.c
rename to openair3/SECU/kdf.c
diff --git a/openair-cn/SECU/key_nas_deriver.c b/openair3/SECU/key_nas_deriver.c
similarity index 100%
rename from openair-cn/SECU/key_nas_deriver.c
rename to openair3/SECU/key_nas_deriver.c
diff --git a/openair-cn/SECU/key_nas_encryption.c b/openair3/SECU/key_nas_encryption.c
similarity index 100%
rename from openair-cn/SECU/key_nas_encryption.c
rename to openair3/SECU/key_nas_encryption.c
diff --git a/openair-cn/SECU/nas_stream_eea1.c b/openair3/SECU/nas_stream_eea1.c
similarity index 100%
rename from openair-cn/SECU/nas_stream_eea1.c
rename to openair3/SECU/nas_stream_eea1.c
diff --git a/openair-cn/SECU/nas_stream_eea2.c b/openair3/SECU/nas_stream_eea2.c
similarity index 100%
rename from openair-cn/SECU/nas_stream_eea2.c
rename to openair3/SECU/nas_stream_eea2.c
diff --git a/openair-cn/SECU/nas_stream_eia1.c b/openair3/SECU/nas_stream_eia1.c
similarity index 100%
rename from openair-cn/SECU/nas_stream_eia1.c
rename to openair3/SECU/nas_stream_eia1.c
diff --git a/openair-cn/SECU/nas_stream_eia2.c b/openair3/SECU/nas_stream_eia2.c
similarity index 100%
rename from openair-cn/SECU/nas_stream_eia2.c
rename to openair3/SECU/nas_stream_eia2.c
diff --git a/openair-cn/SECU/rijndael.c b/openair3/SECU/rijndael.c
similarity index 100%
rename from openair-cn/SECU/rijndael.c
rename to openair3/SECU/rijndael.c
diff --git a/openair-cn/SECU/rijndael.h b/openair3/SECU/rijndael.h
similarity index 100%
rename from openair-cn/SECU/rijndael.h
rename to openair3/SECU/rijndael.h
diff --git a/openair-cn/SECU/secu_defs.h b/openair3/SECU/secu_defs.h
similarity index 100%
rename from openair-cn/SECU/secu_defs.h
rename to openair3/SECU/secu_defs.h
diff --git a/openair-cn/SECU/snow3g.c b/openair3/SECU/snow3g.c
similarity index 100%
rename from openair-cn/SECU/snow3g.c
rename to openair3/SECU/snow3g.c
diff --git a/openair-cn/SECU/snow3g.h b/openair3/SECU/snow3g.h
similarity index 100%
rename from openair-cn/SECU/snow3g.h
rename to openair3/SECU/snow3g.h
diff --git a/openair-cn/TEST/COPYING b/openair3/TEST/COPYING
similarity index 100%
rename from openair-cn/TEST/COPYING
rename to openair3/TEST/COPYING
diff --git a/openair-cn/TEST/EPC_TEST/TEST_1MME_1ENB_1UE_ATTACH_GUTI/enb1.conf b/openair3/TEST/EPC_TEST/TEST_1MME_1ENB_1UE_ATTACH_GUTI/enb1.conf
similarity index 100%
rename from openair-cn/TEST/EPC_TEST/TEST_1MME_1ENB_1UE_ATTACH_GUTI/enb1.conf
rename to openair3/TEST/EPC_TEST/TEST_1MME_1ENB_1UE_ATTACH_GUTI/enb1.conf
diff --git a/openair-cn/TEST/EPC_TEST/TEST_1MME_1ENB_1UE_ATTACH_GUTI/trace.pdml b/openair3/TEST/EPC_TEST/TEST_1MME_1ENB_1UE_ATTACH_GUTI/trace.pdml
similarity index 100%
rename from openair-cn/TEST/EPC_TEST/TEST_1MME_1ENB_1UE_ATTACH_GUTI/trace.pdml
rename to openair3/TEST/EPC_TEST/TEST_1MME_1ENB_1UE_ATTACH_GUTI/trace.pdml
diff --git a/openair-cn/TEST/EPC_TEST/generate_scenario.c b/openair3/TEST/EPC_TEST/generate_scenario.c
similarity index 100%
rename from openair-cn/TEST/EPC_TEST/generate_scenario.c
rename to openair3/TEST/EPC_TEST/generate_scenario.c
diff --git a/openair-cn/TEST/EPC_TEST/mme_test_s1_pcap2pdml b/openair3/TEST/EPC_TEST/mme_test_s1_pcap2pdml
similarity index 100%
rename from openair-cn/TEST/EPC_TEST/mme_test_s1_pcap2pdml
rename to openair3/TEST/EPC_TEST/mme_test_s1_pcap2pdml
diff --git a/openair-cn/TEST/Makefile.am b/openair3/TEST/Makefile.am
similarity index 100%
rename from openair-cn/TEST/Makefile.am
rename to openair3/TEST/Makefile.am
diff --git a/openair-cn/TEST/oaisim_mme_client_test.c b/openair3/TEST/oaisim_mme_client_test.c
similarity index 100%
rename from openair-cn/TEST/oaisim_mme_client_test.c
rename to openair3/TEST/oaisim_mme_client_test.c
diff --git a/openair-cn/TEST/oaisim_mme_itti_test.c b/openair3/TEST/oaisim_mme_itti_test.c
similarity index 100%
rename from openair-cn/TEST/oaisim_mme_itti_test.c
rename to openair3/TEST/oaisim_mme_itti_test.c
diff --git a/openair-cn/TEST/oaisim_mme_list_benchmark.c b/openair3/TEST/oaisim_mme_list_benchmark.c
similarity index 100%
rename from openair-cn/TEST/oaisim_mme_list_benchmark.c
rename to openair3/TEST/oaisim_mme_list_benchmark.c
diff --git a/openair-cn/TEST/oaisim_mme_s1ap_test.c b/openair3/TEST/oaisim_mme_s1ap_test.c
similarity index 100%
rename from openair-cn/TEST/oaisim_mme_s1ap_test.c
rename to openair3/TEST/oaisim_mme_s1ap_test.c
diff --git a/openair-cn/TEST/oaisim_mme_sctp_test.c b/openair3/TEST/oaisim_mme_sctp_test.c
similarity index 100%
rename from openair-cn/TEST/oaisim_mme_sctp_test.c
rename to openair3/TEST/oaisim_mme_sctp_test.c
diff --git a/openair-cn/TEST/oaisim_mme_test_s1c.c b/openair3/TEST/oaisim_mme_test_s1c.c
similarity index 100%
rename from openair-cn/TEST/oaisim_mme_test_s1c.c
rename to openair3/TEST/oaisim_mme_test_s1c.c
diff --git a/openair-cn/TEST/oaisim_mme_test_s1c.h b/openair3/TEST/oaisim_mme_test_s1c.h
similarity index 100%
rename from openair-cn/TEST/oaisim_mme_test_s1c.h
rename to openair3/TEST/oaisim_mme_test_s1c.h
diff --git a/openair-cn/TEST/oaisim_mme_test_s1c_s1ap.c b/openair3/TEST/oaisim_mme_test_s1c_s1ap.c
similarity index 100%
rename from openair-cn/TEST/oaisim_mme_test_s1c_s1ap.c
rename to openair3/TEST/oaisim_mme_test_s1c_s1ap.c
diff --git a/openair-cn/TEST/oaisim_mme_test_s1c_s1ap.h b/openair3/TEST/oaisim_mme_test_s1c_s1ap.h
similarity index 100%
rename from openair-cn/TEST/oaisim_mme_test_s1c_s1ap.h
rename to openair3/TEST/oaisim_mme_test_s1c_s1ap.h
diff --git a/openair-cn/TEST/oaisim_mme_test_s1c_scenario.c b/openair3/TEST/oaisim_mme_test_s1c_scenario.c
similarity index 100%
rename from openair-cn/TEST/oaisim_mme_test_s1c_scenario.c
rename to openair3/TEST/oaisim_mme_test_s1c_scenario.c
diff --git a/openair-cn/TEST/oaisim_mme_test_s1c_scenario.h b/openair3/TEST/oaisim_mme_test_s1c_scenario.h
similarity index 100%
rename from openair-cn/TEST/oaisim_mme_test_s1c_scenario.h
rename to openair3/TEST/oaisim_mme_test_s1c_scenario.h
diff --git a/openair-cn/TEST/oaisim_mme_test_s1c_scenario1.c b/openair3/TEST/oaisim_mme_test_s1c_scenario1.c
similarity index 100%
rename from openair-cn/TEST/oaisim_mme_test_s1c_scenario1.c
rename to openair3/TEST/oaisim_mme_test_s1c_scenario1.c
diff --git a/openair-cn/TEST/test_aes128_cmac_encrypt.c b/openair3/TEST/test_aes128_cmac_encrypt.c
similarity index 100%
rename from openair-cn/TEST/test_aes128_cmac_encrypt.c
rename to openair3/TEST/test_aes128_cmac_encrypt.c
diff --git a/openair-cn/TEST/test_aes128_ctr_decrypt.c b/openair3/TEST/test_aes128_ctr_decrypt.c
similarity index 100%
rename from openair-cn/TEST/test_aes128_ctr_decrypt.c
rename to openair3/TEST/test_aes128_ctr_decrypt.c
diff --git a/openair-cn/TEST/test_aes128_ctr_encrypt.c b/openair3/TEST/test_aes128_ctr_encrypt.c
similarity index 100%
rename from openair-cn/TEST/test_aes128_ctr_encrypt.c
rename to openair3/TEST/test_aes128_ctr_encrypt.c
diff --git a/openair-cn/TEST/test_kdf.c b/openair3/TEST/test_kdf.c
similarity index 100%
rename from openair-cn/TEST/test_kdf.c
rename to openair3/TEST/test_kdf.c
diff --git a/openair-cn/TEST/test_s1ap.c b/openair3/TEST/test_s1ap.c
similarity index 100%
rename from openair-cn/TEST/test_s1ap.c
rename to openair3/TEST/test_s1ap.c
diff --git a/openair-cn/TEST/test_secu.c b/openair3/TEST/test_secu.c
similarity index 100%
rename from openair-cn/TEST/test_secu.c
rename to openair3/TEST/test_secu.c
diff --git a/openair-cn/TEST/test_secu_kenb.c b/openair3/TEST/test_secu_kenb.c
similarity index 100%
rename from openair-cn/TEST/test_secu_kenb.c
rename to openair3/TEST/test_secu_kenb.c
diff --git a/openair-cn/TEST/test_secu_knas.c b/openair3/TEST/test_secu_knas.c
similarity index 100%
rename from openair-cn/TEST/test_secu_knas.c
rename to openair3/TEST/test_secu_knas.c
diff --git a/openair-cn/TEST/test_secu_knas_encrypt_eea1.c b/openair3/TEST/test_secu_knas_encrypt_eea1.c
similarity index 100%
rename from openair-cn/TEST/test_secu_knas_encrypt_eea1.c
rename to openair3/TEST/test_secu_knas_encrypt_eea1.c
diff --git a/openair-cn/TEST/test_secu_knas_encrypt_eea2.c b/openair3/TEST/test_secu_knas_encrypt_eea2.c
similarity index 100%
rename from openair-cn/TEST/test_secu_knas_encrypt_eea2.c
rename to openair3/TEST/test_secu_knas_encrypt_eea2.c
diff --git a/openair-cn/TEST/test_secu_knas_encrypt_eia1.c b/openair3/TEST/test_secu_knas_encrypt_eia1.c
similarity index 100%
rename from openair-cn/TEST/test_secu_knas_encrypt_eia1.c
rename to openair3/TEST/test_secu_knas_encrypt_eia1.c
diff --git a/openair-cn/TEST/test_secu_knas_encrypt_eia2.c b/openair3/TEST/test_secu_knas_encrypt_eia2.c
similarity index 100%
rename from openair-cn/TEST/test_secu_knas_encrypt_eia2.c
rename to openair3/TEST/test_secu_knas_encrypt_eia2.c
diff --git a/openair-cn/TEST/test_secu_knas_stream_int.c b/openair3/TEST/test_secu_knas_stream_int.c
similarity index 100%
rename from openair-cn/TEST/test_secu_knas_stream_int.c
rename to openair3/TEST/test_secu_knas_stream_int.c
diff --git a/openair-cn/TEST/test_util.c b/openair3/TEST/test_util.c
similarity index 100%
rename from openair-cn/TEST/test_util.c
rename to openair3/TEST/test_util.c
diff --git a/openair-cn/TEST/test_util.h b/openair3/TEST/test_util.h
similarity index 100%
rename from openair-cn/TEST/test_util.h
rename to openair3/TEST/test_util.h
diff --git a/openair-cn/UDP/COPYING b/openair3/UDP/COPYING
similarity index 100%
rename from openair-cn/UDP/COPYING
rename to openair3/UDP/COPYING
diff --git a/openair-cn/UDP/udp_eNB_task.c b/openair3/UDP/udp_eNB_task.c
similarity index 100%
rename from openair-cn/UDP/udp_eNB_task.c
rename to openair3/UDP/udp_eNB_task.c
diff --git a/openair-cn/UDP/udp_eNB_task.h b/openair3/UDP/udp_eNB_task.h
similarity index 100%
rename from openair-cn/UDP/udp_eNB_task.h
rename to openair3/UDP/udp_eNB_task.h
diff --git a/openair-cn/UTILS/CONF/COPYING b/openair3/UTILS/CONF/COPYING
similarity index 100%
rename from openair-cn/UTILS/CONF/COPYING
rename to openair3/UTILS/CONF/COPYING
diff --git a/openair-cn/UTILS/COPYING b/openair3/UTILS/COPYING
similarity index 100%
rename from openair-cn/UTILS/COPYING
rename to openair3/UTILS/COPYING
diff --git a/openair-cn/UTILS/HASHTABLE/COPYING b/openair3/UTILS/HASHTABLE/COPYING
similarity index 100%
rename from openair-cn/UTILS/HASHTABLE/COPYING
rename to openair3/UTILS/HASHTABLE/COPYING
diff --git a/openair-cn/UTILS/HASHTABLE/Makefile.am b/openair3/UTILS/HASHTABLE/Makefile.am
similarity index 100%
rename from openair-cn/UTILS/HASHTABLE/Makefile.am
rename to openair3/UTILS/HASHTABLE/Makefile.am
diff --git a/openair-cn/UTILS/HASHTABLE/Makefile.eNB b/openair3/UTILS/HASHTABLE/Makefile.eNB
similarity index 100%
rename from openair-cn/UTILS/HASHTABLE/Makefile.eNB
rename to openair3/UTILS/HASHTABLE/Makefile.eNB
diff --git a/openair-cn/UTILS/HASHTABLE/hashtable.c b/openair3/UTILS/HASHTABLE/hashtable.c
similarity index 100%
rename from openair-cn/UTILS/HASHTABLE/hashtable.c
rename to openair3/UTILS/HASHTABLE/hashtable.c
diff --git a/openair-cn/UTILS/HASHTABLE/hashtable.h b/openair3/UTILS/HASHTABLE/hashtable.h
similarity index 100%
rename from openair-cn/UTILS/HASHTABLE/hashtable.h
rename to openair3/UTILS/HASHTABLE/hashtable.h
diff --git a/openair-cn/UTILS/HASHTABLE/obj_hashtable.c b/openair3/UTILS/HASHTABLE/obj_hashtable.c
similarity index 100%
rename from openair-cn/UTILS/HASHTABLE/obj_hashtable.c
rename to openair3/UTILS/HASHTABLE/obj_hashtable.c
diff --git a/openair-cn/UTILS/HASHTABLE/obj_hashtable.h b/openair3/UTILS/HASHTABLE/obj_hashtable.h
similarity index 100%
rename from openair-cn/UTILS/HASHTABLE/obj_hashtable.h
rename to openair3/UTILS/HASHTABLE/obj_hashtable.h
diff --git a/openair-cn/UTILS/Makefile.am b/openair3/UTILS/Makefile.am
similarity index 100%
rename from openair-cn/UTILS/Makefile.am
rename to openair3/UTILS/Makefile.am
diff --git a/openair-cn/UTILS/conversions.c b/openair3/UTILS/conversions.c
similarity index 100%
rename from openair-cn/UTILS/conversions.c
rename to openair3/UTILS/conversions.c
diff --git a/openair-cn/UTILS/conversions.h b/openair3/UTILS/conversions.h
similarity index 100%
rename from openair-cn/UTILS/conversions.h
rename to openair3/UTILS/conversions.h
diff --git a/openair-cn/UTILS/enum_string.c b/openair3/UTILS/enum_string.c
similarity index 100%
rename from openair-cn/UTILS/enum_string.c
rename to openair3/UTILS/enum_string.c
diff --git a/openair-cn/UTILS/enum_string.h b/openair3/UTILS/enum_string.h
similarity index 100%
rename from openair-cn/UTILS/enum_string.h
rename to openair3/UTILS/enum_string.h
diff --git a/openair-cn/UTILS/log.c b/openair3/UTILS/log.c
similarity index 100%
rename from openair-cn/UTILS/log.c
rename to openair3/UTILS/log.c
diff --git a/openair-cn/UTILS/log.h b/openair3/UTILS/log.h
similarity index 100%
rename from openair-cn/UTILS/log.h
rename to openair3/UTILS/log.h
diff --git a/openair-cn/UTILS/mcc_mnc_itu.c b/openair3/UTILS/mcc_mnc_itu.c
similarity index 100%
rename from openair-cn/UTILS/mcc_mnc_itu.c
rename to openair3/UTILS/mcc_mnc_itu.c
diff --git a/openair-cn/UTILS/mcc_mnc_itu.h b/openair3/UTILS/mcc_mnc_itu.h
similarity index 100%
rename from openair-cn/UTILS/mcc_mnc_itu.h
rename to openair3/UTILS/mcc_mnc_itu.h
diff --git a/openair-cn/UTILS/mme_config.c b/openair3/UTILS/mme_config.c
similarity index 100%
rename from openair-cn/UTILS/mme_config.c
rename to openair3/UTILS/mme_config.c
diff --git a/openair-cn/UTILS/mme_config.h b/openair3/UTILS/mme_config.h
similarity index 100%
rename from openair-cn/UTILS/mme_config.h
rename to openair3/UTILS/mme_config.h
diff --git a/openair-cn/UTILS/mme_default_values.h b/openair3/UTILS/mme_default_values.h
similarity index 100%
rename from openair-cn/UTILS/mme_default_values.h
rename to openair3/UTILS/mme_default_values.h
diff --git a/openair-cn/UTILS/mme_parser.y b/openair3/UTILS/mme_parser.y
similarity index 100%
rename from openair-cn/UTILS/mme_parser.y
rename to openair3/UTILS/mme_parser.y
diff --git a/openair-cn/UTILS/mme_scanner.l b/openair3/UTILS/mme_scanner.l
similarity index 100%
rename from openair-cn/UTILS/mme_scanner.l
rename to openair3/UTILS/mme_scanner.l
diff --git a/openair-cn/UTILS/queue.h b/openair3/UTILS/queue.h
similarity index 100%
rename from openair-cn/UTILS/queue.h
rename to openair3/UTILS/queue.h
diff --git a/openair-cn/UTILS/tree.h b/openair3/UTILS/tree.h
similarity index 100%
rename from openair-cn/UTILS/tree.h
rename to openair3/UTILS/tree.h
diff --git a/openair-cn/valgrind.sh b/openair3/valgrind.sh
similarity index 100%
rename from openair-cn/valgrind.sh
rename to openair3/valgrind.sh
diff --git a/targets/Makefile.common b/targets/Makefile.common
index 7c7698edaa..042a36bf45 100644
--- a/targets/Makefile.common
+++ b/targets/Makefile.common
@@ -1,12 +1,12 @@
# This file gathers compilation directive shared between lte-softmodem and oaisim
export COMMON_UTILS_DIR = $(OPENAIR_DIR)/common/utils
-export UE_NAS_DIR = $(OPENAIR_DIR)/openair-cn/NAS
-export S1AP_DIR = $(OPENAIR_DIR)/openair-cn/S1AP
+export UE_NAS_DIR = $(OPENAIR_DIR)/openair3/NAS
+export S1AP_DIR = $(OPENAIR_DIR)/openair3/S1AP
export X2AP_DIR = $(OPENAIR_DIR)/openair2/X2AP
-export SCTP_DIR = $(OPENAIR_DIR)/openair-cn/SCTP
-export UDP_DIR = $(OPENAIR_DIR)/openair-cn/UDP
-export GTPV1U_DIR = $(OPENAIR_DIR)/openair-cn/GTPV1-U
-export SECU_DIR = $(OPENAIR_DIR)/openair-cn/SECU
+export SCTP_DIR = $(OPENAIR_DIR)/openair3/SCTP
+export UDP_DIR = $(OPENAIR_DIR)/openair3/UDP
+export GTPV1U_DIR = $(OPENAIR_DIR)/openair3/GTPV1-U
+export SECU_DIR = $(OPENAIR_DIR)/openair3/SECU
UE_NAS_OBJ_DIR = $(subst $(OPENAIR_DIR),$(OBJS_DIR),$(UE_NAS_DIR))
SECU_OBJ_DIR = $(subst $(OPENAIR_DIR),$(OBJS_DIR),$(SECU_DIR))
@@ -112,12 +112,12 @@ COMMON_CFLAGS += -DLOG_NO_THREAD
openair_cn_available := $(shell if [ -d "$(UE_NAS_DIR)" ]; then echo "0" ; else echo "1" ; fi )
ifeq ($(openair_cn_available), 0)
COMMON_CFLAGS += -DENABLE_NAS_UE_LOGGING
-COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair-cn/NAS/EURECOM-NAS/src/api/network
-COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair-cn/NAS/EURECOM-NAS/src/include
-COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair-cn/NAS/EURECOM-NAS/src/ies
-COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair-cn/NAS/EURECOM-NAS/src/emm/msg
-COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair-cn/NAS/EURECOM-NAS/src/esm/msg
-COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair-cn/NAS/EURECOM-NAS/src/util
+COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair3/NAS/EURECOM-NAS/src/api/network
+COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair3/NAS/EURECOM-NAS/src/include
+COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair3/NAS/EURECOM-NAS/src/ies
+COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair3/NAS/EURECOM-NAS/src/emm/msg
+COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair3/NAS/EURECOM-NAS/src/esm/msg
+COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair3/NAS/EURECOM-NAS/src/util
endif
UENAS_CFLAGS = $(COMMON_CFLAGS)
@@ -125,8 +125,8 @@ UENAS_CFLAGS += -I$(SECU_DIR)
export UENAS_CFLAGS
SECU_CFLAGS = $(COMMON_CFLAGS)
-SECU_CFLAGS += -I$(OPENAIR_DIR)/openair-cn/COMMON
-SECU_CFLAGS += -I$(OPENAIR_DIR)/openair-cn/UTILS
+SECU_CFLAGS += -I$(OPENAIR_DIR)/openair3/COMMON
+SECU_CFLAGS += -I$(OPENAIR_DIR)/openair3/UTILS
SECU_CFLAGS += -I$(SECU_DIR)
export SECU_CFLAGS
@@ -162,7 +162,7 @@ GTPV1U_CFLAGS += -I$(TOP_DIR)
GTPV1U_CFLAGS += -I$(GTPV1U_DIR)/nw-gtpv1u/include
GTPV1U_CFLAGS += -I$(GTPV1U_DIR)/nw-gtpv1u/shared
GTPV1U_CFLAGS += -I$(OPENAIR_DIR)/openair2/ENB_APP
-GTPV1U_CFLAGS += $(UTIL_incl) -I$(OPENAIRCN_DIR)/UTILS
+GTPV1U_CFLAGS += $(UTIL_incl) -I$(OPENAIR3_DIR)/UTILS
export GTPV1U_CFLAGS
GTPV1U_ENB_CFLAGS = $(COMMON_CFLAGS)
@@ -176,7 +176,7 @@ GTPV1U_ENB_CFLAGS += -I$(TOP_DIR)
GTPV1U_ENB_CFLAGS += -I$(GTPV1U_DIR)/nw-gtpv1u/include
GTPV1U_ENB_CFLAGS += -I$(GTPV1U_DIR)/nw-gtpv1u/shared
GTPV1U_ENB_CFLAGS += -I$(OPENAIR_DIR)/openair2/ENB_APP
-GTPV1U_ENB_CFLAGS += $(UTIL_incl) -I$(OPENAIRCN_DIR)/UTILS
+GTPV1U_ENB_CFLAGS += $(UTIL_incl) -I$(OPENAIR3_DIR)/UTILS
export GTPV1U_ENB_CFLAGS
diff --git a/targets/PROJECTS/E-MBMS/utils.bash b/targets/PROJECTS/E-MBMS/utils.bash
index 5410fc5818..e95fd9e5b6 100755
--- a/targets/PROJECTS/E-MBMS/utils.bash
+++ b/targets/PROJECTS/E-MBMS/utils.bash
@@ -178,7 +178,7 @@ set_openair() {
declare -i index
length_path=${#path}
- for i in 'openair1' 'openair2' 'openair3' 'openair-cn' 'targets'
+ for i in 'openair1' 'openair2' 'openair3' 'openair3' 'targets'
do
index=`echo $path | grep -b -o $i | cut -d: -f1`
#echo ${path%$token*}
@@ -193,7 +193,7 @@ set_openair() {
export OPENAIR1_DIR=$openair_path/openair1
export OPENAIR2_DIR=$openair_path/openair2
export OPENAIR3_DIR=$openair_path/openair3
- export OPENAIRCN_DIR=$openair_path/openair-cn
+ export OPENAIR3_DIR=$openair_path/openair3
export OPENAIR_TARGETS=$openair_path/targets
return 0
fi
@@ -367,7 +367,7 @@ declare -x OPENAIR_DIR=""
declare -x OPENAIR1_DIR=""
declare -x OPENAIR2_DIR=""
declare -x OPENAIR3_DIR=""
-declare -x OPENAIRCN_DIR=""
+declare -x OPENAIR3_DIR=""
declare -x OPENAIR_TARGETS=""
###########################################################
@@ -377,5 +377,5 @@ cecho "OPENAIR_DIR = $OPENAIR_DIR" $green
cecho "OPENAIR1_DIR = $OPENAIR1_DIR" $green
cecho "OPENAIR2_DIR = $OPENAIR2_DIR" $green
cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
-cecho "OPENAIRCN_DIR = $OPENAIRCN_DIR" $green
+cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
cecho "OPENAIR_TARGETS = $OPENAIR_TARGETS" $green
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.generic.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.generic.conf
index 125468e5c7..b73684be95 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.generic.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.generic.conf
@@ -191,7 +191,7 @@ P-GW =
"2014:02:26::0/120"
);
};
- #WARNING DNS ARE HARDCODED IN openair-cn/NAS/EURECOM-NAS/src/esm/msg/ActivateDefaultEpsBearerContextRequest.c:305
+ #WARNING DNS ARE HARDCODED IN openair3/NAS/EURECOM-NAS/src/esm/msg/ActivateDefaultEpsBearerContextRequest.c:305
DEFAULT_DNS_IPV4_ADDRESS = "192.168.12.100";
DEFAULT_DNS_SEC_IPV4_ADDRESS = "192.168.106.12";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.on.enb.example.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.on.enb.example.conf
index e934b33a53..e186c87ac7 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.on.enb.example.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.on.enb.example.conf
@@ -165,7 +165,7 @@ P-GW =
);
};
- #WARNING DNS ARE HARDCODED IN openair-cn/NAS/EURECOM-NAS/src/esm/msg/ActivateDefaultEpsBearerContextRequest.c:305
+ #WARNING DNS ARE HARDCODED IN openair3/NAS/EURECOM-NAS/src/esm/msg/ActivateDefaultEpsBearerContextRequest.c:305
DEFAULT_DNS_IPV4_ADDRESS = "192.168.12.100";
DEFAULT_DNS_SEC_IPV4_ADDRESS = "192.168.106.106";
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/start_enb_and_ue_virt.bash b/targets/PROJECTS/GENERIC-LTE-EPC/start_enb_and_ue_virt.bash
index 880382699c..3c58834f0f 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/start_enb_and_ue_virt.bash
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/start_enb_and_ue_virt.bash
@@ -125,13 +125,13 @@ fi
#######################################################
export NVRAM_DIR=$THIS_SCRIPT_PATH
-if [ ! -f $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data ] || [ ! -f $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data ]; then
+if [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data ] || [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data ]; then
if [ ! -f /tmp/nas_cleaned ]; then
- echo_success "make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS veryveryclean"
- make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS veryveryclean
+ echo_success "make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS veryveryclean"
+ make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS veryveryclean
fi
- echo_success "make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS -f Makefile PROCESS=UE all"
- make -f Makefile --debug=b --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS PROCESS=UE all
+ echo_success "make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS -f Makefile PROCESS=UE all"
+ make -f Makefile --debug=b --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS PROCESS=UE all
rm .ue.nvram
rm .usim.nvram
touch /tmp/nas_cleaned
@@ -139,15 +139,15 @@ fi
if [ ! -f .ue.nvram ]; then
echo_success "generate .ue_emm.nvram .ue.nvram"
- $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
+ $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
fi
if [ ! -f .usim.nvram ]; then
echo_success "generate .usim.nvram"
- $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
+ $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
fi
-$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --print
-$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --print
+$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print
+$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --print
##################################################
# LAUNCH eNB + UE executable
@@ -226,7 +226,7 @@ cd $THIS_SCRIPT_PATH
#nohup tshark -i $ENB_INTERFACE_NAME_FOR_S1_MME -i $ENB_INTERFACE_NAME_FOR_S1U -w OUTPUT/$HOSTNAME/tshark_enb_ue.$HOSTNAME.pcap &
# To start NAS connectivity: AT+CFUN=1
-# nohup xterm -hold -e $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/UserProcess &
+# nohup xterm -hold -e $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/UserProcess &
export MALLOC_TRACE=/tmp/malloc_trace.txt
touch /tmp/malloc_trace.txt
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/start_ue.bash b/targets/PROJECTS/GENERIC-LTE-EPC/start_ue.bash
index 8ae7b10b67..72a3a6fca1 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/start_ue.bash
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/start_ue.bash
@@ -72,27 +72,27 @@ EMULATION_DEV_ADDRESS=`ifconfig $EMULATION_DEV_INTERFACE | grep 'inet addr:'| gr
#######################################################
export NVRAM_DIR=$THIS_SCRIPT_PATH
-if [ ! -f $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data ]; then
- make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS veryveryclean
- make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS PROCESS=UE
+if [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data ]; then
+ make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS veryveryclean
+ make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS PROCESS=UE
rm .ue.nvram
fi
-if [ ! -f $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data ]; then
- make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS veryveryclean
- make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS PROCESS=UE
+if [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data ]; then
+ make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS veryveryclean
+ make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS PROCESS=UE
rm .usim.nvram
fi
if [ ! -f .ue.nvram ]; then
# generate .ue_emm.nvram .ue.nvram
- $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
+ $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
fi
if [ ! -f .usim.nvram ]; then
# generate .usim.nvram
- $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
+ $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
fi
-$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --print
-$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --print
+$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print
+$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --print
##################################################
# LAUNCH UE executable
@@ -145,7 +145,7 @@ if [ x$hard_real_time != "xyes" ]; then
cd $THIS_SCRIPT_PATH
- nohup xterm -e $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/UserProcess &
+ nohup xterm -e $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/UserProcess &
cp $OPENAIR_TARGETS/SIMU/USER/oaisim $OPENAIR_TARGETS/SIMU/USER/oaisim_ue
gdb --args $OPENAIR_TARGETS/SIMU/USER/oaisim_ue -a -l9 -u1 -b0 -M1 -p2 -g$EMULATION_MULTICAST_GROUP -D $EMULATION_DEV_ADDRESS -K $ITTI_LOG_FILE 2>&1 | tee $STDOUT_LOG_FILE
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash b/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash
index aa9bb333d4..0ba30cc504 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash
@@ -186,7 +186,7 @@ set_openair() {
export OPENAIR1_DIR=$openair_path/openair1
export OPENAIR2_DIR=$openair_path/openair2
export OPENAIR3_DIR=$openair_path/openair3
- export OPENAIRCN_DIR=$openair_path/openair-cn
+ export OPENAIR3_DIR=$openair_path/openair3
export OPENAIR_TARGETS=$openair_path/targets
export CDPATH=$CDPATH:$openair_path
}
@@ -302,7 +302,7 @@ start_openswitch_daemon() {
bash_exec "insmod /lib/modules/`uname -r`/extra/openvswitch.ko" > /dev/null 2>&1
else
echo_error "/lib/modules/`uname -r`/extra/openvswitch.ko not found"
- bash $OPENAIRCN_DIR/SCRIPTS/install_openvswitch1.9.0.bash
+ bash $OPENAIR3_DIR/SCRIPTS/install_openvswitch1.9.0.bash
fi
is_process_started "ovsdb-server"
if [ $? -ne 0 ]
@@ -349,26 +349,26 @@ check_epc_s6a_certificate() {
fi
echo_error "MME S6A: Did not find valid certificate in /usr/local/etc/freeDiameter"
echo_warning "MME S6A: generatting new certificate in /usr/local/etc/freeDiameter..."
- cd $OPENAIRCN_DIR/S6A/freediameter
+ cd $OPENAIR3_DIR/S6A/freediameter
./make_certs.sh ${1:-'eur'}
check_epc_s6a_certificate ${1:-'eur'}
return 1
}
check_hss_s6a_certificate() {
- if [ -f $OPENAIRCN_DIR/OPENAIRHSS/conf/hss.cert.pem ]
+ if [ -f $OPENAIR3_DIR/OPENAIRHSS/conf/hss.cert.pem ]
then
- full_hostname=`cat $OPENAIRCN_DIR/OPENAIRHSS/conf/hss.cert.pem | grep "Subject" | grep "CN" | cut -d '=' -f6`
+ full_hostname=`cat $OPENAIR3_DIR/OPENAIRHSS/conf/hss.cert.pem | grep "Subject" | grep "CN" | cut -d '=' -f6`
# we should replace 'hss' with hostname
if [ a$full_hostname == ahss.${1:-'eur'} ]
then
- echo_success "HSS S6A: Found valid certificate in $OPENAIRCN_DIR/OPENAIRHSS/conf/"
+ echo_success "HSS S6A: Found valid certificate in $OPENAIR3_DIR/OPENAIRHSS/conf/"
return 1
fi
fi
- echo_error "HSS S6A: Did not find valid certificate in $OPENAIRCN_DIR/OPENAIRHSS/conf"
- echo_warning "HSS S6A: generatting new certificate in $OPENAIRCN_DIR/OPENAIRHSS/conf..."
- cd $OPENAIRCN_DIR/OPENAIRHSS/conf
+ echo_error "HSS S6A: Did not find valid certificate in $OPENAIR3_DIR/OPENAIRHSS/conf"
+ echo_warning "HSS S6A: generatting new certificate in $OPENAIR3_DIR/OPENAIRHSS/conf..."
+ cd $OPENAIR3_DIR/OPENAIRHSS/conf
./make_certs.sh ${1:-'eur'}
check_hss_s6a_certificate ${1:-'eur'}
return 1
@@ -406,7 +406,7 @@ create_hss_database(){
echo_success "oai_db creation succeeded"
fi
- $MYSQL -u $1 --password=$2 oai_db < $OPENAIRCN_DIR/OPENAIRHSS/db/oai_db.sql
+ $MYSQL -u $1 --password=$2 oai_db < $OPENAIR3_DIR/OPENAIRHSS/db/oai_db.sql
if [ $? -ne 0 ]; then
echo_error "oai_db tables creation failed"
else
@@ -539,13 +539,13 @@ check_install_epc_software() {
if [ ! -d /usr/local/etc/freeDiameter ]
then
# This script make certificates also
- cd $OPENAIRCN_DIR/S6A/freediameter && ./install_freediameter.sh
+ cd $OPENAIR3_DIR/S6A/freediameter && ./install_freediameter.sh
else
echo_success "freediameter is installed"
check_epc_s6a_certificate
fi
- test_command_install_script "asn1c" "$OPENAIRCN_DIR/SCRIPTS/install_asn1c_0.9.24.modified.bash"
+ test_command_install_script "asn1c" "$OPENAIR3_DIR/SCRIPTS/install_asn1c_0.9.24.modified.bash"
# One mor check about version of asn1c
ASN1C_COMPILER_REQUIRED_VERSION_MESSAGE="ASN.1 Compiler, v0.9.24"
@@ -558,7 +558,7 @@ check_install_epc_software() {
echo_error "$ASN1C_COMPILER_VERSION_MESSAGE"
while read -r -n 1 -s answer; do
if [[ $answer = [YyNn] ]]; then
- [[ $answer = [Yy] ]] && $OPENAIRCN_DIR/SCRIPTS/install_asn1c_0.9.24.modified.bash
+ [[ $answer = [Yy] ]] && $OPENAIR3_DIR/SCRIPTS/install_asn1c_0.9.24.modified.bash
[[ $answer = [Nn] ]] && echo_error "Version of asn1c is not the required one, exiting." && exit 1
break
fi
@@ -577,7 +577,7 @@ function cgrp()
find $OPENAIR2_DIR -name *.c -exec grep --color=auto -Hni $1 {} \;
find $OPENAIR1_DIR -name *.c -exec grep --color=auto -Hni $1 {} \;
find $OPENAIR3_DIR -name *.c -exec grep --color=auto -Hni $1 {} \;
- find $OPENAIRCN_DIR -name *.c -exec grep --color=auto -Hni $1 {} \;
+ find $OPENAIR3_DIR -name *.c -exec grep --color=auto -Hni $1 {} \;
find $OPENAIR_TARGETS -name *.c -exec grep --color=auto -Hni $1 {} \;
}
@@ -591,7 +591,7 @@ function hgrp()
find $OPENAIR2_DIR -name *.h -exec grep --color=auto -Hni $1 {} \;
find $OPENAIR1_DIR -name *.h -exec grep --color=auto -Hni $1 {} \;
find $OPENAIR3_DIR -name *.h -exec grep --color=auto -Hni $1 {} \;
- find $OPENAIRCN_DIR -name *.h -exec grep --color=auto -Hni $1 {} \;
+ find $OPENAIR3_DIR -name *.h -exec grep --color=auto -Hni $1 {} \;
find $OPENAIR_TARGETS -name *.h -exec grep --color=auto -Hni $1 {} \;
}
@@ -606,7 +606,7 @@ function svn_find_str_in_file_history()
}
compile_hss() {
- cd $OPENAIRCN_DIR/OPENAIRHSS
+ cd $OPENAIR3_DIR/OPENAIRHSS
OBJ_DIR=`find . -maxdepth 1 -type d -iname obj*`
if [ ! -n "$OBJ_DIR" ]
then
@@ -646,7 +646,7 @@ compile_hss() {
compile_epc() {
- cd $OPENAIRCN_DIR
+ cd $OPENAIR3_DIR
OBJ_DIR=`find . -maxdepth 1 -type d -iname obj*`
if [ ! -n "$OBJ_DIR" ]
then
@@ -695,7 +695,7 @@ declare -x OPENAIR_DIR=""
declare -x OPENAIR1_DIR=""
declare -x OPENAIR2_DIR=""
declare -x OPENAIR3_DIR=""
-declare -x OPENAIRCN_DIR=""
+declare -x OPENAIR3_DIR=""
declare -x OPENAIR_TARGETS=""
###########################################################
@@ -705,7 +705,7 @@ cecho "OPENAIR_DIR = $OPENAIR_DIR" $green
cecho "OPENAIR1_DIR = $OPENAIR1_DIR" $green
cecho "OPENAIR2_DIR = $OPENAIR2_DIR" $green
cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
-cecho "OPENAIRCN_DIR = $OPENAIRCN_DIR" $green
+cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
cecho "OPENAIR_TARGETS = $OPENAIR_TARGETS" $green
export UTILS_ARCH=$(uname -m | sed 's/x86_//;s/i[3-6]86/32/')
diff --git a/targets/SCRIPTS/install_asn1c_0.9.24.modified.bash b/targets/SCRIPTS/install_asn1c_0.9.24.modified.bash
index dc6f1aef25..91281ec31a 100755
--- a/targets/SCRIPTS/install_asn1c_0.9.24.modified.bash
+++ b/targets/SCRIPTS/install_asn1c_0.9.24.modified.bash
@@ -32,7 +32,7 @@
$1 rm -Rf /usr/local/src/asn1c-r1516
$1 svn co https://github.com/vlm/asn1c/trunk /usr/local/src/asn1c-r1516 -r 1516 > /tmp/install_log.txt
cd /usr/local/src/asn1c-r1516
-$1 patch -p0 < $OPENAIRCN_DIR/S1AP/MESSAGES/ASN1/asn1cpatch.p0 > /tmp/install_log.txt
+$1 patch -p0 < $OPENAIR3_DIR/S1AP/MESSAGES/ASN1/asn1cpatch.p0 > /tmp/install_log.txt
$1 ./configure > /tmp/install_log.txt
$1 make > /tmp/install_log.txt
$1 make install > /tmp/install_log.txt
\ No newline at end of file
diff --git a/targets/build_helper.bash b/targets/build_helper.bash
index 2d30029eb4..bc5cd3fbed 100755
--- a/targets/build_helper.bash
+++ b/targets/build_helper.bash
@@ -288,7 +288,7 @@ check_install_freediamter(){
$SUDO tar -xzf 1.1.5.tar.gz
echo "Uncompressing freeDiameter archive"
cd freeDiameter-1.1.5
- $SUDO patch -p1 < $OPENAIRCN_DIR/S6A/freediameter/freediameter-1.1.5.patch
+ $SUDO patch -p1 < $OPENAIR3_DIR/S6A/freediameter/freediameter-1.1.5.patch
$SUDO mkdir build
cd build
$SUDO cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr ../
@@ -327,7 +327,7 @@ check_epc_s6a_certificate() {
fi
echo_error "EPC S6A: Did not find valid certificate in /usr/local/etc/freeDiameter"
echo_warning "EPC S6A: generatting new certificate in /usr/local/etc/freeDiameter..."
- cd $OPENAIRCN_DIR/S6A/freediameter
+ cd $OPENAIR3_DIR/S6A/freediameter
./make_certs.sh ${1:-'eur'}
if [ $# -lt 2 ] ; then
check_epc_s6a_certificate ${1:-'eur'} 2
@@ -353,7 +353,7 @@ check_hss_s6a_certificate() {
fi
echo_error "S6A: Did not find valid certificate in /usr/local/etc/freeDiameter"
echo_warning "S6A: generatting new certificate in /usr/local/etc/freeDiameter..."
- cd $OPENAIRCN_DIR/OPENAIRHSS/conf
+ cd $OPENAIR3_DIR/OPENAIRHSS/conf
./make_certs.sh ${1:-'eur'}
if [ $# -lt 2 ] ; then
check_hss_s6a_certificate ${1:-'eur'} 2
@@ -638,7 +638,7 @@ check_install_asn1c(){
# 2. compile
################################################
compile_hss() {
- cd $OPENAIRCN_DIR/OPENAIRHSS
+ cd $OPENAIR3_DIR/OPENAIRHSS
if [ "$1" -eq 1 ]; then
echo_info "build a clean HSS"
@@ -693,7 +693,7 @@ compile_hss() {
compile_epc() {
- cd $OPENAIRCN_DIR
+ cd $OPENAIR3_DIR
if [ $1 = 1 ]; then
echo_info "build a clean EPC"
bash_exec "rm -rf objs"
@@ -742,7 +742,7 @@ compile_epc() {
return 1
fi
- cd $OPENAIRCN_DIR/GTPV1-U/GTPUAH;
+ cd $OPENAIR3_DIR/GTPV1-U/GTPUAH;
make
if [ $? -ne 0 ]; then
echo_error "Build GTPUAH module failed, exiting"
@@ -752,7 +752,7 @@ compile_epc() {
$SUDO cp -pfv ./Bin/*.ko $OPENAIR_TARGETS/bin
fi
- cd $OPENAIRCN_DIR/GTPV1-U/GTPURH;
+ cd $OPENAIR3_DIR/GTPV1-U/GTPURH;
make
if [ $? -ne 0 ]; then
echo_error "Build GTPURH module failed, exiting"
@@ -854,11 +854,11 @@ compile_nas_tools() {
cd $NVRAM_DIR
if [ ! -f /tmp/nas_cleaned ]; then
- echo_success "make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS/tools veryveryclean"
- make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS/tools veryveryclean
+ echo_success "make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS/tools veryveryclean"
+ make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS/tools veryveryclean
fi
- echo_success "make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS/tools all"
- make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS/tools all
+ echo_success "make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS/tools all"
+ make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS/tools all
rm .ue.nvram
rm .usim.nvram
touch /tmp/nas_cleaned
@@ -882,21 +882,21 @@ check_for_ltesoftmodem_executable() {
}
check_for_epc_executable() {
- if [ ! -f $OPENAIRCN_DIR/objs/OAI_EPC/oai_epc ]; then
- echo_error "Cannot find oai_epc executable object in directory $OPENAIRCN_DIR/objs/OAI_EPC/"
+ if [ ! -f $OPENAIR3_DIR/objs/OAI_EPC/oai_epc ]; then
+ echo_error "Cannot find oai_epc executable object in directory $OPENAIR3_DIR/objs/OAI_EPC/"
echo_fatal "Please make sure you have compiled OAI EPC with --enable-standalone-epc option"
fi
}
check_for_hss_executable() {
- if [ ! -f $OPENAIRCN_DIR/OPENAIRHSS/objs/openair-hss ]; then
- echo_error "Cannot find openair-hss executable object in directory $OPENAIRCN_DIR/OPENAIRHSS/objs/"
+ if [ ! -f $OPENAIR3_DIR/OPENAIRHSS/objs/openair-hss ]; then
+ echo_error "Cannot find openair-hss executable object in directory $OPENAIR3_DIR/OPENAIRHSS/objs/"
echo_fatal "Please make sure you have compiled OAI HSS"
fi
}
check_for_sgw_executable() {
- if [ ! -f $OPENAIRCN_DIR/objs/OAI_SGW/oai_sgw ]; then
+ if [ ! -f $OPENAIR3_DIR/objs/OAI_SGW/oai_sgw ]; then
echo_error "Cannot find oai_sgw executable object in directory $OPENAIR3_DIR/OPENAIRMME/objs/OAI_SGW/"
echo_fatal "Please make sure you have compiled OAI EPC without --enable-standalone-epc option"
fi
@@ -959,8 +959,8 @@ check_for_mbmssim_executable() {
}
check_for_nas_ue_executable() {
- if [ ! -f $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/UserProcess ]; then
- echo_error "Cannot find UserProcess executable object in directory $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin"
+ if [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/UserProcess ]; then
+ echo_error "Cannot find UserProcess executable object in directory $OPENAIR3_DIR/NAS/EURECOM-NAS/bin"
echo_fatal "Check the compilation logs in bin/install_log.txt"
fi
}
@@ -1036,15 +1036,15 @@ install_nas_tools() {
cd $OPENAIR_TARGETS/bin
if [ ! -f .ue.nvram ]; then
echo_success "generate .ue_emm.nvram .ue.nvram"
- $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
+ $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
fi
if [ ! -f .usim.nvram ]; then
echo_success "generate .usim.nvram"
- $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
+ $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
fi
- $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --print
- $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --print
+ $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print
+ $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --print
}
install_nasmesh(){
@@ -1106,7 +1106,7 @@ create_hss_database(){
mysql -u $3 --password=$4 -e "desc $5.users" > /dev/null 2>&1
if [ $? -eq 1 ]; then
- $MYSQL -u $3 --password=$4 $5 < $OPENAIRCN_DIR/OPENAIRHSS/db/oai_db.sql
+ $MYSQL -u $3 --password=$4 $5 < $OPENAIR3_DIR/OPENAIRHSS/db/oai_db.sql
if [ $? -ne 0 ]; then
echo_error "$5 tables creation failed"
return 1
@@ -1126,7 +1126,7 @@ set_openair_env(){
fullpath=`readlink -f $BASH_SOURCE`
[ -f "/.$fullpath" ] || fullpath=`readlink -f $PWD/$fullpath`
openair_path=${fullpath%/targets/*}
- openair_path=${openair_path%/openair-cn/*}
+ openair_path=${openair_path%/openair3/*}
openair_path=${openair_path%/openair[123]/*}
export OPENAIR_DIR=$openair_path
@@ -1134,7 +1134,7 @@ set_openair_env(){
export OPENAIR1_DIR=$openair_path/openair1
export OPENAIR2_DIR=$openair_path/openair2
export OPENAIR3_DIR=$openair_path/openair3
- export OPENAIRCN_DIR=$openair_path/openair-cn
+ export OPENAIR3_DIR=$openair_path/openair3
export OPENAIR_TARGETS=$openair_path/targets
}
diff --git a/targets/build_oai.bash b/targets/build_oai.bash
index 58e1659d56..5eb1845674 100755
--- a/targets/build_oai.bash
+++ b/targets/build_oai.bash
@@ -301,7 +301,7 @@ cecho "OPENAIR_HOME = $OPENAIR_HOME" $green
cecho "OPENAIR1_DIR = $OPENAIR1_DIR" $green
cecho "OPENAIR2_DIR = $OPENAIR2_DIR" $green
cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
-cecho "OPENAIRCN_DIR = $OPENAIRCN_DIR" $green
+cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
cecho "OPENAIR_TARGETS = $OPENAIR_TARGETS" $green
@@ -309,7 +309,7 @@ echo "OPENAIR_HOME = $OPENAIR_HOME" >> bin/${oai_build_date}
echo "OPENAIR1_DIR = $OPENAIR1_DIR" >> bin/${oai_build_date}
echo "OPENAIR2_DIR = $OPENAIR2_DIR" >> bin/${oai_build_date}
echo "OPENAIR3_DIR = $OPENAIR3_DIR" >> bin/${oai_build_date}
-echo "OPENAIRCN_DIR = $OPENAIRCN_DIR" >> bin/${oai_build_date}
+echo "OPENAIR3_DIR = $OPENAIR3_DIR" >> bin/${oai_build_date}
echo "OPENAIR_TARGETS = $OPENAIR_TARGETS" >> bin/${oai_build_date}
@@ -607,7 +607,7 @@ build_epc(){
echo_success "target epc built and installed in the bin directory"
echo "target epc built and installed in the bin directory" >> bin/${oai_build_date}
cp -f $CONFIG_FILE $OPENAIR_TARGETS/bin
- cp -f $OPENAIRCN_DIR/objs/UTILS/CONF/s6a.conf $OPENAIR_TARGETS/bin/epc_s6a.conf
+ cp -f $OPENAIR3_DIR/objs/UTILS/CONF/s6a.conf $OPENAIR_TARGETS/bin/epc_s6a.conf
fi
}
@@ -648,10 +648,10 @@ build_hss(){
######################################
TEMP_FILE=`tempfile`
- cat $OPENAIRCN_DIR/OPENAIRHSS/conf/hss_fd.conf | grep -w "Identity" | tr -d " " | tr -d ";" > $TEMP_FILE
- cat $OPENAIRCN_DIR/OPENAIRHSS/conf/hss.conf | grep -w "MYSQL_user" | tr -d " " | tr -d ";" >> $TEMP_FILE
- cat $OPENAIRCN_DIR/OPENAIRHSS/conf/hss.conf | grep -w "MYSQL_pass" | tr -d " " | tr -d ";" >> $TEMP_FILE
- cat $OPENAIRCN_DIR/OPENAIRHSS/conf/hss.conf | grep -w "MYSQL_db" | tr -d " " | tr -d ";" >> $TEMP_FILE
+ cat $OPENAIR3_DIR/OPENAIRHSS/conf/hss_fd.conf | grep -w "Identity" | tr -d " " | tr -d ";" > $TEMP_FILE
+ cat $OPENAIR3_DIR/OPENAIRHSS/conf/hss.conf | grep -w "MYSQL_user" | tr -d " " | tr -d ";" >> $TEMP_FILE
+ cat $OPENAIR3_DIR/OPENAIRHSS/conf/hss.conf | grep -w "MYSQL_pass" | tr -d " " | tr -d ";" >> $TEMP_FILE
+ cat $OPENAIR3_DIR/OPENAIRHSS/conf/hss.conf | grep -w "MYSQL_db" | tr -d " " | tr -d ";" >> $TEMP_FILE
source $TEMP_FILE
rm -f $TEMP_FILE
@@ -664,7 +664,7 @@ build_hss(){
NEW_HOSTNAME=`hostname -s`
if [ "x$HSS_HOSTNAME" != "x$NEW_HOSTNAME" ]; then
echo_warning "Changing identity of HSS from <$HSS_HOSTNAME.$HSS_REALM> to <$NEW_HOSTNAME.$HSS_REALM>"
- sed -ibak "s/$HSS_HOSTNAME/$NEW_HOSTNAME/" $OPENAIRCN_DIR/OPENAIRHSS/conf/hss_fd.conf
+ sed -ibak "s/$HSS_HOSTNAME/$NEW_HOSTNAME/" $OPENAIR3_DIR/OPENAIRHSS/conf/hss_fd.conf
fi
check_hss_s6a_certificate $HSS_REALM
@@ -765,15 +765,15 @@ if [ $RUN -ne 0 ]; then
# prepare NAS for UE
if [ ! -f .ue.nvram ]; then
echo_success "generate .ue_emm.nvram .ue.nvram"
- $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
+ $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
fi
if [ ! -f .usim.nvram ]; then
echo_success "generate .usim.nvram"
- $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
+ $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
fi
- $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --print
- $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --print
+ $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print
+ $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --print
insmod $OPENAIR2_DIR/NETWORK_DRIVER/UE_IP/ue_ip.ko
@@ -813,7 +813,7 @@ if [ $RUN -ne 0 ]; then
'HSS')
echo "############# running HSS #############"
- cd $OPENAIRCN_DIR/OPENAIRHSS/objs
+ cd $OPENAIR3_DIR/OPENAIRHSS/objs
if [ $RUN_GDB -eq 0 ]; then
$SUDO exec ./openair-hss -c ./conf/hss.conf
else
diff --git a/targets/perf_oai.bash b/targets/perf_oai.bash
index c01ca35a8a..9379f7767c 100755
--- a/targets/perf_oai.bash
+++ b/targets/perf_oai.bash
@@ -167,7 +167,7 @@ cecho "OPENAIR_HOME = $OPENAIR_HOME" $green
cecho "OPENAIR1_DIR = $OPENAIR1_DIR" $green
cecho "OPENAIR2_DIR = $OPENAIR2_DIR" $green
cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
-cecho "OPENAIRCN_DIR = $OPENAIRCN_DIR" $green
+cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
cecho "OPENAIR_TARGETS = $OPENAIR_TARGETS" $green
@@ -175,7 +175,7 @@ echo "OPENAIR_HOME = $OPENAIR_HOME" >> results/${oai_exp_date}
echo "OPENAIR1_DIR = $OPENAIR1_DIR" >> results/${oai_exp_date}
echo "OPENAIR2_DIR = $OPENAIR2_DIR" >> results/${oai_exp_date}
echo "OPENAIR3_DIR = $OPENAIR3_DIR" >> results/${oai_exp_date}
-echo "OPENAIRCN_DIR = $OPENAIRCN_DIR" >> results/${oai_exp_date}
+echo "OPENAIR3_DIR = $OPENAIR3_DIR" >> results/${oai_exp_date}
echo "OPENAIR_TARGETS = $OPENAIR_TARGETS" >> results/${oai_exp_date}
################################
--
GitLab