diff options
| author |   Ido Barnea <ibarnea@cisco.com> | 2016-10-31 17:34:19 +0200 |
|---|---|---|
| committer | Ido Barnea <ibarnea@cisco.com> | 2016-10-31 17:34:19 +0200 |
| commit | dcc8af3773dc15cb674949aa20bea24ac935ded0 (patch) | |
| tree | 205ffd9b2f528fd640695c01eb63e1e1966a441f | |
| parent | 44772cc5cecf40a8bc49614ba9370c45066123a2 (diff) | |
minor fixes
Signed-off-by: Ido Barnea <ibarnea@cisco.com>
| -rwxr-xr-x | src/bp_sim.cpp | 2 | ||||
| -rw-r--r-- | src/main_dpdk.cpp | 6 | ||||
| -rw-r--r-- | src/trex_client_config.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/bp_sim.cpp b/src/bp_sim.cpp index db273b18..24959b7b 100755 --- a/src/bp_sim.cpp +++ b/src/bp_sim.cpp @@ -4669,7 +4669,7 @@ void CFlowGenList::Dump(FILE *fd){ int i; for (i=0; i<(int)m_cap_gen.size(); i++) { CFlowGeneratorRec * lp=m_cap_gen[i]; - lp->Dump(stdout); + lp->Dump(fd); } } diff --git a/src/main_dpdk.cpp b/src/main_dpdk.cpp index fbd55173..de0f2327 100644 --- a/src/main_dpdk.cpp +++ b/src/main_dpdk.cpp @@ -6218,8 +6218,10 @@ int CTRexExtendedDriverBase40G::verify_fw_ver(int port_id) { ret = rte_eth_get_fw_ver(port_id, &version); if (ret == 0) { - printf("port %d: FW ver %02d.%02d.%02d\n", port_id, ((version >> 12) & 0xf), ((version >> 4) & 0xff) - ,(version & 0xf)); + if (CGlobalInfo::m_options.preview.getVMode() >= 1) { + printf("port %d: FW ver %02d.%02d.%02d\n", port_id, ((version >> 12) & 0xf), ((version >> 4) & 0xff) + ,(version & 0xf)); + } if ((((version >> 12) & 0xf) < 5) || ((((version >> 12) & 0xf) == 5) && ((version >> 4 & 0xff) == 0) && ((version & 0xf) < 4))) { diff --git a/src/trex_client_config.cpp b/src/trex_client_config.cpp index b56037ea..ad71d38e 100644 --- a/src/trex_client_config.cpp +++ b/src/trex_client_config.cpp @@ -127,7 +127,7 @@ ClientCfgDB::parse_single_group(YAMLParserWrapper &parser, const YAML::Node &nod void ClientCfgDB::parse_dir(YAMLParserWrapper &parser, const YAML::Node &node, ClientCfgDir &dir) { if (node.FindValue("src_mac")) { - dir.set_dst_mac_addr(parser.parse_mac_addr(node, "src_mac")); + dir.set_src_mac_addr(parser.parse_mac_addr(node, "src_mac")); } if (node.FindValue("dst_mac")) { |