diff options
| author |   imarom <imarom@cisco.com> | 2016-03-29 11:24:36 +0300 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2016-03-29 11:24:36 +0300 |
| commit | d2d85206626a701280cb7b6844fd0337990c7b1f (patch) | |
| tree | d926dd9035beff0cdd02f93c08e95678aa9aae9f | |
| parent | e482f78cf93b8d4ad4641d83276a4fa6d9744e42 (diff) | |
| parent | ff9afa49a0b4612a1dbfb1d6d5b060ecf697d377 (diff) | |
Merge branch 'master' of csi-sceasr-b33:/auto/proj-pcube-b/apps/PL-b/tools/repo//trex-core
erges an updated upstream into a topic branch.
| -rw-r--r-- | src/flow_stat_parser.cpp | 4 | ||||
| -rw-r--r-- | src/main_dpdk.cpp | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/flow_stat_parser.cpp b/src/flow_stat_parser.cpp index 200c19c9..8cb41fb7 100644 --- a/src/flow_stat_parser.cpp +++ b/src/flow_stat_parser.cpp @@ -82,7 +82,7 @@ int CFlowStatParser::set_ip_id(uint16_t new_id) { return -1; // Updating checksum, not recalculating, so if someone put bad checksum on purpose, it will stay bad - m_ipv4->updateCheckSum(m_ipv4->getId(), PKT_NTOHS(new_id)); + m_ipv4->updateCheckSum(PKT_NTOHS(m_ipv4->getId()), PKT_NTOHS(new_id)); m_ipv4->setId(new_id); return 0; @@ -111,7 +111,7 @@ int CFlowStatParser::test() { 0x0a, 0xbc, 0x08, 0x00, // vlan // IP header 0x45,0x02,0x00,0x30, - 0x00,0x00,0x40,0x00, + 0x01,0x02,0x40,0x00, 0xff, TEST_L4_PROTO, 0xbd,0x04, 0x10,0x0,0x0,0x1, 0x30,0x0,0x0,0x1, diff --git a/src/main_dpdk.cpp b/src/main_dpdk.cpp index 496d0602..6b81916b 100644 --- a/src/main_dpdk.cpp +++ b/src/main_dpdk.cpp @@ -191,7 +191,8 @@ public: virtual void clear_extended_stats(CPhyEthIF * _if); virtual int dump_fdir_global_stats(CPhyEthIF * _if, FILE *fd) {return 0;} virtual int get_stat_counters_num() {return MAX_FLOW_STATS;} - virtual int get_rx_stat_capabilities() {return TrexPlatformApi::IF_STAT_IPV4_ID;} + virtual int get_rx_stat_capabilities() {return 0;} + //virtual int get_rx_stat_capabilities() {return TrexPlatformApi::IF_STAT_IPV4_ID;} virtual int wait_for_stable_link(); virtual void wait_after_link_up(); }; @@ -244,7 +245,8 @@ public: virtual int wait_for_stable_link(); virtual int get_stat_counters_num() {return MAX_FLOW_STATS;} - virtual int get_rx_stat_capabilities() {return TrexPlatformApi::IF_STAT_IPV4_ID;} + virtual int get_rx_stat_capabilities() {return 0;} + // virtual int get_rx_stat_capabilities() {return TrexPlatformApi::IF_STAT_IPV4_ID;} }; @@ -281,7 +283,8 @@ public: virtual void clear_extended_stats(CPhyEthIF * _if); virtual int wait_for_stable_link(); virtual int get_stat_counters_num() {return MAX_FLOW_STATS;} - virtual int get_rx_stat_capabilities() {return TrexPlatformApi::IF_STAT_IPV4_ID;} + virtual int get_rx_stat_capabilities() {return 0;} + // virtual int get_rx_stat_capabilities() {return TrexPlatformApi::IF_STAT_IPV4_ID;} virtual CFlowStatParser *get_flow_stat_parser(); }; |