diff options
| author |   imarom <imarom@cisco.com> | 2017-01-22 16:20:45 +0200 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2017-01-22 16:20:45 +0200 |
| commit | 904eacd9be1230efb7ae0ab7997ec131b588ec8a (patch) | |
| tree | 8e4bcd1b1a5f683efdb8f3eeb962acefc3201961 /src/trex_client_config.h | |
| parent | d2f1c8451e2e8ffc47b208f68f9b16697d706d60 (diff) | |
| parent | b81cdb6c2d6d118c1c346e7c8dae6a5e747d867d (diff) | |
Merge branch 'master' into capture
Signed-off-by: imarom <imarom@cisco.com>
Conflicts:
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py
src/main_dpdk.cpp
Diffstat (limited to 'src/trex_client_config.h')
| -rw-r--r-- | src/trex_client_config.h | 5 |
1 files changed, 3 insertions, 2 deletions
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 */ |