diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index ba05e8ba414fc07288c12c030be1f81fa5ab9218..56def83bc4b1dd4b5426730009032f8206722c6a 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -1826,7 +1826,7 @@ endif()
if (OAI_NW_DRIVER_USE_NETLINK)
list(APPEND nasmesh_src netlink.c)
endif()
-make_driver(nasmesh ${OPENAIR2_DIR}/NAS/DRIVER/MESH ${nasmesh_src})
+make_driver(nasmesh ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH ${nasmesh_src})
# ???
####################
@@ -1834,7 +1834,7 @@ list(APPEND oai_nw_drv_src device.c common.c ioctl.c classifier.c tool.c)
if(OAI_NW_DRIVER_USE_NETLINK)
list(APPEND oai_nw_drv_src netlink.c)
endif()
-make_driver(oai_nw_drv ${OPENAIR2_DIR}/NAS/DRIVER/LITE ${oai_nw_drv_src})
+make_driver(oai_nw_drv ${OPENAIR2_DIR}/NETWORK_DRIVER/LITE ${oai_nw_drv_src})
# Exmimo board drivers
#########################
diff --git a/openair-cn/NAS/EURECOM-NAS/tools/ue_data.c b/openair-cn/NAS/EURECOM-NAS/tools/ue_data.c
index 8608ee117d062480ee7efa230d4af204b0315c0b..4336c54dd870db6c88415fba56e4926397e17cf4 100644
--- a/openair-cn/NAS/EURECOM-NAS/tools/ue_data.c
+++ b/openair-cn/NAS/EURECOM-NAS/tools/ue_data.c
@@ -124,7 +124,6 @@ int main (int argc, const char* argv[])
_display_usage(argv[0]);
exit(EXIT_SUCCESS);
}
-
/*
* ----------------------
* UE's non-volatile data
diff --git a/openair-cn/UDP/udp_eNB_task.c b/openair-cn/UDP/udp_eNB_task.c
index 875dfc5abc38c9dda33411826886ec40622adbe9..b8c29d5eea023dc6a9c19471e441c3a55fb6d38f 100644
--- a/openair-cn/UDP/udp_eNB_task.c
+++ b/openair-cn/UDP/udp_eNB_task.c
@@ -175,7 +175,8 @@ int udp_eNB_create_socket(int port, char *ip_addr, task_id_t task_id)
if ((rc = bind(sd, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) < 0) {
close(sd);
- AssertFatal(rc >= 0, "UDP: Failed to bind socket: (%s:%d)\n\n", strerror(errno), errno);
+ AssertFatal(rc >= 0, "UDP: Failed to bind socket: (%s:%d) address %s port %u\n",
+ strerror(errno), errno, ip_addr, port);
}
/* Create a new descriptor for this connection */
diff --git a/openair1/DOCS/DOXYGEN/Doxyfile.openair2 b/openair1/DOCS/DOXYGEN/Doxyfile.openair2
index 6153620336d43339dcfd1398f9215b188a6fc767..c3fa4a2320769c10966cc852f12b884c3404bbe3 100644
--- a/openair1/DOCS/DOXYGEN/Doxyfile.openair2
+++ b/openair1/DOCS/DOXYGEN/Doxyfile.openair2
@@ -4,19 +4,19 @@
# Project related configuration options
#---------------------------------------------------------------------------
PROJECT_NAME = OPENAIR
-PROJECT_NUMBER =
-OUTPUT_DIRECTORY =
+PROJECT_NUMBER =
+OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
USE_WINDOWS_ENCODING = YES
BRIEF_MEMBER_DESC = YES
REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF =
+ABBREVIATE_BRIEF =
ALWAYS_DETAILED_SEC = NO
INLINE_INHERITED_MEMB = NO
FULL_PATH_NAMES = NO
-STRIP_FROM_PATH =
-STRIP_FROM_INC_PATH =
+STRIP_FROM_PATH =
+STRIP_FROM_INC_PATH =
SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = YES
MULTILINE_CPP_IS_BRIEF = YES
@@ -24,7 +24,7 @@ DETAILS_AT_TOP = YES
INHERIT_DOCS = NO
DISTRIBUTE_GROUP_DOC = NO
TAB_SIZE = 8
-ALIASES =
+ALIASES =
OPTIMIZE_OUTPUT_FOR_C = YES
OPTIMIZE_OUTPUT_JAVA = NO
SUBGROUPING = YES
@@ -52,18 +52,18 @@ GENERATE_TODOLIST = YES
GENERATE_TESTLIST = NO
GENERATE_BUGLIST = YES
GENERATE_DEPRECATEDLIST= NO
-ENABLED_SECTIONS =
+ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = NO
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
-QUIET = NO
+QUIET = NO
WARNINGS = YES
WARN_IF_UNDOCUMENTED = YES
WARN_IF_DOC_ERROR = YES
WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE =
+WARN_LOGFILE =
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
@@ -76,25 +76,25 @@ INPUT = ../../PHY/spec_defs.h \
../../PHY/ESTIMATION/defs.h \
../../PHY/CONFIG/defs.h \
../../PHY/INIT/defs.h \
- $(OPENAIR2_DIR)/LAYER2/MAC/defs.h \
+ $(OPENAIR2_DIR)/LAYER2/MAC/defs.h \
$(OPENAIR2_DIR)/COMMON/mac_rrc_primitives.h \
$(OPENAIR2_DIR)/COMMON/mac_rlc_primitives.h \
$(OPENAIR2_DIR)/LAYER2/MAC/lchan_interface.h \
$(OPENAIR2_DIR)/PHY_INTERFACE/defs.h \
- $(OPENAIR2_DIR)/NAS/DRIVER/MESH/proto_extern.h \
+ $(OPENAIR2_DIR)/NETWORK_DRIVER/MESH/proto_extern.h \
$(OPENAIR2_DIR)/SIMULATION/PHY_EMULATION/CONTROL/defs.h \
FILE_PATTERNS = *.h
RECURSIVE = NO
-EXCLUDE =
+EXCLUDE =
EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS =
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS =
+EXCLUDE_PATTERNS =
+EXAMPLE_PATH =
+EXAMPLE_PATTERNS =
EXAMPLE_RECURSIVE = NO
IMAGE_PATH = images
-INPUT_FILTER =
-FILTER_PATTERNS =
+INPUT_FILTER =
+FILTER_PATTERNS =
FILTER_SOURCE_FILES = NO
#---------------------------------------------------------------------------
# configuration options related to source browsing
@@ -110,29 +110,29 @@ VERBATIM_HEADERS = YES
#---------------------------------------------------------------------------
ALPHABETICAL_INDEX = NO
COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
+IGNORE_PREFIX =
#---------------------------------------------------------------------------
COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
+IGNORE_PREFIX =
#---------------------------------------------------------------------------
# configuration options related to the alphabetical class index
#---------------------------------------------------------------------------
ALPHABETICAL_INDEX = NO
COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
+IGNORE_PREFIX =
#---------------------------------------------------------------------------
# configuration options related to the HTML output
#---------------------------------------------------------------------------
GENERATE_HTML = YES
HTML_OUTPUT = html
HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET =
+HTML_HEADER =
+HTML_FOOTER =
+HTML_STYLESHEET =
HTML_ALIGN_MEMBERS = YES
GENERATE_HTMLHELP = YES
CHM_FILE = irs_openair.chm
-HHC_LOCATION =
+HHC_LOCATION =
GENERATE_CHI = NO
BINARY_TOC = NO
TOC_EXPAND = NO
@@ -162,8 +162,8 @@ GENERATE_RTF = NO
RTF_OUTPUT = rtf
COMPACT_RTF = YES
RTF_HYPERLINKS = YES
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
#---------------------------------------------------------------------------
# configuration options related to the man page output
#---------------------------------------------------------------------------
@@ -176,8 +176,8 @@ MAN_LINKS = NO
#---------------------------------------------------------------------------
GENERATE_XML = NO
XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
+XML_SCHEMA =
+XML_DTD =
XML_PROGRAMLISTING = YES
#---------------------------------------------------------------------------
# configuration options for the AutoGen Definitions output
@@ -189,29 +189,29 @@ GENERATE_AUTOGEN_DEF = NO
GENERATE_PERLMOD = NO
PERLMOD_LATEX = NO
PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
+PERLMOD_MAKEVAR_PREFIX =
#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
+# Configuration options related to the preprocessor
#---------------------------------------------------------------------------
ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
+INCLUDE_PATH =
+INCLUDE_FILE_PATTERNS =
PREDEFINED = __attribute__(x)=, PHY_CONTEXT
-EXPAND_AS_DEFINED =
+EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration::additions related to external references
#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
+TAGFILES =
+GENERATE_TAGFILE =
ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
+# Configuration options related to the dot tool
#---------------------------------------------------------------------------
CLASS_DIAGRAMS = NO
HIDE_UNDOC_RELATIONS = NO
@@ -223,7 +223,7 @@ TEMPLATE_RELATIONS = NO
INCLUDE_GRAPH = NO
INCLUDED_BY_GRAPH = NO
CALL_GRAPH = NO
-GRAPHICAL_HIERARCHY = NO
+GRAPHICAL_HIERARCHY = NO
DOT_IMAGE_FORMAT = jpg
DOT_PATH = "/usr/bin"
DOTFILE_DIRS = ../docs/dotfiles
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
index a731f17917d39d1f5ef4b59be267ee68ea3185c9..94eddded6e1a5d443bd0caf34acb1ad2ebdcec25 100755
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
@@ -59,7 +59,7 @@ extern int otg_enabled;
#include "../MAC/extern.h"
#include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
-#include "NAS/DRIVER/LITE/constant.h"
+#include "NETWORK_DRIVER/LITE/constant.h"
#include "SIMULATION/ETH_TRANSPORT/extern.h"
#include "UTIL/OCG/OCG.h"
#include "UTIL/OCG/OCG_extern.h"
diff --git a/openair2/NAS/DRIVER/LITE/COPYING b/openair2/NETWORK_DRIVER/LITE/COPYING
similarity index 100%
rename from openair2/NAS/DRIVER/LITE/COPYING
rename to openair2/NETWORK_DRIVER/LITE/COPYING
diff --git a/openair2/NAS/DRIVER/LITE/Makefile b/openair2/NETWORK_DRIVER/LITE/Makefile
similarity index 100%
rename from openair2/NAS/DRIVER/LITE/Makefile
rename to openair2/NETWORK_DRIVER/LITE/Makefile
diff --git a/openair2/NAS/DRIVER/LITE/RB_TOOL/Makefile b/openair2/NETWORK_DRIVER/LITE/RB_TOOL/Makefile
similarity index 100%
rename from openair2/NAS/DRIVER/LITE/RB_TOOL/Makefile
rename to openair2/NETWORK_DRIVER/LITE/RB_TOOL/Makefile
diff --git a/openair2/NAS/DRIVER/LITE/RB_TOOL/rb_tool.c b/openair2/NETWORK_DRIVER/LITE/RB_TOOL/rb_tool.c
similarity index 100%
rename from openair2/NAS/DRIVER/LITE/RB_TOOL/rb_tool.c
rename to openair2/NETWORK_DRIVER/LITE/RB_TOOL/rb_tool.c
diff --git a/openair2/NAS/DRIVER/LITE/classifier.c b/openair2/NETWORK_DRIVER/LITE/classifier.c
similarity index 100%
rename from openair2/NAS/DRIVER/LITE/classifier.c
rename to openair2/NETWORK_DRIVER/LITE/classifier.c
diff --git a/openair2/NAS/DRIVER/LITE/common.c b/openair2/NETWORK_DRIVER/LITE/common.c
similarity index 100%
rename from openair2/NAS/DRIVER/LITE/common.c
rename to openair2/NETWORK_DRIVER/LITE/common.c
diff --git a/openair2/NAS/DRIVER/LITE/constant.h b/openair2/NETWORK_DRIVER/LITE/constant.h
similarity index 100%
rename from openair2/NAS/DRIVER/LITE/constant.h
rename to openair2/NETWORK_DRIVER/LITE/constant.h
diff --git a/openair2/NAS/DRIVER/LITE/device.c b/openair2/NETWORK_DRIVER/LITE/device.c
similarity index 100%
rename from openair2/NAS/DRIVER/LITE/device.c
rename to openair2/NETWORK_DRIVER/LITE/device.c
diff --git a/openair2/NAS/DRIVER/LITE/ioctl.c b/openair2/NETWORK_DRIVER/LITE/ioctl.c
similarity index 100%
rename from openair2/NAS/DRIVER/LITE/ioctl.c
rename to openair2/NETWORK_DRIVER/LITE/ioctl.c
diff --git a/openair2/NAS/DRIVER/LITE/ioctl.h b/openair2/NETWORK_DRIVER/LITE/ioctl.h
similarity index 100%
rename from openair2/NAS/DRIVER/LITE/ioctl.h
rename to openair2/NETWORK_DRIVER/LITE/ioctl.h
diff --git a/openair2/NAS/DRIVER/LITE/local.h b/openair2/NETWORK_DRIVER/LITE/local.h
similarity index 100%
rename from openair2/NAS/DRIVER/LITE/local.h
rename to openair2/NETWORK_DRIVER/LITE/local.h
diff --git a/openair2/NAS/DRIVER/LITE/netlink.c b/openair2/NETWORK_DRIVER/LITE/netlink.c
similarity index 100%
rename from openair2/NAS/DRIVER/LITE/netlink.c
rename to openair2/NETWORK_DRIVER/LITE/netlink.c
diff --git a/openair2/NAS/DRIVER/LITE/proto_extern.h b/openair2/NETWORK_DRIVER/LITE/proto_extern.h
similarity index 100%
rename from openair2/NAS/DRIVER/LITE/proto_extern.h
rename to openair2/NETWORK_DRIVER/LITE/proto_extern.h
diff --git a/openair2/NAS/DRIVER/LITE/sap.h b/openair2/NETWORK_DRIVER/LITE/sap.h
similarity index 100%
rename from openair2/NAS/DRIVER/LITE/sap.h
rename to openair2/NETWORK_DRIVER/LITE/sap.h
diff --git a/openair2/NAS/DRIVER/LITE/tool.c b/openair2/NETWORK_DRIVER/LITE/tool.c
similarity index 100%
rename from openair2/NAS/DRIVER/LITE/tool.c
rename to openair2/NETWORK_DRIVER/LITE/tool.c
diff --git a/openair2/NAS/DRIVER/MESH/COPYING b/openair2/NETWORK_DRIVER/MESH/COPYING
similarity index 100%
rename from openair2/NAS/DRIVER/MESH/COPYING
rename to openair2/NETWORK_DRIVER/MESH/COPYING
diff --git a/openair2/NAS/DRIVER/MESH/Makefile b/openair2/NETWORK_DRIVER/MESH/Makefile
similarity index 100%
rename from openair2/NAS/DRIVER/MESH/Makefile
rename to openair2/NETWORK_DRIVER/MESH/Makefile
diff --git a/openair2/NAS/DRIVER/MESH/RB_TOOL/Makefile b/openair2/NETWORK_DRIVER/MESH/RB_TOOL/Makefile
similarity index 100%
rename from openair2/NAS/DRIVER/MESH/RB_TOOL/Makefile
rename to openair2/NETWORK_DRIVER/MESH/RB_TOOL/Makefile
diff --git a/openair2/NAS/DRIVER/MESH/RB_TOOL/rb_tool.c b/openair2/NETWORK_DRIVER/MESH/RB_TOOL/rb_tool.c
similarity index 100%
rename from openair2/NAS/DRIVER/MESH/RB_TOOL/rb_tool.c
rename to openair2/NETWORK_DRIVER/MESH/RB_TOOL/rb_tool.c
diff --git a/openair2/NAS/DRIVER/MESH/TESTBENCH/testbench.c b/openair2/NETWORK_DRIVER/MESH/TESTBENCH/testbench.c
similarity index 100%
rename from openair2/NAS/DRIVER/MESH/TESTBENCH/testbench.c
rename to openair2/NETWORK_DRIVER/MESH/TESTBENCH/testbench.c
diff --git a/openair2/NAS/DRIVER/MESH/classifier.c b/openair2/NETWORK_DRIVER/MESH/classifier.c
similarity index 100%
rename from openair2/NAS/DRIVER/MESH/classifier.c
rename to openair2/NETWORK_DRIVER/MESH/classifier.c
diff --git a/openair2/NAS/DRIVER/MESH/common.c b/openair2/NETWORK_DRIVER/MESH/common.c
similarity index 100%
rename from openair2/NAS/DRIVER/MESH/common.c
rename to openair2/NETWORK_DRIVER/MESH/common.c
diff --git a/openair2/NAS/DRIVER/MESH/constant.h b/openair2/NETWORK_DRIVER/MESH/constant.h
similarity index 100%
rename from openair2/NAS/DRIVER/MESH/constant.h
rename to openair2/NETWORK_DRIVER/MESH/constant.h
diff --git a/openair2/NAS/DRIVER/MESH/device.c b/openair2/NETWORK_DRIVER/MESH/device.c
similarity index 100%
rename from openair2/NAS/DRIVER/MESH/device.c
rename to openair2/NETWORK_DRIVER/MESH/device.c
diff --git a/openair2/NAS/DRIVER/MESH/ioctl.c b/openair2/NETWORK_DRIVER/MESH/ioctl.c
similarity index 100%
rename from openair2/NAS/DRIVER/MESH/ioctl.c
rename to openair2/NETWORK_DRIVER/MESH/ioctl.c
diff --git a/openair2/NAS/DRIVER/MESH/ioctl.h b/openair2/NETWORK_DRIVER/MESH/ioctl.h
similarity index 100%
rename from openair2/NAS/DRIVER/MESH/ioctl.h
rename to openair2/NETWORK_DRIVER/MESH/ioctl.h
diff --git a/openair2/NAS/DRIVER/MESH/local.h b/openair2/NETWORK_DRIVER/MESH/local.h
similarity index 100%
rename from openair2/NAS/DRIVER/MESH/local.h
rename to openair2/NETWORK_DRIVER/MESH/local.h
diff --git a/openair2/NAS/DRIVER/MESH/mesh.c b/openair2/NETWORK_DRIVER/MESH/mesh.c
similarity index 100%
rename from openair2/NAS/DRIVER/MESH/mesh.c
rename to openair2/NETWORK_DRIVER/MESH/mesh.c
diff --git a/openair2/NAS/DRIVER/MESH/netlink.c b/openair2/NETWORK_DRIVER/MESH/netlink.c
similarity index 100%
rename from openair2/NAS/DRIVER/MESH/netlink.c
rename to openair2/NETWORK_DRIVER/MESH/netlink.c
diff --git a/openair2/NAS/DRIVER/MESH/proto_extern.h b/openair2/NETWORK_DRIVER/MESH/proto_extern.h
similarity index 100%
rename from openair2/NAS/DRIVER/MESH/proto_extern.h
rename to openair2/NETWORK_DRIVER/MESH/proto_extern.h
diff --git a/openair2/NAS/DRIVER/MESH/rrc_nas_primitives.h b/openair2/NETWORK_DRIVER/MESH/rrc_nas_primitives.h
similarity index 100%
rename from openair2/NAS/DRIVER/MESH/rrc_nas_primitives.h
rename to openair2/NETWORK_DRIVER/MESH/rrc_nas_primitives.h
diff --git a/openair2/NAS/DRIVER/MESH/sap.h b/openair2/NETWORK_DRIVER/MESH/sap.h
similarity index 100%
rename from openair2/NAS/DRIVER/MESH/sap.h
rename to openair2/NETWORK_DRIVER/MESH/sap.h
diff --git a/openair2/NAS/DRIVER/MESH/tool.c b/openair2/NETWORK_DRIVER/MESH/tool.c
similarity index 100%
rename from openair2/NAS/DRIVER/MESH/tool.c
rename to openair2/NETWORK_DRIVER/MESH/tool.c
diff --git a/openair2/RRC/NAS/rb_config.c b/openair2/RRC/NAS/rb_config.c
index 1bf9d6bb7ba5ebd9ee2ff3512e191897a042bd50..2779a70420776ec427f6cf91ca82ac41aac3d203 100644
--- a/openair2/RRC/NAS/rb_config.c
+++ b/openair2/RRC/NAS/rb_config.c
@@ -42,9 +42,9 @@
#include "nas_config.h"
#include "UTIL/LOG/log.h"
-#include "NAS/DRIVER/MESH/rrc_nas_primitives.h"
-#include "NAS/DRIVER/MESH/ioctl.h"
-#include "NAS/DRIVER/MESH/constant.h"
+#include "NETWORK_DRIVER/MESH/rrc_nas_primitives.h"
+#include "NETWORK_DRIVER/MESH/ioctl.h"
+#include "NETWORK_DRIVER/MESH/constant.h"
#define BUF_SIZE 800