瀏覽代碼

small changes

aidmar.wainakh 6 年之前
父節點
當前提交
80d176ea95
共有 3 個文件被更改,包括 4 次插入5 次删除
  1. 0 1
      code/ID2TLib/Statistics.py
  2. 4 0
      code_boost/src/cxx/pcap_processor.cpp
  3. 0 4
      code_boost/src/cxx/statistics.cpp

+ 0 - 1
code/ID2TLib/Statistics.py

@@ -643,7 +643,6 @@ class Statistics:
         port_out_path = plot_port('.' + format)
         ip_src_out_path = plot_ip_src('.' + format)
         ip_dst_out_path = plot_ip_dst('.' + format)
-        ip_dst_out_path = plot_ip_dst('.' + format)
         plot_interval_pktCount = plot_interval_pktCount('.' + format)
         plot_interval_ip_src_ent = plot_interval_ip_src_ent('.' + format)
         plot_interval_ip_dst_ent = plot_interval_ip_dst_ent('.' + format)

+ 4 - 0
code_boost/src/cxx/pcap_processor.cpp

@@ -126,6 +126,10 @@ void pcap_processor::collect_statistics() {
         for (SnifferIterator j = snifferOverview.begin(); j != snifferOverview.end(); j++) {lastpkt = j;}        
         std::chrono::microseconds lastTimestamp = lastpkt->timestamp();                  
         std::chrono::microseconds captureDuration = lastTimestamp - firstTimestamp;
+        if(captureDuration.count()<=0){
+            std::cout<<"ERROR: PCAP file is empty!"<<"\n";
+            return;
+        }
         long timeInterval_microsec = captureDuration.count() / timeIntervalsNum;
         std::chrono::duration<int, std::micro> timeInterval(timeInterval_microsec); // 10,000,000 = 10 sec
         std::cout << "Aidmar: First:" << firstTimestamp.count() << std::endl;

+ 0 - 4
code_boost/src/cxx/statistics.cpp

@@ -633,14 +633,10 @@ void statistics::writeToDatabase(std::string database_path) {
     db.writeStatisticsMss(ip_sumMss);
     db.writeStatisticsPorts(ip_ports);
     db.writeStatisticsProtocols(protocol_distribution);
-    std::cout<<"1"<<"\n";
     // Aidmar
     db.writeStatisticsMss_dist(mss_distribution);
-    std::cout<<"2"<<"\n";
     db.writeStatisticsWin(win_distribution);
-    std::cout<<"3"<<"\n";
     db.writeStatisticsConv(conv_statistics);
-    std::cout<<"4"<<"\n";
     db.writeStatisticsInterval(interval_statistics);