* Change the Linux Sched policy to SCHED_DEADLINE for the kernel version > 3.14

* Add MAC/RRC wireshark interface to LTE softmodem
* Add OTG support to the eNB App, and some cleanup


git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6115 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair2/UTIL/OTG/otg_externs.h

@@ -42,13 +42,30 @@
 #    define __OTG_EXTERNS_H__
 
 
-
-
 /*!< \brief main log variables */
 extern otg_t *g_otg; /*!< \brief global params */
 extern otg_multicast_t *g_otg_multicast; /*!< \brief global params */
 extern otg_info_t *otg_info; /*!< \brief info otg */
 extern otg_multicast_info_t *otg_multicast_info; /*!< \brief  info otg: measurements about the simulation  */
+extern otg_forms_info_t *otg_forms_info;
+
+extern mapping otg_multicast_app_type_names[] ;
+
+extern mapping otg_app_type_names[];
+
+extern mapping otg_transport_protocol_names[];
+
+extern mapping otg_ip_version_names[];
+
+extern mapping otg_multicast_app_type_names[];
+
+extern mapping otg_distribution_names[];
+
+extern mapping frame_type_names[];
+
+extern mapping switch_names[] ;
+
+extern mapping packet_gen_names[];
 
 #endif
 

openair2/UTIL/OTG/otg_form.c

@@ -40,7 +40,7 @@
 */
 
 #include "otg_form.h"
-#include "otg_vars.h"
+#include "otg_externs.h"
 #include "otg_kpi.h"
 
 extern unsigned char NB_eNB_INST;

openair2/UTIL/OTG/otg_rx.c

@@ -39,7 +39,7 @@
 */
 
 #include "otg_rx.h"
-#include "otg_vars.h"
+#include "otg_externs.h"
 #include "../UTIL/MATH/oml.h"
 #include <math.h>
 #include "otg_form.h"

openair2/UTIL/OTG/otg_tx.c

@@ -41,11 +41,12 @@
 
 #include "UTIL/MATH/oml.h"
 #include "otg_tx.h" 
-#include "otg_vars.h"
+#include "otg_externs.h"
 
 extern unsigned char NB_eNB_INST;
 extern unsigned char NB_UE_INST;
 
+
 // char string for payload gen
 const char HEADER_STRING[] = "048717272261061594909177115977673656394812939088509638561159848103044447631759621785741859753883189837913087874397230808338408049820398430984093477437879374893649639479575023646394693665969273071047";
 const char PAYLOAD_STRING[] = "UVk5miARQfZGDFKf1wS0dt57kHigd0fXNrUZCjIhpyOS4pZWMHOP1GPdgXmlPtarLUjd3Rmkg05bhUZWtDDmdhrl5EzMZz6DkhIg0Uq7NlaU8ZGrt9EzgVLdr9SiBOLLXiTN3aMInMrlDYFYZ8n5WYbfZTnpz13lbMY4OBE4eWfIMLvBLLyzzzEqjUGILBVMfKGVccPi0VSCyg28RqAiR3z1P6zryk4FWFp0G78AUT1hZWhGcGOTDcKj9bCzny592m1Dj123KWczIm5KVLupO7AP83flqamimfLz6GtHrz5ZN2BAEVQjUhYSc35s5jDhofIlL2U4qPT3Ilsd7amTjaCl5zE0L89ZeIcPCWKSEuNdH5gG8sojuSvph1hU0gG4QOLhCk15IE8eCeMCz2LTL68U0hEQqeM6UmgmA9j7Eid7oPzQHbzj8A30HzGXGhWpt4CT3MSwWVvcCWSbYjkYGgOhHj5csTsONWyGAh5l3qquf8v3jGRSRu0nGXqYILCkw1SX9Na46qodrN6BnPl49djH2AuAaYKAStoR9oL7I1aZG6rVLFPMIZiAqF1tuDVcX9VWnyTVpTMXR6GtBp5bgfDyKuT4ZE9MDUASikGA5hoMfX5Gf2Ml7eLGBtEqZF4rouczHI0DRfgX4ev967n6dYFFkaXbFTvWdykN5bfMinzcrWeqVrmZhTvtUkvq3Rc9enM9qTNz6cDo0HHM0VD8EYtpaPH3yG2CYGDgogHlkaCcHaOyViyq8RH8wf4WQWoHuTNG1kWdkpgTrWic5Gv5p24O9YAPMOn6A1IsdvwpOF85qj8nPvj4nfIo385HOjGfadzfBXueruaKEa0lvbhLgS1bQWKv5fE7k2cMPzQ8USIpUyBhBGUHsLKaykvsr1qDTueAUWAGH8VqyozZZkyhWahjmFEEwU6hhcK1Z9wv9jOAAeqopQvbQFm4aQzzBwGIAhBqhZMiarIBwYPOFdPmK1hKHIa94GGtQbMZ0n83IGt6w8K3dqfOhmpQWqSRZscFwPuo4uhC0ByoC9hFpnizCBfoRZ7Gj9cGOzVLT2eMtD0XC8rUnDiR3p7Ke4ho6lWMLHmtCr7VWYIpY19dtiWoyU0FQ7VMlHoWeBhIUfuG54WVVX0h5Mvvvo0cnLQzh4knysVhAfQw9EhXq94mLrI9GydUaTihOvydQikfq2CrvLeNK81msBlYYoK0aT7OewTUI51YYufj7kYGkPVDf7t5n3VnMV3ShMERKwFyTNHQZyo9ccFibYdoT1FyMAfVeMDO89bUMKAD7RFaT9kUZpaIiH5W7dIbPcPPdSBSr1krKPtuQEeHVgf4OcQLfpOWtsEya4ftXpNw76RPCXmp4rjKt1mCh0pBiTYkQ5GDnj2khLZMzb1uua6R1ika8ACglrs1n0vDbnNjZEVpIMK4OGLFOXIOn9UBserI4Pa63PhUl49TGLNjiqQWdnAsolTKrcjnSklN1swcmyVU8B5gTO4Y3vhkG2U2";

openair2/UTIL/OTG/otg_vars.h

@@ -48,8 +48,113 @@ otg_info_t *otg_info; /*!< \brief  info otg: measurements about the simulation
 otg_multicast_info_t *otg_multicast_info; /*!< \brief  info otg: measurements about the simulation  */
 otg_forms_info_t *otg_forms_info;
 
+mapping otg_app_type_names[] =
+{
+  {"no_predefined_traffic", 0},
+  {"m2m", 1},
+  {"scbr", 2},
+  {"mcbr", 3},
+  {"bcbr", 4},
+  {"auto_pilot", 5},
+  {"bicycle_race", 6},
+  {"open_arena", 7},
+  {"team_fortress", 8},
+  {"full_buffer", 9},
+  {"m2m_traffic", 10},
+  {"auto_pilot_l",11},
+  {"auto_pilot_m", 12},
+  {"auto_pilot_h", 13},
+  {"auto_pilot_e", 14},
+  {"virtual_game_l", 15},
+  {"virtual_game_m", 16},
+  {"virtual_game_h", 17},
+  {"virtual_game_f", 18},
+  {"alarm_humidity", 19},
+  {"alarm_smoke",20},
+  {"alarm_temperature", 21},
+  {"openarena_dl", 22},
+  {"openarena_ul", 23},
+  {"voip_g711", 24},
+  {"voip_g729", 25},
+  {"iqsim_mango", 26},
+  {"iqsim_newsteo", 27},
+  {"openarena_dl_tarma", 28},
+  {"video_vbr_10mbps", 29},
+  {"video_vbr_4mbps", 30},
+  {"video_vbr_2mbps", 31},
+  {"video_vbr_768kbps", 32},
+  {"video_vbr_384kbps", 33},
+  {"video_vbr_192kpbs", 34},
+  {"background_users", 35},
+  {NULL, -1}
+};
+mapping otg_transport_protocol_names[] =
+{
+    {"no_proto", 0},
+    {"udp", 1},
+    {"tcp", 2},
+    {NULL, -1}
+};
+mapping otg_ip_version_names[] =
+{
+    {"no_ip", 0},
+    {"ipv4", 1},
+    {"ipv6", 2},
+    {NULL, -1}
+};
 
+mapping otg_multicast_app_type_names[] = {
+  {"no_predefined_multicast_traffic", 0},
+  {"mscbr", 1},
+  {"mmcbr", 2},
+  {"mbcbr", 3},
+  {"msvbr", 4},
+  {"mmvbr", 5},
+  {"mbvbr", 6},
+  {"mvideo_vbr_4mbps", 7},
+  {NULL, -1}
+}  ;
 
+mapping otg_distribution_names[] =
+{
+    {"no_customized_traffic", 0},
+    {"uniform", 1},
+    {"gaussian", 2},
+    {"exponential", 3},
+    {"poisson", 4},
+    {"fixed", 5},
+    {"weibull", 6},
+    {"pareto", 7},
+    {"gamma", 8},
+    {"cauchy",9},
+    {"log_normal",10},
+    {"tarma",11},
+    {"video",12},
+    {"background_dist",13},
+    {NULL, -1}
+};
+mapping frame_type_names[] =
+{
+    {"TDD", 1},
+    {"FDD", 0},
+    {NULL, -1}
+};
+
+mapping switch_names[] =
+{
+    {"disable", 0},
+    {"enable", 1},
+    {NULL, -1}
+};
+
+mapping packet_gen_names[] =
+{
+    {"repeat_string", 0},
+    {"substract_string", 1},
+    {"random_position", 2},
+    {"random_string", 3},
+    {NULL, -1}
+};
 //int ptime; /*!< \brief ptime is uses to compute the local simulation time */
 
 #endif