Merge branch 'develop' of ssh://localhost:7999/vs/sniffer into develop

Telephonic · Jul 16, 2015 · 26fb84c · 26fb84c
2 parents a5999af + 8d293c8
commit 26fb84c
Show file tree

Hide file tree

Showing 11 changed files with 629 additions and 1,260 deletions.
diff --git a/config_mysql.cpp b/config_mysql.cpp
@@ -1,3 +1,5 @@
+/* obsolete
+
 #include <syslog.h>
 #include <string.h>
 #include <math.h>
@@ -680,33 +682,22 @@ config_load_mysql(bool checkConnect) {
 			opt_saveaudio_reversestereo = atoi(row["saveaudio_reversestereo"].c_str());
 		}
 
-		/*
-		
-		packetbuffer default configuration
-		
-		packetbuffer_enable	     = no
-		packetbuffer_block_maxsize      = 500   #kB
-		packetbuffer_block_maxtime      = 500   #ms
-		packetbuffer_total_maxheap      = 500   #MB
-		packetbuffer_thread_maxheap     = 500   #MB
-		packetbuffer_file_totalmaxsize  = 20000 #MB
-		packetbuffer_file_path	  = /var/spool/voipmonitor/packetbuffer
-		packetbuffer_file_maxfilesize   = 1000  #MB
-		packetbuffer_file_maxtime       = 5000  #ms
-		packetbuffer_compress	   = yes
-		#mirror_destination_ip	  =
-		#mirror_destination_port	=
-		#mirror_source_ip	       =
-		#mirror_source_port	     =
-		*/
-
-#ifdef QUEUE_NONBLOCK2
-		if(opt_scanpcapdir[0] != '\0') {
-			opt_pcap_queue = 0;
-		}
-#else   
-		opt_pcap_queue = 0;
-#endif
+// 		packetbuffer default configuration
+// 		
+// 		packetbuffer_enable	     = no
+// 		packetbuffer_block_maxsize      = 500   #kB
+// 		packetbuffer_block_maxtime      = 500   #ms
+// 		packetbuffer_total_maxheap      = 500   #MB
+// 		packetbuffer_thread_maxheap     = 500   #MB
+// 		packetbuffer_file_totalmaxsize  = 20000 #MB
+// 		packetbuffer_file_path	  = /var/spool/voipmonitor/packetbuffer
+// 		packetbuffer_file_maxfilesize   = 1000  #MB
+// 		packetbuffer_file_maxtime       = 5000  #ms
+// 		packetbuffer_compress	   = yes
+// 		#mirror_destination_ip	  =
+// 		#mirror_destination_port	=
+// 		#mirror_source_ip	       =
+// 		#mirror_source_port	     =
 
 		if(opt_pcap_queue) {
 			if(!opt_pcap_queue_disk_folder.length() || !opt_pcap_queue_store_queue_max_disk_size) {
@@ -740,3 +731,5 @@ config_load_mysql(bool checkConnect) {
 	}
 	delete sqlDb;
 }
+
+*/
diff --git a/config_mysql.h b/config_mysql.h
@@ -1,3 +1,5 @@
+/* obsolete
+
 #include <cstdlib>
 #include <iostream>
 #include <string>
@@ -154,7 +156,6 @@ extern int opt_pcap_queue_iface_dedup_separate_threads_extend;
 extern int opt_pcap_queue_iface_separate_threads;
 extern int opt_pcap_queue_receive_dlt;
 extern int opt_pcap_split;
-extern int opt_pcap_threaded;
 extern int opt_printinsertid;
 extern int opt_promisc;
 extern int opt_read_from_file;
@@ -268,3 +269,4 @@ extern unsigned int opt_openfile_max;
 
 void config_load_mysql(bool checkConnect = false);
 
+*/
diff --git a/manager.cpp b/manager.cpp
@@ -682,6 +682,7 @@ int parse_command(char *buf, int size, int client, int eof, const char *buf_long
 			return -1;
 		}
 	} else if(strstr(buf, "listcalls") != NULL) {
+		if(calltable) {
 		//list<Call*>::iterator call;
 		map<string, Call*>::iterator callMAPIT;
 		Call *call;
@@ -787,6 +788,7 @@ int parse_command(char *buf, int size, int client, int eof, const char *buf_long
 			return -1;
 		}
 		delete [] resbuf;
+		}
 		return 0;
 	} else if(strstr(buf, "d_lc_for_destroy") != NULL) {
 		ostringstream outStr;

diff --git a/pcap_queue.cpp b/pcap_queue.cpp
@@ -149,7 +149,6 @@ static bool __config_BYPASS_FIFO			= true;
 static bool __config_USE_PCAP_FOR_FIFO			= false;
 static bool __config_ENABLE_TOGETHER_READ_WRITE_FILE	= false;
 
-int opt_pcap_queue					= 1;
 #if TEST_DEBUG_PARAMS > 0
 	u_int opt_pcap_queue_block_max_time_ms 			= 500;
 	size_t opt_pcap_queue_block_max_size   			= OPT_PCAP_BLOCK_STORE_MAX_ITEMS * AVG_PACKET_SIZE;

diff --git a/skinny.cpp b/skinny.cpp
@@ -65,7 +65,6 @@ extern int opt_mirroronly;
 extern char opt_scanpcapdir[2048];
 extern int opt_ipaccount;
 extern int rtp_threaded;
-extern int opt_pcap_threaded;
 extern int opt_rtpnosip;
 extern char opt_cachedir[1024];
 extern int opt_savewav_force;