diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index 48be9ec905..3447bc6941 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -164,9 +164,6 @@ clean_all_files() { set_openair_env dir=$OPENAIR_DIR/cmake_targets rm -rf $dir/ran_build $dir/ran_build_noLOG - rm -rf $dir/lte-simulators/build - rm -rf $dir/oaisim_build_oai/build $dir/oaisim_build_oai/CMakeLists.txt - rm -rf $dir/autotests/bin $dir/autotests/log $dir/autotests/*/build } ############################################ diff --git a/cmake_targets/tools/mem_usage b/cmake_targets/tools/mem_usage deleted file mode 100755 index 4290372f02..0000000000 --- a/cmake_targets/tools/mem_usage +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -pid=$1 -sleep_sec=0.5 - -if [ "$2" != "" ] ; then -sleep_sec=$2 -fi -#declare -r cnt=$sleep_sec -OUTPUT_FILE="/tmp/mem_usage_${pid}_${sleep_sec}.csv" -echo "RSS(KB);PSS(KB);SHARED_CLEAN(KB);SHARED_DIRTY(KB);PRIVATE)KB)" >> $OUTPUT_FILE -echo "Mem usage for PID $pid with observation period of ${sleep_sec}" - -while ps $pid >/dev/null -do - if [ -f /proc/$pid/smaps ]; then - rss=$(awk '/^Rss/ {i = i + $2} END {print i}' /proc/$pid/smaps) - pss=$(awk '/^Pss/ {i = i + $2 + 0.5} END {print i}' /proc/$pid/smaps) - sc=$(awk '/^Shared_Clean/ {i = i + $2} END {print i}' /proc/$pid/smaps) - sd=$(awk '/^Shared_Dirty/ {i = i + $2} END {print i}' /proc/$pid/smaps) - pc=$(awk '/^Private_Clean/ {i = i + $2} END {print i}' /proc/$pid/smaps) - pd=$(awk '/^Private_Dirty/ {i = i + $2} END {print i}' /proc/$pid/smaps) - echo "$cnt;$rss;$pss;$sc;$pc;$pd;" >> $OUTPUT_FILE - fi - - sleep $sleep_sec -done diff --git a/cmake_targets/tools/start_bladerf.py b/cmake_targets/tools/start_bladerf.py deleted file mode 100755 index ad83d5d517..0000000000 --- a/cmake_targets/tools/start_bladerf.py +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/python -import time -import serial -import os -from pyroute2 import IPRoute -import sys -import re -import threading -import signal -import traceback -import commands - -if os.environ.get('OPENAIR_DIR') == None: - print "Error getting OPENAIR_DIR environment variable" - sys.exit(1) - -sys.path.append(os.path.expandvars('$OPENAIR_DIR/cmake_targets/autotests/tools/')) - -from lib_autotest import * - -def reset_bladerf(): - stringIdBladeRF='OpenMoko, Inc' - status, out = commands.getstatusoutput('lsusb | grep -i \'' + stringIdBladeRF + '\'') - if (out == '') : - print "BladeRF not found. Exiting now..." - sys.exit() - p=re.compile('Bus\s*(\w+)\s*Device\s*(\w+):\s*ID\s*(\w+):(\w+)') - res=p.findall(out) - BusId=res[0][0] - DeviceId=res[0][1] - VendorId=res[0][2] - ProductId=res[0][3] - usb_dir= find_usb_path(VendorId, ProductId) - print "BladeRF Found in directory..." + usb_dir - cmd = "sudo sh -c \"echo 0 > " + usb_dir + "/authorized\"" - os.system(cmd + " ; sleep 5" ) - cmd = "sudo sh -c \"echo 1 > " + usb_dir + "/authorized\"" - os.system(cmd + " ; sleep 5" ) - -os.system ('sudo -E bladeRF-cli --flash-firmware /usr/share/Nuand/bladeRF/bladeRF_fw.img') - -print "Resettting BladeRF..." - -reset_bladerf() - -os.system ("dmesg|tail") diff --git a/common/utils/LOG/README.txt b/common/utils/LOG/README.txt index d56c5a2661..2e95fa68ae 100644 --- a/common/utils/LOG/README.txt +++ b/common/utils/LOG/README.txt @@ -5,7 +5,6 @@ Signals may have two types: - Variables to dump the state of a variable (range 0..2^64 - 1). - Functions to log function usage (implies two call to VCD API: IN and OUT) -This module is always built in, but is only used when -V oaisim option is added. The VCD file generated is called openair_vcd_dump.vcd and is located in the execution folder. Usage: diff --git a/common/utils/T/DOC/T/basic.md b/common/utils/T/DOC/T/basic.md index 5f1c977044..318bf157c3 100644 --- a/common/utils/T/DOC/T/basic.md +++ b/common/utils/T/DOC/T/basic.md @@ -56,9 +56,7 @@ softmodem to wait for a tracer. The default port is 2021. The option `--T_dont_fork` allows one to use gdb to debug problems with the softmodem. Note that you then may have some "zombie" processes after crashes, in which case you can run -`sudo killall -9 lte-softmodem` to get rid of them (`lte-softmodem` -to be replaced by the program you trace, like `lte-softmodem-nos1` -or `oaisim`). +`sudo killall -9 lte-softmodem` to get rid of them. The option `--T_stdout` also accepts values 0 (to disable output on the terminal and only use the T tracer) and 1 (to disable diff --git a/common/utils/T/DOC/T/record.md b/common/utils/T/DOC/T/record.md index c2e58e1e20..67782a0c10 100644 --- a/common/utils/T/DOC/T/record.md +++ b/common/utils/T/DOC/T/record.md @@ -11,7 +11,7 @@ to activate/deactivate specific traces): ./record -d ../T_messages.txt -o record.raw -ON -off VCD -off HEAVY -off LEGACY_GROUP_TRACE -off LEGACY_GROUP_DEBUG ``` -And then you run the program to trace (`lte-softmodem`, `oaisim`, whatever) +And then you run the program to trace (`lte-softmodem`, `nr-softmodem`, whatever) as explained in [basic usage](./basic.md). To stop the recording, you simply press `control+c` to end `record`. diff --git a/common/utils/T/DOC/T/replay.md b/common/utils/T/DOC/T/replay.md index 2390d177f6..c1af2321e2 100644 --- a/common/utils/T/DOC/T/replay.md +++ b/common/utils/T/DOC/T/replay.md @@ -5,7 +5,7 @@ First, read the [basic usage](./basic.md) to compile things. Then, read [record](./record.md) to know how to record a trace. To replay, you use the `replay` program. It will act -as a *tracee* (`lte-softmodem`, `oaisim`, etc.). +as a *tracee* (`lte-softmodem`, `nr-softmodem`, etc.). Then you use your usual tracer, eg. `enb` or `textlog`. diff --git a/doc/L1SIM.md b/doc/L1SIM.md index eef27540fa..bbe527cd29 100644 --- a/doc/L1SIM.md +++ b/doc/L1SIM.md @@ -4,12 +4,8 @@ Rather, you are probably looking for the [RFsimulator](../radio/rfsimulator/README.md)!** -oaisim has been scraped and replaced by the same programs that are used for the -real-time operation, `lte-softmodem` and `lte-uesoftmodem`. This uses the IF4p5 -fronthaul protocol to achieve the communication. - -> Context: oaisim used to be a simulation mode inside OAI to emulate an eNB and -multiple UEs. +`lte-softmodem` and `lte-uesoftmodem` can use the IF4p5 fronthaul protocol to +communicate with each other. [[_TOC_]] @@ -50,7 +46,7 @@ $ cd ../ran_build/build $ sudo ./lte-uesoftmodem -O XXX.conf -r 25 --siml1 --noS1 ``` -That should give you equivalent functionality to what you had with oaisim including noise and RF channel emulation (path loss / fading, etc.). You should also be able to run multiple UEs. +That should give you functionality to do noise and RF channel emulation (path loss / fading, etc.). You should also be able to run multiple UEs. ## How to ping an eNB from a UE and vice versa (with the noS1 option) diff --git a/openair2/UTIL/OSD/OCG.pid b/openair2/UTIL/OSD/OCG.pid deleted file mode 100644 index 8ae5f7cb87..0000000000 --- a/openair2/UTIL/OSD/OCG.pid +++ /dev/null @@ -1 +0,0 @@ -7415 diff --git a/openair2/UTIL/OSD/OpenAirEmu.conf b/openair2/UTIL/OSD/OpenAirEmu.conf deleted file mode 100644 index aa37b9df44..0000000000 --- a/openair2/UTIL/OSD/OpenAirEmu.conf +++ /dev/null @@ -1,15 +0,0 @@ - diff --git a/openair2/UTIL/OSD/Platform_is_running.php b/openair2/UTIL/OSD/Platform_is_running.php deleted file mode 100644 index bf4f0d2f2d..0000000000 --- a/openair2/UTIL/OSD/Platform_is_running.php +++ /dev/null @@ -1,17 +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.

-If the process is stuck, execute the following command :
-

" kill "
-
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 @@ -
-* All fields have to be filled in. If you get a red cross 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.

-
- -
- - - - - -
-
- Environment and System Configuration -
-
-

Fading

-
- Pathloss Exponent : (2 to 6)
- Pathloss Zero Db: dB (0 to -150)

-
-
-


- SCM_A
- SCM_B
- SCM_C
- SCM_D
- EPA
- EVA
- ETU
- Rayleigh8
- Rayleigh1
- Rayleigh1_corr
- Rayleigh1_anticorr
- Rice8
- Rice1
- Rice1_corr
- Rice1_anticorr
- AWGN
-
- -
-

Other parameters

- dB
- MHz
- GHz
-
-
-
-
-
-

- TDD      
- FDD
-
- -
-
-

Antenna

-

- dB
-
- dB
- dBi
- dBm
-
-
-
-
-



- dB
- dBi
- dBm
-
-
-
-
-
-
-
- -
-
- Topology Configuration -
- -
-
- Area X : m
- Area Y : m
-
- -
-
- Homogeneous
- Heterogeneous
-
- -
-
- Macrocell
- MicroCell
- PicoCell
- FemtoCell
-
- -
-
- Number of Relays : (DISABLED)
-
-
- -
-

Mobility

-
- -
- Random
- Concentrated
- Grid Map
-
- -
- Number of Nodes :

- - -
- Static
- Random Way point
- Random Walk
- Trace
- Sumo
- Grid Walk

-
- -
-
- Min Speed :
- Max Speed :
- Min Sleep :
- Max Sleep :
- Min Journey Time :
- Max Journey Time :
-
- -
- SUMO CMD :
- SUMO CONFIG FILE :
- SUMO START :
- SUMO END :
- SUMO STEP :
- SUMO HOST IP :
- SUMO HOST PORT :
-
- -
- -
-
- Fixed
- Pos X : m
- Pos Y : m
- Random
- Grid
- Hexagonal
-
- -
- Number of Cells :

- -
- Static
- Mobile
- -
- -
-

-
-
-
-
- -
-
- Application Configuration - -
- -
-
-

-

-

-
- TCP
- UDP

-
- IPv4
- IPv6

-
- no customised traffic
- scbr
- mcbr
- bcbr
- m2m_AP
- m2m_BR
- gaming_OA
- gaming_TF
- full_buffer
- customised
-
-
- -
- -
-

-

-
- TCP
- UDP

-
- IPv4
- IPv6
-
- -
-
-
- No customised traffic
- uniform
- poisson
- gaussian
- exponential
- static
- weibull
- pareto
- gamma
- cauchy
- ms
- ms
-
-
-
-
-
- - -
-
-
- No customised traffic
- uniform
- poisson
- gaussian
- exponential
- static
- weibull
- pareto
- gamma
- cauchy
-
-
-
-
-
-
-
- -
- -
-
-
- PROB OFF-PU :
- PROB PU-ED :
- HOLDING TIME OFF-PU :

- - -
- PROB OFF-ED :
- PROB ED-PE :
- HOLDING TIME OFF-ED :

- -
- HOLDING TIME OFF-PE :
-
- - -
-
-
- -
-
- Emulation Configuration - -
- : milliseconds(ms)
-
- -
- -
- -
-
- Throughput
- Latency
- Loss Rate
-
- PHY Abstraction
- Profiling Statistics
- PCAP Trace
-
- CLI Enabled
- CLI Start eNB
- CLI Start UE
-
- Show Curves (not working)
-
-
-
- Level
- Verbosity
- Interval
-
-
-
-

- -
-
-
-
- -
-Send details :
-
-
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 @@ - - - - - - -OpenAirEmulation Scenario Descriptor - Basic Scenario - - - - - - - - diff --git a/openair2/UTIL/OSD/httpd-result.conf b/openair2/UTIL/OSD/httpd-result.conf deleted file mode 100644 index 9dd9ca2e86..0000000000 --- a/openair2/UTIL/OSD/httpd-result.conf +++ /dev/null @@ -1,39 +0,0 @@ -# -# Provide access to the documentation on your server as -# http://yourserver.example.com/manual/ -# The documentation is always available at -# http://httpd.apache.org/docs/2.2/ -# -# Required modules: mod_alias, mod_setenvif, mod_negotiation -# - -#AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ "/opt/lampp/manual$1" -# pointing from OSD in htdocs to OSD in $(OPENAIR_TARGETS)/SIMU/EXAMPLES/OSD -Alias /xmlfile/ "/opt/lampp/htdocs/OSD/OSD/WEBXML/" -Alias /results/ "/opt/lampp/htdocs/OSD/OSD/RESULTS/" - - - - #Options Indexes - #AllowOverride None - #Order allow,deny - Allow from all - - - - #Options Indexes - #AllowOverride None - #Order allow,deny - Allow from all - - - # - #SetHandler type-map - # - - #SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br|ru)/ prefer-language=$1 - #RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br|ru)){2,}(/.*)?$ /manual/$1$2 - - #LanguagePriority en de es fr ja ko pt-br ru - #ForceLanguagePriority Prefer Fallback -# diff --git a/openair2/UTIL/OSD/index.php b/openair2/UTIL/OSD/index.php deleted file mode 100644 index 7e76f9f9ad..0000000000 --- a/openair2/UTIL/OSD/index.php +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - -
-

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(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(H(){J w=1b.4M,3m$=1b.$;J D=1b.4M=1b.$=H(a,b){I 2B D.17.5j(a,b)};J u=/^[^<]*(<(.|\\s)+>)[^>]*$|^#(\\w+)$/,62=/^.[^:#\\[\\.]*$/,12;D.17=D.44={5j:H(d,b){d=d||S;G(d.16){7[0]=d;7.K=1;I 7}G(1j d=="23"){J c=u.2D(d);G(c&&(c[1]||!b)){G(c[1])d=D.4h([c[1]],b);N{J a=S.61(c[3]);G(a){G(a.2v!=c[3])I D().2q(d);I D(a)}d=[]}}N I D(b).2q(d)}N G(D.1D(d))I D(S)[D.17.27?"27":"43"](d);I 7.6Y(D.2d(d))},5w:"1.2.6",8G:H(){I 7.K},K:0,3p:H(a){I a==12?D.2d(7):7[a]},2I:H(b){J a=D(b);a.5n=7;I a},6Y:H(a){7.K=0;2p.44.1p.1w(7,a);I 7},P:H(a,b){I D.P(7,a,b)},5i:H(b){J a=-1;I D.2L(b&&b.5w?b[0]:b,7)},1K:H(c,a,b){J d=c;G(c.1q==56)G(a===12)I 7[0]&&D[b||"1K"](7[0],c);N{d={};d[c]=a}I 7.P(H(i){R(c 1n d)D.1K(b?7.V:7,c,D.1i(7,d[c],b,i,c))})},1g:H(b,a){G((b==\'2h\'||b==\'1Z\')&&3d(a)<0)a=12;I 7.1K(b,a,"2a")},1r:H(b){G(1j b!="49"&&b!=U)I 7.4E().3v((7[0]&&7[0].2z||S).5F(b));J a="";D.P(b||7,H(){D.P(7.3t,H(){G(7.16!=8)a+=7.16!=1?7.76:D.17.1r([7])})});I a},5z:H(b){G(7[0])D(b,7[0].2z).5y().39(7[0]).2l(H(){J a=7;1B(a.1x)a=a.1x;I a}).3v(7);I 7},8Y:H(a){I 7.P(H(){D(7).6Q().5z(a)})},8R:H(a){I 7.P(H(){D(7).5z(a)})},3v:H(){I 7.3W(19,M,Q,H(a){G(7.16==1)7.3U(a)})},6F:H(){I 7.3W(19,M,M,H(a){G(7.16==1)7.39(a,7.1x)})},6E:H(){I 7.3W(19,Q,Q,H(a){7.1d.39(a,7)})},5q:H(){I 7.3W(19,Q,M,H(a){7.1d.39(a,7.2H)})},3l:H(){I 7.5n||D([])},2q:H(b){J c=D.2l(7,H(a){I D.2q(b,a)});I 7.2I(/[^+>] [^+>]/.11(b)||b.1h("..")>-1?D.4r(c):c)},5y:H(e){J f=7.2l(H(){G(D.14.1f&&!D.4n(7)){J a=7.6o(M),5h=S.3h("1v");5h.3U(a);I D.4h([5h.4H])[0]}N I 7.6o(M)});J d=f.2q("*").5c().P(H(){G(7[E]!=12)7[E]=U});G(e===M)7.2q("*").5c().P(H(i){G(7.16==3)I;J c=D.L(7,"3w");R(J a 1n c)R(J b 1n c[a])D.W.1e(d[i],a,c[a][b],c[a][b].L)});I f},1E:H(b){I 7.2I(D.1D(b)&&D.3C(7,H(a,i){I b.1k(a,i)})||D.3g(b,7))},4Y:H(b){G(b.1q==56)G(62.11(b))I 7.2I(D.3g(b,7,M));N b=D.3g(b,7);J a=b.K&&b[b.K-1]!==12&&!b.16;I 7.1E(H(){I a?D.2L(7,b)<0:7!=b})},1e:H(a){I 7.2I(D.4r(D.2R(7.3p(),1j a==\'23\'?D(a):D.2d(a))))},3F:H(a){I!!a&&D.3g(a,7).K>0},7T:H(a){I 7.3F("."+a)},6e:H(b){G(b==12){G(7.K){J c=7[0];G(D.Y(c,"2A")){J e=c.64,63=[],15=c.15,2V=c.O=="2A-2V";G(e<0)I U;R(J i=2V?e:0,2f=2V?e+1:15.K;i<2f;i++){J d=15[i];G(d.2W){b=D.14.1f&&!d.at.2x.an?d.1r:d.2x;G(2V)I b;63.1p(b)}}I 63}N I(7[0].2x||"").1o(/\\r/g,"")}I 12}G(b.1q==4L)b+=\'\';I 7.P(H(){G(7.16!=1)I;G(b.1q==2p&&/5O|5L/.11(7.O))7.4J=(D.2L(7.2x,b)>=0||D.2L(7.34,b)>=0);N G(D.Y(7,"2A")){J a=D.2d(b);D("9R",7).P(H(){7.2W=(D.2L(7.2x,a)>=0||D.2L(7.1r,a)>=0)});G(!a.K)7.64=-1}N 7.2x=b})},2K:H(a){I a==12?(7[0]?7[0].4H:U):7.4E().3v(a)},7b:H(a){I 7.5q(a).21()},79:H(i){I 7.3s(i,i+1)},3s:H(){I 7.2I(2p.44.3s.1w(7,19))},2l:H(b){I 7.2I(D.2l(7,H(a,i){I b.1k(a,i,a)}))},5c:H(){I 7.1e(7.5n)},L:H(d,b){J a=d.1R(".");a[1]=a[1]?"."+a[1]:"";G(b===12){J c=7.5C("9z"+a[1]+"!",[a[0]]);G(c===12&&7.K)c=D.L(7[0],d);I c===12&&a[1]?7.L(a[0]):c}N I 7.1P("9u"+a[1]+"!",[a[0],b]).P(H(){D.L(7,d,b)})},3b:H(a){I 7.P(H(){D.3b(7,a)})},3W:H(g,f,h,d){J e=7.K>1,3x;I 7.P(H(){G(!3x){3x=D.4h(g,7.2z);G(h)3x.9o()}J b=7;G(f&&D.Y(7,"1T")&&D.Y(3x[0],"4F"))b=7.3H("22")[0]||7.3U(7.2z.3h("22"));J c=D([]);D.P(3x,H(){J a=e?D(7).5y(M)[0]:7;G(D.Y(a,"1m"))c=c.1e(a);N{G(a.16==1)c=c.1e(D("1m",a).21());d.1k(b,a)}});c.P(6T)})}};D.17.5j.44=D.17;H 6T(i,a){G(a.4d)D.3Y({1a:a.4d,31:Q,1O:"1m"});N D.5u(a.1r||a.6O||a.4H||"");G(a.1d)a.1d.37(a)}H 1z(){I+2B 8J}D.1l=D.17.1l=H(){J b=19[0]||{},i=1,K=19.K,4x=Q,15;G(b.1q==8I){4x=b;b=19[1]||{};i=2}G(1j b!="49"&&1j b!="H")b={};G(K==i){b=7;--i}R(;i-1}},6q:H(b,c,a){J e={};R(J d 1n c){e[d]=b.V[d];b.V[d]=c[d]}a.1k(b);R(J d 1n c)b.V[d]=e[d]},1g:H(d,e,c){G(e=="2h"||e=="1Z"){J b,3X={30:"5x",5g:"1G",18:"3I"},35=e=="2h"?["5e","6k"]:["5G","6i"];H 5b(){b=e=="2h"?d.8f:d.8c;J a=0,2C=0;D.P(35,H(){a+=3d(D.2a(d,"57"+7,M))||0;2C+=3d(D.2a(d,"2C"+7+"4b",M))||0});b-=29.83(a+2C)}G(D(d).3F(":4j"))5b();N D.6q(d,3X,5b);I 29.2f(0,b)}I D.2a(d,e,c)},2a:H(f,l,k){J e,V=f.V;H 3E(b){G(!D.14.2k)I Q;J a=3P.54(b,U);I!a||a.52("3E")==""}G(l=="1y"&&D.14.1f){e=D.1K(V,"1y");I e==""?"1":e}G(D.14.2G&&l=="18"){J d=V.50;V.50="0 7Y 7W";V.50=d}G(l.1I(/4i/i))l=y;G(!k&&V&&V[l])e=V[l];N G(3P.54){G(l.1I(/4i/i))l="4i";l=l.1o(/([A-Z])/g,"-$1").3y();J c=3P.54(f,U);G(c&&!3E(f))e=c.52(l);N{J g=[],2E=[],a=f,i=0;R(;a&&3E(a);a=a.1d)2E.6h(a);R(;i<2E.K;i++)G(3E(2E[i])){g[i]=2E[i].V.18;2E[i].V.18="3I"}e=l=="18"&&g[2E.K-1]!=U?"2F":(c&&c.52(l))||"";R(i=0;i]*?)\\/>/g,H(b,a,c){I c.1I(/^(aK|4f|7E|aG|4T|7A|aB|3n|az|ay|av)$/i)?b:a+">"});J f=D.3k(d).3y(),1v=h.3h("1v");J e=!f.1h("",""]||!f.1h("",""]||f.1I(/^<(aq|22|am|ak|ai)/)&&[1,"<1T>",""]||!f.1h("<4F")&&[2,"<1T><22>",""]||(!f.1h("<22><4F>",""]||!f.1h("<7E")&&[2,"<1T><22><7q>",""]||D.14.1f&&[1,"1v<1v>",""]||[0,"",""];1v.4H=e[1]+d+e[2];1B(e[0]--)1v=1v.5T;G(D.14.1f){J g=!f.1h("<1T")&&f.1h("<22")<0?1v.1x&&1v.1x.3t:e[1]=="<1T>"&&f.1h("<22")<0?1v.3t:[];R(J j=g.K-1;j>=0;--j)G(D.Y(g[j],"22")&&!g[j].3t.K)g[j].1d.37(g[j]);G(/^\\s/.11(d))1v.39(h.5F(d.1I(/^\\s*/)[0]),1v.1x)}d=D.2d(1v.3t)}G(d.K===0&&(!D.Y(d,"3V")&&!D.Y(d,"2A")))I;G(d[0]==12||D.Y(d,"3V")||d.15)k.1p(d);N k=D.2R(k,d)});I k},1K:H(d,f,c){G(!d||d.16==3||d.16==8)I 12;J e=!D.4n(d),40=c!==12,1f=D.14.1f;f=e&&D.3X[f]||f;G(d.2j){J g=/5Q|4d|V/.11(f);G(f=="2W"&&D.14.2k)d.1d.64;G(f 1n d&&e&&!g){G(40){G(f=="O"&&D.Y(d,"4T")&&d.1d)7p"O a3 a1\'t 9V 9U";d[f]=c}G(D.Y(d,"3V")&&d.7i(f))I d.7i(f).76;I d[f]}G(1f&&e&&f=="V")I D.1K(d.V,"9T",c);G(40)d.9Q(f,""+c);J h=1f&&e&&g?d.4G(f,2):d.4G(f);I h===U?12:h}G(1f&&f=="1y"){G(40){d.6B=1;d.1E=(d.1E||"").1o(/7f\\([^)]*\\)/,"")+(3r(c)+\'\'=="9L"?"":"7f(1y="+c*7a+")")}I d.1E&&d.1E.1h("1y=")>=0?(3d(d.1E.1I(/1y=([^)]*)/)[1])/7a)+\'\':""}f=f.1o(/-([a-z])/9H,H(a,b){I b.2r()});G(40)d[f]=c;I d[f]},3k:H(a){I(a||"").1o(/^\\s+|\\s+$/g,"")},2d:H(b){J a=[];G(b!=U){J i=b.K;G(i==U||b.1R||b.4I||b.1k)a[0]=b;N 1B(i)a[--i]=b[i]}I a},2L:H(b,a){R(J i=0,K=a.K;i*",7).21();1B(7.1x)7.37(7.1x)}},H(a,b){D.17[a]=H(){I 7.P(b,19)}});D.P(["6N","4b"],H(i,c){J b=c.3y();D.17[b]=H(a){I 7[0]==1b?D.14.2G&&S.1c["5t"+c]||D.14.2k&&1b["5s"+c]||S.70=="6Z"&&S.1C["5t"+c]||S.1c["5t"+c]:7[0]==S?29.2f(29.2f(S.1c["4y"+c],S.1C["4y"+c]),29.2f(S.1c["2i"+c],S.1C["2i"+c])):a==12?(7.K?D.1g(7[0],b):U):7.1g(b,a.1q==56?a:a+"2X")}});H 25(a,b){I a[0]&&3r(D.2a(a[0],b,M),10)||0}J C=D.14.2k&&3r(D.14.5B)<8H?"(?:[\\\\w*3m-]|\\\\\\\\.)":"(?:[\\\\w\\8F-\\8E*3m-]|\\\\\\\\.)",6L=2B 4v("^>\\\\s*("+C+"+)"),6J=2B 4v("^("+C+"+)(#)("+C+"+)"),6I=2B 4v("^([#.]?)("+C+"*)");D.1l({6H:{"":H(a,i,m){I m[2]=="*"||D.Y(a,m[2])},"#":H(a,i,m){I a.4G("2v")==m[2]},":":{8D:H(a,i,m){I im[3]-0},3a:H(a,i,m){I m[3]-0==i},79:H(a,i,m){I m[3]-0==i},3o:H(a,i){I i==0},3S:H(a,i,m,r){I i==r.K-1},6D:H(a,i){I i%2==0},6C:H(a,i){I i%2},"3o-4u":H(a){I a.1d.3H("*")[0]==a},"3S-4u":H(a){I D.3a(a.1d.5T,1,"4l")==a},"8z-4u":H(a){I!D.3a(a.1d.5T,2,"4l")},6W:H(a){I a.1x},4E:H(a){I!a.1x},8y:H(a,i,m){I(a.6O||a.8x||D(a).1r()||"").1h(m[3])>=0},4j:H(a){I"1G"!=a.O&&D.1g(a,"18")!="2F"&&D.1g(a,"5g")!="1G"},1G:H(a){I"1G"==a.O||D.1g(a,"18")=="2F"||D.1g(a,"5g")=="1G"},8w:H(a){I!a.3R},3R:H(a){I a.3R},4J:H(a){I a.4J},2W:H(a){I a.2W||D.1K(a,"2W")},1r:H(a){I"1r"==a.O},5O:H(a){I"5O"==a.O},5L:H(a){I"5L"==a.O},5p:H(a){I"5p"==a.O},3Q:H(a){I"3Q"==a.O},5o:H(a){I"5o"==a.O},6A:H(a){I"6A"==a.O},6z:H(a){I"6z"==a.O},2s:H(a){I"2s"==a.O||D.Y(a,"2s")},4T:H(a){I/4T|2A|6y|2s/i.11(a.Y)},3T:H(a,i,m){I D.2q(m[3],a).K},8t:H(a){I/h\\d/i.11(a.Y)},8s:H(a){I D.3C(D.3O,H(b){I a==b.T}).K}}},6x:[/^(\\[) *@?([\\w-]+) *([!*$^~=]*) *(\'?"?)(.*?)\\4 *\\]/,/^(:)([\\w-]+)\\("?\'?(.*?(\\(.*?\\))?[^(]*?)"?\'?\\)/,2B 4v("^([:.#]*)("+C+"+)")],3g:H(a,c,b){J d,1t=[];1B(a&&a!=d){d=a;J f=D.1E(a,c,b);a=f.t.1o(/^\\s*,\\s*/,"");1t=b?c=f.r:D.2R(1t,f.r)}I 1t},2q:H(t,o){G(1j t!="23")I[t];G(o&&o.16!=1&&o.16!=9)I[];o=o||S;J d=[o],2o=[],3S,Y;1B(t&&3S!=t){J r=[];3S=t;t=D.3k(t);J l=Q,3j=6L,m=3j.2D(t);G(m){Y=m[1].2r();R(J i=0;d[i];i++)R(J c=d[i].1x;c;c=c.2H)G(c.16==1&&(Y=="*"||c.Y.2r()==Y))r.1p(c);d=r;t=t.1o(3j,"");G(t.1h(" ")==0)6M;l=M}N{3j=/^([>+~])\\s*(\\w*)/i;G((m=3j.2D(t))!=U){r=[];J k={};Y=m[2].2r();m=m[1];R(J j=0,3i=d.K;j<3i;j++){J n=m=="~"||m=="+"?d[j].2H:d[j].1x;R(;n;n=n.2H)G(n.16==1){J g=D.L(n);G(m=="~"&&k[g])1X;G(!Y||n.Y.2r()==Y){G(m=="~")k[g]=M;r.1p(n)}G(m=="+")1X}}d=r;t=D.3k(t.1o(3j,""));l=M}}G(t&&!l){G(!t.1h(",")){G(o==d[0])d.4s();2o=D.2R(2o,d);r=d=[o];t=" "+t.6v(1,t.K)}N{J h=6J;J m=h.2D(t);G(m){m=[0,m[2],m[3],m[1]]}N{h=6I;m=h.2D(t)}m[2]=m[2].1o(/\\\\/g,"");J f=d[d.K-1];G(m[1]=="#"&&f&&f.61&&!D.4n(f)){J p=f.61(m[2]);G((D.14.1f||D.14.2G)&&p&&1j p.2v=="23"&&p.2v!=m[2])p=D(\'[@2v="\'+m[2]+\'"]\',f)[0];d=r=p&&(!m[3]||D.Y(p,m[3]))?[p]:[]}N{R(J i=0;d[i];i++){J a=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];G(a=="*"&&d[i].Y.3y()=="49")a="3n";r=D.2R(r,d[i].3H(a))}G(m[1]==".")r=D.5m(r,m[2]);G(m[1]=="#"){J e=[];R(J i=0;r[i];i++)G(r[i].4G("2v")==m[2]){e=[r[i]];1X}r=e}d=r}t=t.1o(h,"")}}G(t){J b=D.1E(t,r);d=r=b.r;t=D.3k(b.t)}}G(t)d=[];G(d&&o==d[0])d.4s();2o=D.2R(2o,d);I 2o},5m:H(r,m,a){m=" "+m+" ";J c=[];R(J i=0;r[i];i++){J b=(" "+r[i].1F+" ").1h(m)>=0;G(!a&&b||a&&!b)c.1p(r[i])}I c},1E:H(t,r,h){J d;1B(t&&t!=d){d=t;J p=D.6x,m;R(J i=0;p[i];i++){m=p[i].2D(t);G(m){t=t.8r(m[0].K);m[2]=m[2].1o(/\\\\/g,"");1X}}G(!m)1X;G(m[1]==":"&&m[2]=="4Y")r=62.11(m[3])?D.1E(m[3],r,M).r:D(r).4Y(m[3]);N G(m[1]==".")r=D.5m(r,m[2],h);N G(m[1]=="["){J g=[],O=m[3];R(J i=0,3i=r.K;i<3i;i++){J a=r[i],z=a[D.3X[m[2]]||m[2]];G(z==U||/5Q|4d|2W/.11(m[2]))z=D.1K(a,m[2])||\'\';G((O==""&&!!z||O=="="&&z==m[5]||O=="!="&&z!=m[5]||O=="^="&&z&&!z.1h(m[5])||O=="$="&&z.6v(z.K-m[5].K)==m[5]||(O=="*="||O=="~=")&&z.1h(m[5])>=0)^h)g.1p(a)}r=g}N G(m[1]==":"&&m[2]=="3a-4u"){J e={},g=[],11=/(-?)(\\d*)n((?:\\+|-)?\\d*)/.2D(m[3]=="6D"&&"2n"||m[3]=="6C"&&"2n+1"||!/\\D/.11(m[3])&&"8q+"+m[3]||m[3]),3o=(11[1]+(11[2]||1))-0,d=11[3]-0;R(J i=0,3i=r.K;i<3i;i++){J j=r[i],1d=j.1d,2v=D.L(1d);G(!e[2v]){J c=1;R(J n=1d.1x;n;n=n.2H)G(n.16==1)n.4q=c++;e[2v]=M}J b=Q;G(3o==0){G(j.4q==d)b=M}N G((j.4q-d)%3o==0&&(j.4q-d)/3o>=0)b=M;G(b^h)g.1p(j)}r=g}N{J f=D.6H[m[1]];G(1j f=="49")f=f[m[2]];G(1j f=="23")f=6u("Q||H(a,i){I "+f+";}");r=D.3C(r,H(a,i){I f(a,i,m,r)},h)}}I{r:r,t:t}},4S:H(b,c){J a=[],1t=b[c];1B(1t&&1t!=S){G(1t.16==1)a.1p(1t);1t=1t[c]}I a},3a:H(a,e,c,b){e=e||1;J d=0;R(;a;a=a[c])G(a.16==1&&++d==e)1X;I a},5v:H(n,a){J r=[];R(;n;n=n.2H){G(n.16==1&&n!=a)r.1p(n)}I r}});D.W={1e:H(f,i,g,e){G(f.16==3||f.16==8)I;G(D.14.1f&&f.4I)f=1b;G(!g.24)g.24=7.24++;G(e!=12){J h=g;g=7.3M(h,H(){I h.1w(7,19)});g.L=e}J j=D.L(f,"3w")||D.L(f,"3w",{}),1H=D.L(f,"1H")||D.L(f,"1H",H(){G(1j D!="12"&&!D.W.5k)I D.W.1H.1w(19.3L.T,19)});1H.T=f;D.P(i.1R(/\\s+/),H(c,b){J a=b.1R(".");b=a[0];g.O=a[1];J d=j[b];G(!d){d=j[b]={};G(!D.W.2t[b]||D.W.2t[b].4p.1k(f)===Q){G(f.3K)f.3K(b,1H,Q);N G(f.6t)f.6t("4o"+b,1H)}}d[g.24]=g;D.W.26[b]=M});f=U},24:1,26:{},21:H(e,h,f){G(e.16==3||e.16==8)I;J i=D.L(e,"3w"),1L,5i;G(i){G(h==12||(1j h=="23"&&h.8p(0)=="."))R(J g 1n i)7.21(e,g+(h||""));N{G(h.O){f=h.2y;h=h.O}D.P(h.1R(/\\s+/),H(b,a){J c=a.1R(".");a=c[0];G(i[a]){G(f)2U i[a][f.24];N R(f 1n i[a])G(!c[1]||i[a][f].O==c[1])2U i[a][f];R(1L 1n i[a])1X;G(!1L){G(!D.W.2t[a]||D.W.2t[a].4A.1k(e)===Q){G(e.6p)e.6p(a,D.L(e,"1H"),Q);N G(e.6n)e.6n("4o"+a,D.L(e,"1H"))}1L=U;2U i[a]}}})}R(1L 1n i)1X;G(!1L){J d=D.L(e,"1H");G(d)d.T=U;D.3b(e,"3w");D.3b(e,"1H")}}},1P:H(h,c,f,g,i){c=D.2d(c);G(h.1h("!")>=0){h=h.3s(0,-1);J a=M}G(!f){G(7.26[h])D("*").1e([1b,S]).1P(h,c)}N{G(f.16==3||f.16==8)I 12;J b,1L,17=D.1D(f[h]||U),W=!c[0]||!c[0].32;G(W){c.6h({O:h,2J:f,32:H(){},3J:H(){},4C:1z()});c[0][E]=M}c[0].O=h;G(a)c[0].6m=M;J d=D.L(f,"1H");G(d)b=d.1w(f,c);G((!17||(D.Y(f,\'a\')&&h=="4V"))&&f["4o"+h]&&f["4o"+h].1w(f,c)===Q)b=Q;G(W)c.4s();G(i&&D.1D(i)){1L=i.1w(f,b==U?c:c.7d(b));G(1L!==12)b=1L}G(17&&g!==Q&&b!==Q&&!(D.Y(f,\'a\')&&h=="4V")){7.5k=M;1U{f[h]()}1V(e){}}7.5k=Q}I b},1H:H(b){J a,1L,38,5f,4m;b=19[0]=D.W.6l(b||1b.W);38=b.O.1R(".");b.O=38[0];38=38[1];5f=!38&&!b.6m;4m=(D.L(7,"3w")||{})[b.O];R(J j 1n 4m){J c=4m[j];G(5f||c.O==38){b.2y=c;b.L=c.L;1L=c.1w(7,19);G(a!==Q)a=1L;G(1L===Q){b.32();b.3J()}}}I a},6l:H(b){G(b[E]==M)I b;J d=b;b={8o:d};J c="8n 8m 8l 8k 2s 8j 47 5d 6j 5E 8i L 8h 8g 4K 2y 5a 59 8e 8b 58 6f 8a 88 4k 87 86 84 6d 2J 4C 6c O 82 81 35".1R(" ");R(J i=c.K;i;i--)b[c[i]]=d[c[i]];b[E]=M;b.32=H(){G(d.32)d.32();d.80=Q};b.3J=H(){G(d.3J)d.3J();d.7Z=M};b.4C=b.4C||1z();G(!b.2J)b.2J=b.6d||S;G(b.2J.16==3)b.2J=b.2J.1d;G(!b.4k&&b.4K)b.4k=b.4K==b.2J?b.6c:b.4K;G(b.58==U&&b.5d!=U){J a=S.1C,1c=S.1c;b.58=b.5d+(a&&a.2e||1c&&1c.2e||0)-(a.6b||0);b.6f=b.6j+(a&&a.2c||1c&&1c.2c||0)-(a.6a||0)}G(!b.35&&((b.47||b.47===0)?b.47:b.5a))b.35=b.47||b.5a;G(!b.59&&b.5E)b.59=b.5E;G(!b.35&&b.2s)b.35=(b.2s&1?1:(b.2s&2?3:(b.2s&4?2:0)));I b},3M:H(a,b){b.24=a.24=a.24||b.24||7.24++;I b},2t:{27:{4p:H(){55();I},4A:H(){I}},3D:{4p:H(){G(D.14.1f)I Q;D(7).2O("53",D.W.2t.3D.2y);I M},4A:H(){G(D.14.1f)I Q;D(7).4e("53",D.W.2t.3D.2y);I M},2y:H(a){G(F(a,7))I M;a.O="3D";I D.W.1H.1w(7,19)}},3N:{4p:H(){G(D.14.1f)I Q;D(7).2O("51",D.W.2t.3N.2y);I M},4A:H(){G(D.14.1f)I Q;D(7).4e("51",D.W.2t.3N.2y);I M},2y:H(a){G(F(a,7))I M;a.O="3N";I D.W.1H.1w(7,19)}}}};D.17.1l({2O:H(c,a,b){I c=="4X"?7.2V(c,a,b):7.P(H(){D.W.1e(7,c,b||a,b&&a)})},2V:H(d,b,c){J e=D.W.3M(c||b,H(a){D(7).4e(a,e);I(c||b).1w(7,19)});I 7.P(H(){D.W.1e(7,d,e,c&&b)})},4e:H(a,b){I 7.P(H(){D.W.21(7,a,b)})},1P:H(c,a,b){I 7.P(H(){D.W.1P(c,a,7,M,b)})},5C:H(c,a,b){I 7[0]&&D.W.1P(c,a,7[0],Q,b)},2m:H(b){J c=19,i=1;1B(i=0){J i=g.3s(e,g.K);g=g.3s(0,e)}c=c||H(){};J f="2P";G(d)G(D.1D(d)){c=d;d=U}N{d=D.3n(d);f="6g"}J h=7;D.3Y({1a:g,O:f,1O:"2K",L:d,1J:H(a,b){G(b=="1W"||b=="7J")h.2K(i?D("<1v/>").3v(a.4U.1o(/<1m(.|\\s)*?\\/1m>/g,"")).2q(i):a.4U);h.P(c,[a.4U,b,a])}});I 7},aL:H(){I D.3n(7.7I())},7I:H(){I 7.2l(H(){I D.Y(7,"3V")?D.2d(7.aH):7}).1E(H(){I 7.34&&!7.3R&&(7.4J||/2A|6y/i.11(7.Y)||/1r|1G|3Q/i.11(7.O))}).2l(H(i,c){J b=D(7).6e();I b==U?U:b.1q==2p?D.2l(b,H(a,i){I{34:c.34,2x:a}}):{34:c.34,2x:b}}).3p()}});D.P("7H,7G,7F,7D,7C,7B".1R(","),H(i,o){D.17[o]=H(f){I 7.2O(o,f)}});J B=1z();D.1l({3p:H(d,b,a,c){G(D.1D(b)){a=b;b=U}I D.3Y({O:"2P",1a:d,L:b,1W:a,1O:c})},aE:H(b,a){I D.3p(b,U,a,"1m")},aD:H(c,b,a){I D.3p(c,b,a,"3z")},aC:H(d,b,a,c){G(D.1D(b)){a=b;b={}}I D.3Y({O:"6g",1a:d,L:b,1W:a,1O:c})},aA:H(a){D.1l(D.60,a)},60:{1a:5Z.5Q,26:M,O:"2P",2T:0,7z:"4R/x-ax-3V-aw",7x:M,31:M,L:U,5Y:U,3Q:U,4Q:{2N:"4R/2N, 1r/2N",2K:"1r/2K",1m:"1r/4t, 4R/4t",3z:"4R/3z, 1r/4t",1r:"1r/as",4w:"*/*"}},4z:{},3Y:H(s){s=D.1l(M,s,D.1l(M,{},D.60,s));J g,2Z=/=\\?(&|$)/g,1u,L,O=s.O.2r();G(s.L&&s.7x&&1j s.L!="23")s.L=D.3n(s.L);G(s.1O=="4P"){G(O=="2P"){G(!s.1a.1I(2Z))s.1a+=(s.1a.1I(/\\?/)?"&":"?")+(s.4P||"7u")+"=?"}N G(!s.L||!s.L.1I(2Z))s.L=(s.L?s.L+"&":"")+(s.4P||"7u")+"=?";s.1O="3z"}G(s.1O=="3z"&&(s.L&&s.L.1I(2Z)||s.1a.1I(2Z))){g="4P"+B++;G(s.L)s.L=(s.L+"").1o(2Z,"="+g+"$1");s.1a=s.1a.1o(2Z,"="+g+"$1");s.1O="1m";1b[g]=H(a){L=a;1W();1J();1b[g]=12;1U{2U 1b[g]}1V(e){}G(i)i.37(h)}}G(s.1O=="1m"&&s.1Y==U)s.1Y=Q;G(s.1Y===Q&&O=="2P"){J j=1z();J k=s.1a.1o(/(\\?|&)3m=.*?(&|$)/,"$ap="+j+"$2");s.1a=k+((k==s.1a)?(s.1a.1I(/\\?/)?"&":"?")+"3m="+j:"")}G(s.L&&O=="2P"){s.1a+=(s.1a.1I(/\\?/)?"&":"?")+s.L;s.L=U}G(s.26&&!D.4O++)D.W.1P("7H");J n=/^(?:\\w+:)?\\/\\/([^\\/?#]+)/;G(s.1O=="1m"&&O=="2P"&&n.11(s.1a)&&n.2D(s.1a)[1]!=5Z.al){J i=S.3H("6w")[0];J h=S.3h("1m");h.4d=s.1a;G(s.7t)h.aj=s.7t;G(!g){J l=Q;h.ah=h.ag=H(){G(!l&&(!7.3f||7.3f=="68"||7.3f=="1J")){l=M;1W();1J();i.37(h)}}}i.3U(h);I 12}J m=Q;J c=1b.7s?2B 7s("ae.ac"):2B 7r();G(s.5Y)c.6R(O,s.1a,s.31,s.5Y,s.3Q);N c.6R(O,s.1a,s.31);1U{G(s.L)c.4B("ab-aa",s.7z);G(s.5S)c.4B("a9-5R-a8",D.4z[s.1a]||"a7, a6 a5 a4 5N:5N:5N a2");c.4B("X-9Z-9Y","7r");c.4B("9W",s.1O&&s.4Q[s.1O]?s.4Q[s.1O]+", */*":s.4Q.4w)}1V(e){}G(s.7m&&s.7m(c,s)===Q){s.26&&D.4O--;c.7l();I Q}G(s.26)D.W.1P("7B",[c,s]);J d=H(a){G(!m&&c&&(c.3f==4||a=="2T")){m=M;G(f){7k(f);f=U}1u=a=="2T"&&"2T"||!D.7j(c)&&"3e"||s.5S&&D.7h(c,s.1a)&&"7J"||"1W";G(1u=="1W"){1U{L=D.6X(c,s.1O,s.9S)}1V(e){1u="5J"}}G(1u=="1W"){J b;1U{b=c.5I("7g-5R")}1V(e){}G(s.5S&&b)D.4z[s.1a]=b;G(!g)1W()}N D.5H(s,c,1u);1J();G(s.31)c=U}};G(s.31){J f=4I(d,13);G(s.2T>0)3B(H(){G(c){c.7l();G(!m)d("2T")}},s.2T)}1U{c.9P(s.L)}1V(e){D.5H(s,c,U,e)}G(!s.31)d();H 1W(){G(s.1W)s.1W(L,1u);G(s.26)D.W.1P("7C",[c,s])}H 1J(){G(s.1J)s.1J(c,1u);G(s.26)D.W.1P("7F",[c,s]);G(s.26&&!--D.4O)D.W.1P("7G")}I c},5H:H(s,a,b,e){G(s.3e)s.3e(a,b,e);G(s.26)D.W.1P("7D",[a,s,e])},4O:0,7j:H(a){1U{I!a.1u&&5Z.9O=="5p:"||(a.1u>=7e&&a.1u<9N)||a.1u==7c||a.1u==9K||D.14.2k&&a.1u==12}1V(e){}I Q},7h:H(a,c){1U{J b=a.5I("7g-5R");I a.1u==7c||b==D.4z[c]||D.14.2k&&a.1u==12}1V(e){}I Q},6X:H(a,c,b){J d=a.5I("9J-O"),2N=c=="2N"||!c&&d&&d.1h("2N")>=0,L=2N?a.9I:a.4U;G(2N&&L.1C.2j=="5J")7p"5J";G(b)L=b(L,c);G(c=="1m")D.5u(L);G(c=="3z")L=6u("("+L+")");I L},3n:H(a){J s=[];G(a.1q==2p||a.5w)D.P(a,H(){s.1p(3u(7.34)+"="+3u(7.2x))});N R(J j 1n a)G(a[j]&&a[j].1q==2p)D.P(a[j],H(){s.1p(3u(j)+"="+3u(7))});N s.1p(3u(j)+"="+3u(D.1D(a[j])?a[j]():a[j]));I s.6s("&").1o(/%20/g,"+")}});D.17.1l({1N:H(c,b){I c?7.2g({1Z:"1N",2h:"1N",1y:"1N"},c,b):7.1E(":1G").P(H(){7.V.18=7.5D||"";G(D.1g(7,"18")=="2F"){J a=D("<"+7.2j+" />").6P("1c");7.V.18=a.1g("18");G(7.V.18=="2F")7.V.18="3I";a.21()}}).3l()},1M:H(b,a){I b?7.2g({1Z:"1M",2h:"1M",1y:"1M"},b,a):7.1E(":4j").P(H(){7.5D=7.5D||D.1g(7,"18");7.V.18="2F"}).3l()},78:D.17.2m,2m:H(a,b){I D.1D(a)&&D.1D(b)?7.78.1w(7,19):a?7.2g({1Z:"2m",2h:"2m",1y:"2m"},a,b):7.P(H(){D(7)[D(7).3F(":1G")?"1N":"1M"]()})},9G:H(b,a){I 7.2g({1Z:"1N"},b,a)},9F:H(b,a){I 7.2g({1Z:"1M"},b,a)},9E:H(b,a){I 7.2g({1Z:"2m"},b,a)},9D:H(b,a){I 7.2g({1y:"1N"},b,a)},9M:H(b,a){I 7.2g({1y:"1M"},b,a)},9C:H(c,a,b){I 7.2g({1y:a},c,b)},2g:H(k,j,i,g){J h=D.77(j,i,g);I 7[h.36===Q?"P":"36"](H(){G(7.16!=1)I Q;J f=D.1l({},h),p,1G=D(7).3F(":1G"),46=7;R(p 1n k){G(k[p]=="1M"&&1G||k[p]=="1N"&&!1G)I f.1J.1k(7);G(p=="1Z"||p=="2h"){f.18=D.1g(7,"18");f.33=7.V.33}}G(f.33!=U)7.V.33="1G";f.45=D.1l({},k);D.P(k,H(c,a){J e=2B D.28(46,f,c);G(/2m|1N|1M/.11(a))e[a=="2m"?1G?"1N":"1M":a](k);N{J b=a.6r().1I(/^([+-]=)?([\\d+-.]+)(.*)$/),2b=e.1t(M)||0;G(b){J d=3d(b[2]),2M=b[3]||"2X";G(2M!="2X"){46.V[c]=(d||1)+2M;2b=((d||1)/e.1t(M))*2b;46.V[c]=2b+2M}G(b[1])d=((b[1]=="-="?-1:1)*d)+2b;e.3G(2b,d,2M)}N e.3G(2b,a,"")}});I M})},36:H(a,b){G(D.1D(a)||(a&&a.1q==2p)){b=a;a="28"}G(!a||(1j a=="23"&&!b))I A(7[0],a);I 7.P(H(){G(b.1q==2p)A(7,a,b);N{A(7,a).1p(b);G(A(7,a).K==1)b.1k(7)}})},9X:H(b,c){J a=D.3O;G(b)7.36([]);7.P(H(){R(J i=a.K-1;i>=0;i--)G(a[i].T==7){G(c)a[i](M);a.7n(i,1)}});G(!c)7.5A();I 7}});J A=H(b,c,a){G(b){c=c||"28";J q=D.L(b,c+"36");G(!q||a)q=D.L(b,c+"36",D.2d(a))}I q};D.17.5A=H(a){a=a||"28";I 7.P(H(){J q=A(7,a);q.4s();G(q.K)q[0].1k(7)})};D.1l({77:H(b,a,c){J d=b&&b.1q==a0?b:{1J:c||!c&&a||D.1D(b)&&b,2u:b,41:c&&a||a&&a.1q!=9t&&a};d.2u=(d.2u&&d.2u.1q==4L?d.2u:D.28.5K[d.2u])||D.28.5K.74;d.5M=d.1J;d.1J=H(){G(d.36!==Q)D(7).5A();G(D.1D(d.5M))d.5M.1k(7)};I d},41:{73:H(p,n,b,a){I b+a*p},5P:H(p,n,b,a){I((-29.9r(p*29.9q)/2)+0.5)*a+b}},3O:[],48:U,28:H(b,c,a){7.15=c;7.T=b;7.1i=a;G(!c.3Z)c.3Z={}}});D.28.44={4D:H(){G(7.15.2Y)7.15.2Y.1k(7.T,7.1z,7);(D.28.2Y[7.1i]||D.28.2Y.4w)(7);G(7.1i=="1Z"||7.1i=="2h")7.T.V.18="3I"},1t:H(a){G(7.T[7.1i]!=U&&7.T.V[7.1i]==U)I 7.T[7.1i];J r=3d(D.1g(7.T,7.1i,a));I r&&r>-9p?r:3d(D.2a(7.T,7.1i))||0},3G:H(c,b,d){7.5V=1z();7.2b=c;7.3l=b;7.2M=d||7.2M||"2X";7.1z=7.2b;7.2S=7.4N=0;7.4D();J e=7;H t(a){I e.2Y(a)}t.T=7.T;D.3O.1p(t);G(D.48==U){D.48=4I(H(){J a=D.3O;R(J i=0;i7.15.2u+7.5V){7.1z=7.3l;7.2S=7.4N=1;7.4D();7.15.45[7.1i]=M;J b=M;R(J i 1n 7.15.45)G(7.15.45[i]!==M)b=Q;G(b){G(7.15.18!=U){7.T.V.33=7.15.33;7.T.V.18=7.15.18;G(D.1g(7.T,"18")=="2F")7.T.V.18="3I"}G(7.15.1M)7.T.V.18="2F";G(7.15.1M||7.15.1N)R(J p 1n 7.15.45)D.1K(7.T.V,p,7.15.3Z[p])}G(b)7.15.1J.1k(7.T);I Q}N{J n=t-7.5V;7.4N=n/7.15.2u;7.2S=D.41[7.15.41||(D.41.5P?"5P":"73")](7.4N,n,0,1,7.15.2u);7.1z=7.2b+((7.3l-7.2b)*7.2S);7.4D()}I M}};D.1l(D.28,{5K:{9l:9j,9i:7e,74:9g},2Y:{2e:H(a){a.T.2e=a.1z},2c:H(a){a.T.2c=a.1z},1y:H(a){D.1K(a.T.V,"1y",a.1z)},4w:H(a){a.T.V[a.1i]=a.1z+a.2M}}});D.17.2i=H(){J b=0,1S=0,T=7[0],3q;G(T)ao(D.14){J d=T.1d,4a=T,1s=T.1s,1Q=T.2z,5U=2k&&3r(5B)<9c&&!/9a/i.11(v),1g=D.2a,3c=1g(T,"30")=="3c";G(T.7y){J c=T.7y();1e(c.1A+29.2f(1Q.1C.2e,1Q.1c.2e),c.1S+29.2f(1Q.1C.2c,1Q.1c.2c));1e(-1Q.1C.6b,-1Q.1C.6a)}N{1e(T.5X,T.5W);1B(1s){1e(1s.5X,1s.5W);G(42&&!/^t(98|d|h)$/i.11(1s.2j)||2k&&!5U)2C(1s);G(!3c&&1g(1s,"30")=="3c")3c=M;4a=/^1c$/i.11(1s.2j)?4a:1s;1s=1s.1s}1B(d&&d.2j&&!/^1c|2K$/i.11(d.2j)){G(!/^96|1T.*$/i.11(1g(d,"18")))1e(-d.2e,-d.2c);G(42&&1g(d,"33")!="4j")2C(d);d=d.1d}G((5U&&(3c||1g(4a,"30")=="5x"))||(42&&1g(4a,"30")!="5x"))1e(-1Q.1c.5X,-1Q.1c.5W);G(3c)1e(29.2f(1Q.1C.2e,1Q.1c.2e),29.2f(1Q.1C.2c,1Q.1c.2c))}3q={1S:1S,1A:b}}H 2C(a){1e(D.2a(a,"6V",M),D.2a(a,"6U",M))}H 1e(l,t){b+=3r(l,10)||0;1S+=3r(t,10)||0}I 3q};D.17.1l({30:H(){J a=0,1S=0,3q;G(7[0]){J b=7.1s(),2i=7.2i(),4c=/^1c|2K$/i.11(b[0].2j)?{1S:0,1A:0}:b.2i();2i.1S-=25(7,\'94\');2i.1A-=25(7,\'aF\');4c.1S+=25(b,\'6U\');4c.1A+=25(b,\'6V\');3q={1S:2i.1S-4c.1S,1A:2i.1A-4c.1A}}I 3q},1s:H(){J a=7[0].1s;1B(a&&(!/^1c|2K$/i.11(a.2j)&&D.1g(a,\'30\')==\'93\'))a=a.1s;I D(a)}});D.P([\'5e\',\'5G\'],H(i,b){J c=\'4y\'+b;D.17[c]=H(a){G(!7[0])I;I a!=12?7.P(H(){7==1b||7==S?1b.92(!i?a:D(1b).2e(),i?a:D(1b).2c()):7[c]=a}):7[0]==1b||7[0]==S?46[i?\'aI\':\'aJ\']||D.71&&S.1C[c]||S.1c[c]:7[0][c]}});D.P(["6N","4b"],H(i,b){J c=i?"5e":"5G",4f=i?"6k":"6i";D.17["5s"+b]=H(){I 7[b.3y()]()+25(7,"57"+c)+25(7,"57"+4f)};D.17["90"+b]=H(a){I 7["5s"+b]()+25(7,"2C"+c+"4b")+25(7,"2C"+4f+"4b")+(a?25(7,"6S"+c)+25(7,"6S"+4f):0)}})})();',62,669,'|||||||this|||||||||||||||||||||||||||||||||||if|function|return|var|length|data|true|else|type|each|false|for|document|elem|null|style|event||nodeName|||test|undefined||browser|options|nodeType|fn|display|arguments|url|window|body|parentNode|add|msie|css|indexOf|prop|typeof|call|extend|script|in|replace|push|constructor|text|offsetParent|cur|status|div|apply|firstChild|opacity|now|left|while|documentElement|isFunction|filter|className|hidden|handle|match|complete|attr|ret|hide|show|dataType|trigger|doc|split|top|table|try|catch|success|break|cache|height||remove|tbody|string|guid|num|global|ready|fx|Math|curCSS|start|scrollTop|makeArray|scrollLeft|max|animate|width|offset|tagName|safari|map|toggle||done|Array|find|toUpperCase|button|special|duration|id|copy|value|handler|ownerDocument|select|new|border|exec|stack|none|opera|nextSibling|pushStack|target|html|inArray|unit|xml|bind|GET|isReady|merge|pos|timeout|delete|one|selected|px|step|jsre|position|async|preventDefault|overflow|name|which|queue|removeChild|namespace|insertBefore|nth|removeData|fixed|parseFloat|error|readyState|multiFilter|createElement|rl|re|trim|end|_|param|first|get|results|parseInt|slice|childNodes|encodeURIComponent|append|events|elems|toLowerCase|json|readyList|setTimeout|grep|mouseenter|color|is|custom|getElementsByTagName|block|stopPropagation|addEventListener|callee|proxy|mouseleave|timers|defaultView|password|disabled|last|has|appendChild|form|domManip|props|ajax|orig|set|easing|mozilla|load|prototype|curAnim|self|charCode|timerId|object|offsetChild|Width|parentOffset|src|unbind|br|currentStyle|clean|float|visible|relatedTarget|previousSibling|handlers|isXMLDoc|on|setup|nodeIndex|unique|shift|javascript|child|RegExp|_default|deep|scroll|lastModified|teardown|setRequestHeader|timeStamp|update|empty|tr|getAttribute|innerHTML|setInterval|checked|fromElement|Number|jQuery|state|active|jsonp|accepts|application|dir|input|responseText|click|styleSheets|unload|not|lastToggle|outline|mouseout|getPropertyValue|mouseover|getComputedStyle|bindReady|String|padding|pageX|metaKey|keyCode|getWH|andSelf|clientX|Left|all|visibility|container|index|init|triggered|removeAttribute|classFilter|prevObject|submit|file|after|windowData|inner|client|globalEval|sibling|jquery|absolute|clone|wrapAll|dequeue|version|triggerHandler|oldblock|ctrlKey|createTextNode|Top|handleError|getResponseHeader|parsererror|speeds|checkbox|old|00|radio|swing|href|Modified|ifModified|lastChild|safari2|startTime|offsetTop|offsetLeft|username|location|ajaxSettings|getElementById|isSimple|values|selectedIndex|runtimeStyle|rsLeft|_load|loaded|DOMContentLoaded|clientTop|clientLeft|toElement|srcElement|val|pageY|POST|unshift|Bottom|clientY|Right|fix|exclusive|detachEvent|cloneNode|removeEventListener|swap|toString|join|attachEvent|eval|substr|head|parse|textarea|reset|image|zoom|odd|even|before|prepend|exclude|expr|quickClass|quickID|uuid|quickChild|continue|Height|textContent|appendTo|contents|open|margin|evalScript|borderTopWidth|borderLeftWidth|parent|httpData|setArray|CSS1Compat|compatMode|boxModel|cssFloat|linear|def|webkit|nodeValue|speed|_toggle|eq|100|replaceWith|304|concat|200|alpha|Last|httpNotModified|getAttributeNode|httpSuccess|clearInterval|abort|beforeSend|splice|styleFloat|throw|colgroup|XMLHttpRequest|ActiveXObject|scriptCharset|callback|fieldset|multiple|processData|getBoundingClientRect|contentType|link|ajaxSend|ajaxSuccess|ajaxError|col|ajaxComplete|ajaxStop|ajaxStart|serializeArray|notmodified|keypress|keydown|change|mouseup|mousedown|dblclick|focus|blur|stylesheet|hasClass|rel|doScroll|black|hover|solid|cancelBubble|returnValue|wheelDelta|view|round|shiftKey|resize|screenY|screenX|relatedNode|mousemove|prevValue|originalTarget|offsetHeight|keyup|newValue|offsetWidth|eventPhase|detail|currentTarget|cancelable|bubbles|attrName|attrChange|altKey|originalEvent|charAt|0n|substring|animated|header|noConflict|line|enabled|innerText|contains|only|weight|font|gt|lt|uFFFF|u0128|size|417|Boolean|Date|toggleClass|removeClass|addClass|removeAttr|replaceAll|insertAfter|prependTo|wrap|contentWindow|contentDocument|iframe|children|siblings|prevAll|wrapInner|nextAll|outer|prev|scrollTo|static|marginTop|next|inline|parents|able|cellSpacing|adobeair|cellspacing|522|maxLength|maxlength|readOnly|400|readonly|fast|600|class|slow|1px|htmlFor|reverse|10000|PI|cos|compatible|Function|setData|ie|ra|it|rv|getData|userAgent|navigator|fadeTo|fadeIn|slideToggle|slideUp|slideDown|ig|responseXML|content|1223|NaN|fadeOut|300|protocol|send|setAttribute|option|dataFilter|cssText|changed|be|Accept|stop|With|Requested|Object|can|GMT|property|1970|Jan|01|Thu|Since|If|Type|Content|XMLHTTP|th|Microsoft|td|onreadystatechange|onload|cap|charset|colg|host|tfoot|specified|with|1_|thead|leg|plain|attributes|opt|embed|urlencoded|www|area|hr|ajaxSetup|meta|post|getJSON|getScript|marginLeft|img|elements|pageYOffset|pageXOffset|abbr|serialize|pixelLeft'.split('|'),0,{})) \ No newline at end of file diff --git a/openair2/UTIL/OSD/recep.php b/openair2/UTIL/OSD/recep.php deleted file mode 100644 index eb1036acad..0000000000 --- a/openair2/UTIL/OSD/recep.php +++ /dev/null @@ -1,614 +0,0 @@ - - - - - - - -'.$WEBXML_PATH.'
'.$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 = ''.$_POST['tdd_config'].''; } else { $TDD_CONFIG = ''; } - -// VARIABLES FOR BOTH WEBPORTAL AND PORTABLE VERSION -$espace= array(" "); -$date = date("YmdHis"); -$PERSON = str_replace($espace, "", $user); -$ID = $PERSON.$date; -$user = $_POST['username']; -$XML_FILENAME = str_replace($espace, "", $user).'.'.$date.'.xml'; - -// eNB Distribution -if (isset($_POST['eNB_initial_distribution']) && $_POST['eNB_initial_distribution'] == 'fixed') { -$eNB_INITIAL_DISTRIBUTION = - 'fixed - - '.nospace($_POST['pos_x']).' - '.nospace($_POST['pos_y']).' - '; - } -elseif (isset($_POST['eNB_initial_distribution']) && $_POST['eNB_initial_distribution'] == 'random') { -$eNB_INITIAL_DISTRIBUTION = - 'random - - '.nospace($_POST['random_eNB_distr']).' - '; - } - -// RBs -if (isset($_POST['num_rbs_dl'])) { - $NUMBER_OF_RBS = ''.$_POST['num_rbs_dl'].''; -} -else { - $NUM_RBS = ''; -} - -// PCAP -if ($PCAP_TRACE == 1) { - $TRACE_FILE = 'pcap'; -} -else { - $TRACE_FILE = ''; -} - -// CLI -if ( isset($_POST['cli_enabled']) && $_POST['cli_enabled'] == '1' ) { - if ( isset($_POST['cli_start_enb']) && $_POST['cli_start_enb'] == '1' ) { $CLI_START_ENB = 1; } else { $CLI_START_ENB = 0; } - if ( isset($_POST['cli_start_ue']) && $_POST['cli_start_ue'] == '1' ) { $CLI_START_UE = 1; } else { $CLI_START_UE = 0; } - $CLI = - ' - '.$CLI_START_ENB.' - '.$CLI_START_UE.' - '; -} -else { - $CLI = ''; -} - -// ICI TOUTES LES OPTIONS - ELLES SONT COMMENTEES EN BAS DU FICHIER - -// -$data = ' - - - - - 0 - - '.nospace($_POST['pathlossexp']).' - '.nospace($_POST['pathlosszero']).' - - '.nospace($_POST['smallscale']).' - - '.nospace($_POST['wallpenetloss']).' - '.nospace($_POST['sysbw']).' - '.nospace($_POST['uefreq']).' - '.$NUMBER_OF_RBS.' - '.$TRANSMISSION_MODE.' - - '.$FRAME_TYPE.' - '.$TDD_CONFIG.' - - - - '.nospace($_POST['eNB_RX_noise_power']).' - '.nospace($_POST['eNB_nb_sectors']).' - '.nospace($_POST['eNB_beam_width']).' - '.nospace($_POST['eNB_antenna_gain']).' - '.nospace($_POST['eNB_TX_power']).' - - - '.nospace($_POST['UE_RX_noise_power']).' - '.nospace($_POST['UE_antenna_gain']).' - '.nospace($_POST['UE_TX_power']).' - - - - - - '.nospace($_POST['areax']).' - '.nospace($_POST['areay']).' - - '.nospace($_POST['typetopo']).' - '.nospace($_POST['celltype']).' - 0 - - - '.nospace($_POST['uedistr']).' - - '.nospace($_POST['random_UE_dist_nb_node']).' - - '.nospace($_POST['uemobility']).' - - '.nospace($_POST['minspeed']).' - '.nospace($_POST['maxspeed']).' - '.nospace($_POST['minpausetime']).' - '.nospace($_POST['maxpausetime']).' - '.nospace($_POST['minjourneytime']).' - '.nospace($_POST['maxjourneytime']).' - - - - '.nospace($eNB_INITIAL_DISTRIBUTION).' - '.nospace($_POST['enbmobility']).' - - - '.nospace($_POST['omv']).' - - - - '.nospace($_POST['pre_sourceid']).' - '.nospace($_POST['pre_apptype']).' - '.nospace($_POST['pre_destid']).' - '.$BG_TRAFFIC.' - - - '.nospace($_POST['cust_sourceid']).' - '.nospace($_POST['cust_transprot']).' - '.nospace($_POST['cust_ipversion']).' - '.nospace($_POST['cust_destid']).' - '.nospace($_POST['idt_dist']).' - '.nospace($_POST['idtmin']).' - '.nospace($_POST['idtmax']).' - '.nospace($_POST['idtstddeviation']).' - '.nospace($_POST['idtlambda']).' - '.nospace($_POST['idtscale']).' - '.nospace($_POST['idtshape']).' - '.nospace($_POST['size_dist']).' - '.nospace($_POST['sizemin']).' - '.nospace($_POST['sizemax']).' - '.nospace($_POST['sizestddeviation']).' - '.nospace($_POST['sizelambda']).' - '.nospace($_POST['sizescale']).' - '.nospace($_POST['sizeshape']).' - '.nospace($_POST['destport']).' - - '.nospace($_POST['proboffpu']).' - '.nospace($_POST['probpued']).' - '.nospace($_POST['holdtimeoffpu']).' - - - '.nospace($_POST['proboffed']).' - '.nospace($_POST['probedpe']).' - '.nospace($_POST['holdtimeoffed']).' - - - '.nospace($_POST['holdtimeoffpe']).' - - - - - - '.nospace($_POST['emutime']).' - '.$CURVES.' - '.$PROFILING.' - '.$TRACE_FILE.' - - '.$THROUGHPUT.' - '.$LATENCY.' - '.$LOSS_RATE.' - 1 - - - '.nospace($_POST['level']).' - '.nospace($_POST['verbosity']).' - '.nospace($_POST['interval']).' - - '.$PKTTRACE.' - '.nospace($_POST['seedvalue']).' - '.$CLI.' - - '.$XML_FILENAME.' - -'; - -//echo $data."

"; - - -/* -// 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 = ' -
-
-

Here are the performance profiling statistics : -
- profiling.log

-
'; -} -else { - $PROFILING_OUTPUT = ''; -} -if ($PCAP_TRACE == 1) { - $PCAP_OUTPUT = ' -
-
-

Here is the PCAP File : -
- oai_opt.pcap

-
'; -} -else { - $PCAP_OUTPUT = ''; -} - -// -// 3 - DISPLAY RESULTS -// - -// THE FIRST SQUARE - XML FILE -echo ' -
-
-
- -
-
-
-
- -
-
-
-

Here is the XML file of your OpenAirEmulation : -
- '.$XML_FILENAME.'

-
- -
-
-

Here is the output of your OpenAirEmulation : -
- oaisim.log

-
- - '.$PROFILING_OUTPUT.' - - '.$PCAP_OUTPUT.' - -
-
-
-
-'; - - -/* -// THE SECOND SQUARE - DISPLAY FILE RESULTS - if ($handle = opendir("$RESULTS_PATH_EMULATION_LOGS")) { - while (false !== ($file = readdir($handle))) - { - if ($file != "." && $file != "..") - { - $thelist .= ''.$file.'
'; - } - } - closedir($handle); - } - -echo '
-

List of files:

-

oaisim.log.bz2

-
'; - -// THE THIRD SQUARE - DISPLAY FILE RESULTS -echo '
-

HERE DISPLAY PACKET TRACES FILES

-
'; - -*/ - - - -/* PHIL - J'enlve la SUMO CONFIG - - '.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/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