* Wireshark support for MAC/RLC/PDCP/RRC of lte-softmodem (option -W, and -P [file])

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6930 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Navid Nikaein
2015-03-27 15:40:27 +00:00
parent d0b473973c
commit e66f7865ce
14 changed files with 109 additions and 92 deletions
+1 -1
View File
@@ -1785,7 +1785,7 @@ oai_shutdown (void) {
ShaF = 0;
}
if ((oai_emulation.info.opt_enabled == 1))
if (opt_enabled == 1)
terminate_opt ();
if (oai_emulation.info.cli_enabled)
+1 -1
View File
@@ -1168,7 +1168,7 @@ int ocg_config_emu(void){
oai_emulation.info.opt_enabled = ( oai_emulation.emulation_config.packet_trace.enabled == 0) ? oai_emulation.info.opt_enabled : oai_emulation.emulation_config.packet_trace.enabled;
if (oai_emulation.info.opt_enabled == 1) {
radio_type_t radio_type;
opt_enabled = 1;
if (oai_emulation.info.frame_type[0] == FDD) {
radio_type = RADIO_TYPE_FDD;
} else {
+2 -1
View File
@@ -527,7 +527,7 @@ void get_simulation_options(int argc, char *argv[]) {
case 'P':
oai_emulation.info.opt_enabled = 1;
opt_enabled = 1;
if (strcmp(optarg, "wireshark") == 0) {
opt_type = OPT_WIRESHARK;
printf("Enabling OPT for wireshark\n");
@@ -539,6 +539,7 @@ void get_simulation_options(int argc, char *argv[]) {
printf("Possible values are either wireshark or pcap\n");
opt_type = OPT_NONE;
oai_emulation.info.opt_enabled = 0;
opt_enabled = 0;
}
oai_emulation.info.opt_mode = opt_type;
break;
+1 -1
View File
@@ -998,7 +998,7 @@ void run(int argc, char *argv[]) {
if ((oai_emulation.info.ocm_enabled == 1) && (ethernet_flag == 0) && (ShaF != NULL))
destroyMat(ShaF,map1, map2);
if ((oai_emulation.info.opt_enabled == 1) )
if (opt_enabled == 1 )
terminate_opt();
if (oai_emulation.info.cli_enabled)