Merge branch 'master' to rx_features phase 0.5

Signed-off-by: imarom <imarom@cisco.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/src/flow_stat_parser.cpp b/src/flow_stat_parser.cpp
index 7335a6a2..4a6722e6 100644
--- a/src/flow_stat_parser.cpp
+++ b/src/flow_stat_parser.cpp
@@ -27,6 +27,7 @@
 #include "common/Network/Packet/TcpHeader.h"
 #include "pkt_gen.h"
 #include "flow_stat_parser.h"
+#include "bp_sim.h"
 
 void CFlowStatParser::reset() {
     m_start = 0;
@@ -120,12 +121,15 @@ int CFlowStatParser::get_ip_id(uint32_t &ip_id) {
 int CFlowStatParser::set_ip_id(uint32_t new_id) {
     if (m_ipv4) {
         // Updating checksum, not recalculating, so if someone put bad checksum on purpose, it will stay bad
+        m_ipv4->updateCheckSum(PKT_NTOHS(m_ipv4->getFirstWord()), PKT_NTOHS(m_ipv4->getFirstWord() |TOS_TTL_RESERVE_DUPLICATE));
         m_ipv4->updateCheckSum(PKT_NTOHS(m_ipv4->getId()), PKT_NTOHS(new_id));
         m_ipv4->setId(new_id);
+        m_ipv4->setTOS(m_ipv4->getTOS()|TOS_TTL_RESERVE_DUPLICATE);
         return 0;
     }
 
     if (m_ipv6) {
+        m_ipv6->setTrafficClass(m_ipv6->getTrafficClass()|TOS_TTL_RESERVE_DUPLICATE);
         m_ipv6->setFlowLabel(new_id);
         return 0;
     }