rename *.cpp to *.c; renmae API. move benchmarks/* to test/decoder/http; fix TSG-22347
This commit is contained in:
@@ -20,20 +20,20 @@ add_test(NAME HTTP_COPY_HTTP_GTEST_ENTRY_CONF COMMAND sh -c "mkdir -p ${TEST_RUN
|
||||
|
||||
# update config files
|
||||
add_test(NAME HTTP_UPDATE_GTEST_PLUG_ENTRY COMMAND bash -c "sed -i 's/name=.*/name=\\x22http_decoder_test_entry\\x22/' ${TEST_RUN_DIR}/etc/http/gtest_entry.toml")
|
||||
add_test(NAME HTTP_UPDATE_GTEST_PLUG_TOPIC COMMAND bash -c "sed -i 's/topic=.*/topic=\\x22HTTP_DECODER_MESSAGE\\x22/' ${TEST_RUN_DIR}/etc/http/gtest_entry.toml")
|
||||
add_test(NAME HTTP_UPDATE_GTEST_PLUG_TOPIC COMMAND bash -c "sed -i 's/topic=.*/topic=\\x22HTTP_MESSAGE\\x22/' ${TEST_RUN_DIR}/etc/http/gtest_entry.toml")
|
||||
|
||||
# update plugin to be tested
|
||||
add_test(NAME HTTP_CP_DECODER_SO COMMAND sh -c "cp ${CMAKE_BINARY_DIR}/decoders/http/http_dyn.so ${TEST_RUN_DIR}/plugin/${DECODER_NAME}.so")
|
||||
add_test(NAME HTTP_CP_DECODER_GTEST_SO COMMAND sh -c "cp ${CMAKE_BINARY_DIR}/test/decoders/http/${DECODER_NAME}_test.so ${TEST_RUN_DIR}/plugin/${DECODER_NAME}_test.so")
|
||||
add_test(NAME HTTP_CP_DECODER_SO COMMAND sh -c "cp ${CMAKE_BINARY_DIR}/decoders/http/http_dyn.so ${TEST_RUN_DIR}/plugin/http.so")
|
||||
add_test(NAME HTTP_CP_DECODER_GTEST_SO COMMAND sh -c "cp ${CMAKE_BINARY_DIR}/test/decoders/http/http_test.so ${TEST_RUN_DIR}/plugin/http_test.so")
|
||||
|
||||
set_tests_properties(HTTP_MKDIR_METRIC HTTP_COPY_SPEC HTTP_COPY_HTTP_DECODER_CONF HTTP_COPY_HTTP_GTEST_ENTRY_CONF
|
||||
HTTP_COPY_CONF HTTP_COPY_LOG_CONF
|
||||
HTTP_CP_DECODER_SO HTTP_CP_DECODER_GTEST_SO
|
||||
HTTP_UPDATE_GTEST_PLUG_ENTRY HTTP_UPDATE_GTEST_PLUG_TOPIC
|
||||
PROPERTIES FIXTURES_SETUP TestFixture)
|
||||
PROPERTIES FIXTURES_SETUP HTTP_GTEST)
|
||||
|
||||
set(TEST_JSON_DIR ${PROJECT_SOURCE_DIR}/benchmarks/json/http)
|
||||
set(TEST_PCAP_DIR ${PROJECT_SOURCE_DIR}/benchmarks/pcap/http)
|
||||
set(TEST_JSON_DIR ${PROJECT_SOURCE_DIR}/test/decoders/http/benchmarks/json)
|
||||
set(TEST_PCAP_DIR ${PROJECT_SOURCE_DIR}/test/decoders/http/benchmarks/pcap)
|
||||
|
||||
# run tests
|
||||
add_test(NAME HTTP_GET_SINGLE_TRANS_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_get_single_trans.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_get_single_trans.json" WORKING_DIRECTORY ${TEST_RUN_DIR})
|
||||
@@ -70,6 +70,7 @@ add_test(NAME HTTP_CHN_ENCODE_URL COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_c
|
||||
add_test(NAME HTTP_ZLIB_DEADLOCK COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_zlib_deadlock.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_zlib_deadlock.json" WORKING_DIRECTORY ${TEST_RUN_DIR})
|
||||
add_test(NAME HTTP_OUT_OF_ORDER COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_out_of_order.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_out_of_order.json" WORKING_DIRECTORY ${TEST_RUN_DIR})
|
||||
add_test(NAME HTTP_GZIP_OUT_OF_ORDER COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_gzip_out_of_order.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_gzip_out_of_order.json" WORKING_DIRECTORY ${TEST_RUN_DIR})
|
||||
add_test(NAME HTTP_HEADER_SPLITTING COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_pipeline_header_splitting.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_pipeline_header_splitting.json" WORKING_DIRECTORY ${TEST_RUN_DIR})
|
||||
|
||||
set_tests_properties(HTTP_GET_SINGLE_TRANS_TEST
|
||||
HTTP_GET_MULTI_TRANS_TEST
|
||||
@@ -98,13 +99,14 @@ set_tests_properties(HTTP_GET_SINGLE_TRANS_TEST
|
||||
HTTP_ZLIB_DEADLOCK
|
||||
HTTP_OUT_OF_ORDER
|
||||
HTTP_GZIP_OUT_OF_ORDER
|
||||
PROPERTIES FIXTURES_REQUIRED TestFixture)
|
||||
HTTP_HEADER_SPLITTING
|
||||
PROPERTIES FIXTURES_REQUIRED HTTP_GTEST)
|
||||
|
||||
add_test(NAME HTTP_UPDATE_STATE_PLUG_ENTRY COMMAND bash -c "sed -i 's/name=.*/name=\\x22http_decoder_test_state_entry\\x22/' ${TEST_RUN_DIR}/etc/http/gtest_entry.toml")
|
||||
add_test(NAME HTTP_UPDATE_STATE_PLUG_TOPIC COMMAND bash -c "sed -i 's/topic=.*/topic=\\x22HTTP_DECODER_MESSAGE\\x22/' ${TEST_RUN_DIR}/etc/http/gtest_entry.toml")
|
||||
add_test(NAME HTTP_UPDATE_STATE_PLUG_TOPIC COMMAND bash -c "sed -i 's/topic=.*/topic=\\x22HTTP_MESSAGE\\x22/' ${TEST_RUN_DIR}/etc/http/gtest_entry.toml")
|
||||
|
||||
set_tests_properties(HTTP_UPDATE_STATE_PLUG_ENTRY HTTP_UPDATE_STATE_PLUG_TOPIC HTTP_CP_DECODER_SO HTTP_CP_DECODER_GTEST_SO HTTP_MKDIR_METRIC
|
||||
PROPERTIES FIXTURES_SETUP TestState)
|
||||
PROPERTIES FIXTURES_SETUP HTTP_STATE_TEST)
|
||||
|
||||
add_test(NAME HTTP_MSG_TYPE_STATE_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_post.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_msg_type_state.json" WORKING_DIRECTORY ${TEST_RUN_DIR})
|
||||
add_test(NAME HTTP_MSG_TYPE_STATE_C2S_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_post_c2s.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_msg_type_state_c2s.json" WORKING_DIRECTORY ${TEST_RUN_DIR})
|
||||
@@ -119,5 +121,5 @@ set_tests_properties(HTTP_MSG_TYPE_STATE_TEST
|
||||
HTTP_MSG_TYPE_STATE_PIPELINE_TEST
|
||||
HTTP_MSG_TYPE_STATE_SES_EXCEPTION_C2S_TEST
|
||||
HTTP_MSG_TYPE_STATE_SES_EXCEPTION_S2C_TEST
|
||||
PROPERTIES FIXTURES_REQUIRED TestState)
|
||||
PROPERTIES FIXTURES_REQUIRED HTTP_STATE_TEST)
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
[entry]
|
||||
name="http_decoder_test_state_entry"
|
||||
topic="HTTP_DECODER_MESSAGE"
|
||||
topic="HTTP_MESSAGE"
|
||||
|
||||
@@ -9,20 +9,20 @@
|
||||
pcap_path = "./pcap/test.pcap"
|
||||
nr_worker_thread = 1 # range: [1, 256]
|
||||
cpu_mask = [5, 6, 7, 8, 9, 10, 11, 12]
|
||||
idle_yield_interval_ms = 900 # range: [0, 60000] (ms)
|
||||
idle_yield_interval_ms = 90 # range: [0, 60000] (ms)
|
||||
|
||||
[ip_reassembly]
|
||||
enable = 1
|
||||
bucket_entries = 32 # range: [1, 4294967295] (must be power of 2)
|
||||
bucket_num = 1024 # range: [1, 4294967295]
|
||||
|
||||
ip_frag_timeout_ms = 10000 # range: [1, 60000] (ms)
|
||||
ip_frag_timeout_ms = 1000 # range: [1, 60000] (ms)
|
||||
ip_frag_expire_polling_interval_ms = 0 # range: [0, 60000] (ms)
|
||||
ip_frag_expire_polling_limit = 1024 # range: [1, 1024]
|
||||
|
||||
[session_manager]
|
||||
tcp_session_max = 50000
|
||||
udp_session_max = 50000
|
||||
tcp_session_max = 500
|
||||
udp_session_max = 500
|
||||
|
||||
evict_old_on_tcp_table_limit = 1 # range: [0, 1]
|
||||
evict_old_on_udp_table_limit = 1 # range: [0, 1]
|
||||
@@ -31,35 +31,35 @@
|
||||
expire_batch_max = 1024 # range: [1, 1024]
|
||||
|
||||
[session_manager.tcp_timeout_ms]
|
||||
init = 5000 # range: [1, 60000] (ms)
|
||||
handshake = 5000 # range: [1, 60000] (ms)
|
||||
data = 5000 # range: [1, 15999999000] (ms)
|
||||
half_closed = 5000 # range: [1, 604800000] (ms)
|
||||
time_wait = 5000 # range: [1, 600000] (ms)
|
||||
discard_default = 10000 # range: [1, 15999999000] (ms)
|
||||
unverified_rst = 5000 # range: [1, 600000] (ms)
|
||||
init = 500 # range: [1, 60000] (ms)
|
||||
handshake = 500 # range: [1, 60000] (ms)
|
||||
data = 500 # range: [1, 15999999000] (ms)
|
||||
half_closed = 500 # range: [1, 604800000] (ms)
|
||||
time_wait = 500 # range: [1, 600000] (ms)
|
||||
discard_default = 1000 # range: [1, 15999999000] (ms)
|
||||
unverified_rst = 500 # range: [1, 600000] (ms)
|
||||
|
||||
[session_manager.udp_timeout_ms]
|
||||
data = 5000 # range: [1, 15999999000] (ms)
|
||||
discard_default = 5000 # range: [1, 15999999000] (ms)
|
||||
data = 500 # range: [1, 15999999000] (ms)
|
||||
discard_default = 500 # range: [1, 15999999000] (ms)
|
||||
|
||||
[session_manager.duplicated_packet_bloom_filter]
|
||||
enable = 1
|
||||
enable = 0
|
||||
capacity = 1000000 # range: [1, 4294967295]
|
||||
time_window_ms = 10000 # range: [1, 60000] (ms)
|
||||
error_rate = 0.00001 # range: [0.0, 1.0]
|
||||
|
||||
[session_manager.evicted_session_bloom_filter]
|
||||
enable = 1 # range: [0, 1]
|
||||
enable = 0 # range: [0, 1]
|
||||
capacity = 1000000 # range: [1, 4294967295]
|
||||
time_window_ms = 10000 # range: [1, 60000] (ms)
|
||||
error_rate = 0.00001 # range: [0.0, 1.0]
|
||||
|
||||
[session_manager.tcp_reassembly]
|
||||
enable = 1 # range: [0, 1]
|
||||
timeout_ms = 10000 # range: [1, 60000] (ms)
|
||||
timeout_ms = 100 # range: [1, 60000] (ms)
|
||||
buffered_segments_max = 256 # range: [2, 4096] per flow
|
||||
|
||||
[schedule]
|
||||
merge_stat_interval = 500 # range: [1, 60000] (ms)
|
||||
output_stat_interval = 2000 # range: [1, 60000] (ms)
|
||||
merge_stat_interval = 50 # range: [1, 60000] (ms)
|
||||
output_stat_interval = 200 # range: [1, 60000] (ms)
|
||||
|
||||
Reference in New Issue
Block a user