Browse Source

small changes

aidmar.wainakh 6 years ago
parent
commit
a38a8fc215

+ 1 - 1
code_boost/src/cxx/pcap_processor.cpp

@@ -137,7 +137,7 @@ void pcap_processor::collect_statistics() {
             std::chrono::microseconds barrier =  timeIntervalNum*timeInterval;
             if(currentCaptureDuration>barrier){
                 //std::cout<<"LastpkstTimstamp:" << lastPktTimestamp.count() << ", currentCaptureDuration:"<< currentCaptureDuration.count() << ", barrier:" <<barrier.count()<<", interval:" << timeIntervalNum << ", interval time:"<<timeInterval.count()<<"\n";                    
-                stats.addIntervalStat(timeInterval, intervalStartTimestamp, previousPacketCount);
+                stats.addIntervalStat(timeInterval, intervalStartTimestamp, lastPktTimestamp, previousPacketCount);
                 stats.calculateLastIntervalIPsEntropy(filePath, intervalStartTimestamp);
                 stats.calculateLastIntervalPacketRate(timeInterval, intervalStartTimestamp);                                
                 timeIntervalNum++;   

+ 3 - 3
code_boost/src/cxx/statistics.cpp

@@ -188,12 +188,12 @@ void statistics::calculateLastIntervalPacketRate(std::chrono::duration<int, std:
         }
 }
 
-void statistics::addIntervalStat(std::chrono::duration<int, std::micro> interval, std::chrono::microseconds intervalStartTimestamp, int previousPacketCount){
+void statistics::addIntervalStat(std::chrono::duration<int, std::micro> interval, std::chrono::microseconds intervalStartTimestamp, std::chrono::microseconds lastPktTimestamp, int previousPacketCount){
     //std::string filePath = "";
     //calculateLastIntervalIPsEntropy(filePath, intervalStartTimestamp);
     //calculateLastIntervalPacketRate(interval, intervalStartTimestamp);
-    std::string interval_start_str = std::to_string(intervalStartTimestamp.count());
-    interval_statistics[interval_start_str].pkts_count = packetCount - previousPacketCount;        
+    std::string lastPktTimestamp_s = std::to_string(lastPktTimestamp.count());
+    interval_statistics[lastPktTimestamp_s].pkts_count = packetCount - previousPacketCount;        
 }
     
     

+ 1 - 1
code_boost/src/cxx/statistics.h

@@ -335,7 +335,7 @@ public:
     void addFlowStat(std::string ipAddressSender,int sport,std::string ipAddressReceiver,int dport, std::chrono::microseconds timestamp);
     void calculateLastIntervalIPsEntropy(std::string filePath, std::chrono::microseconds intervalStartTimestamp);
     void calculateLastIntervalPacketRate(std::chrono::duration<int, std::micro> interval, std::chrono::microseconds intervalStartTimestamp);
-    void addIntervalStat(std::chrono::duration<int, std::micro> interval, std::chrono::microseconds intervalStartTimestamp, int previousPacketCount);
+    void addIntervalStat(std::chrono::duration<int, std::micro> interval, std::chrono::microseconds intervalStartTimestamp, std::chrono::microseconds lastPktTimestamp, int previousPacketCount);
 
     void incrementTTLcount(std::string ipAddress, int ttlValue);