maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* applying patch 11 contributed from S. Held

Browse Source 
* add protocol configuration to OCG XML file


git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6629 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Navid Nikaein
2015-02-27 10:35:37 +00:00
parent 103b751fb1
commit eb91417fc7
23 changed files with 151 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/UTIL/OTG/otg_kpi.c
+1 -2
View File
@@ -390,11 +390,10 @@ fc=fopen("/tmp/otg.log","w");;
else
strcpy(traffic_type,"APPLICATION");
if (map_int_to_str(otg_app_type_names,g_otg->application_type[i][j][k]) == -1){
if (map_int_to_str(otg_app_type_names,g_otg->application_type[i][j][k]) == 0){
LOG_E(OTG,"(src=%d, dst=%d, appli %d) : Unknown traffic \n ", i, j,k);
strcpy(traffic,"UKNOWN TRAFFIC");
} else {
//strcpy (traffic, map_int_to_str(otg_app_type_names,g_otg->application_type[i][j][k]));
strncpy (traffic, map_int_to_str(otg_app_type_names,g_otg->application_type[i][j][k]), sizeof(traffic));
traffic[sizeof(traffic) - 1] = 0; // terminate string
}
openair2/UTIL/OTG/otg_models.c
+2 -2
View File
@@ -431,7 +431,7 @@ void tarmaPrintVideoInit(tarmaVideo_t *video){
input:
output: - random realization of R_s (B/s)
*/
double backgroundRateRnd(){
double backgroundRateRnd(void){
double rate;
rate=pow(10,lognormal_dist(1.3525, 0.1954))/8; /*Byte/s*/;
if(rate>BACKGROUND_RATE_MAX){
@@ -447,7 +447,7 @@ double backgroundRateRnd(){
input:
output: - random realization of D_s (ms)
*/
int backgroundSessionDurationRnd(){
int backgroundSessionDurationRnd(void){
int duration;
duration = ceil(pow(10,exponential_dist(1/0.3591))*1000); /*ms*/
if(duration<0){