Fix to trex-330 - client_cfg does not work

Signed-off-by: Ido Barnea <[email protected]>

diff --git a/src/sim/trex_sim_stateful.cpp b/src/sim/trex_sim_stateful.cpp
index 7546644..3980dc2 100644 (file)
--- 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 257d354..6423c39 100644 (file)
--- 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 */