diff options
| author |   Ido Barnea <ibarnea@cisco.com> | 2017-01-09 15:16:23 +0200 |
|---|---|---|
| committer | Ido Barnea <ibarnea@cisco.com> | 2017-01-09 15:19:00 +0200 |
| commit | 097d2ab2521669c6bd8918e1953389f6acffdaff (patch) | |
| tree | bb618291311bc9feaa55d819115327487e46ce19 | |
| parent | e532c2a19bd6afeaccb0b3eafebed3c5e758b339 (diff) | |
Fix to trex-330 - client_cfg does not work
Signed-off-by: Ido Barnea <ibarnea@cisco.com>
| -rw-r--r-- | src/sim/trex_sim_stateful.cpp | 3 | ||||
| -rw-r--r-- | src/trex_client_config.h | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/sim/trex_sim_stateful.cpp b/src/sim/trex_sim_stateful.cpp index 7546644d..3980dc24 100644 --- a/src/sim/trex_sim_stateful.cpp +++ b/src/sim/trex_sim_stateful.cpp @@ -169,6 +169,9 @@ int load_list_of_cap_files(CParserOption * op){ if (op->client_cfg_file != "") { try { fl.load_client_config_file(op->client_cfg_file); + // The simulator only test MAC address configs, so this parameter is not used + CManyIPInfo pretest_result; + fl.set_client_config_resolved_macs(pretest_result); } catch (const std::runtime_error &e) { std::cout << "\n*** " << e.what() << "\n\n"; exit(-1); diff --git a/src/trex_client_config.h b/src/trex_client_config.h index 257d354f..6423c390 100644 --- a/src/trex_client_config.h +++ b/src/trex_client_config.h @@ -202,7 +202,7 @@ public: ClientCfgDirBase m_responder; }; -class ClientCfgExt : public ClientCfgBase { +class ClientCfgExt { public: virtual void dump (FILE *fd) const { fprintf(fd, " initiator:\n"); @@ -281,7 +281,8 @@ public: * @param info */ void assign(ClientCfgBase &info) { - info = m_cfg; + info.m_initiator = m_cfg.m_initiator; + info.m_responder = m_cfg.m_responder; info.update(m_iterator, &m_cfg); /* advance for the next assign */ |