Merge pull request #183 from robbietu/master

change bandwidth-restrict check
Netis · Sep 23, 2024 · aa24759 · aa24759
2 parents 723fd99 + e07edac
commit aa24759
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ endif ()
 # set PKTMINERG_MAJOR_VERSION, PKTMINERG_MINOR_VERSION, etc.
 set(PKTMINERG_MAJOR_VERSION "0")
 set(PKTMINERG_MINOR_VERSION "8")
-set(PKTMINERG_PATCH_VERSION "1")
+set(PKTMINERG_PATCH_VERSION "2")
 set(PKTMINERG_VERSION_STRING "${PKTMINERG_MAJOR_VERSION}.${PKTMINERG_MINOR_VERSION}.${PKTMINERG_PATCH_VERSION}")
 
 if (WIN32)

diff --git a/src/daemonManager.cpp b/src/daemonManager.cpp
@@ -1118,7 +1118,7 @@ DaemonManager::DaemonManager(const boost::program_options::variables_map &vm, ti
         }
     }
 
-	daemon_.setClientVersion("0.8.0");
+	daemon_.setClientVersion("0.8.2");
     std::vector<std::string> strs;
     split(strs, SUPPORT_API_VERSIONS, boost::algorithm::is_any_of(","));
     for (const auto& str:strs) {

diff --git a/src/pcapexport.h b/src/pcapexport.h
@@ -169,7 +169,7 @@ class PcapExportBase {
 
                             delta_us = (uint64_t)(_send_bytes / _Bpus);
                             tick_us = _first_send_us + delta_us;
-                            if(us < tick_us)// && (tick_us - us) > 1000) //traffic jitter
+                            if((us < tick_us)&&(tick_us - us) > 100000)  //traffic jitter
                                 return -1;
                             tick_us = _first_send_us + delta_us + __TRAFFIC_GAP_US; //traffic gap
                             if(us > tick_us)
@@ -196,7 +196,7 @@ class PcapExportBase {
 
                             delta_us = (uint64_t)(_send_bytes / _Bpus);
                             tick_us = _first_send_us + delta_us;
-                            if(us < tick_us)// && (tick_us - us) > 1000) //traffic jitter
+                            if((us < tick_us)&&(tick_us - us) > 100000) 
                                 return -1;
                             tick_us = _first_send_us + delta_us + __TRAFFIC_GAP_US; //traffic gap
                             if(us > tick_us)
@@ -225,7 +225,7 @@ class PcapExportBase {
 
                             delta_us = (uint64_t)(_send_bytes / _Bpus);
                             tick_us = _first_send_us + delta_us;
-                            if(us < tick_us)// && (tick_us - us) > 1000) //traffic jitter
+                            if((us < tick_us)&&(tick_us - us) > 100000) //traffic jitter
                                 return -1;
                             tick_us = _first_send_us + delta_us + __TRAFFIC_GAP_US; //traffic gap
                             if(us > tick_us)