Commit 057d7619 authored by Rohit Gupta's avatar Rohit Gupta

Merge branch 'feature-131-new-license' into develop

parents c4a9e94b 4c100a29

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

This diff is collapsed.
This diff is collapsed.
Credits for LFDS user space source code located in folder openair2/UTILS/LFDS/liblfds6.1.1/
http://liblfds.org/.
Extract from http://liblfds.org/pages/downloads_and_license.html:
"There is no license. You are free to use this software in any way, for any purpose. Go forth and create wealth!
If however for legal reasons a licence is required, the license of your choice will be granted."
Credits for source code common/utils/collection/queue.h:
The Regents of the University of California: BSD 3-Clause Licence.
Credits for source code common/utils/collection/tree.h:
Niels Provos <provos@citi.umich.edu>: BSD 2-Clause Licence.
...@@ -7,7 +7,7 @@ The OpenAirInterface (OAI) software is composed of the following parts: ...@@ -7,7 +7,7 @@ The OpenAirInterface (OAI) software is composed of the following parts:
openairinterface5g openairinterface5g
├── cmake_targets: build utilities to compile (simulation, emulation and real-time platforms), and generated build files ├── cmake_targets: build utilities to compile (simulation, emulation and real-time platforms), and generated build files
├── common : some common OAI utilities, other tools can be found at openair2/UTILS ├── common : some common OAI utilities, other tools can be found at openair2/UTILS
├── COPYING ├── LICENSE
├── maketags : script to generate emacs tags ├── maketags : script to generate emacs tags
├── openair1 : 3GPP LTE Rel-10 PHY layer + PHY RF simulation and a subset of Rel 12 Features. ├── openair1 : 3GPP LTE Rel-10 PHY layer + PHY RF simulation and a subset of Rel 12 Features.
├── openair2 :3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP implementation. ├── openair2 :3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP implementation.
......
################################################################################ #/*
# OpenAirInterface # * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
# Copyright(c) 1999 - 2014 Eurecom # * contributor license agreements. See the NOTICE file distributed with
# # * this work for additional information regarding copyright ownership.
# OpenAirInterface is free software: you can redistribute it and/or modify # * The OpenAirInterface Software Alliance licenses this file to You under
# it under the terms of the GNU General Public License as published by # * the OAI Public License, Version 1.0 (the "License"); you may not use this file
# the Free Software Foundation, either version 3 of the License, or # * except in compliance with the License.
# (at your option) any later version. # * You may obtain a copy of the License at
# # *
# OpenAirInterface is distributed in the hope that it will be useful, # * http://www.openairinterface.org/?page_id=698
# but WITHOUT ANY WARRANTY; without even the implied warranty of # *
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # * Unless required by applicable law or agreed to in writing, software
# GNU General Public License for more details. # * distributed under the License is distributed on an "AS IS" BASIS,
# # * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# You should have received a copy of the GNU General Public License # * See the License for the specific language governing permissions and
# along with OpenAirInterface.The full GNU General Public License is # * limitations under the License.
# included in this distribution in the file called "COPYING". If not, # *-------------------------------------------------------------------------------
# see <http://www.gnu.org/licenses/>. # * For more information about the OpenAirInterface (OAI) Software Alliance:
# # * contact@openairinterface.org
# Contact Information # */
# OpenAirInterface Admin: openair_admin@eurecom.fr
# OpenAirInterface Tech : openair_tech@eurecom.fr
# OpenAirInterface Dev : openair4g-devel@lists.eurecom.fr
#
# Address : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
# Author: laurent THOMAS, Lionel GAUTHIER # Author: laurent THOMAS, Lionel GAUTHIER
###############################################################################
cmake_minimum_required (VERSION 2.8) cmake_minimum_required (VERSION 2.8)
...@@ -844,10 +839,10 @@ include_directories("${OPENAIR_DIR}") ...@@ -844,10 +839,10 @@ include_directories("${OPENAIR_DIR}")
# Utilities Library # Utilities Library
################ ################
add_library(HASHTABLE add_library(HASHTABLE
${OPENAIR_DIR}/common/utils/collection/hashtable/hashtable.c ${OPENAIR_DIR}/common/utils/hashtable/hashtable.c
${OPENAIR_DIR}/common/utils/collection/hashtable/obj_hashtable.c ${OPENAIR_DIR}/common/utils/hashtable/obj_hashtable.c
) )
include_directories(${OPENAIR_DIR}/common/utils/collection/hashtable) include_directories(${OPENAIR_DIR}/common/utils/hashtable)
if (MESSAGE_CHART_GENERATOR) if (MESSAGE_CHART_GENERATOR)
add_library(MSC add_library(MSC
...@@ -875,20 +870,16 @@ set(UTIL_SRC ...@@ -875,20 +870,16 @@ set(UTIL_SRC
${OPENAIR2_DIR}/UTIL/OCG/OCG_parse_filename.c ${OPENAIR2_DIR}/UTIL/OCG/OCG_parse_filename.c
${OPENAIR2_DIR}/UTIL/OCG/OCG_parse_XML.c ${OPENAIR2_DIR}/UTIL/OCG/OCG_parse_XML.c
${OPENAIR2_DIR}/UTIL/OCG/OCG_save_XML.c ${OPENAIR2_DIR}/UTIL/OCG/OCG_save_XML.c
${OPENAIR2_DIR}/UTIL/OMG/client_traci_OMG.c
${OPENAIR2_DIR}/UTIL/OMG/common.c ${OPENAIR2_DIR}/UTIL/OMG/common.c
${OPENAIR2_DIR}/UTIL/OMG/grid.c ${OPENAIR2_DIR}/UTIL/OMG/grid.c
${OPENAIR2_DIR}/UTIL/OMG/id_manager.c
${OPENAIR2_DIR}/UTIL/OMG/job.c ${OPENAIR2_DIR}/UTIL/OMG/job.c
${OPENAIR2_DIR}/UTIL/OMG/mobility_parser.c ${OPENAIR2_DIR}/UTIL/OMG/mobility_parser.c
${OPENAIR2_DIR}/UTIL/OMG/omg.c ${OPENAIR2_DIR}/UTIL/OMG/omg.c
${OPENAIR2_DIR}/UTIL/OMG/omg_hashtable.c ${OPENAIR2_DIR}/UTIL/OMG/omg_hashtable.c
${OPENAIR2_DIR}/UTIL/OMG/rwalk.c ${OPENAIR2_DIR}/UTIL/OMG/rwalk.c
${OPENAIR2_DIR}/UTIL/OMG/rwp.c ${OPENAIR2_DIR}/UTIL/OMG/rwp.c
${OPENAIR2_DIR}/UTIL/OMG/socket_traci_OMG.c
${OPENAIR2_DIR}/UTIL/OMG/static.c ${OPENAIR2_DIR}/UTIL/OMG/static.c
${OPENAIR2_DIR}/UTIL/OMG/steadystaterwp.c ${OPENAIR2_DIR}/UTIL/OMG/steadystaterwp.c
${OPENAIR2_DIR}/UTIL/OMG/storage_traci_OMG.c
${OPENAIR2_DIR}/UTIL/OMG/trace.c ${OPENAIR2_DIR}/UTIL/OMG/trace.c
${OPENAIR2_DIR}/UTIL/OMG/trace_hashtable.c ${OPENAIR2_DIR}/UTIL/OMG/trace_hashtable.c
${OPENAIR2_DIR}/UTIL/OPT/probe.c ${OPENAIR2_DIR}/UTIL/OPT/probe.c
...@@ -901,6 +892,15 @@ set(UTIL_SRC ...@@ -901,6 +892,15 @@ set(UTIL_SRC
) )
add_library(UTIL ${UTIL_SRC}) add_library(UTIL ${UTIL_SRC})
#set(OMG_SUMO_SRC
# ${OPENAIR2_DIR}/UTIL/OMG/client_traci_OMG.c
# ${OPENAIR2_DIR}/UTIL/OMG/id_manager.c
# ${OPENAIR2_DIR}/UTIL/OMG/sumo.c
# ${OPENAIR2_DIR}/UTIL/OMG/socket_traci_OMG.c
# ${OPENAIR2_DIR}/UTIL/OMG/storage_traci_OMG.c
# )
#add_library(OMG_SUMO ${OMG_SUMO_SRC})
set(SECU_OSA_SRC set(SECU_OSA_SRC
${OPENAIR2_DIR}/UTIL/OSA/osa_key_deriver.c ${OPENAIR2_DIR}/UTIL/OSA/osa_key_deriver.c
${OPENAIR2_DIR}/UTIL/OSA/osa_rijndael.c ${OPENAIR2_DIR}/UTIL/OSA/osa_rijndael.c
...@@ -1756,7 +1756,6 @@ add_executable(oaisim ...@@ -1756,7 +1756,6 @@ add_executable(oaisim
${OPENAIR_TARGETS}/SIMU/USER/oaisim.c ${OPENAIR_TARGETS}/SIMU/USER/oaisim.c
${OPENAIR2_DIR}/RRC/NAS/nas_config.c ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
${OPENAIR2_DIR}/RRC/NAS/rb_config.c ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
${OPENAIR2_DIR}/UTIL/OMG/sumo.c
${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
${GTPU_need_ITTI} ${GTPU_need_ITTI}
${OPENAIR_TARGETS}/COMMON/create_tasks.c ${OPENAIR_TARGETS}/COMMON/create_tasks.c
...@@ -1802,7 +1801,6 @@ add_executable(oaisim_nos1 ...@@ -1802,7 +1801,6 @@ add_executable(oaisim_nos1
${OPENAIR_TARGETS}/SIMU/USER/oaisim.c ${OPENAIR_TARGETS}/SIMU/USER/oaisim.c
${OPENAIR2_DIR}/RRC/NAS/nas_config.c ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
${OPENAIR2_DIR}/RRC/NAS/rb_config.c ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
${OPENAIR2_DIR}/UTIL/OMG/sumo.c
${OPENAIR_TARGETS}/COMMON/create_tasks.c ${OPENAIR_TARGETS}/COMMON/create_tasks.c
${HW_SOURCE} ${HW_SOURCE}
${TRANSPORT_SOURCE} ${TRANSPORT_SOURCE}
...@@ -1887,7 +1885,6 @@ foreach(myExe s1ap ...@@ -1887,7 +1885,6 @@ foreach(myExe s1ap
aes128_cmac_encrypt aes128_cmac_encrypt
secu_knas_encrypt_eia2) secu_knas_encrypt_eia2)
add_executable(test_${myExe} add_executable(test_${myExe}
${OPENAIR3_DIR}/TEST/test_util.c
${OPENAIR3_DIR}/TEST/test_${myExe}.c ${OPENAIR3_DIR}/TEST/test_${myExe}.c
) )
target_link_libraries (test_${myExe} target_link_libraries (test_${myExe}
......
################################################################################ #/*
# OpenAirInterface # * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
# Copyright(c) 1999 - 2014 Eurecom # * contributor license agreements. See the NOTICE file distributed with
# # * this work for additional information regarding copyright ownership.
# OpenAirInterface is free software: you can redistribute it and/or modify # * The OpenAirInterface Software Alliance licenses this file to You under
# it under the terms of the GNU General Public License as published by # * the OAI Public License, Version 1.0 (the "License"); you may not use this file
# the Free Software Foundation, either version 3 of the License, or # * except in compliance with the License.
# (at your option) any later version. # * You may obtain a copy of the License at
# # *
# OpenAirInterface is distributed in the hope that it will be useful, # * http://www.openairinterface.org/?page_id=698
# but WITHOUT ANY WARRANTY; without even the implied warranty of # *
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # * Unless required by applicable law or agreed to in writing, software
# GNU General Public License for more details. # * distributed under the License is distributed on an "AS IS" BASIS,
# # * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# You should have received a copy of the GNU General Public License # * See the License for the specific language governing permissions and
# along with OpenAirInterface.The full GNU General Public License is # * limitations under the License.
# included in this distribution in the file called "COPYING". If not, # *-------------------------------------------------------------------------------
# see <http:/www.gnu.org/licenses/>. # * For more information about the OpenAirInterface (OAI) Software Alliance:
# # * contact@openairinterface.org
# Contact Information # */
# OpenAirInterface Admin: openair_admin@eurecom.fr
# OpenAirInterface Tech : openair_tech@eurecom.fr
# OpenAirInterface Dev : openair4g-devel@lists.eurecom.fr
#
# Address : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
# Author: Lionel GAUTHIER # Author: Lionel GAUTHIER
###############################################################################
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_VERBOSE_MAKEFILE ON)
......
#****************************************************************************** #/*
# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
# Eurecom OpenAirInterface # * contributor license agreements. See the NOTICE file distributed with
# Copyright(c) 1999 - 2013 Eurecom # * this work for additional information regarding copyright ownership.
# * The OpenAirInterface Software Alliance licenses this file to You under
# This program is free software; you can redistribute it and/or modify it # * the OAI Public License, Version 1.0 (the "License"); you may not use this file
# under the terms and conditions of the GNU General Public License, # * except in compliance with the License.
# version 2, as published by the Free Software Foundation. # * You may obtain a copy of the License at