-
-
diff --git a/openair2/UTIL/OSD/README.txt b/openair2/UTIL/OSD/README.txt
deleted file mode 100644
index 4636f60e20..0000000000
--- a/openair2/UTIL/OSD/README.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-2012 07 10 - Working version
-It is just generating the XML file and it is placing it in $(OPENAIR_TARGETS)/SIMU/EXAMPLE/OSD/WEBXML/ or http://localhost/xmlfile/ so that the oaisim could pars and run the simulation/emulation
-
-Please follow the steps described below:
-
-- install XAMPP for Linux (http://www.apachefriends.org/en/xampp-linux.html) in /opt (highly recommanded)
-- create a symbolic link to this OSD directory into lampp/htdocs (e.g. cd ln -s $OPENAIR2_DIR/UTIL/OSD /opt/lampp/htdocs/OSD)
-- make sure that the path to $(OPENAIR_TARGETS)/SIMU/EXAMPLE/OSD/ and all the subdirectories are in 777 mode ("chmod -R 777 $(OPENAIR_TARGETS)/SIMU/EXAMPLE/OSD/). This is requires since apache client is nobody and needs to access to this directory for RW
-- set the OAI env vars in $OPENAIR2_DIR/UTIL/OSD/OpenAirEmu.conf
-- copy the $OPENAIR2_DIR/UTIL/OSD/httpd-results.conf in /opt/lampp/etc/extras/
-- add "Include etc/extra/httpd-result.conf" at the end of the /opt/lampp/etc/httpd.conf
-- if does not exist, create a symbolic link pointing at $(OPENAIR_TARGETS)/SIMU/EXAMPLES/OSD/ in /opt/lampp/htdocs/OSD/ (e.g. ln -s $(OPENAIR_TARGETS)/SIMU/EXAMPLES/OSD OSD )
-- restart the lampp (e.g. sudo /opt/lampp/lampp restart)
-- open the browser, and goto http://localhost/OSD
-
-For the license, see the file COPYING
diff --git a/openair2/UTIL/OSD/css/blueprint.css b/openair2/UTIL/OSD/css/blueprint.css
deleted file mode 100644
index 322203110f..0000000000
--- a/openair2/UTIL/OSD/css/blueprint.css
+++ /dev/null
@@ -1,516 +0,0 @@
-/* @group blueprint overrides */
-
-body {
- margin: 0;
- align: center;
-}
-
-div.container {
- margin: 1.5em auto;
-}
-
-a:link {
- color: #0066B3;
-}
-
-a:visited {
- color: #330099;
-}
-
-a:hover,a:focus,a:active {
- color: #BF3030;
-}
-
-h1, h2, h3, h4, h5, h6 {
- color: #222;
-}
-
-thead th, th {
- background: #f7f7f7;
- border-bottom: 1px solid #ccc;
- color: #333;
-}
-
-th a img {
- margin: 0;
-}
-
-tr.even td {
- background: #F1F5FA;
-}
-
-tr.odd td {
- background: #fff;
-}
-
-fieldset dl, fieldset select {
- margin: 0;
-}
-
-.box {
- background: #f7f7f7;
-}
-
-.box fieldset {
- background: #fff;
-}
-
-div.form-item div.description img {
- margin: 0;
-}
-
-div.messages {
- margin-bottom: 1.5em;
- padding: 0.68em;
- font-weight: bold;
-}
-
-div.messages.success {
- border: 1px solid #7AC142;
- color: #55872E;
- background: #F1F8EB;
-}
-
-div.messages ul {
- margin-bottom: 0;
-}
-
-/* @end */
-
-/* @group drupal overrides */
-
-div.admin {
- padding-top: 0; /* fix alignment of admin panel */
-}
-
-div.admin-panel {
- padding: 1.5em 0 0 0;
-}
-
-div.admin-panel .body {
- padding: 0;
-}
-
-div.admin-panel .description {
- margin: 0 0 1.5em 0;
- padding: 0;
-}
-
-div.admin .left,
-div.admin .right {
- margin:0;
-}
-
-#user-admin-filter ul li,
-#node-admin-filter ul li {
- list-style: none; /* remove list style from content node filter */
-}
-
-.breadcrumb {
- padding-bottom: 0;
- margin-bottom: 1.5em;
-}
-
-.more-help-link {
- font-size: 0.9em;
- line-height: 1.667em;
-}
-
-input.form-text, textarea {
- border: 1px solid #ccc;
- padding: 0.2em;
-}
-
-textarea, input {
- font-size: 1em;
- vertical-align:text-bottom;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-div.form-item {
- margin-bottom: 1.5em;
- margin-top: 1.5em;
-}
-
-div.error, tr.error, span.form-required, span.marker {
- color: #8A1F11;
-}
-
-.form-item input.error, .form-item textarea.error, .form-item select.error {
- border: 1px solid #DD7777;
- background: #FFCCCC;
- color: #8A1F11;
-}
-
-/* fix admin/settings/performance */
-
-.form-item strong.error {
- display: block;
-}
-
-.form-item textarea.error {
- padding: 0.2em;
-}
-
-.form-item .description {
- font-size: 0.9em;
- line-height: 1.667em; /* more accurate line-height value */
-}
-
-fieldset {
- background: #f7f7f7;
- border: 1px solid #ccc;
- padding: 0.5em;
-}
-
-fieldset legend {
- display: block;
- font-size: 1em;
- background: #fff;
- border: 1px solid #ccc;
- padding: 0 0.4em;
-}
-
-/* prevent uncessary scrollbars */
-fieldset .collapsible {
- overflow: hidden;
-}
-
-textarea {
- line-height: 1.5em;
- height: auto;
-}
-
-div.resizable-textarea textarea {
- margin-top: 0;
-}
-
-html.js fieldset.collapsed {
- background: none;
-}
-
-html.js fieldset.collapsible legend a {
- background: transparent url(../images/icons/menu-expanded.gif) no-repeat scroll 0% 50%;
- text-decoration: none;
-}
-
-html.js fieldset.collapsed legend a {
- background: transparent url(../images/icons/menu-collapsed.gif) no-repeat scroll 0% 50%;
-}
-
-ul.menu li, .item-list ul li {
- margin: 0;
- padding: 0;
-}
-
-.tips {
- font-size:1em;
- margin-left:3em;
-}
-
-/* remove bottom margins from nested ul elements in menus */
-
-ul.menu li ul {
- margin-bottom: 0;
-}
-
-.block ul, ul.menu, .item-list ul {
- margin: 0pt 1.5em 1.5em;
- padding: 0;
-}
-
-ul li, ul.menu li, .item-list ul li, li.leaf {
- list-style-image: url(../images/icons/menu-leaf.gif);
-}
-
-ul li.expanded {
- list-style-image: url(../images/icons/menu-expanded.gif);
-}
-
-ul li.collapsed {
- list-style-image: url(../images/icons/menu-collapsed.gif);
-}
-
-div.tabs {
- margin-bottom: 1.5em;
-}
-
-ul.secondary {
- margin: 0;
- padding: 0;
-}
-
-ul.secondary li {
- padding: 0 0.7em 0 0; /* align subtabs flush to edge */
- margin: 0 0.5em 0 0;
-}
-
-ul.primary {
- margin: 1.5em 0;
- line-height: 1.417; /* account for 1px bottom border */
-}
-
-ul.primary li a {
- background: #f7f7f7;
- padding: 3px 10px 2px 10px; /* fix alignment of tabs */
-}
-
-div.help {
- background: #ffc;
- padding: 0.75em; /* fix alignment of help text */
- margin-bottom: 1.5em;
-}
-
-/* fix alignment on user profile page */
-
-.profile dt {
- margin: 1.5em 0 0 0;
-}
-
-/* fix book module */
-
-.book-navigation .page-links {
- background: #F1F5FA;
- border: none;
- padding: 0.75em;
- margin-bottom: 1.5em;
-}
-
-.book-navigation .menu {
- padding: 1.417em 0 0 3em;
- margin: 0 0 1.5em 0;
- border-color: #bbb;
-}
-
-/* @end */
-
-/* @group basic elements */
-
-blockquote {
- background: url(../images/lquote.png) no-repeat left top;
- font-size: 1em;
- margin: 0 0 1.5em 0;
- padding: 0 0 0 40px;
-}
-
-blockquote p {
- margin: 0;
-}
-
-#saving {
- background: url(../images/loading.gif) no-repeat 12px 1px;
- padding-left: 36px;
- font-weight: bold;
- font-size: 1em;
- display: none;
-}
-
-#saving p {
- margin: 0;
-}
-
-#saving-notice {
- font-size: 0.9em;
- background: #ffc;
- font-style: italic;
-}
-
-/* @end */
-
-/* @group nodes */
-
-div.node {
- margin: 0 0 1.5em 0;
- padding: 0 0 1.417em 0;
- border-bottom: 1px solid #ccc;
-}
-
-div.node h2 {
- margin-bottom: 0;
-}
-
-div.node div.meta {
- font-size: 0.9em;
- line-height: 1.667em;
- margin-bottom: 1.667em;
-}
-
-div.meta div.submitted, div.meta div.terms {
- display: inline;
-}
-
-div.node div.picture {
- float: right;
- margin: 0 0 0.8em 0.8em;
-}
-
-div.node ul.links {
- display: block;
- text-align: right;
-}
-
-div.node div.meta ul.links {
- display: inline;
- padding: 0 1em 0 0;
-}
-
-/* @end */
-
-/* @group comments */
-
-div.comment-content {
- float: left;
- margin-right: 10px;
-}
-
-div.comment div.picture {
- text-align: right;
-}
-
-div.comment span.username {
- font-weight: bold;
-}
-
-div.comment span.date {
- font-style: italic;
-}
-
-div.comment span.new {
- color: #5B1100;
- font-weight: bold;
-}
-
-div.comment div.permalink {
- width:32px;
- float:right;
-}
-
-div.comment img {
- margin: 0;
- border: 1px solid #ccc;
- padding:1px;
-}
-
-div.comment {
- padding: 0.75em 1em;
- margin: 1.5em 0;
-}
-
-div.comment.odd {
- background: #F1F5FA;
-}
-
-div.comment.author {
- background: #ffc;
-}
-
-h3#comment-number {
- margin-top: 1em;
-}
-
-div.indented {
- margin-left:40px;
-}
-
-/* @end */
-
-/* @group blocks */
-
-div.block {
- margin-bottom: 1.5em;
-}
-
-/* @end */
-
-/* @group block editing */
-
- div.block.with-block-editing
- {
- position: relative;
- }
-
- div.block.with-block-editing div.edit
- {
- display: none;
- position: absolute;
- right: 0;
- top: 0;
- z-index: 40;
- border: 1px solid #eee;
- padding: 0 2px;
- font-size: 9px;
- background-color: #fff;
- }
-
- div.block.with-block-editing:hover div.edit
- {
- display: block;
- }
-
-/* @end */
-
-/* @group pager */
-
-ul.pager {
- line-height: 1.667em;
- margin: 1.667em 0;
- font-size: 0.9em;
-}
-
-ul.pager a, ul.pager li.pager-current {
- border: 1px solid #0066B3;
- text-decoration: none;
- margin-right: 3px;
- padding: 3px 6px;
-}
-
-ul.pager li.pager-current {
- background: #0066B3;
- color: #fff;
-}
-
-ul.pager a:link,
-ul.pager a:visited {
- color:#0066B3;
-}
-
-ul.pager a:hover,
-ul.pager a:focus,
-ul.pager a:active {
- background-color: #0066B3;
- color: #fff;
- border: 1px solid #0066B3;
-}
-
-ul.pager span.pager-ellipsis {
- padding: 0 0.5em;
-}
-
-.item-list .pager li {
- padding:0em;
-}
-
-/* @end */
-
-#user-login-form li.openid-link,
-#user-login li.openid-link {
- background-position: 0 0;
- padding-left:18px;
-}
-
-/* @group Fixes */
-
-/* These are fixes to an issue in blueprint.
-See: http://blueprintcss.lighthouseapp.com/projects/15318-blueprint-css/tickets/94-checkbox-and-radio-button-alignment
-http://drupal.org/node/491052
-http://drupal.org/node/700464 */
-
-input[type=checkbox], input[type=radio], input.checkbox, input.radio {
- top: 0;
-}
-
-textarea, input {
- vertical-align: inherit;
-}
-
-/* @end */
diff --git a/openair2/UTIL/OSD/css/fix-ie-rtl.css b/openair2/UTIL/OSD/css/fix-ie-rtl.css
deleted file mode 100644
index 67e3673731..0000000000
--- a/openair2/UTIL/OSD/css/fix-ie-rtl.css
+++ /dev/null
@@ -1,63 +0,0 @@
-/* $Id: fix-ie-rtl.css,v 1.2 2007/11/09 22:14:41 goba Exp $ */
-
-body {
- /* Center layout */
- text-align: center;
- /* Allow text resizing */
- font-size: 80%;
-}
-
-#squeeze {
- zoom: 1;
- direction: ltr;
-}
-
-#squeeze .left-corner{
- direction: rtl
-}
-
-#header-region, #wrapper #container {
- /* Reset text alignment */
- text-align: right;
-}
-
-#wrapper #container #center {
- /* Reduce amount of damage done by extremely wide content */
- overflow: hidden;
-}
-
-#wrapper #container #center .right-corner .left-corner {
- /* Because of the lack of min-height, we use height as an alternative */
- height: 400px;
-}
-
-fieldset {
- /* Don't draw backgrounds on fieldsets in IE, as they look really bad. */
- background: none;
-}
-
-/* Prevent fieldsets from shifting when changing collapsed state. */
-html.js fieldset.collapsible {
- position: relative;
- top: -1em;
-}
-
-html.js fieldset.collapsed {
- top: 0;
- margin-bottom: 1em;
-}
-
-tr.menu-disabled {
- /* Use filter to emulate CSS3 opacity */
- filter: alpha(opacity=50);
-}
-
-#header-region {
- /* Because of the lack of min-height, we use height as an alternative */
- height: 1em;
-}
-
-#attach-hide label, #uploadprogress div.message {
- /* Fading elements in IE causes the text to bleed unless they have a background. */
- background-color: #ffffff;
-}
diff --git a/openair2/UTIL/OSD/css/fix-ie.css b/openair2/UTIL/OSD/css/fix-ie.css
deleted file mode 100644
index 044dfcc0d5..0000000000
--- a/openair2/UTIL/OSD/css/fix-ie.css
+++ /dev/null
@@ -1,69 +0,0 @@
-/* $Id: fix-ie.css,v 1.8.2.1 2008/02/05 09:27:26 goba Exp $ */
-
-/**
- * Garland, for Drupal 6.x
- * Stefan Nagtegaal, iStyledThis [dot] nl
- * Steven Wittens, acko [dot] net
- */
-
-body {
- /* Center layout */
- text-align: center;
- /* Allow text resizing */
- font-size: 80%;
-}
-
-#header-region, #wrapper #container {
- /* Reset text alignment */
- text-align: left; /* LTR */
-}
-
-#wrapper #container #center {
- /* Reduce amount of damage done by extremely wide content */
- overflow: hidden;
-}
-
-#wrapper #container #center .right-corner .left-corner {
- /* Because of the lack of min-height, we use height as an alternative */
- height: 400px;
-}
-
-fieldset {
- /* Don't draw backgrounds on fieldsets in IE, as they look really bad. */
- background: none;
-}
-
-ul.primary {
- /* Fix missing top margin */
- position: relative; /* LTR */
-/* top: 0.5em; */
-}
-
-/* Prevent fieldsets from shifting when changing collapsed state. */
-html.js fieldset.collapsible {
- position: relative;
- top: -1em;
-}
-html.js fieldset.collapsed {
- top: 0;
- margin-bottom: 1em;
-}
-
-tr.menu-disabled {
- /* Use filter to emulate CSS3 opacity */
- filter: alpha(opacity=50);
-}
-
-#header-region {
- /* Because of the lack of min-height, we use height as an alternative */
- height: 1em;
-}
-
-tr.taxonomy-term-preview {
- filter: alpha(opacity=50);
-}
-
-#attach-hide label, #uploadprogress div.message {
- /* Fading elements in IE causes the text to bleed unless they have a background. */
- background-color: #ffffff;
-}
diff --git a/openair2/UTIL/OSD/css/ie.css b/openair2/UTIL/OSD/css/ie.css
deleted file mode 100644
index 61a5371437..0000000000
--- a/openair2/UTIL/OSD/css/ie.css
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -----------------------------------------------------------------------
-
-
- Blueprint CSS Framework 1.0
- http://blueprintcss.org
-
- * Copyright (c) 2007-Present. See LICENSE for more info.
- * See README for instructions on how to use Blueprint.
- * For credits and origins, see AUTHORS.
- * This is a compressed file. See the sources in the 'src' directory.
-
------------------------------------------------------------------------ */
-
-/* ie.css */
-body {text-align:center;}
-.container {text-align:left;}
-* html .column, * html .span-1, * html .span-2, * html .span-3, * html .span-4, * html .span-5, * html .span-6, * html .span-7, * html .span-8, * html .span-9, * html .span-10, * html .span-11, * html .span-12, * html .span-13, * html .span-14, * html .span-15, * html .span-16, * html .span-17, * html .span-18, * html .span-19, * html .span-20, * html .span-21, * html .span-22, * html .span-23, * html .span-24 {display:inline;overflow-x:hidden;}
-* html legend {margin:0px -8px 16px 0;padding:0;}
-sup {vertical-align:text-top;}
-sub {vertical-align:text-bottom;}
-html>body p code {*white-space:normal;}
-hr {margin:-8px auto 11px;}
-img {-ms-interpolation-mode:bicubic;}
-.clearfix, .container {display:inline-block;}
-* html .clearfix, * html .container {height:1%;}
-fieldset {padding-top:0;}
-legend {margin-top:-0.2em;margin-bottom:1em;margin-left:-0.5em;}
-textarea {overflow:auto;}
-label {vertical-align:middle;position:relative;top:-0.25em;}
-input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;}
-input.text:focus, input.title:focus {border-color:#666;}
-input.text, input.title, textarea, select {margin:0.5em 0;}
-input.checkbox, input.radio {position:relative;top:.25em;}
-form.inline div, form.inline p {vertical-align:middle;}
-form.inline input.checkbox, form.inline input.radio, form.inline input.button, form.inline button {margin:0.5em 0;}
-button, input.button {position:relative;top:0.25em;}
\ No newline at end of file
diff --git a/openair2/UTIL/OSD/css/ie6.css b/openair2/UTIL/OSD/css/ie6.css
deleted file mode 100644
index c9a3ef6e1c..0000000000
--- a/openair2/UTIL/OSD/css/ie6.css
+++ /dev/null
@@ -1,20 +0,0 @@
-table {
- border-collapse: collapse; /* equivalent of cellspacing = 0 */
-}
-
-fieldset {
- padding-top:1.5em;
-}
-
-fieldset legend {
- padding:0 0.5em;
-}
-
-fieldset legend a:link,
-fieldset legend a:visited {
- color:#0066B3;
-}
-
-ul.primary li a {
- padding: 3px 10px 1px 10px; /* fix alignment of tabs */
-}
diff --git a/openair2/UTIL/OSD/css/images/false.png b/openair2/UTIL/OSD/css/images/false.png
deleted file mode 100644
index e308ddcd66..0000000000
Binary files a/openair2/UTIL/OSD/css/images/false.png and /dev/null differ
diff --git a/openair2/UTIL/OSD/css/images/false2.png b/openair2/UTIL/OSD/css/images/false2.png
deleted file mode 100644
index 53950f439a..0000000000
Binary files a/openair2/UTIL/OSD/css/images/false2.png and /dev/null differ
diff --git a/openair2/UTIL/OSD/css/images/lquote.png b/openair2/UTIL/OSD/css/images/lquote.png
deleted file mode 100644
index 28060603fe..0000000000
Binary files a/openair2/UTIL/OSD/css/images/lquote.png and /dev/null differ
diff --git a/openair2/UTIL/OSD/css/images/true.png b/openair2/UTIL/OSD/css/images/true.png
deleted file mode 100644
index cecf618d8a..0000000000
Binary files a/openair2/UTIL/OSD/css/images/true.png and /dev/null differ
diff --git a/openair2/UTIL/OSD/css/images/warning.png b/openair2/UTIL/OSD/css/images/warning.png
deleted file mode 100644
index da3894e3ca..0000000000
Binary files a/openair2/UTIL/OSD/css/images/warning.png and /dev/null differ
diff --git a/openair2/UTIL/OSD/css/print.css b/openair2/UTIL/OSD/css/print.css
deleted file mode 100644
index fe2e089446..0000000000
--- a/openair2/UTIL/OSD/css/print.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -----------------------------------------------------------------------
-
-
- Blueprint CSS Framework 1.0
- http://blueprintcss.org
-
- * Copyright (c) 2007-Present. See LICENSE for more info.
- * See README for instructions on how to use Blueprint.
- * For credits and origins, see AUTHORS.
- * This is a compressed file. See the sources in the 'src' directory.
-
------------------------------------------------------------------------ */
-
-/* print.css */
-body {line-height:1.5;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;color:#000;background:none;font-size:10pt;}
-.container {background:none;}
-hr {background:#ccc;color:#ccc;width:100%;height:2px;margin:2em 0;padding:0;border:none;}
-hr.space {background:#fff;color:#fff;visibility:hidden;}
-h1, h2, h3, h4, h5, h6 {font-family:"Helvetica Neue", Arial, "Lucida Grande", sans-serif;}
-code {font:.9em "Courier New", Monaco, Courier, monospace;}
-a img {border:none;}
-p img.top {margin-top:0;}
-blockquote {margin:1.5em;padding:1em;font-style:italic;font-size:.9em;}
-.small {font-size:.9em;}
-.large {font-size:1.1em;}
-.quiet {color:#999;}
-.hide {display:none;}
-a:link, a:visited {background:transparent;font-weight:700;text-decoration:underline;}
-a:link:after, a:visited:after {content:" (" attr(href) ")";font-size:90%;}
\ No newline at end of file
diff --git a/openair2/UTIL/OSD/css/screen.css b/openair2/UTIL/OSD/css/screen.css
deleted file mode 100644
index 4f3a2344b9..0000000000
--- a/openair2/UTIL/OSD/css/screen.css
+++ /dev/null
@@ -1,267 +0,0 @@
-/* -----------------------------------------------------------------------
-
-
- Blueprint CSS Framework 1.0
- http://blueprintcss.org
-
- * Copyright (c) 2007-Present. See LICENSE for more info.
- * See README for instructions on how to use Blueprint.
- * For credits and origins, see AUTHORS.
- * This is a compressed file. See the sources in the 'src' directory.
-
------------------------------------------------------------------------ */
-
-/* reset.css */
-html {margin:0;padding:0;border:0;}
-body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;}
-article, aside, dialog, figure, footer, header, hgroup, nav, section {display:block;}
-body {line-height:1.5;background:white;}
-table {border-collapse:separate;border-spacing:0;}
-caption, th, td {text-align:left;font-weight:normal;float:none !important;}
-table, th, td {vertical-align:middle;}
-blockquote:before, blockquote:after, q:before, q:after {content:'';}
-blockquote, q {quotes:"" "";}
-a img {border:none;}
-:focus {outline:0;}
-
-/* typography.css */
-html {font-size:100.01%;}
-body {font-size:75%;color:#222;background:#fff;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;}
-h1, h2, h3, h4, h5, h6 {font-weight:normal;color:#111;}
-h1 {font-size:3em;line-height:1;margin-bottom:0.5em;}
-h2 {font-size:2em;margin-bottom:0.75em;}
-h3 {font-size:1.5em;line-height:1;margin-bottom:1em;}
-h4 {font-size:1.2em;line-height:1.25;margin-bottom:1.25em;}
-h5 {font-size:1em;font-weight:bold;margin-bottom:1.5em;}
-h6 {font-size:1em;font-weight:bold;}
-h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {margin:0;}
-p {margin:0 0 1.5em;}
-.left {float:left !important;}
-p .left {margin:1.5em 1.5em 1.5em 0;padding:0;}
-.right {float:right !important;}
-p .right {margin:1.5em 0 1.5em 1.5em;padding:0;}
-a:focus, a:hover {color:#09f;}
-a {color:#06c;text-decoration:underline;}
-blockquote {margin:1.5em;color:#666;font-style:italic;}
-strong, dfn {font-weight:bold;}
-em, dfn {font-style:italic;}
-sup, sub {line-height:0;}
-abbr, acronym {border-bottom:1px dotted #666;}
-address {margin:0 0 1.5em;font-style:italic;}
-del {color:#666;}
-pre {margin:1.5em 0;white-space:pre;}
-pre, code, tt {font:1em 'andale mono', 'lucida console', monospace;line-height:1.5;}
-li ul, li ol {margin:0;}
-ul, ol {margin:0 1.5em 1.5em 0;padding-left:1.5em;}
-ul {list-style-type:disc;}
-ol {list-style-type:decimal;}
-dl {margin:0 0 1.5em 0;}
-dl dt {font-weight:bold;}
-dd {margin-left:1.5em;}
-table {margin-bottom:1.4em;width:100%;}
-th {font-weight:bold;}
-thead th {background:#c3d9ff;}
-th, td, caption {padding:4px 10px 4px 5px;}
-tbody tr:nth-child(even) td, tbody tr.even td {background:#e5ecf9;}
-tfoot {font-style:italic;}
-caption {background:#eee;}
-.small {font-size:.8em;margin-bottom:1.875em;line-height:1.875em;}
-.large {font-size:1.2em;line-height:2.5em;margin-bottom:1.25em;}
-.hide {display:none;}
-.quiet {color:#666;}
-.loud {color:#000;}
-.highlight {background:#ff0;}
-.added {background:#060;color:#fff;}
-.removed {background:#900;color:#fff;}
-.first {margin-left:0;padding-left:0;}
-.last {margin-right:0;padding-right:0;}
-.top {margin-top:0;padding-top:0;}
-.bottom {margin-bottom:0;padding-bottom:0;}
-
-/* forms.css */
-label {font-weight:bold;}
-fieldset {padding:0 1.4em 1.4em 1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;}
-legend {font-weight:bold;font-size:1.2em;margin-top:-0.2em;margin-bottom:1em;}
-fieldset, #IE8#HACK {padding-top:1.4em;}
-legend, #IE8#HACK {margin-top:0;margin-bottom:0;}
-input[type=text], input[type=password], input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;}
-input[type=text]:focus, input[type=password]:focus, input.text:focus, input.title:focus, textarea:focus {border-color:#666;}
-select {background-color:#fff;border-width:1px;border-style:solid;}
-input[type=text], input[type=password], input.text, input.title, textarea, select {margin:0.5em 0;}
-input.text, input.title {width:300px;padding:5px;}
-input.title {font-size:1.5em;}
-textarea {width:390px;height:250px;padding:5px;}
-form.inline {line-height:3;}
-form.inline p {margin-bottom:0;}
-.error, .alert, .notice, .success, .info, .dde {padding:0.8em;margin-bottom:1em;border:2px solid #ddd;}
-.error, .alert {background:#fbe3e4;color:#8a1f11;border-color:#fbc2c4;}
-.notice {background:#fff6bf;color:#514721;border-color:#ffd324;}
-.success {background:#e6efc2;color:#264409;border-color:#c6d880;}
-.info {background:#d5edf8;color:#205791;border-color:#92cae4;}
-.dde {background:#FFCC99;color:#FF6633;border-color:#ff9933;}
-.error a, .alert a {color:#8a1f11;}
-.notice a {color:#514721;}
-.success a {color:#264409;}
-.info a {color:#205791;}
-.dde a {color:#FF6633;}
-
-/* grid.css */
-.container {width:950px;margin:0 auto;}
-.showgrid {background:url(src/grid.png);}
-.column, .span-1, .span-2, .span-3, .span-4, .span-5, .span-6, .span-7, .span-8, .span-9, .span-10, .span-11, .span-12, .span-13, .span-14, .span-15, .span-16, .span-17, .span-18, .span-19, .span-20, .span-21, .span-22, .span-23, .span-24 {float:left;margin-right:10px;}
-.last {margin-right:0;}
-.span-1 {width:30px;}
-.span-2 {width:70px;}
-.span-3 {width:110px;}
-.span-4 {width:150px;}
-.span-5 {width:190px;}
-.span-6 {width:230px;}
-.span-7 {width:270px;}
-.span-8 {width:310px;}
-.span-9 {width:350px;}
-.span-10 {width:390px;}
-.span-11 {width:430px;}
-.span-12 {width:470px;}
-.span-13 {width:510px;}
-.span-14 {width:550px;}
-.span-15 {width:590px;}
-.span-16 {width:630px;}
-.span-17 {width:670px;}
-.span-18 {width:710px;}
-.span-19 {width:750px;}
-.span-20 {width:790px;}
-.span-21 {width:830px;}
-.span-22 {width:870px;}
-.span-23 {width:910px;}
-.span-24 {width:950px;margin-right:0;}
-input.span-1, textarea.span-1, input.span-2, textarea.span-2, input.span-3, textarea.span-3, input.span-4, textarea.span-4, input.span-5, textarea.span-5, input.span-6, textarea.span-6, input.span-7, textarea.span-7, input.span-8, textarea.span-8, input.span-9, textarea.span-9, input.span-10, textarea.span-10, input.span-11, textarea.span-11, input.span-12, textarea.span-12, input.span-13, textarea.span-13, input.span-14, textarea.span-14, input.span-15, textarea.span-15, input.span-16, textarea.span-16, input.span-17, textarea.span-17, input.span-18, textarea.span-18, input.span-19, textarea.span-19, input.span-20, textarea.span-20, input.span-21, textarea.span-21, input.span-22, textarea.span-22, input.span-23, textarea.span-23, input.span-24, textarea.span-24 {border-left-width:1px;border-right-width:1px;padding-left:5px;padding-right:5px;}
-input.span-1, textarea.span-1 {width:18px;}
-input.span-2, textarea.span-2 {width:58px;}
-input.span-3, textarea.span-3 {width:98px;}
-input.span-4, textarea.span-4 {width:138px;}
-input.span-5, textarea.span-5 {width:178px;}
-input.span-6, textarea.span-6 {width:218px;}
-input.span-7, textarea.span-7 {width:258px;}
-input.span-8, textarea.span-8 {width:298px;}
-input.span-9, textarea.span-9 {width:338px;}
-input.span-10, textarea.span-10 {width:378px;}
-input.span-11, textarea.span-11 {width:418px;}
-input.span-12, textarea.span-12 {width:458px;}
-input.span-13, textarea.span-13 {width:498px;}
-input.span-14, textarea.span-14 {width:538px;}
-input.span-15, textarea.span-15 {width:578px;}
-input.span-16, textarea.span-16 {width:618px;}
-input.span-17, textarea.span-17 {width:658px;}
-input.span-18, textarea.span-18 {width:698px;}
-input.span-19, textarea.span-19 {width:738px;}
-input.span-20, textarea.span-20 {width:778px;}
-input.span-21, textarea.span-21 {width:818px;}
-input.span-22, textarea.span-22 {width:858px;}
-input.span-23, textarea.span-23 {width:898px;}
-input.span-24, textarea.span-24 {width:938px;}
-.append-1 {padding-right:40px;}
-.append-2 {padding-right:80px;}
-.append-3 {padding-right:120px;}
-.append-4 {padding-right:160px;}
-.append-5 {padding-right:200px;}
-.append-6 {padding-right:240px;}
-.append-7 {padding-right:280px;}
-.append-8 {padding-right:320px;}
-.append-9 {padding-right:360px;}
-.append-10 {padding-right:400px;}
-.append-11 {padding-right:440px;}
-.append-12 {padding-right:480px;}
-.append-13 {padding-right:520px;}
-.append-14 {padding-right:560px;}
-.append-15 {padding-right:600px;}
-.append-16 {padding-right:640px;}
-.append-17 {padding-right:680px;}
-.append-18 {padding-right:720px;}
-.append-19 {padding-right:760px;}
-.append-20 {padding-right:800px;}
-.append-21 {padding-right:840px;}
-.append-22 {padding-right:880px;}
-.append-23 {padding-right:920px;}
-.prepend-1 {padding-left:40px;}
-.prepend-2 {padding-left:80px;}
-.prepend-3 {padding-left:120px;}
-.prepend-4 {padding-left:160px;}
-.prepend-5 {padding-left:200px;}
-.prepend-6 {padding-left:240px;}
-.prepend-7 {padding-left:280px;}
-.prepend-8 {padding-left:320px;}
-.prepend-9 {padding-left:360px;}
-.prepend-10 {padding-left:400px;}
-.prepend-11 {padding-left:440px;}
-.prepend-12 {padding-left:480px;}
-.prepend-13 {padding-left:520px;}
-.prepend-14 {padding-left:560px;}
-.prepend-15 {padding-left:600px;}
-.prepend-16 {padding-left:640px;}
-.prepend-17 {padding-left:680px;}
-.prepend-18 {padding-left:720px;}
-.prepend-19 {padding-left:760px;}
-.prepend-20 {padding-left:800px;}
-.prepend-21 {padding-left:840px;}
-.prepend-22 {padding-left:880px;}
-.prepend-23 {padding-left:920px;}
-.border {padding-right:4px;margin-right:5px;border-right:1px solid #ddd;}
-.colborder {padding-right:24px;margin-right:25px;border-right:1px solid #ddd;}
-.pull-1 {margin-left:-40px;}
-.pull-2 {margin-left:-80px;}
-.pull-3 {margin-left:-120px;}
-.pull-4 {margin-left:-160px;}
-.pull-5 {margin-left:-200px;}
-.pull-6 {margin-left:-240px;}
-.pull-7 {margin-left:-280px;}
-.pull-8 {margin-left:-320px;}
-.pull-9 {margin-left:-360px;}
-.pull-10 {margin-left:-400px;}
-.pull-11 {margin-left:-440px;}
-.pull-12 {margin-left:-480px;}
-.pull-13 {margin-left:-520px;}
-.pull-14 {margin-left:-560px;}
-.pull-15 {margin-left:-600px;}
-.pull-16 {margin-left:-640px;}
-.pull-17 {margin-left:-680px;}
-.pull-18 {margin-left:-720px;}
-.pull-19 {margin-left:-760px;}
-.pull-20 {margin-left:-800px;}
-.pull-21 {margin-left:-840px;}
-.pull-22 {margin-left:-880px;}
-.pull-23 {margin-left:-920px;}
-.pull-24 {margin-left:-960px;}
-.pull-1, .pull-2, .pull-3, .pull-4, .pull-5, .pull-6, .pull-7, .pull-8, .pull-9, .pull-10, .pull-11, .pull-12, .pull-13, .pull-14, .pull-15, .pull-16, .pull-17, .pull-18, .pull-19, .pull-20, .pull-21, .pull-22, .pull-23, .pull-24 {float:left;position:relative;}
-.push-1 {margin:0 -40px 1.5em 40px;}
-.push-2 {margin:0 -80px 1.5em 80px;}
-.push-3 {margin:0 -120px 1.5em 120px;}
-.push-4 {margin:0 -160px 1.5em 160px;}
-.push-5 {margin:0 -200px 1.5em 200px;}
-.push-6 {margin:0 -240px 1.5em 240px;}
-.push-7 {margin:0 -280px 1.5em 280px;}
-.push-8 {margin:0 -320px 1.5em 320px;}
-.push-9 {margin:0 -360px 1.5em 360px;}
-.push-10 {margin:0 -400px 1.5em 400px;}
-.push-11 {margin:0 -440px 1.5em 440px;}
-.push-12 {margin:0 -480px 1.5em 480px;}
-.push-13 {margin:0 -520px 1.5em 520px;}
-.push-14 {margin:0 -560px 1.5em 560px;}
-.push-15 {margin:0 -600px 1.5em 600px;}
-.push-16 {margin:0 -640px 1.5em 640px;}
-.push-17 {margin:0 -680px 1.5em 680px;}
-.push-18 {margin:0 -720px 1.5em 720px;}
-.push-19 {margin:0 -760px 1.5em 760px;}
-.push-20 {margin:0 -800px 1.5em 800px;}
-.push-21 {margin:0 -840px 1.5em 840px;}
-.push-22 {margin:0 -880px 1.5em 880px;}
-.push-23 {margin:0 -920px 1.5em 920px;}
-.push-24 {margin:0 -960px 1.5em 960px;}
-.push-1, .push-2, .push-3, .push-4, .push-5, .push-6, .push-7, .push-8, .push-9, .push-10, .push-11, .push-12, .push-13, .push-14, .push-15, .push-16, .push-17, .push-18, .push-19, .push-20, .push-21, .push-22, .push-23, .push-24 {float:left;position:relative;}
-div.prepend-top, .prepend-top {margin-top:1.5em;}
-div.append-bottom, .append-bottom {margin-bottom:1.5em;}
-.box {padding:1.5em;margin-bottom:1.5em;background:#e5eCf9;}
-hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:1px;margin:0 0 1.45em;border:none;}
-hr.space {background:#fff;color:#fff;visibility:hidden;}
-.clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;}
-.clearfix, .container {display:block;}
-.clear {clear:both;}
diff --git a/openair2/UTIL/OSD/css/style.css b/openair2/UTIL/OSD/css/style.css
deleted file mode 100644
index a159ab2942..0000000000
--- a/openair2/UTIL/OSD/css/style.css
+++ /dev/null
@@ -1,31 +0,0 @@
-/* put your custom CSS in here */
-
-/* ADDED BY PHIL */
-.error-message{
- background:url(images/false.png) 10px center no-repeat;
- padding:0 0 0 30px;
- display:inline;
- color:#ff5b5b;
- border-color: #FF0000;
- display:none;
-}
-
-.good-message{
- background:url(images/true.png) 10px center no-repeat;
- padding:0 0 0 30px;
- display:inline;
- color:#99CC33;
- display:none;
-}
-
-
-#xmlwritten {
- position:absolute;
- left:20%;
- width:60%;
- margin-top:50px;
- text-align:center;
- padding:15px;
- border:1px dashed #333;
- }
-
diff --git a/openair2/UTIL/OSD/fake_oaisim b/openair2/UTIL/OSD/fake_oaisim
deleted file mode 100755
index 08c46fa12c..0000000000
--- a/openair2/UTIL/OSD/fake_oaisim
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-ls -lR /
-
diff --git a/openair2/UTIL/OSD/form.php b/openair2/UTIL/OSD/form.php
deleted file mode 100644
index d8cb1e5d83..0000000000
--- a/openair2/UTIL/OSD/form.php
+++ /dev/null
@@ -1,353 +0,0 @@
-
Warning
The OpenAirInterface Simulator is already running.
-You should wait for the current simulation to be over before to process to a new one.
-
" kill "-
-* All fields have to be filled in. If you get a red cross- - diff --git a/openair2/UTIL/OSD/header.php b/openair2/UTIL/OSD/header.php deleted file mode 100644 index fe2cf57a19..0000000000 --- a/openair2/UTIL/OSD/header.php +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - -it means your field is empty, so please insert a value. Whereas if you get a green tick
, it would mean that you correctly filled in the field
-* The fields in grey have been disabled for the moment since they are not yet supported by our Emulation plateform.
-
-
OpenAirEmulation Scenario Descriptor - Basic Scenario
- -= 1){ - // the process is still running - include('Platform_is_running.php'); - return false; - } - - include('form.php'); - return true; - // the process is dead - } - -// Way Number one - USING the OCG.pid file -/* $myFile = "OCG.pid"; -$fh = fopen($myFile, 'r'); -$theData = fread($fh, filesize($myFile)); -fclose($fh); -checkPid($theData); */ - -// Way Number Two - Checking whether a process called OCG is running -$name = 'oaisim'; -checkPid($name); -?> - - - - diff --git a/openair2/UTIL/OSD/jquery/jquery.js b/openair2/UTIL/OSD/jquery/jquery.js deleted file mode 100644 index 4c38852a46..0000000000 --- a/openair2/UTIL/OSD/jquery/jquery.js +++ /dev/null @@ -1,13 +0,0 @@ -// $Id: jquery.js,v 1.12.2.3 2008/06/25 09:38:39 goba Exp $ - -/* - * jQuery 1.2.6 - New Wave Javascript - * - * Copyright (c) 2008 John Resig (jquery.com) - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) - * Rev: 5685 - */ -eval(function(p,a,c,k,e,r){e=function(c){return(c'.$RESULTS_PATH.'
'.$OPENAIR1_DIR.'
'.$OPENAIR2_DIR.'
'.$OPENAIR3_DIR.'
'; - -// TO HIDE ALL THE PHP ERRORS AND WARNINGS -ini_set('display_errors','Off'); -ini_set('log_errors',1); -ini_set('error_log','/var/logs/php/errlog.txt'); - -// ***************************************************************************************** -// COPY and PASTE -//FROM HERE COPY AND PASTE THE CONTENT OF THE FORM RECEPTION OF THE WEBPORTAL VERSION FROM AFTER THIS LINE -// -// ***************************************************************************************** - -function nospace($input) { - $espace = array(" "); - return str_replace($espace, "", $input); -} - -// PHIL - To put a 0 or 1 between tags For all the CHECKBOXES so they are not empties- 2012 06 28 -if ( isset($_POST['throughput']) && $_POST['throughput'] == '1' ) { $THROUGHPUT = 1; } else { $THROUGHPUT = 0; } -if ( isset($_POST['latency']) && $_POST['latency'] == '1' ) { $LATENCY = 1; } else { $LATENCY = 0; } -if ( isset($_POST['lossrate']) && $_POST['lossrate'] == '1' ) { $LOSS_RATE = 1; } else { $LOSS_RATE = 0; } -if ( isset($_POST['pkttrace']) && $_POST['pkttrace'] == '1' ) { $PKTTRACE = 1; } else { $PKTTRACE = 0; } -if ( isset($_POST['bg_traffic']) && $_POST['bg_traffic'] == '1' ) { $BG_TRAFFIC = 1; } else { $BG_TRAFFIC = 0; } -if ( isset($_POST['curves']) && $_POST['curves'] == '1' ) { $CURVES = enabled; } else { $CURVES = disabled; } -// More parameters -if ( isset($_POST['phy_abstraction']) && $_POST['phy_abstraction'] == '1' ) { $PHY_ABSTRACTION = '-a'; } else { $PHY_ABSTRACTION = ''; } -if ( isset($_POST['pcap_trace']) && $_POST['pcap_trace'] == '1' ) { $PCAP_TRACE = 1; } else { $PCAP_TRACE = 0; } -if ( isset($_POST['profiling']) && $_POST['profiling'] == '1' ) { $PROFILING = 1; } else { $PROFILING = 0; } -if ( isset($_POST['dl_mcs'])) { $DL_MCS = '-m' . $_POST['dl_mcs']; } else { $DL_MCS = ''; } -if ( isset($_POST['ul_mcs'])) { $UL_MCS = '-t' . $_POST['ul_mcs']; } else { $UL_MCS = ''; } -if ( isset($_POST['snr'])) { $SNR = '-s' . $_POST['snr']; } else { $SNR = ''; } -if ( isset($_POST['transmission_mode'])) { $TRANSMISSION_MODE = $_POST['transmission_mode']; } else { $TRANSMISSION_MODE = ''; } -if ( isset($_POST['frame_type'])) { $FRAME_TYPE = $_POST['frame_type']; } else { $FRAME_TYPE = ''; } -if ( isset($_POST['tdd_config'])) { $TDD_CONFIG = '
"; - - -/* -// VARIABLES FOR WEBPORTAL -$EMU_RESULTS = "/drupal-6.19/CLUSTER/r4g7/emu_results"; -$EMU_RESULTS_USER = $EMU_RESULTS.'/'.str_replace($espace, "", $user).'/'.$date; -$FOR_R4G1 = "/opt/lampp/htdocs/drupal-6.19/CLUSTER/r4g7/emu_results/".str_replace($espace, "", $user)."/".$date."/LOGS/"; -$CHEMIN = "/nfs/emu_results/".str_replace($espace, "", $user)."/".$date."/LOGS/"; -$file = '/opt/lampp/htdocs/drupal-6.19/CLUSTER/r4g7/webxml/'.$XML_FILE; -*/ - -// VARIABLES FOR PORTABLE VERSION -$xmlfile = $WEBXML_PATH.'/'.str_replace($espace, "", $user).'.'.$date.'.xml'; -//echo $xmlfile.'
'.$XML_FILENAME.'
'; -// 1 - WRITTING THE XML FILE -File_put_contents($xmlfile, $data); -sleep(1); - -// IN PORTABLE VERSION THERE IS NO FOR R4G1, SINCE WE WORK ON ONLY ONE MACHINE -// RESULTS_PATH is defined in /opt/lampp/htdocs/OSD/OpenAirEmu.conf file -$RESULTS_PATH_EMULATION = $RESULTS_PATH."/".str_replace($espace, "", $user)."/".$date."/"; -//echo $RESULTS_PATH_EMULATION.'
'; -//$RESULTS_PATH_EMULATION_LOGS = $RESULTS_PATH_EMULATION."LOGS/"; -//$RESULTS_PATH_EMULATION_XML = $RESULTS_PATH_EMULATION."SCENARIO/XML/"; - -// PROFILING and PCAP Copy -if ($PROFILING == 1) { - $PROFILING_PARSE = '2>profiling.log'; - $PROFILING_COPY = ' ; cp profiling.log '.$RESULTS_PATH_EMULATION; -} -else { - $PROFILING_PARSE = ''; - $PROFILING_COPY = ''; -} -if ($PCAP_TRACE == 1) { - $PCAP_COPY = ' ; cp oai_opt.pcap '.$RESULTS_PATH_EMULATION; -} -else { - $PCAP_COPY = ''; -} - -// -1 : portable, 0: web portal, # for templates -// 2 - STARTING OAISIM -// $OAISIM=shell_exec("set -x ; mkdir /tmp/$ID ; cd /tmp/$ID ; export OPENAIR1_DIR=$OPENAIR1_DIR ; export OPENAIR2_DIR=$OPENAIR2_DIR ; export OPENAIR3_DIR=$OPENAIR3_DIR ; export OPENAIR_TARGETS=$OPENAIR_TARGETS ; $OPENAIR_TARGETS/SIMU/USER/oaisim -a -c $XML_FILENAME >oaisim.log ; mv * $RESULTS_PATH_EMULATION_LOGS ; rmdir /tmp/$ID "); - -$OAISIM="set -x ; mkdir /tmp/$ID ; cd /tmp/$ID ; export OPENAIR1_DIR=$OPENAIR1_DIR ; export OPENAIR2_DIR=$OPENAIR2_DIR ; export OPENAIR3_DIR=$OPENAIR3_DIR ; export OPENAIR_TARGETS=$OPENAIR_TARGETS ; $OPENAIR_TARGETS/SIMU/USER/oaisim $PHY_ABSTRACTION $SNR $DL_MCS $UL_MCS -c -1 >oaisim.log ".$PROFILING_PARSE." ; cp oaisim.log $RESULTS_PATH_EMULATION".$PROFILING_COPY.$PCAP_COPY; - -//echo $OAISIM; - -shell_exec($OAISIM); - -// Get hostname -if (version_compare(PHP_VERSION, '5.3.0') >= 0) { - $hostname = gethostname(); -} -elseif (version_compare(PHP_VERSION, '4.2.0') >= 0) { - $hostname = php_uname('n'); -} -elseif (version_compare(PHP_VERSION, '4.2.0') < 0) { - $hostname = getenv('HOSTNAME'); - if(!$hostname) $hostname = trim(`hostname`); - if(!$hostname) $hostname = exec('echo $HOSTNAME'); - if(!$hostname) $hostname = preg_replace('#^\w+\s+(\w+).*$#', '$1', exec('uname -a')); -} - -// APACHE VARIABLES -$RESULTS_PATH="http://".$hostname."/results/"; -$XMLFILE_PATH="http://".$hostname."/xmlfile/"; - -// PROFILING and PCAP Results -if ($PROFILING == 1) { - $PROFILING_OUTPUT = ' -
-
-
';
-}
-else {
- $PROFILING_OUTPUT = '';
-}
-if ($PCAP_TRACE == 1) {
- $PCAP_OUTPUT = '
- -
Here are the performance profiling statistics :
-
- profiling.log
-
-
';
-}
-else {
- $PCAP_OUTPUT = '';
-}
-
-//
-// 3 - DISPLAY RESULTS
-//
-
-// THE FIRST SQUARE - XML FILE
-echo '
--
Here is the PCAP File :
-
- oai_opt.pcap
-
-
-
- -
-
'; - } - } - closedir($handle); - } - -echo '
- '.nospace($_POST['sumocmd']).'
- '.nospace($_POST['sumoconffile']).'
- '.nospace($_POST['sumostart']).'
- '.nospace($_POST['sumoend']).'
- '.nospace($_POST['sumostep']).'
- '.nospace($_POST['sumohostip']).'
- '.nospace($_POST['sumohostport']).'
-
-
-
-
- '.$CLI_START_ENB.'
- '.$CLI_START_UE.'
-
-
-'.nospace($_POST['eNB_antennas_rx']).'
- '.nospace($_POST['eNB_antennas_tx']).'
-
-'.nospace($_POST['UE_antennas_rx']).'
- '.nospace($_POST['UE_antennas_tx']).'
-*/
-
-
-
-/*
-// UE MOBILITY TYPE
-//
-if ( $_POST['uemobility'] == 'fixed' ) {
-$UE_MOBILITY =
- ''.nospace($_POST['uemobility']).' ';
- }
-if ( $_POST['uemobility'] == 'random_waypoint' ) {
-$UE_MOBILITY =
- ''.nospace($_POST['uemobility']).' ';
- }
-if ( $_POST['uemobility'] == 'random_walk' ) {
-$UE_MOBILITY =
- ''.nospace($_POST['uemobility']).' ';
- }
-if ( $_POST['uemobility'] == 'grid_walk' ) {
-$UE_MOBILITY =
- ''.nospace($_POST['uemobility']).'
-
- '.nospace($_POST['horizgrid']).'
- '.nospace($_POST['vertgrid']).'
-
- '.nospace($_POST['gridtype']).' ';
- }
-
-//
-// UEs DISTRIBUTION
-//
-if ( $_POST['uedistr'] == 'random' ) {
-$UE_DISTRIBUTION =
- '
- 1
- ';
- }
-
-if ( $_POST['uedistr'] == 'concentrated' ) {
-$UE_DISTRIBUTION =
- '
- 1
- ';
- }
-
-if ( $_POST['uedistr'] == 'grid_map' ) {
- if ( $_POST['gridmapradio'] == 'random_grid' ) {
-$UE_DISTRIBUTION =
- 'random_grid
-
- '.nospace($_POST['rdgridnbnodes']).'
- ';
- }
- if ( $_POST['gridmapradio'] == 'border_grid' ) {
-$UE_DISTRIBUTION =
- 'border_grid
-
- '.nospace($_POST['bdgridnbnodes']).'
- ';
- }
-}
-
-//
-// eNB INITIAL DISTRIBUTION
-//
-if ( $_POST['eNB_initial_distribution'] == 'grid' ) {
-$eNB_INITIAL_DISTRIBUTION =
- 'grid
-
- '.nospace($_POST['gridx']).'
- '.nospace($_POST['gridy']).'
- ';
- }
-if ( $_POST['eNB_initial_distribution'] == 'hexagonal' ) {
-$eNB_INITIAL_DISTRIBUTION =
- 'hexagonal
-
- '.nospace($_POST['hexanbcells']).'
- '.nospace($_POST['interenbdist']).'
- ';
- }
-if ( $_POST['eNB_initial_distribution'] == 'random' ) {
-$eNB_INITIAL_DISTRIBUTION =
- 'random
-
- '.nospace($_POST['nbenbs']).'
- ';
- }
-
-//
-// TRAFFIC - PACKET SIZE
-//
-if ( $_POST['pktsize'] == 'fixed' ) {
-$PACKET_SIZE =
- 'fixed
-
- '.nospace($_POST['pktsizefixed']).'
- ';
- }
-if ( $_POST['pktsize'] == 'uniform' ) {
-$PACKET_SIZE =
- 'uniform
-
- '.nospace($_POST['pktsizeunimin']).'
- '.nospace($_POST['pktsizeunimax']).'
- ';
- }
-
-//
-// INTER ARRIVAL TIME
-//
-if ( $_POST['interarrivtime'] == 'fixed' ) {
-$INTER_ARRIVAL_TIME =
- 'fixed
-
- '.nospace($_POST['intarrtimefixed']).'
- ';
- }
-if ( $_POST['interarrivtime'] == 'uniform' ) {
-$INTER_ARRIVAL_TIME =
- 'uniform
-
- '.nospace($_POST['intarrtimeunimin']).'
- '.nospace($_POST['intarrtimeunimax']).'
- ';
- }
-if ( $_POST['interarrivtime'] == 'poisson' ) {
-$INTER_ARRIVAL_TIME =
- 'poisson
-
- '.nospace($_POST['intarrtimepoisson']).'
- ';
- }
-
-//
-// RANDOM SEED
-//
-if ( $_POST['randomseed'] == 'random' ) {
-$RANDOM_SEED =
- 'random ';
- }
-if ( $_POST['randomseed'] == 'userspecified' ) {
-$RANDOM_SEED =
- 'user_specified
-
- '.nospace($_POST['seedvalue']).'
- ';
- }
-*/
-?>
diff --git a/openair2/UTIL/OSD/toto.php b/openair2/UTIL/OSD/toto.php
deleted file mode 100644
index 870549377b..0000000000
--- a/openair2/UTIL/OSD/toto.php
+++ /dev/null
@@ -1 +0,0 @@
-toto1234
diff --git a/openair3/NAS/NR_UE/nr_nas_msg.c b/openair3/NAS/NR_UE/nr_nas_msg.c
index 4cfb061cee..dda04f12bb 100644
--- a/openair3/NAS/NR_UE/nr_nas_msg.c
+++ b/openair3/NAS/NR_UE/nr_nas_msg.c
@@ -78,6 +78,12 @@
static nr_ue_nas_t nr_ue_nas[MAX_NUM_NR_UE_INST] = {0};
+nr_ue_nas_t *get_nr_ue_nas_info(uint8_t ue_inst)
+{
+ AssertFatal(ue_inst >= 0 && ue_inst < MAX_NUM_NR_UE_INST, "Invalid UE instance\n");
+ return &nr_ue_nas[ue_inst];
+}
+
#define FOREACH_STATE(TYPE_DEF) \
TYPE_DEF(NAS_SECURITY_NO_SECURITY_CONTEXT, 0) \
TYPE_DEF(NAS_SECURITY_UNPROTECTED, 1) \
@@ -1166,6 +1172,10 @@ static void generateSecurityModeComplete(nr_ue_nas_t *nas, as_nas_info_t *initia
security_header_len
+ mm_msg_encode(plain, (uint8_t *)(initialNasMsg->nas_data + security_header_len), size - security_header_len);
+ if (rr.nas_data) {
+ free(rr.nas_data);
+ }
+
/* ciphering */
uint8_t buf[initialNasMsg->length - 7];
stream_cipher.context = nas->security_container->ciphering_context;
diff --git a/openair3/NAS/NR_UE/nr_nas_msg.h b/openair3/NAS/NR_UE/nr_nas_msg.h
index bbd3a13fe5..7602525313 100644
--- a/openair3/NAS/NR_UE/nr_nas_msg.h
+++ b/openair3/NAS/NR_UE/nr_nas_msg.h
@@ -113,5 +113,6 @@ void *nas_nrue(void *args_p);
void nas_init_nrue(int num_ues);
void nr_ue_create_ip_if(const char *ifnameprefix, const char *ipv4, const char *ipv6, int ue_id, int pdu_session_id);
void request_pdusession(nr_ue_nas_t *nas, const pdu_session_config_t *pdu);
+nr_ue_nas_t *get_nr_ue_nas_info(uint8_t ue_inst);
#endif /* __NR_NAS_MSG_SIM_H__*/
diff --git a/openair3/NAS/UE/UEprocess.c b/openair3/NAS/UE/UEprocess.c
index 2a38c6a461..41ac5d5dde 100644
--- a/openair3/NAS/UE/UEprocess.c
+++ b/openair3/NAS/UE/UEprocess.c
@@ -393,7 +393,6 @@ static void _nas_clean(user_api_id_t *user_api_id, int net_fd)
LOG_TRACE (INFO, "UE-MAIN - Perform EMM and ESM cleanup");
// FIXME nas_network_cleanup depends on nas_user_t
- // Why this program should interfere like that with oaisim ?
//nas_network_cleanup ();
LOG_TRACE (INFO, "UE-MAIN - "
diff --git a/openair3/NGAP/ngap_gNB.c b/openair3/NGAP/ngap_gNB.c
index 995de828bb..da4108df12 100644
--- a/openair3/NGAP/ngap_gNB.c
+++ b/openair3/NGAP/ngap_gNB.c
@@ -66,10 +66,6 @@
#include "sctp_messages_types.h"
#include "tree.h"
-#if defined(TEST_S1C_AMF)
- #include "oaisim_amf_test_s1c.h"
-#endif
-
static int ngap_gNB_generate_ng_setup_request(
ngap_gNB_instance_t *instance_p, ngap_gNB_amf_data_t *ngap_amf_data_p);
@@ -300,13 +296,8 @@ static
void ngap_gNB_handle_sctp_data_ind(sctp_data_ind_t *sctp_data_ind) {
int result;
DevAssert(sctp_data_ind != NULL);
-#if defined(TEST_S1C_AMF)
- amf_test_s1_notify_sctp_data_ind(sctp_data_ind->assoc_id, sctp_data_ind->stream,
- sctp_data_ind->buffer, sctp_data_ind->buffer_length);
-#else
ngap_gNB_handle_message(sctp_data_ind->assoc_id, sctp_data_ind->stream,
sctp_data_ind->buffer, sctp_data_ind->buffer_length);
-#endif
result = itti_free(TASK_UNKNOWN, sctp_data_ind->buffer);
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
}
diff --git a/openair3/S1AP/s1ap_eNB.c b/openair3/S1AP/s1ap_eNB.c
index 3676ecc88d..e5b2bf5e32 100644
--- a/openair3/S1AP/s1ap_eNB.c
+++ b/openair3/S1AP/s1ap_eNB.c
@@ -59,9 +59,6 @@
#include "assertions.h"
#include "conversions.h"
-#if defined(TEST_S1C_MME)
- #include "oaisim_mme_test_s1c.h"
-#endif
static int s1ap_eNB_generate_s1_setup_request(
s1ap_eNB_instance_t *instance_p, s1ap_eNB_mme_data_t *s1ap_mme_data_p);
@@ -411,15 +408,10 @@ static
void s1ap_eNB_handle_sctp_data_ind(sctp_data_ind_t *sctp_data_ind) {
int result;
DevAssert(sctp_data_ind != NULL);
-#if defined(TEST_S1C_MME)
- mme_test_s1_notify_sctp_data_ind(sctp_data_ind->assoc_id, sctp_data_ind->stream,
- sctp_data_ind->buffer, sctp_data_ind->buffer_length);
-#else
if (s1ap_eNB_handle_message(sctp_data_ind->assoc_id, sctp_data_ind->stream,
sctp_data_ind->buffer, sctp_data_ind->buffer_length) == -1) {
S1AP_ERROR("Failed to handle s1ap eNB message\n");
}
-#endif
result = itti_free(TASK_UNKNOWN, sctp_data_ind->buffer);
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
}
diff --git a/openair3/valgrind.sh b/openair3/valgrind.sh
deleted file mode 100755
index e353645435..0000000000
--- a/openair3/valgrind.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-valgrind --tool=memcheck --leak-check=full --show-reachable=yes --num-callers=20 --track-origins=yes --track-fds=yes ./objs/OAISIM_MME/oaisim_mme 2>leakage
\ No newline at end of file
diff --git a/radio/fhi_72/oran-config.c b/radio/fhi_72/oran-config.c
index 4478154e6c..512a7841c6 100644
--- a/radio/fhi_72/oran-config.c
+++ b/radio/fhi_72/oran-config.c
@@ -441,17 +441,16 @@ void print_fh_config(const struct xran_fh_config *fh_config)
#endif
}
-static uint64_t get_u64_mask(const paramdef_t *pd)
+static void get_u128_mask(const paramdef_t *pd, uint64_t *u0t63, uint64_t *u64t127)
{
DevAssert(pd != NULL);
AssertFatal(pd->numelt > 0, "no entries for creation of mask\n");
- uint64_t mask = 0;
for (int i = 0; i < pd->numelt; ++i) {
int num = pd->iptr[i];
- AssertFatal(num >= 0 && num < 64, "cannot put element of %d in 64-bit mask\n", num);
- mask |= 1LL << num;
+ AssertFatal(num >= 0 && num < 128, "cannot put element of %d in 128-bit mask\n", num);
+ uint64_t *mask = num < 64 ? u0t63 : u64t127;
+ *mask |= 1LL << (num % 64);
}
- return mask;
}
#if defined F_RELEASE
@@ -520,8 +519,7 @@ static bool set_fh_io_cfg(struct xran_io_cfg *io_cfg, const paramdef_t *fhip, in
these parameters are machine specific */
io_cfg->core = *gpd(fhip, nump, ORAN_CONFIG_IO_CORE)->iptr; // core used for IO; absolute CPU core ID for xran library, it should be an isolated core
io_cfg->system_core = *gpd(fhip, nump, ORAN_CONFIG_SYSTEM_CORE)->iptr; // absolute CPU core ID for DPDK control threads, it should be an isolated core
- io_cfg->pkt_proc_core = get_u64_mask(gpd(fhip, nump, ORAN_CONFIG_WORKER_CORES)); // worker mask 0-63
- io_cfg->pkt_proc_core_64_127 = 0x0; // worker mask 64-127; to be used if machine supports more than 64 cores
+ get_u128_mask(gpd(fhip, nump, ORAN_CONFIG_WORKER_CORES), &io_cfg->pkt_proc_core, &io_cfg->pkt_proc_core_64_127); // worker masks 0-63 and 64-127
io_cfg->pkt_aux_core = 0; // sample app says 0 = "do not start"
io_cfg->timing_core = *gpd(fhip, nump, ORAN_CONFIG_IO_CORE)->iptr; // core used by xran
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 63d036a83c..f401a73a3d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,2 +1,3 @@
add_subdirectory(nr-cuup)
add_subdirectory(nr-cu-nrppa)
+add_subdirectory(nr-ue-nas-simulator)
diff --git a/tests/nr-ue-nas-simulator/CMakeLists.txt b/tests/nr-ue-nas-simulator/CMakeLists.txt
new file mode 100644
index 0000000000..040d0f79cf
--- /dev/null
+++ b/tests/nr-ue-nas-simulator/CMakeLists.txt
@@ -0,0 +1,11 @@
+add_executable(nr-ue-nas-simulator-test nr-ue-nas-simulator.c
+ ${OPENAIR2_DIR}/GNB_APP/gnb_config_common.c
+ ${OPENAIR2_DIR}/GNB_APP/gnb_config_ng.c)
+
+target_link_libraries(nr-ue-nas-simulator-test PRIVATE nr_nas nr_common lib_uicc usim_lib)
+target_link_libraries(nr-ue-nas-simulator-test PRIVATE
+ CONFIG_LIB ITTI SCTP_CLIENT
+ f1ap ngap SECURITY GTPV1U
+ UTIL softmodem_common)
+target_link_libraries(nr-ue-nas-simulator-test PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
+add_dependencies(nr-ue-nas-simulator-test params_libconfig)
diff --git a/tests/nr-ue-nas-simulator/README.md b/tests/nr-ue-nas-simulator/README.md
new file mode 100644
index 0000000000..b1af0e1e21
--- /dev/null
+++ b/tests/nr-ue-nas-simulator/README.md
@@ -0,0 +1,87 @@
+This is a simple standalone tester for 5G UE NAS signaling and NGAP messages. It connects to the AMF to perform NGAP and NAS encoding/decoding and validates the UE Registration and PDU Session Establishment processes without the overhead of a full Radio Access Network (PHY/MAC/RLC).
+
+[[_TOC_]]
+
+# Motivation
+- This tester is a lightweight, deterministic tool to **test the UE NAS layer directly**.
+- Developers can easily inject specific NAS messages depending on the use-case.
+- Developers can validate custom NAS/NGAP messages without the need to implement complete RRC/MAC etc procedures.
+
+# Overview
+From a schematic point of view, the tester and Core Network interaction looks like this:
+```
+ +-------+
+ | AMF |
+ +-------+
+ |
+ NGAP/NAS | (N1/N2)
+ |
+ +-------+
+ |tester | (nr-ue-nas-simulator-test)
+ +-------+
+
+```
+
+The tester is designed to validate the integration of NAS and NGAP messages required for a 5G Standalone (SA) UE to attach to the network. It acts as a simulated gNB and a UE, bridging NAS messages directly into NGAP payloads and connecting to the 5G Core Network's AMF.
+
+The following messages are integrated and tested:
+
+* **NGAP:** NG Setup Request/Response, Initial UE Message, Downlink NAS Transport, Uplink NAS Transport, Initial Context Setup Request/Response, PDU Session Resource Setup Request/Response, UE Context Release Command/Complete.
+
+* **NAS (5GMM/5GSM):** Registration Request/Accept/Complete, Authentication Request/Response, Security Mode Command/Complete, PDU Session Establishment Request/Accept, Deregistration Request/Accept.
+
+* **RRC (Custom):** Forwards the uplink/downlink NAS messages directly between UE and AMF.
+
+A test scenario is fixed to these steps:
+1. The 5G Core Network is deployed via Docker.
+2. The tester connects to the AMF and establishes the NGAP connection (NG Setup).
+3. The tester automatically triggers an Initial UE Registration Request.
+4. Authentication and NAS Security Mode procedures are completed.
+5. The tester requests and successfully establishes an IPv4 PDU Session.
+6. The tester finally initiates deregistration request and exits succesfully.
+
+# Usage
+To run this test, you need to set up the Core Network and build the tester.
+
+**1. Core Network Deployment**
+
+Pull the required Docker images for the OAI 5G Core:
+
+ docker pull oaisoftwarealliance/ims:latest
+ docker pull oaisoftwarealliance/oai-amf:develop
+ docker pull oaisoftwarealliance/oai-nrf:develop
+ docker pull oaisoftwarealliance/oai-smf:develop
+ docker pull oaisoftwarealliance/oai-udr:develop
+ docker pull oaisoftwarealliance/oai-upf:develop
+ docker pull oaisoftwarealliance/oai-udm:develop
+ docker pull oaisoftwarealliance/oai-ausf:develop
+
+Deploy the network using the docker compose file:
+
+ cd doc/tutorial_resources/oai-cn5g
+ docker compose -f docker-compose.yaml up -d
+
+At the end of all experiments, you can also undeploy the network with:
+ docker compose -f docker-compose.yaml down -t 0
+
+**2. Building the Tester**
+
+You can build the tester as follows:
+
+ cd ~/openairinterface5g
+ mkdir build && cd build && cmake .. -GNinja && ninja nr-ue-nas-simulator-test
+
+**3. Running the Tester**
+
+Start the tester with the dedicated configuration file:
+
+ openairinterface5g/build$ LD_LIBRARY_PATH=. ./tests/nr-ue-nas-simulator/nr-ue-nas-simulator-test -O ../tests/nr-ue-nas-simulator/test.conf
+
+# Limitations
+- The tester is limited to a fixed flow: Initial Attach -> PDU Session -> Deregistration.
+- The tester doesnt create a GTP tunnel after PDU session and uses a harcoded teid.
+
+# Future Enhancements
+- A real GTP tunnel can be created to test various data related functionalities like QoS.
+- Simulate the actual UE RRC layer, i.e., forwarding the CellGroupConfig, have the UE apply that (without actually using it).
+- Make it scriptable to test custom message implementations.
diff --git a/tests/nr-ue-nas-simulator/nr-ue-nas-simulator.c b/tests/nr-ue-nas-simulator/nr-ue-nas-simulator.c
new file mode 100644
index 0000000000..7e9f64e856
--- /dev/null
+++ b/tests/nr-ue-nas-simulator/nr-ue-nas-simulator.c
@@ -0,0 +1,410 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+#include "executables/softmodem-common.h"
+#include "common/utils/ocp_itti/intertask_interface.h"
+#include "common/ran_context.h"
+#include "nfapi/oai_integration/vendor_ext.h"
+#include "openair2/GNB_APP/gnb_config_common.h"
+#include "openair2/GNB_APP/gnb_config_ng.h"
+#include "openair2/GNB_APP/gnb_paramdef.h"
+#include "openair3/SCTP/sctp_default_values.h"
+#include "openair3/NAS/NR_UE/nr_nas_msg.h"
+#include "executables/nr-uesoftmodem.h"
+#include "openair3/ocp-gtpu/gtp_itf.h"
+
+RAN_CONTEXT_t RC;
+THREAD_STRUCT thread_struct;
+uint64_t downlink_frequency[MAX_NUM_CCs][4];
+int64_t uplink_frequency_offset[MAX_NUM_CCs][4];
+int oai_exit = 0;
+int gnb_id = 0;
+uint32_t tac = 1;
+uint16_t mcc = 1;
+uint16_t mnc = 1;
+uint8_t mnc_len = 2;
+char *gnb_ipv4_address_for_NGU = NULL;
+int NB_UE_INST = 1;
+
+void exit_function(const char *file, const char *function, const int line, const char *s, const int assert)
+{
+ LOG_E(GNB_APP, "error at %s:%d:%s: %s\n", file, line, function, s);
+ abort();
+}
+
+nfapi_mode_t nfapi_mod = -1;
+void nfapi_setmode(nfapi_mode_t nfapi_mode)
+{
+ nfapi_mod = nfapi_mode;
+}
+nfapi_mode_t nfapi_getmode(void)
+{
+ return nfapi_mod;
+}
+
+ngran_node_t get_node_type()
+{
+ return ngran_gNB_CUUP;
+}
+
+nrUE_params_t *get_nrUE_params(void)
+{
+ static nrUE_params_t params = {0};
+ params.extra_pdu_id = -1;
+ return ¶ms;
+}
+
+void create_ue_ip_if(void)
+{
+}
+
+void create_ue_eth_if(void)
+{
+}
+
+void set_qfi(void)
+{
+}
+
+int nr_rlc_get_available_tx_space(const rnti_t rntiP, const logical_chan_id_t channel_idP)
+{
+ abort();
+ return 0;
+}
+
+configmodule_interface_t *uniqCfg = NULL;
+
+// Emulate registration request to register UE in the AMF (required for positioning)
+void send_initial_ue_message(instance_t instance)
+{
+ MessageDef *msg_p = itti_alloc_new_message(TASK_RRC_GNB, 0, NGAP_NAS_FIRST_REQ);
+
+ NGAP_NAS_FIRST_REQ(msg_p).gNB_ue_ngap_id = 1; // Simulated UE ID
+
+ NGAP_NAS_FIRST_REQ(msg_p).plmn.mcc = mcc;
+ NGAP_NAS_FIRST_REQ(msg_p).plmn.mnc = mnc;
+ NGAP_NAS_FIRST_REQ(msg_p).plmn.mnc_digit_length = mnc_len;
+
+ NGAP_NAS_FIRST_REQ(msg_p).nr_cell_id = gnb_id;
+
+ NGAP_NAS_FIRST_REQ(msg_p).establishment_cause = NGAP_RRC_CAUSE_MO_SIGNALLING;
+
+ as_nas_info_t initialNasMsg = {0};
+ nr_ue_nas_t *nr_ue_nas = get_ue_nas_info(0);
+ generateRegistrationRequest(&initialNasMsg, nr_ue_nas, false);
+
+ NGAP_NAS_FIRST_REQ(msg_p).nas_pdu.buf = initialNasMsg.nas_data;
+ NGAP_NAS_FIRST_REQ(msg_p).nas_pdu.len = initialNasMsg.length;
+
+ NGAP_NAS_FIRST_REQ(msg_p).ue_identity.presenceMask = 0;
+
+ itti_send_msg_to_task(TASK_NGAP, instance, msg_p);
+}
+
+void send_uplink_nas_to_amf(instance_t instance, as_nas_info_t *nas_msg)
+{
+ if (nas_msg->length > 0 && nas_msg->nas_data != NULL) {
+ MessageDef *msg = itti_alloc_new_message(TASK_RRC_GNB, instance, NGAP_UPLINK_NAS);
+
+ NGAP_UPLINK_NAS(msg).gNB_ue_ngap_id = 1; // Simulated UE ID
+ NGAP_UPLINK_NAS(msg).nas_pdu.buf = nas_msg->nas_data;
+ NGAP_UPLINK_NAS(msg).nas_pdu.len = nas_msg->length;
+
+ NGAP_UPLINK_NAS(msg).plmn.mcc = mcc;
+ NGAP_UPLINK_NAS(msg).plmn.mnc = mnc;
+ NGAP_UPLINK_NAS(msg).plmn.mnc_digit_length = mnc_len;
+
+ NGAP_UPLINK_NAS(msg).nr_cell_id = gnb_id;
+ NGAP_UPLINK_NAS(msg).tac = tac;
+
+ itti_send_msg_to_task(TASK_NGAP, instance, msg);
+ }
+}
+
+void *rrc_ue_task_local(void *args_p)
+{
+ MessageDef *msg_p;
+ instance_t instance;
+ int result;
+
+ itti_mark_task_ready(TASK_RRC_NRUE);
+ LOG_I(NR_RRC, "Entering RRC UE task (TASK_RRC_NRUE)\n");
+
+ while (1) {
+ itti_receive_msg(TASK_RRC_NRUE, &msg_p);
+ instance = ITTI_MSG_DESTINATION_INSTANCE(msg_p);
+
+ switch (ITTI_MSG_ID(msg_p)) {
+ case TERMINATE_MESSAGE:
+ LOG_W(NR_RRC, " *** Exiting RRC UE thread\n");
+ itti_exit_task();
+ break;
+ case NAS_UPLINK_DATA_REQ:
+ LOG_I(NR_RRC, "Received NAS_UPLINK_DATA_REQ from NAS Library (via RRC UE Task)\n");
+ as_nas_info_t nas_msg;
+ nas_msg.nas_data = NAS_UPLINK_DATA_REQ(msg_p).nasMsg.nas_data;
+ nas_msg.length = NAS_UPLINK_DATA_REQ(msg_p).nasMsg.length;
+ send_uplink_nas_to_amf(instance, &nas_msg);
+ break;
+ case NAS_5GMM_IND:
+ LOG_I(NR_RRC, "Received NAS_5GMM_IND (ignored for nr_ue_nas_simulator test)\n");
+ break;
+ case NAS_KENB_REFRESH_REQ:
+ LOG_I(NR_RRC, "Received NAS_KENB_REFRESH_REQ (ignored for nr_ue_nas_simulator test)\n");
+ break;
+ case NAS_DETACH_REQ:
+ LOG_I(NR_RRC, "Received NAS_DETACH_REQ (ignored for nr_ue_nas_simulator test)\n");
+ break;
+ default:
+ LOG_E(NR_RRC, "RRC UE Task received unexpected message %s\n", ITTI_MSG_NAME(msg_p));
+ break;
+ }
+ result = itti_free(ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
+ AssertFatal(result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
+ msg_p = NULL;
+ }
+ return NULL;
+}
+
+void *gNB_app_task(void *args_p)
+{
+ MessageDef *msg_p = NULL;
+ const char *msg_name = NULL;
+ instance_t instance;
+ int result;
+ /* for no gcc warnings */
+ (void)instance;
+
+ itti_mark_task_ready(TASK_GNB_APP);
+ do {
+ // Wait for a message
+ itti_receive_msg(TASK_GNB_APP, &msg_p);
+
+ msg_name = ITTI_MSG_NAME(msg_p);
+ instance = ITTI_MSG_DESTINATION_INSTANCE(msg_p);
+
+ switch (ITTI_MSG_ID(msg_p)) {
+ case TERMINATE_MESSAGE:
+ LOG_W(GNB_APP, " *** Exiting GNB_APP thread\n");
+ itti_exit_task();
+ break;
+
+ case NGAP_REGISTER_GNB_CNF:
+ LOG_I(GNB_APP, "[gNB %ld] Received %s: associated AMF %d\n", instance, msg_name, NGAP_REGISTER_GNB_CNF(msg_p).nb_amf);
+ LOG_I(GNB_APP, "Triggering NAS Registration sequence\n");
+ send_initial_ue_message(instance);
+ break;
+
+ default:
+ LOG_E(GNB_APP, "Received unexpected message %s\n", msg_name);
+ break;
+ }
+ result = itti_free(ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
+ AssertFatal(result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
+ } while (1);
+
+ return NULL;
+}
+
+// Forward NAS payload from the AMF directly to the NAS NRUE Task
+void forward_downlink_nas_to_ue(uint8_t *pdu_buf, uint32_t pdu_len)
+{
+ if (pdu_len > 0 && pdu_buf != NULL) {
+ MessageDef *msg_p = itti_alloc_new_message(TASK_RRC_GNB, 0, NAS_DOWNLINK_DATA_IND);
+
+ NAS_DOWNLINK_DATA_IND(msg_p).UEid = 0;
+ NAS_DOWNLINK_DATA_IND(msg_p).nasMsg.length = pdu_len;
+ NAS_DOWNLINK_DATA_IND(msg_p).nasMsg.nas_data = malloc_or_fail(pdu_len);
+ memcpy(NAS_DOWNLINK_DATA_IND(msg_p).nasMsg.nas_data, pdu_buf, pdu_len);
+ free(pdu_buf);
+
+ LOG_I(NR_RRC, "Forwarding Downlink NAS message to real NAS Task (Length: %d)\n", pdu_len);
+ itti_send_msg_to_task(TASK_NAS_NRUE, 0, msg_p);
+ }
+}
+
+void *rrc_gnb_task(void *args_p)
+{
+ MessageDef *msg_p;
+ MessageDef *msg_p_resp;
+ instance_t instance;
+ int result;
+
+ itti_mark_task_ready(TASK_RRC_GNB);
+ LOG_I(NR_RRC, "Entering main loop of NR_RRC message task\n");
+
+ while (1) {
+ // Wait for a message
+ itti_receive_msg(TASK_RRC_GNB, &msg_p);
+ const char *msg_name_p = ITTI_MSG_NAME(msg_p);
+ instance = ITTI_MSG_DESTINATION_INSTANCE(msg_p);
+ LOG_D(NR_RRC,
+ "RRC GNB Task Received %s for instance %ld from task %s\n",
+ ITTI_MSG_NAME(msg_p),
+ ITTI_MSG_DESTINATION_INSTANCE(msg_p),
+ ITTI_MSG_ORIGIN_NAME(msg_p));
+ switch (ITTI_MSG_ID(msg_p)) {
+ case TERMINATE_MESSAGE:
+ LOG_W(NR_RRC, " *** Exiting NR_RRC thread\n");
+ itti_exit_task();
+ break;
+ case NGAP_DOWNLINK_NAS:
+ LOG_I(NR_RRC, "Received NGAP_DOWNLINK_NAS\n");
+ forward_downlink_nas_to_ue(NGAP_DOWNLINK_NAS(msg_p).nas_pdu.buf, NGAP_DOWNLINK_NAS(msg_p).nas_pdu.len);
+ break;
+ case NGAP_INITIAL_CONTEXT_SETUP_REQ:
+ LOG_I(NR_RRC, "Received NGAP_INITIAL_CONTEXT_SETUP_REQ\n");
+
+ if (NGAP_INITIAL_CONTEXT_SETUP_REQ(msg_p).nas_pdu.len > 0) {
+ LOG_I(NR_RRC, "Processing NAS PDU in Initial Context Setup\n");
+ forward_downlink_nas_to_ue(NGAP_INITIAL_CONTEXT_SETUP_REQ(msg_p).nas_pdu.buf,
+ NGAP_INITIAL_CONTEXT_SETUP_REQ(msg_p).nas_pdu.len);
+ }
+
+ LOG_I(NR_RRC, "Sending NGAP_INITIAL_CONTEXT_SETUP_RESP\n");
+ msg_p_resp = itti_alloc_new_message(TASK_RRC_GNB, 0, NGAP_INITIAL_CONTEXT_SETUP_RESP);
+ NGAP_INITIAL_CONTEXT_SETUP_RESP(msg_p_resp).gNB_ue_ngap_id = NGAP_INITIAL_CONTEXT_SETUP_REQ(msg_p).gNB_ue_ngap_id;
+ itti_send_msg_to_task(TASK_NGAP, instance, msg_p_resp);
+ break;
+ case NAS_UPLINK_DATA_REQ:
+ LOG_I(NR_RRC, "Received NAS_UPLINK_DATA_REQ from NAS Library\n");
+ as_nas_info_t nas_msg;
+ nas_msg.nas_data = NAS_UPLINK_DATA_REQ(msg_p).nasMsg.nas_data;
+ nas_msg.length = NAS_UPLINK_DATA_REQ(msg_p).nasMsg.length;
+ send_uplink_nas_to_amf(instance, &nas_msg);
+ break;
+ case NGAP_PDUSESSION_SETUP_REQ:
+ LOG_I(NR_RRC, "Received NGAP_PDUSESSION_SETUP_REQ\n");
+
+ for (int i = 0; i < NGAP_PDUSESSION_SETUP_REQ(msg_p).nb_pdusessions_tosetup; i++) {
+ if (NGAP_PDUSESSION_SETUP_REQ(msg_p).pdusession[i].nas_pdu.len > 0) {
+ forward_downlink_nas_to_ue(NGAP_PDUSESSION_SETUP_REQ(msg_p).pdusession[i].nas_pdu.buf,
+ NGAP_PDUSESSION_SETUP_REQ(msg_p).pdusession[i].nas_pdu.len);
+ }
+ }
+
+ msg_p_resp = itti_alloc_new_message(TASK_RRC_GNB, 0, NGAP_PDUSESSION_SETUP_RESP);
+ NGAP_PDUSESSION_SETUP_RESP(msg_p_resp).gNB_ue_ngap_id = NGAP_PDUSESSION_SETUP_REQ(msg_p).gNB_ue_ngap_id;
+ NGAP_PDUSESSION_SETUP_RESP(msg_p_resp).nb_of_pdusessions = NGAP_PDUSESSION_SETUP_REQ(msg_p).nb_pdusessions_tosetup;
+
+ for (int i = 0; i < NGAP_PDUSESSION_SETUP_REQ(msg_p).nb_pdusessions_tosetup; i++) {
+ pdusession_setup_t *resp_item = &NGAP_PDUSESSION_SETUP_RESP(msg_p_resp).pdusessions[i];
+ pdusession_resource_item_t *req_item = &NGAP_PDUSESSION_SETUP_REQ(msg_p).pdusession[i];
+
+ resp_item->pdusession_id = req_item->pdusession_id;
+ resp_item->pdu_session_type = req_item->pdusessionTransfer.pdu_session_type;
+ resp_item->n3_outgoing.teid = 0x00000001 + i;
+ struct in_addr addr;
+ inet_pton(AF_INET, gnb_ipv4_address_for_NGU, &addr);
+ resp_item->n3_outgoing.addr.length = 4;
+ memcpy(resp_item->n3_outgoing.addr.buffer, &addr.s_addr, resp_item->n3_outgoing.addr.length);
+ resp_item->nb_of_qos_flow = req_item->pdusessionTransfer.nb_qos;
+ DevAssert(resp_item->nb_of_qos_flow < MAX_QOS_FLOWS);
+ for (int q = 0; q < resp_item->nb_of_qos_flow; q++) {
+ resp_item->associated_qos_flows[q].qfi = req_item->pdusessionTransfer.qos[q].qfi;
+ resp_item->associated_qos_flows[q].qos_flow_mapping_ind = QOSFLOW_MAPPING_INDICATION_DL;
+ }
+ }
+
+ LOG_I(NR_RRC, "Sending NGAP_PDUSESSION_SETUP_RESP\n");
+ itti_send_msg_to_task(TASK_NGAP, instance, msg_p_resp);
+
+ // Initiate UE Deregistration
+ sleep(1);
+ MessageDef *msg = itti_alloc_new_message(TASK_NAS_NRUE, 0, NAS_DEREGISTRATION_REQ);
+ NAS_DEREGISTRATION_REQ(msg).cause = AS_DETACH;
+ itti_send_msg_to_task(TASK_NAS_NRUE, 0, msg);
+ break;
+ case NGAP_UE_CONTEXT_RELEASE_COMMAND:
+ LOG_I(NR_RRC, "Received NGAP_UE_CONTEXT_RELEASE_COMMAND\n");
+
+ msg_p_resp = itti_alloc_new_message(TASK_RRC_GNB, 0, NGAP_UE_CONTEXT_RELEASE_COMPLETE);
+ NGAP_UE_CONTEXT_RELEASE_COMPLETE(msg_p_resp).gNB_ue_ngap_id = NGAP_UE_CONTEXT_RELEASE_COMMAND(msg_p).gNB_ue_ngap_id;
+
+ LOG_I(NR_RRC, "Sending NGAP_UE_CONTEXT_RELEASE_COMPLETE\n");
+ itti_send_msg_to_task(TASK_NGAP, instance, msg_p_resp);
+ LOG_I(NR_RRC, "Simulator flow finished successfully!\n");
+ exit(EXIT_SUCCESS);
+ break;
+ default:
+ LOG_E(NR_RRC, "[gNB %ld] Received unexpected message %s\n", instance, msg_name_p);
+ break;
+ }
+ result = itti_free(ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
+ AssertFatal(result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
+ msg_p = NULL;
+ }
+}
+
+int main(int argc, char **argv)
+{
+ // load the config file
+ if ((uniqCfg = load_configmodule(argc, argv, CONFIG_ENABLECMDLINEONLY)) == NULL) {
+ exit_fun("[SOFTMODEM] Error, configuration module init failed\n");
+ }
+ logInit();
+
+ nas_init_nrue(NB_UE_INST);
+
+ set_softmodem_sighandler();
+
+ // Initialize ITTI tasks
+ itti_init(TASK_MAX, tasks_info);
+
+ int rc;
+ rc = itti_create_task(TASK_SCTP, sctp_eNB_task, NULL);
+ AssertFatal(rc >= 0, "Create task for SCTP failed\n");
+
+ rc = itti_create_task(TASK_NGAP, ngap_gNB_task, NULL);
+ AssertFatal(rc >= 0, "Create task for NGAP failed\n");
+
+ rc = itti_create_task(TASK_RRC_GNB, rrc_gnb_task, NULL);
+ AssertFatal(rc >= 0, "Create task for RRC failed\n");
+
+ rc = itti_create_task(TASK_GNB_APP, gNB_app_task, NULL);
+ AssertFatal(rc >= 0, "Create task for gNB_app failed\n");
+
+ rc = itti_create_task(TASK_NAS_NRUE, nas_nrue_task, NULL);
+ AssertFatal(rc >= 0, "Create task for nas_nrue_task failed\n");
+
+ rc = itti_create_task(TASK_RRC_NRUE, rrc_ue_task_local, NULL);
+ AssertFatal(rc >= 0, "Create task for RRC_NRUE failed\n");
+
+ MessageDef *msg_p;
+ msg_p = itti_alloc_new_message(TASK_GNB_APP, 0, NGAP_REGISTER_GNB_REQ);
+ RCconfig_NR_NG(msg_p, 0);
+ gnb_id = NGAP_REGISTER_GNB_REQ(msg_p).gNB_id;
+ tac = NGAP_REGISTER_GNB_REQ(msg_p).tac;
+ mcc = NGAP_REGISTER_GNB_REQ(msg_p).plmn[0].plmn.mcc;
+ mnc = NGAP_REGISTER_GNB_REQ(msg_p).plmn[0].plmn.mnc;
+ mnc_len = NGAP_REGISTER_GNB_REQ(msg_p).plmn[0].plmn.mnc_digit_length;
+ gnb_ipv4_address_for_NGU = NGAP_REGISTER_GNB_REQ(msg_p).gnb_ip_address.ipv4_address;
+
+ LOG_I(GNB_APP, "Sending NGAP_REGISTER_GNB_REQ to TASK_NGAP\n");
+ itti_send_msg_to_task(TASK_NGAP, 0, msg_p);
+
+ printf("TYPE TO TERMINATE\n");
+ itti_wait_tasks_end(NULL);
+
+ logClean();
+ printf("Bye.\n");
+ return 0;
+}
diff --git a/tests/nr-ue-nas-simulator/test.conf b/tests/nr-ue-nas-simulator/test.conf
new file mode 100644
index 0000000000..ee4c82b90b
--- /dev/null
+++ b/tests/nr-ue-nas-simulator/test.conf
@@ -0,0 +1,59 @@
+Active_gNBs = ( "gNB-OAI");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+ ////////// Identification parameters:
+ gNB_ID = 0xe00;
+ gNB_name = "gNB-OAI";
+
+ // Tracking area code, 0x0000 and 0xfffe are reserved values
+ tracking_area_code = 1;
+ plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; }) });
+
+ nr_cellid = 12345678L;
+
+ # ------- SCTP definitions
+ SCTP :
+ {
+ # Number of streams to use in input/output
+ SCTP_INSTREAMS = 2;
+ SCTP_OUTSTREAMS = 2;
+ };
+
+
+ ////////// AMF parameters:
+ amf_ip_address = ({ ipv4 = "192.168.70.132"; });
+
+
+ NETWORK_INTERFACES :
+ {
+ GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24";
+ GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24";
+ GNB_PORT_FOR_S1U = 2152; # Spec 2152
+ };
+
+ }
+);
+
+uicc0 = {
+ imsi = "001010000000001";
+ key = "fec86ba6eb707ed08905757b1bb44b8f";
+ opc = "C42449363BBAD02B66D16BC975D77CC1";
+ pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+}
+
+log_config :
+{
+ global_log_level ="info";
+ hw_log_level ="info";
+ phy_log_level ="info";
+ mac_log_level ="info";
+ rlc_log_level ="info";
+ pdcp_log_level ="info";
+ rrc_log_level ="info";
+ ngap_log_level ="debug";
+ f1ap_log_level ="debug";
+};
diff --git a/tools/plots/README.md b/tools/plots/README.md
index 39f9fab6f1..a04043d097 100644
--- a/tools/plots/README.md
+++ b/tools/plots/README.md
@@ -32,3 +32,51 @@ The plots are saved in three formats: `.png`, `.pdf` and `.svg`.
### Example graphs:
#### BER
+
+
+## `plot_power_control.sh`
+
+This plots the relevant graphs for power control at the gNB, exported through T
+and recorded via the [`csv` tracer](../../common/utils/T/DOC/T/csv.md) and
+plotted with `gnuplot`.
+
+Run first the `csv` tracer in one terminal, selecting the desired quantities, and
+write them out to a file:
+
+ ./common/utils/T/tracer/csv -d ../common/utils/T/T_messages.txt -s $'\t' -t time GNB_MAC_PUSCH_POWER_CONTROL time snrx10 phr tpc tb_size txpower_calc rbSize mcs > /tmp/pusch.csv
+
+in a second terminal, run the gNB with desired configuration, and pass the
+`--T_stdout 2` option to connect to the `csv` tracer:
+
+ sudo ./nr-softmodem -O --T_stdout 2
+
+Note that you could also run both in one window, connecting both commands with
+a `&`. In that case, it's important to run the `nr-softmodem` at second
+position, which will receive signals and stop the `csv` tracer when stopping
+the main process.
+
+The script might also be used to print PUCCH SNR. This can be achieved by only
+recording the relevant fields with the `csv` tracer for trace
+`GNB_MAC_PUCCH_POWER_CONTROL
+
+ ./common/utils/T/tracer/record -d ../common/utils/T/T_messages.txt -OFF -on GNB_MAC_PUSCH_POWER_CONTROL -on GNB_MAC_PUCCH_POWER_CONTROL -o /tmp/record.raw
+
+Use the `replay` tracer and `csv` to separate into PUSCH and PUCCH traces.
+
+After recovering the `pusch.csv` file, you could plot it with a script.
+
+ ./plot-power-control.gp.sh /tmp/pusch.csv
+
+The script prints four graphs:
+
+1. prints instantaneous SNR, and "deltaMCS" (the power used for the
+ transmission if in deltaMCS mode that accounts for MCS). It also prints an
+ average SNR, but this has to be manually post-processed from the instanteous
+ SNR values (`snrx10` above)
+2. TPC commands and PHR of the UE
+3. Resource blocks used for all transmissions, and the MCS
+4. transport block size of the transmission, to estimate the amount of traffic.
+
+The script should either auto-scale graphs or have sensible defaults. It prints
+on screen. There is code to print to a file; uncomment the relevant lines to
+achieve this.
diff --git a/tools/plots/plot-power-control.gp.sh b/tools/plots/plot-power-control.gp.sh
new file mode 100755
index 0000000000..33329ad212
--- /dev/null
+++ b/tools/plots/plot-power-control.gp.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+function die() { echo "$@"; exit 1; }
+
+[[ $# == 1 ]] || die "usage: $0 "
+
+FILE=${1}
+
+#OUTPUT=/tmp/results.png
+#echo "dumping to $OUTPUT"
+gnuplot << EOF
+
+#set terminal pngcairo size 2000,2000 enhanced font 'Verdana,10'
+#set output "$OUTPUT"
+
+set format x '%H:%M:%S'
+set timefmt '%H:%M:%S'
+set datafile separator "\t"
+set xdata time
+#set xrange ['08:43:17':'08:43:18']
+set grid
+
+set multiplot layout 4,1
+
+set yrange [0:300]
+set ylabel "dB"
+plot "$FILE" using 1:2 w l title "SNRx10 (inst)", "$FILE" using 1:9 w l title "SNRx10 (smooth)", "$FILE" using 1:6 w l title "txpower-calc"
+
+set yrange [5:50]
+set ylabel "PHR (dB)"
+set y2range [0:3]
+set y2label "TPC"
+set boxwidth 0.1
+plot "$FILE" using 1:4 w points pt 7 axes x1y2 title "TPC", "$FILE" using 1:3 w l title "PHR"
+
+set yrange [0:60]
+set ylabel "RB"
+set y2range [0:27]
+set y2label "MCS"
+plot "$FILE" using 1:7 w l title "RB", "$FILE" using 1:8 w l axes x1y2 title "MCS"
+
+set yrange [0:1000]
+set ylabel "TB size (B)"
+plot "$FILE" using 1:5 w l
+
+unset multiplot
+
+pause mouse close
+EOF
-
-
-
- -
-
-';
-
-
-/*
-// THE SECOND SQUARE - DISPLAY FILE RESULTS
- if ($handle = opendir("$RESULTS_PATH_EMULATION_LOGS")) {
- while (false !== ($file = readdir($handle)))
- {
- if ($file != "." && $file != "..")
- {
- $thelist .= ''.$file.'
-
-
-
- -
Here is the XML file of your OpenAirEmulation :
-
- '.$XML_FILENAME.'
-
-
-
- '.$PROFILING_OUTPUT.'
-
- '.$PCAP_OUTPUT.'
-
- -
Here is the output of your OpenAirEmulation :
-
- oaisim.log
-
-
--
'; - } - } - closedir($handle); - } - -echo '
-
';
-
-// THE THIRD SQUARE - DISPLAY FILE RESULTS
-echo 'List of files:
- -
-
';
-
-*/
-
-
-
-/* PHIL - J'enlve la SUMO CONFIG
-HERE DISPLAY PACKET TRACES FILES
-