Skip to content

O
OpenXG-RAN
Commit 390d96e5 authored by Jaroslava Fiedlerova's avatar Jaroslava Fiedlerova
Browse files
Options

Merge remote-tracking branch 'origin/remove-osd' into integration_2026_w13 (!4004) 

Remove OSD, some scripts, oaisim references

The README says:
  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

oaisim does not exist anymore, and corresponding simulation cannot be done.
Also, it requires XAMPP and similar technologies, that I think nobody uses
in the context of OAI.
Remove also most references to oaisim.
Remove some scripts that are likely not used by anybody, or straight useless.
parents 0ba31c0f 7c81c8ad
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2427 deletions
cmake_targets/tools/build_helper
View file @ 390d96e5
......@@ -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
}
############################################
......
cmake_targets/tools/mem_usage deleted 100755 → 0
View file @ 0ba31c0f
#!/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
cmake_targets/tools/start_bladerf.py deleted 100755 → 0
View file @ 0ba31c0f
#!/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")
common/utils/LOG/README.txt
View file @ 390d96e5
......@@ -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:
......
common/utils/T/DOC/T/basic.md
View file @ 390d96e5
......@@ -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
......
common/utils/T/DOC/T/record.md
View file @ 390d96e5
......@@ -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`.
......
common/utils/T/DOC/T/replay.md
View file @ 390d96e5
......@@ -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`.
......
doc/L1SIM.md
View file @ 390d96e5
......@@ -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)
......
openair2/UTIL/OSD/OpenAirEmu.conf deleted 100644 → 0
View file @ 0ba31c0f
<?
// PLEASE ADAPT THE OPENAIR_HOME VARIABLE TO YOUR CORRECT PATH
$OPENAIR_HOME = "/home/$USER/openair4G";
//
// DO NOT CHANGE THESE VARIABLES
//
$OPENAIR1_DIR = "$OPENAIR_HOME/openair1";
$OPENAIR2_DIR = "$OPENAIR_HOME/openair2";
$OPENAIR3_DIR = "$OPENAIR_HOME/openair3";
$OPENAIR_TARGETS = "$OPENAIR_HOME/targets";
$WEBXML_PATH = "$OPENAIR_TARGETS/SIMU/EXAMPLES/OSD/WEBXML";
$RESULTS_PATH = "$OPENAIR_TARGETS/SIMU/EXAMPLES/OSD/RESULTS";
?>
openair2/UTIL/OSD/Platform_is_running.php deleted 100644 → 0
View file @ 0ba31c0f
<?php
function givePID($pid)
{
// create our system command
$GIVE_PID=shell_exec("pgrep $pid");
echo $GIVE_PID;
}
?>
<div id="xmlwritten" class="alert">
<p><img src="/OpenAirEmu/css/images/warning.png" /><b>Warning<b/><p />
<p>The OpenAirInterface Simulator is already running.<br />
You should wait for the current simulation to be over before to process to a new one.<p/>
If the process is stuck, execute the following command :<br />
<blockquote>" kill <? givePID("oaisim");?> "</blockquote>
</div>
openair2/UTIL/OSD/README.txt deleted 100644 → 0
View file @ 0ba31c0f
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
openair2/UTIL/OSD/css/blueprint.css deleted 100644 → 0
View file @ 0ba31c0f
/* @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 */
openair2/UTIL/OSD/css/fix-ie-rtl.css deleted 100644 → 0
View file @ 0ba31c0f
/* $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;
}
openair2/UTIL/OSD/css/fix-ie.css deleted 100644 → 0
View file @ 0ba31c0f
/* $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;
}
openair2/UTIL/OSD/css/ie.css deleted 100644 → 0
View file @ 0ba31c0f
/* -----------------------------------------------------------------------
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
openair2/UTIL/OSD/css/ie6.css deleted 100644 → 0
View file @ 0ba31c0f
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 */
}
openair2/UTIL/OSD/css/print.css deleted 100644 → 0
View file @ 0ba31c0f
/* -----------------------------------------------------------------------
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
openair2/UTIL/OSD/css/screen.css deleted 100644 → 0
View file @ 0ba31c0f
This diff is collapsed.
openair2/UTIL/OSD/css/style.css deleted 100644 → 0
View file @ 0ba31c0f
/* 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;
}
openair2/UTIL/OSD/form.php deleted 100644 → 0
View file @ 0ba31c0f
This diff is collapsed.
openair2/UTIL/OSD/header.php deleted 100644 → 0
View file @ 0ba31c0f
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<?php
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
?>
<meta http-equiv="cache-control" content="no-cache">
<meta http-equiv="expires" content="-1">
<meta http-equiv="pragma" content="no-cache">
<title>OpenAirEmulation Scenario Descriptor - Basic Scenario</title>
<link type="text/css" rel="stylesheet" media="screen,projection" href="/OSD/css/screen.css?8" />
<link type="text/css" rel="stylesheet" media="screen,projection" href="/OSD/css/blueprint.css?8" />
<link type="text/css" rel="stylesheet" media="screen,projection" href="/OSD/css/style.css?8" />
<script type="text/javascript" src="/OSD/jquery/jquery.js?8"></script>
<!--[if lt IE 7]>
<link type="text/css" rel="stylesheet" media="all" href="/OSD/css/fix-ie.css" />
<![endif]-->
<script type="text/javascript">
$(function(){
$("#envoyer").click(function(){
valid = true;
// text non vide
// $("input[value=]").filter(".required").css("border-color","#FF0000").next(".error-message").fadeIn("slow").text("Champ vide");
// $("input[value!=]").filter(".required").css("border-color","#CCFF00").next(".error-message").fadeOut("fast").next(".good-message").fadeIn("slow");
$("input[value=]").filter(".required").next(".message").text("Empty").addClass("error-message").removeClass("good-message").fadeIn("slow");
$("input[value!=]").filter(".required").next(".message").text("Ok").addClass("good-message").removeClass("error-message").fadeIn("slow");
valid = valid && ($("input[value=]").filter(".required").size() == 0)
// test intger
//.....
// valid = valid and ....
return valid;
});
// PART 1 - BUTTON FADING - SMALL SCALE
$(":radio[name='smallscale']").click(function(){
if ($(":radio[name='smallscale']:checked").val() == 'rayleigh') {
$("#rayleigh").show(1);
$("#rician").hide(1);
}
if ($(":radio[name='smallscale']:checked").val() == 'rician') {
$("#rayleigh").hide(1);
$("#rician").show(1);
}
});
// PART 2 - BUTTON eNB TOPOLOGY
$(":radio[name='eNB_initial_distribution']").click(function(){
if ($(":radio[name='eNB_initial_distribution']:checked").val() == 'random') {
$("#grid").hide(1);
$("#hexagonal").hide(1);
$("#random").hide(1);
$("#fixed").show(1);
}
if ($(":radio[name='eNB_initial_distribution']:checked").val() == 'random') {
$("#grid").hide(1);
$("#hexagonal").hide(1);
$("#random").show(1);
$("#fixed").hide(1);
}
if ($(":radio[name='eNB_initial_distribution']:checked").val() == 'grid') {
$("#grid").show(1);
$("#hexagonal").hide(1);
$("#random").hide(1);
$("#fixed").hide(1);
}
if ($(":radio[name='eNB_initial_distribution']:checked").val() == 'hexagonal') {
$("#grid").hide(1);
$("#hexagonal").show(1);
$("#random").hide(1);
$("#fixed").hide(1);
}
});
// PART 2 - BUTTON UE DISTRIBUTION
$(":radio[name='uedistr']").click(function(){
if ($(":radio[name='uedistr']:checked").val() == 'random') {
$("#gridue").hide(1);
}
if ($(":radio[name='uedistr']:checked").val() == 'concentrated') {
$("#gridue").hide(1);
}
if ($(":radio[name='uedistr']:checked").val() == 'grid_map') {
$("#gridue").show(1);
}
});
$(":radio[name='gridmapradio']").click(function(){
if ($(":radio[name='gridmapradio']:checked").val() == 'random_grid') {
$("#random_grid").show(1);
$("#border_grid").hide(1);
}
if ($(":radio[name='gridmapradio']:checked").val() == 'border_grid') {
$("#random_grid").hide(1);
$("#border_grid").show(1);
}
});
// PART 2 - BUTTON MOBILITY
$(":radio[name='uemobility']").click(function(){
if ($(":radio[name='uemobility']:checked").val() == 'fixed') {
$("#grid_walk").hide(1);
}
if ($(":radio[name='uemobility']:checked").val() == 'random_waypoint') {
$("#grid_walk").hide(1);
}
if ($(":radio[name='uemobility']:checked").val() == 'random_walk') {
$("#grid_walk").hide(1);
}
if ($(":radio[name='uemobility']:checked").val() == 'grid_walk') {
$("#grid_walk").show(1);
}
});
// BUTTON TRAFFIC - PACKET SIZE
$(":radio[name='pktsize']").click(function(){
if ($(":radio[name='pktsize']:checked").val() == 'fixed') {
$("#pktsizefixed").show(1);
$("#pktsizeuniform").hide(1);
}
if ($(":radio[name='pktsize']:checked").val() == 'uniform') {
$("#pktsizefixed").hide(1);
$("#pktsizeuniform").show(1);
}
});
// BUTTON TRAFFIC - INTER ARRIVAL TIME
$(":radio[name='interarrivtime']").click(function(){
if ($(":radio[name='interarrivtime']:checked").val() == 'fixed') {
$("#intarrtimefixed").show(1);
$("#intarrtimeuni").hide(1);
$("#intarrtimepoisson").hide(1);
}
if ($(":radio[name='interarrivtime']:checked").val() == 'uniform') {
$("#intarrtimefixed").hide(1);
$("#intarrtimeuni").show(1);
$("#intarrtimepoisson").hide(1);
}
if ($(":radio[name='interarrivtime']:checked").val() == 'poisson') {
$("#intarrtimefixed").hide(1);
$("#intarrtimeuni").hide(1);
$("#intarrtimepoisson").show(1);
}
});
$("input.disabled").attr("disabled", true);
// PART 4 - RANDOM SEED
$(":radio[name='randomseed']").click(function(){
if ($(":radio[name='randomseed']:checked").val() == 'random') {
$("#userspecified").hide(1);
}
if ($(":radio[name='randomseed']:checked").val() == 'userspecified') {
$("#userspecified").show(1);
}
});
});
</script>
openair2/UTIL/OSD/httpd-result.conf deleted 100644 → 0
View file @ 0ba31c0f
#
# 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/"
<Directory "/opt/lampp/htdocs/OSD/OSD/RESULTS/">
#Options Indexes
#AllowOverride None
#Order allow,deny
Allow from all
</Directory>
<Directory "/opt/lampp/htdocs/OSD/OSD/WEBXML/">
#Options Indexes
#AllowOverride None
#Order allow,deny
Allow from all
</Directory>
#<Files *.html>
#SetHandler type-map
#</Files>
#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
#</Directory>
openair2/UTIL/OSD/index.php deleted 100644 → 0
View file @ 0ba31c0f
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
<head>
<?
include('header.php');
?>
</head>
<body>
<br>
<h3>OpenAirEmulation Scenario Descriptor - Basic Scenario</h3>
<?
// We test here if OpenairConfigGenerator (OCG) and OpenAirEmu are running before to allow the user to use the form
function checkPid($pid)
{
// create our system command
$cmd = "pgrep $pid";
// run the system command and assign output to a variable ($output)
exec($cmd, $output, $result);
// check the number of lines that were returned
if(count($output) >= 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);
?>
</body>
</html>
openair2/UTIL/OSD/jquery/jquery.js deleted 100644 → 0
View file @ 0ba31c0f
This diff is collapsed.
openair2/UTIL/OSD/recep.php deleted 100644 → 0
View file @ 0ba31c0f
This diff is collapsed.
openair3/NAS/UE/UEprocess.c
View file @ 390d96e5
......@@ -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 - "
......
openair3/NGAP/ngap_gNB.c
View file @ 390d96e5
......@@ -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);
}
......
openair3/S1AP/s1ap_eNB.c
View file @ 390d96e5
......@@ -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);
}
......
openair3/valgrind.sh deleted 100755 → 0
View file @ 0ba31c0f
#!/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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment