diff options
| author |   itraviv <itraviv@cisco.com> | 2016-07-31 11:56:41 +0300 |
|---|---|---|
| committer | itraviv <itraviv@cisco.com> | 2016-07-31 11:56:41 +0300 |
| commit | 893d0feef9ba6fa3fb36c49f4b5bcad47cb2bf60 (patch) | |
| tree | 689a09fa656f990672d2d62143dc173a46fe0316 /linux | |
| parent | abf329075bd14f5f41c3753d560260ac809ec4f3 (diff) | |
| parent | dceb010b01e9f8a0e9c905370d39f149f01cab7e (diff) | |
Merge branch 'master' into scapy_server
Diffstat (limited to 'linux')
| -rwxr-xr-x | linux/ws_main.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/ws_main.py b/linux/ws_main.py index 3aee05db..66d79d13 100755 --- a/linux/ws_main.py +++ b/linux/ws_main.py @@ -112,6 +112,7 @@ main_src = SrcGroup(dir='src', 'utl_yaml.cpp', 'rx_check_header.cpp', 'nat_check.cpp', + 'nat_check_flow_table.cpp', 'timer_wheel_pq.cpp', 'time_histogram.cpp', 'utl_json.cpp', @@ -122,8 +123,10 @@ main_src = SrcGroup(dir='src', 'flow_stat.cpp', 'flow_stat_parser.cpp', 'trex_watchdog.cpp', + 'trex_client_config.cpp', 'pal/linux/pal_utl.cpp', 'pal/linux/mbuf.cpp', + 'pal/common/common_mbuf.cpp', 'sim/trex_sim_stateless.cpp', 'sim/trex_sim_stateful.cpp' ]); @@ -254,6 +257,7 @@ cxxflags_base =['-DWIN_UCODE_SIM', includes_path =''' ../src/pal/linux/ + ../src/pal/common/ ../src/ ../src/rpc-server/ ../src/stateless/cp/ |