diff options
Diffstat (limited to 'test')
129 files changed, 236 insertions, 6828 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4001cb1..087aa94 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,3 +1,4 @@ add_subdirectory(packet_inject) add_subdirectory(packet_tool) -add_subdirectory(debug_plugin)
\ No newline at end of file +add_subdirectory(debug_plugin) +add_subdirectory(decoders/http) diff --git a/test/http_decoder/.gitkeep b/test/decoders/http/.gitkeep index e69de29..e69de29 100644 --- a/test/http_decoder/.gitkeep +++ b/test/decoders/http/.gitkeep diff --git a/test/decoders/http/CMakeLists.txt b/test/decoders/http/CMakeLists.txt new file mode 100644 index 0000000..78467f5 --- /dev/null +++ b/test/decoders/http/CMakeLists.txt @@ -0,0 +1,50 @@ +set(DECODER_NAME http) + +aux_source_directory(${PROJECT_SOURCE_DIR}/deps/toml DEPS_SRC) + +add_library(${DECODER_NAME}_test SHARED http_decoder_test_plug.cpp md5.c ${DEPS_SRC}) +add_dependencies(${DECODER_NAME}_test ${DECODER_NAME}) +target_link_libraries(${DECODER_NAME}_test cjson-static) +set_target_properties(${DECODER_NAME}_test PROPERTIES PREFIX "") + +# add_library(${DECODER_NAME}_perf SHARED http_decoder_perf_plug.cpp) +# add_dependencies(${DECODER_NAME}_perf ${DECODER_NAME}) +# set_target_properties(${DECODER_NAME}_perf PROPERTIES PREFIX "") + +set(TEST_RUN_DIR ${CMAKE_BINARY_DIR}/testing) + +include_directories(${CMAKE_SOURCE_DIR}/include) +include_directories(${CMAKE_SOURCE_DIR}/src) +include_directories(${CMAKE_SOURCE_DIR}/deps) +include_directories(/opt/tsg/stellar/include/) +include_directories(/opt/tsg/framework/include/) +include_directories(${CMAKE_BINARY_DIR}/vendor/llhttp/include) +include_directories(${CMAKE_BINARY_DIR}/vendor/cjson/src/cjson/include) +include_directories(${PROJECT_SOURCE_DIR}/decoders/http) +include_directories(${PROJECT_SOURCE_DIR}/include/stellar) + +aux_source_directory(${PROJECT_SOURCE_DIR}/deps/mempool PERF_TEST_DEP_SRC) +aux_source_directory(${PROJECT_SOURCE_DIR}/deps/toml PERF_TEST_DEP_SRC) +aux_source_directory(${PROJECT_SOURCE_DIR}/src PERF_TEST_DEP_SRC) + +add_executable(gtest_http http_decoder_gtest.cpp ${PROJECT_SOURCE_DIR}/decoders/http/http_decoder_utils.cpp) +target_link_libraries(gtest_http gtest stellar_devel) + +add_executable(http_test_main plugin_test_main.cpp) +set_target_properties(http_test_main + PROPERTIES + LINK_OPTIONS + "-rdynamic" + ) +set_target_properties(http_test_main + PROPERTIES + LINK_FLAGS + "-rdynamic" + ) +set(LINK_FLAGS "-rdynamic") +target_link_libraries(http_test_main gtest cjson-static stellar_devel) + +add_subdirectory(test_based_on_stellar) + +include(GoogleTest) +gtest_discover_tests(gtest_http) diff --git a/test/http_decoder/base64.c b/test/decoders/http/base64.c index eeded25..eeded25 100644 --- a/test/http_decoder/base64.c +++ b/test/decoders/http/base64.c diff --git a/test/http_decoder/base64.h b/test/decoders/http/base64.h index 9bea95a..9bea95a 100644 --- a/test/http_decoder/base64.h +++ b/test/decoders/http/base64.h diff --git a/test/http_decoder/http_decoder_gtest.cpp b/test/decoders/http/http_decoder_gtest.cpp index c8ad653..68f275f 100644 --- a/test/http_decoder/http_decoder_gtest.cpp +++ b/test/decoders/http/http_decoder_gtest.cpp @@ -1,11 +1,11 @@ #include <gtest/gtest.h> #include <unistd.h> #include <stdio.h> -#include "http_decoder.h" -#include "http_decoder_inc.h" +#include "http.h" +#include "http_decoder_private.h" void httpd_url_decode(const char *string, size_t length, char *ostring, size_t *olen); -TEST(url_decoder, none) +TEST(http_url_decoder, none) { char decode_url_buf[2048]; size_t decode_url_len = sizeof(decode_url_buf); @@ -16,7 +16,7 @@ TEST(url_decoder, none) EXPECT_EQ(decode_url_len, strlen("https://docs.geedge.net/#all-updates")); } -TEST(url_decoder, simple) +TEST(http_url_decoder, simple) { char decode_url_buf[2048]; size_t decode_url_len = sizeof(decode_url_buf); @@ -34,7 +34,7 @@ TEST(url_decoder, simple) EXPECT_EQ(decode_url_len, sizeof(expect_result)-1); } -TEST(url_decoder, chinese1) +TEST(http_url_decoder, chinese1) { char decode_url_buf[2048]; size_t decode_url_len = sizeof(decode_url_buf); @@ -45,7 +45,7 @@ TEST(url_decoder, chinese1) EXPECT_EQ(decode_url_len, strlen("http://www.baidu.com/\xE6\xB5\x8B\xE8\xAF\x95\xE4\xB8\xAD\xE6\x96\x87\xE8\xA7\xA3\xE7\xA0\x81")); } -TEST(url_decoder, chinese2) +TEST(http_url_decoder, chinese2) { char decode_url_buf[2048]; size_t decode_url_len = sizeof(decode_url_buf); diff --git a/test/http_decoder/http_decoder_gtest.h b/test/decoders/http/http_decoder_gtest.h index a38e6f4..eabae77 100644 --- a/test/http_decoder/http_decoder_gtest.h +++ b/test/decoders/http/http_decoder_gtest.h @@ -10,7 +10,7 @@ extern "C" #ifdef __cplusplus } #endif -#include "http_decoder.h" +#include "http.h" #include "md5.h" #include <stdint.h> #include <stdlib.h> @@ -47,6 +47,7 @@ extern "C" #define EX_DATA_MAX_SIZE 10 #define PIPELINE_MAX_NUM 8 + #define GTEST_FIX_PAYLOAD_CSTR "<Hello http decoder World!!!>" #define GTEST_FIX_PAYLOAD_MD5 "e91e072f772737c7a45013cc3b1a916c" @@ -58,6 +59,7 @@ extern "C" #define GTEST_HTTP_RAW_PAYLOAD_MD5_NAME "__X_HTTP_RAW_PAYLOAD_MD5" #define GTEST_HTTP_DECOMPRESS_PAYLOAD_MD5_NAME "__X_HTTP_DECOMPRESS_PAYLOAD_MD5" + struct stellar *stellar_init(void); void stellar_destroy(struct stellar *st); int stellar_load_plugin(struct stellar *st, void *(plugin_init_cb)(struct stellar *st)); diff --git a/test/http_decoder/http_decoder_perf_main.cpp b/test/decoders/http/http_decoder_perf_main.cpp index 7d314e9..7d314e9 100644 --- a/test/http_decoder/http_decoder_perf_main.cpp +++ b/test/decoders/http/http_decoder_perf_main.cpp diff --git a/test/http_decoder/http_decoder_perf_plug.cpp b/test/decoders/http/http_decoder_perf_plug.cpp index 739e70f..338acaa 100644 --- a/test/http_decoder/http_decoder_perf_plug.cpp +++ b/test/decoders/http/http_decoder_perf_plug.cpp @@ -1,4 +1,4 @@ -#include "http_decoder.h" +#include "http.h" #include <stdio.h> #include <time.h> #include <unistd.h> @@ -8,7 +8,7 @@ #ifdef __cplusplus extern "C" { -#include "http_decoder_inc.h" +#include "http_decoder_private.h" #include "cJSON.h" } #endif diff --git a/test/http_decoder/http_decoder_test_plug.cpp b/test/decoders/http/http_decoder_test_plug.cpp index 4c1dd0f..86be09f 100644 --- a/test/http_decoder/http_decoder_test_plug.cpp +++ b/test/decoders/http/http_decoder_test_plug.cpp @@ -4,8 +4,8 @@ #include <assert.h> #include <string.h> -#include "http_decoder.h" -#include "http_decoder_inc.h" +#include "http.h" +#include "http_decoder_private.h" #ifdef __cplusplus extern "C" @@ -133,6 +133,7 @@ void output_http_body(hstring *body, int decompress_flag) static void append_http_payload(struct session *sess, struct gtest_plug_exdata_t *gtest_plug_exdata, enum payload_compress_mode mode, const hstring *body, enum http_transaction_type type) { + (void)sess; if (NULL == body->iov_base || 0 == body->iov_len) { return; @@ -206,8 +207,8 @@ void http_header_to_json(cJSON *ctx, struct http_header *header) else { // ctx already has the key, so rename key by key%d - char new_key[MAX_KEY_STR_LEN] = {0}; - sprintf(new_key, "%s%d", key, g_header_count++); + char new_key[header->val.iov_len + 64] = {0}; + snprintf(new_key,sizeof(new_key), "%s%d", key, g_header_count++); http_field_to_json(ctx, new_key, (char *)header->val.iov_base, header->val.iov_len); } } @@ -261,9 +262,12 @@ static void commit_payload_md5sum(cJSON *last_jnode, struct gtest_plug_exdata_t for (int i = 0; i < 16; i++) sprintf((char *)md5_result_cstr + 2 * i, "%02x", md5_result_bin[i]); md5_result_cstr[32] = '\0'; - if(mode == PAYLOAD_RAW){ + if (mode == PAYLOAD_RAW) + { cJSON_AddStringToObject(last_jnode, GTEST_HTTP_RAW_PAYLOAD_MD5_NAME, (char *)md5_result_cstr); - }else{ + } + else + { cJSON_AddStringToObject(last_jnode, GTEST_HTTP_DECOMPRESS_PAYLOAD_MD5_NAME, (char *)md5_result_cstr); } FREE(gtest_plug_exdata->payload_md5ctx[mode][type]); @@ -334,7 +338,6 @@ static int get_gtest_plug_entry(const char *cfg_path, char *entry_name, int max_ return -1; } - int ret = 0; char errbuf[256] = {0}; toml_table_t *root = toml_parse_file(fp, errbuf, sizeof(errbuf)); @@ -387,10 +390,13 @@ static void set_gtest_plug_entry(const char *entry_name) extern "C" void http_decoder_test_entry(struct session *sess, int topic_id, const void *raw_msg, void *no_use_ctx, void *plugin_env) { - struct http_request_line req_line = {0}; - struct http_response_line res_line = {0}; - struct http_header header = {0}; - hstring body = {0}; + (void)topic_id; + (void)no_use_ctx; + (void)plugin_env; + struct http_request_line req_line = {}; + struct http_response_line res_line = {}; + struct http_header header = {}; + hstring body = {}; struct http_message *msg = (struct http_message *)raw_msg; enum http_message_type msg_type = http_message_type_get(msg); @@ -401,14 +407,14 @@ extern "C" void http_decoder_test_entry(struct session *sess, int topic_id, cons session_exdata_set(sess, g_exdata_idx, gtest_plug_exdata); } - if (http_message_type_is_req(sess, msg_type)) - { - cJSON *json = gtest_plug_exdata->result_jnode[HTTP_TRANSACTION_REQ]; - } - else - { - cJSON *json = gtest_plug_exdata->result_jnode[HTTP_TRANSACTION_RES]; - } + // if (http_message_type_is_req(sess, msg_type)) + // { + // cJSON *json = gtest_plug_exdata->result_jnode[HTTP_TRANSACTION_REQ]; + // } + // else + // { + // cJSON *json = gtest_plug_exdata->result_jnode[HTTP_TRANSACTION_RES]; + // } http_decoder_test_update_session_tuple4(sess, gtest_plug_exdata); @@ -485,6 +491,8 @@ extern "C" void http_decoder_test_entry(struct session *sess, int topic_id, cons void http_decoder_test_exdata_free(int idx, void *ex_ptr, void *arg) { + (void)idx; + (void)arg; if (ex_ptr != NULL) { struct gtest_plug_exdata_t *gtest_plug_exdata = (struct gtest_plug_exdata_t *)ex_ptr; @@ -500,16 +508,19 @@ void http_decoder_test_exdata_free(int idx, void *ex_ptr, void *arg) } } -static int update_config_file(const char *filename, const char *key, const char *value) -{ - char cmd_buf[1024] = {}; - snprintf(cmd_buf, 1024, "sed 's/^[ \t]*%s=.*/%s=%s/g' -i %s", key, key, value, filename); - int ret = system(cmd_buf); - return ret; -} +// static int update_config_file(const char *filename, const char *key, const char *value) +// { +// char cmd_buf[1024] = {}; +// snprintf(cmd_buf, 1024, "sed 's/^[ \t]*%s=.*/%s=%s/g' -i %s", key, key, value, filename); +// int ret = system(cmd_buf); +// return ret; +// } extern "C" void http_decoder_test_state_entry(struct session *sess, int topic_id, const void *raw_msg, void *no_use_ctx, void *plugin_env) { + (void)topic_id; + (void)no_use_ctx; + (void)plugin_env; static int msg_index = 0; char msg_index_name[64] = {}; char msg_index_value[64] = {}; @@ -568,6 +579,9 @@ extern "C" void http_decoder_test_state_entry(struct session *sess, int topic_id extern "C" void http_decoder_tunnel_entry(struct session *sess, int topic_id, const void *raw_msg, void *no_use_ctx, void *plugin_env) { + (void)topic_id; + (void)no_use_ctx; + (void)plugin_env; struct gtest_plug_exdata_t *gtest_plug_exdata; enum http_tunnel_message_type tmsg_type = http_tunnel_message_type_get((const struct http_tunnel_message *)raw_msg); static size_t req_payload_block = 0, req_payload_size = 0; @@ -590,7 +604,7 @@ extern "C" void http_decoder_tunnel_entry(struct session *sess, int topic_id, co cJSON_AddStringToObject(gtest_plug_exdata->result_jnode[HTTP_TRANSACTION_SESSION], GTEST_HTTP_TUPLE4_NAME, human_addr_cstr); commit_test_result_json(gtest_plug_exdata->result_jnode[HTTP_TRANSACTION_SESSION], "TUNNEL_NEW"); } - // OPENING state has payload, go on + break; case HTTP_TUNNEL_ACTIVE: { diff --git a/test/http_decoder/md5.c b/test/decoders/http/md5.c index 13a5d16..3df1eb5 100644 --- a/test/http_decoder/md5.c +++ b/test/decoders/http/md5.c @@ -346,7 +346,7 @@ Rotation is separate from addition to prevent recomputation. */ MD5Init(&context);
MD5Update(&context, raw_data, raw_data_len);
- MD5Final(result, &context);
+ MD5Final((unsigned char *)result, &context);
return result;
}
diff --git a/test/http_decoder/md5.h b/test/decoders/http/md5.h index adf5457..adf5457 100644 --- a/test/http_decoder/md5.h +++ b/test/decoders/http/md5.h diff --git a/test/http_decoder/test_based_on_stellar/plugin_test_main.cpp b/test/decoders/http/plugin_test_main.cpp index accec2d..a94c692 100644 --- a/test/http_decoder/test_based_on_stellar/plugin_test_main.cpp +++ b/test/decoders/http/plugin_test_main.cpp @@ -1,4 +1,3 @@ -#include "stream.h" #include "cJSON.h" #include <gtest/gtest.h> #include <unistd.h> @@ -19,13 +18,13 @@ extern "C" #ifdef IGNORE_PRINTF #define printf(fmt, ...) (0) #endif - static cJSON *g_test_result_root = NULL; static cJSON *g_load_result_root = NULL; static const char *result_json_path = NULL; extern "C" int commit_test_result_json(cJSON *node, const char *name) { + (void)name; if (g_test_result_root) { // cJSON_AddItemToObject(g_test_result_root, name, node); diff --git a/test/decoders/http/test_based_on_stellar/CMakeLists.txt b/test/decoders/http/test_based_on_stellar/CMakeLists.txt new file mode 100644 index 0000000..acc4bda --- /dev/null +++ b/test/decoders/http/test_based_on_stellar/CMakeLists.txt @@ -0,0 +1,128 @@ +set(DECODER_NAME http) + +set(TEST_RUN_DIR ${CMAKE_BINARY_DIR}/test/decoders/http) +set(SAPP_DEVEL_DIR ${TEST_RUN_DIR}/lib) +set(TEST_MAIN http_test_main) + +include_directories(${CMAKE_SOURCE_DIR}/include) +include_directories(${CMAKE_SOURCE_DIR}/test) +include_directories(/usr/local/include/cjson) +include_directories(/opt/tsg/framework/include/stellar) +include_directories(/opt/MESA/include/MESA) +include_directories(/opt/tsg/stellar/include/) + +#various ways to add -rdynamic for centos7, centos8, and different cmake version +add_definitions(-rdynamic) +link_directories(${SAPP_DEVEL_DIR}) + +# assemble test env +add_test(NAME HTTP_MKDIR_METRIC COMMAND sh -c "mkdir -p ${TEST_RUN_DIR}/metrics; mkdir -p ${TEST_RUN_DIR}/plugin; mkdir -p ${TEST_RUN_DIR}/log; mkdir -p ${TEST_RUN_DIR}/pcap") +add_test(NAME HTTP_COPY_SPEC COMMAND sh -c "mkdir -p ${TEST_RUN_DIR}/plugin/ && cp ${CMAKE_CURRENT_SOURCE_DIR}/env/spec.toml ${TEST_RUN_DIR}/plugin/spec.toml") +add_test(NAME HTTP_COPY_CONF COMMAND sh -c "mkdir -p ${TEST_RUN_DIR}/conf/ && cp ${CMAKE_CURRENT_SOURCE_DIR}/env/stellar.toml ${TEST_RUN_DIR}/conf/stellar.toml") +add_test(NAME HTTP_COPY_LOG_CONF COMMAND sh -c "mkdir -p ${TEST_RUN_DIR}/conf/ && cp ${CMAKE_CURRENT_SOURCE_DIR}/env/log.toml ${TEST_RUN_DIR}/conf/log.toml") +add_test(NAME HTTP_COPY_HTTP_DECODER_CONF COMMAND sh -c "mkdir -p ${TEST_RUN_DIR}/etc/http && cp ${CMAKE_CURRENT_SOURCE_DIR}/env/http_decoder.toml ${TEST_RUN_DIR}/etc/http/") +add_test(NAME HTTP_COPY_HTTP_GTEST_ENTRY_CONF COMMAND sh -c "mkdir -p ${TEST_RUN_DIR}/etc/http && cp ${CMAKE_CURRENT_SOURCE_DIR}/env/gtest_entry.toml ${TEST_RUN_DIR}/etc/http/") + +# 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") + +# 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") + +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) + +set(TEST_JSON_DIR ${PROJECT_SOURCE_DIR}/benchmarks/json/http) +set(TEST_PCAP_DIR ${PROJECT_SOURCE_DIR}/benchmarks/pcap/http) + +# 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}) +add_test(NAME HTTP_GET_MULTI_TRANS_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_get_multi_trans.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_get_multi_trans.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_GET_LONG_COOKIE_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_get_long_cookie.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_get_long_cookie.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_GET_ENCODED_URI_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_get_encoded_uri.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_get_encoded_uri.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_RES_GZIP_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_res_gzip.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_res_gzip.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_CHUNKED_RES_GZIP_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_chunked_res_gzip.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_chunked_res_gzip.json"WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_OVER_TCP_KEEPALIVE_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_over_tcp_keepalive.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_over_tcp_keepalive.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_OVER_PPPOE_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_over_pppoe.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_over_pppoe.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_OVER_TLS_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_over_tls.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_over_tls.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME NON_HTTP_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/non_http.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/non_http.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_REQ_1BYTE_SLIDING_WINDOW_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_req_1byte_sliding_window.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_req_1byte_sliding_window.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_RES_1BYTE_SLIDING_WINDOW_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_res_1byte_sliding_window.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_res_1byte_sliding_window.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_NO_CONTENT_LENGTH_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_no_content_length.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_no_content_length.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_POST_MULTIPART_FORM_DATA_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_post_multipart_form_data.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_post_multipart_form_data.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_HEADERS_EXCEED_MAXIMUM_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_hdrs_exceed_maximum.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_hdrs_exceed_maximum.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_GET_MALFORMED_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_get_malformed.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_get_malformed.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_URL_WITHOUT_HOST_V4_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_url_test_without_host.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_url_test_without_host.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_URL_WITHOUT_HOST_V6_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_url_test_without_host_v6.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_url_test_without_host_v6.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +#no SYN, steallar not support ! +# add_test(NAME HTTP_HEADER_VALUE_EMPTY_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_hdr_value_empty.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_hdr_value_empty.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_UPGRADE_WEBSOCKET_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_upgrade_websocket.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_upgrade_websocket.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_MULTI_PARSE_ERROR_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_multi_parse_error.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_multi_parse_error.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_GET_REQ_PIPELINE_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_get_req_pipeline.pcap ${TEST_RUN_DIR}/pcap/test.pcap;./${TEST_MAIN} ${TEST_JSON_DIR}/http_get_req_pipeline.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_TRANS_PIPELINE_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_trans_pipeline.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_trans_pipeline.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +#no SYN, steallar not support ! +# add_test(NAME HTTP_HEADER_TRUNCATED_IN_KV_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_hdr_truncated_in_kv.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_hdr_truncated_in_kv.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +# add_test(NAME HTTP_HEADER_TRUNCATED_AFTER_KV_TEST COMMAND ./${TEST_MAIN} ${TEST_JSON_DIR}/http_hdr_truncated_after_kv.json -r ${TEST_PCAP_DIR}/http_hdr_truncated_after_kv.pcap WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_FIN_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_fin.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/non_http.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +# add_test(NAME HTTP_TUNNEL_ONLY_HDR_TEST COMMAND ./${TEST_MAIN} ${TEST_JSON_DIR}/http_tunnel_s2c_only_hdr.json +# -r ${TEST_PCAP_DIR}/http_tunnel_s2c_only_hdr.pcap WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_CHN_ENCODE_URL COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_chn_encode_url.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_chn_encode_url.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +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}) + +set_tests_properties(HTTP_GET_SINGLE_TRANS_TEST + HTTP_GET_MULTI_TRANS_TEST + HTTP_GET_LONG_COOKIE_TEST + HTTP_GET_ENCODED_URI_TEST + HTTP_RES_GZIP_TEST + HTTP_CHUNKED_RES_GZIP_TEST + HTTP_OVER_TCP_KEEPALIVE_TEST + HTTP_OVER_PPPOE_TEST + HTTP_OVER_TLS_TEST + NON_HTTP_TEST + HTTP_REQ_1BYTE_SLIDING_WINDOW_TEST + HTTP_RES_1BYTE_SLIDING_WINDOW_TEST + HTTP_NO_CONTENT_LENGTH_TEST + HTTP_POST_MULTIPART_FORM_DATA_TEST + HTTP_HEADERS_EXCEED_MAXIMUM_TEST + HTTP_GET_MALFORMED_TEST + HTTP_URL_WITHOUT_HOST_V4_TEST + HTTP_URL_WITHOUT_HOST_V6_TEST + HTTP_MULTI_PARSE_ERROR_TEST + HTTP_UPGRADE_WEBSOCKET_TEST + HTTP_GET_REQ_PIPELINE_TEST + HTTP_TRANS_PIPELINE_TEST + HTTP_FIN_TEST + HTTP_CHN_ENCODE_URL + HTTP_ZLIB_DEADLOCK + HTTP_OUT_OF_ORDER + HTTP_GZIP_OUT_OF_ORDER + PROPERTIES FIXTURES_REQUIRED TestFixture) + +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") + +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) + +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}) +add_test(NAME HTTP_MSG_TYPE_STATE_S2C_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_post_s2c.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_msg_type_state_s2c.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_MSG_TYPE_STATE_PIPELINE_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_get_multi_trans.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_msg_type_state_pipeline.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_MSG_TYPE_STATE_SES_EXCEPTION_C2S_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_session_exception_c2s.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_msg_type_state_exception_c2s.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) +add_test(NAME HTTP_MSG_TYPE_STATE_SES_EXCEPTION_S2C_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_session_exception_s2c.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_msg_type_state_exception_s2c.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) + +set_tests_properties(HTTP_MSG_TYPE_STATE_TEST + HTTP_MSG_TYPE_STATE_C2S_TEST + HTTP_MSG_TYPE_STATE_S2C_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) + diff --git a/test/http_decoder/conf/gtest_entry.toml b/test/decoders/http/test_based_on_stellar/env/gtest_entry.toml index 35e32ca..35e32ca 100644 --- a/test/http_decoder/conf/gtest_entry.toml +++ b/test/decoders/http/test_based_on_stellar/env/gtest_entry.toml diff --git a/test/http_decoder/conf/http_decoder.toml b/test/decoders/http/test_based_on_stellar/env/http_decoder.toml index a2bb060..a2bb060 100644 --- a/test/http_decoder/conf/http_decoder.toml +++ b/test/decoders/http/test_based_on_stellar/env/http_decoder.toml diff --git a/test/http_decoder/test_based_on_stellar/env/log.toml b/test/decoders/http/test_based_on_stellar/env/log.toml index 0246ed1..0246ed1 100644 --- a/test/http_decoder/test_based_on_stellar/env/log.toml +++ b/test/decoders/http/test_based_on_stellar/env/log.toml diff --git a/test/http_decoder/test_based_on_stellar/env/spec.toml b/test/decoders/http/test_based_on_stellar/env/spec.toml index 9bc3474..cce2c71 100644 --- a/test/http_decoder/test_based_on_stellar/env/spec.toml +++ b/test/decoders/http/test_based_on_stellar/env/spec.toml @@ -1,9 +1,9 @@ [[plugin]] -path = "./plugin/http_decoder.so" +path = "./plugin/http.so" init = "http_decoder_init" exit = "http_decoder_exit" [[plugin]] -path = "./plugin/http_decoder_test.so" +path = "./plugin/http_test.so" init = "http_decoder_test_init" exit = "http_decoder_test_exit" diff --git a/test/http_decoder/test_based_on_stellar/env/stellar.toml b/test/decoders/http/test_based_on_stellar/env/stellar.toml index 9e11af5..9e11af5 100644 --- a/test/http_decoder/test_based_on_stellar/env/stellar.toml +++ b/test/decoders/http/test_based_on_stellar/env/stellar.toml diff --git a/test/http_decoder/CMakeLists.txt b/test/http_decoder/CMakeLists.txt deleted file mode 100644 index 98d06d3..0000000 --- a/test/http_decoder/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -set(DECODER_NAME http_decoder) - -aux_source_directory(${PROJECT_SOURCE_DIR}/deps/toml DEPS_SRC) - -add_library(${DECODER_NAME}_test SHARED http_decoder_test_plug.cpp md5.c ${DEPS_SRC}) -add_dependencies(${DECODER_NAME}_test ${DECODER_NAME}) -target_link_libraries(${DECODER_NAME}_test MESA_prof_load cjson-static) -set_target_properties(${DECODER_NAME}_test PROPERTIES PREFIX "") - -add_library(${DECODER_NAME}_perf SHARED http_decoder_perf_plug.cpp) -add_dependencies(${DECODER_NAME}_perf ${DECODER_NAME}) -set_target_properties(${DECODER_NAME}_perf PROPERTIES PREFIX "") - -set(TEST_RUN_DIR /home/mesasoft/sapp_run) - -include_directories(${CMAKE_SOURCE_DIR}/include) -include_directories(${CMAKE_SOURCE_DIR}/src) -include_directories(${CMAKE_SOURCE_DIR}/deps) -include_directories(/opt/tsg/stellar/include/) -include_directories(/opt/tsg/framework/include/) -include_directories(/opt/MESA/include/MESA) -include_directories(${CMAKE_BINARY_DIR}/vendor/vbuild/include) -include_directories(${CMAKE_BINARY_DIR}/vendor/cjson/src/cjson/include) - -aux_source_directory(${PROJECT_SOURCE_DIR}/deps/mempool PERF_TEST_DEP_SRC) -aux_source_directory(${PROJECT_SOURCE_DIR}/deps/toml PERF_TEST_DEP_SRC) -aux_source_directory(${PROJECT_SOURCE_DIR}/src PERF_TEST_DEP_SRC) - -# add_executable(httpd_perf_test ${PERF_TEST_DEP_SRC} http_decoder_perf_main.cpp http_decoder_perf_plug.cpp http_stellar_mock.cpp) -# target_link_libraries(httpd_perf_test z brotlidec llhttp-static fieldstat4 pthread) - -add_executable(httpd_gtest http_decoder_gtest.cpp http_stellar_mock.cpp ${PROJECT_SOURCE_DIR}/src/http_decoder_utils.cpp) -target_link_libraries(httpd_gtest gtest stellar_devel) diff --git a/test/http_decoder/conf/.gitkeep b/test/http_decoder/conf/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/test/http_decoder/conf/.gitkeep +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_6over4_single_trans.pcap b/test/http_decoder/http_pcap/http_6over4_single_trans.pcap Binary files differdeleted file mode 100644 index 6b074e5..0000000 --- a/test/http_decoder/http_pcap/http_6over4_single_trans.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_chn_encode_url.pcap b/test/http_decoder/http_pcap/http_chn_encode_url.pcap Binary files differdeleted file mode 100644 index dac9495..0000000 --- a/test/http_decoder/http_pcap/http_chn_encode_url.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_chunked_res_gzip.pcap b/test/http_decoder/http_pcap/http_chunked_res_gzip.pcap Binary files differdeleted file mode 100644 index fa237fb..0000000 --- a/test/http_decoder/http_pcap/http_chunked_res_gzip.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_connect_flood.pcap b/test/http_decoder/http_pcap/http_connect_flood.pcap Binary files differdeleted file mode 100644 index 11b7e14..0000000 --- a/test/http_decoder/http_pcap/http_connect_flood.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_error.pcap b/test/http_decoder/http_pcap/http_error.pcap Binary files differdeleted file mode 100644 index 3ef0829..0000000 --- a/test/http_decoder/http_pcap/http_error.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_fin.pcap b/test/http_decoder/http_pcap/http_fin.pcap Binary files differdeleted file mode 100644 index d23bcba..0000000 --- a/test/http_decoder/http_pcap/http_fin.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_get_encoded_uri.pcap b/test/http_decoder/http_pcap/http_get_encoded_uri.pcap Binary files differdeleted file mode 100644 index 633b50b..0000000 --- a/test/http_decoder/http_pcap/http_get_encoded_uri.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_get_long_cookie.pcap b/test/http_decoder/http_pcap/http_get_long_cookie.pcap Binary files differdeleted file mode 100644 index 8857615..0000000 --- a/test/http_decoder/http_pcap/http_get_long_cookie.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_get_malformed.pcap b/test/http_decoder/http_pcap/http_get_malformed.pcap Binary files differdeleted file mode 100644 index 08deaeb..0000000 --- a/test/http_decoder/http_pcap/http_get_malformed.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_get_multi_trans.pcap b/test/http_decoder/http_pcap/http_get_multi_trans.pcap Binary files differdeleted file mode 100644 index 9c0d2e7..0000000 --- a/test/http_decoder/http_pcap/http_get_multi_trans.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_get_req_pipeline.pcap b/test/http_decoder/http_pcap/http_get_req_pipeline.pcap Binary files differdeleted file mode 100644 index f805493..0000000 --- a/test/http_decoder/http_pcap/http_get_req_pipeline.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_get_single_trans.pcap b/test/http_decoder/http_pcap/http_get_single_trans.pcap Binary files differdeleted file mode 100644 index a4b6bea..0000000 --- a/test/http_decoder/http_pcap/http_get_single_trans.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_gzip_out_of_order.pcap b/test/http_decoder/http_pcap/http_gzip_out_of_order.pcap Binary files differdeleted file mode 100644 index b3bb169..0000000 --- a/test/http_decoder/http_pcap/http_gzip_out_of_order.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_hdr_truncated_after_kv.pcap b/test/http_decoder/http_pcap/http_hdr_truncated_after_kv.pcap Binary files differdeleted file mode 100644 index de9f018..0000000 --- a/test/http_decoder/http_pcap/http_hdr_truncated_after_kv.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_hdr_truncated_in_kv.pcap b/test/http_decoder/http_pcap/http_hdr_truncated_in_kv.pcap Binary files differdeleted file mode 100644 index b4015c9..0000000 --- a/test/http_decoder/http_pcap/http_hdr_truncated_in_kv.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_hdr_value_empty.pcap b/test/http_decoder/http_pcap/http_hdr_value_empty.pcap Binary files differdeleted file mode 100644 index bb22243..0000000 --- a/test/http_decoder/http_pcap/http_hdr_value_empty.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_hdrs_exceed_maximum.pcap b/test/http_decoder/http_pcap/http_hdrs_exceed_maximum.pcap Binary files differdeleted file mode 100644 index 537bffa..0000000 --- a/test/http_decoder/http_pcap/http_hdrs_exceed_maximum.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_multi_parse_error.pcap b/test/http_decoder/http_pcap/http_multi_parse_error.pcap Binary files differdeleted file mode 100644 index b57e275..0000000 --- a/test/http_decoder/http_pcap/http_multi_parse_error.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_no_content_length.pcap b/test/http_decoder/http_pcap/http_no_content_length.pcap Binary files differdeleted file mode 100644 index 28e6881..0000000 --- a/test/http_decoder/http_pcap/http_no_content_length.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_out_of_order.pcap b/test/http_decoder/http_pcap/http_out_of_order.pcap Binary files differdeleted file mode 100644 index 7a40e5b..0000000 --- a/test/http_decoder/http_pcap/http_out_of_order.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_over_pppoe.pcap b/test/http_decoder/http_pcap/http_over_pppoe.pcap Binary files differdeleted file mode 100644 index a6587cb..0000000 --- a/test/http_decoder/http_pcap/http_over_pppoe.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_over_tcp_keepalive.pcap b/test/http_decoder/http_pcap/http_over_tcp_keepalive.pcap Binary files differdeleted file mode 100644 index e8d9a34..0000000 --- a/test/http_decoder/http_pcap/http_over_tcp_keepalive.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_over_tls.pcap b/test/http_decoder/http_pcap/http_over_tls.pcap Binary files differdeleted file mode 100644 index 71c557e..0000000 --- a/test/http_decoder/http_pcap/http_over_tls.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_pipeline_C2S.pcap b/test/http_decoder/http_pcap/http_pipeline_C2S.pcap Binary files differdeleted file mode 100644 index 360e0ed..0000000 --- a/test/http_decoder/http_pcap/http_pipeline_C2S.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_pipeline_S2C.pcap b/test/http_decoder/http_pcap/http_pipeline_S2C.pcap Binary files differdeleted file mode 100644 index a7d473f..0000000 --- a/test/http_decoder/http_pcap/http_pipeline_S2C.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_post.pcap b/test/http_decoder/http_pcap/http_post.pcap Binary files differdeleted file mode 100644 index cb5843e..0000000 --- a/test/http_decoder/http_pcap/http_post.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_post_c2s.pcap b/test/http_decoder/http_pcap/http_post_c2s.pcap Binary files differdeleted file mode 100644 index 973a5fb..0000000 --- a/test/http_decoder/http_pcap/http_post_c2s.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_post_multipart_form_data.pcap b/test/http_decoder/http_pcap/http_post_multipart_form_data.pcap Binary files differdeleted file mode 100644 index 052d326..0000000 --- a/test/http_decoder/http_pcap/http_post_multipart_form_data.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_post_s2c.pcap b/test/http_decoder/http_pcap/http_post_s2c.pcap Binary files differdeleted file mode 100644 index 0be23a8..0000000 --- a/test/http_decoder/http_pcap/http_post_s2c.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_post_single_trans.pcap b/test/http_decoder/http_pcap/http_post_single_trans.pcap Binary files differdeleted file mode 100644 index dfa37d3..0000000 --- a/test/http_decoder/http_pcap/http_post_single_trans.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_req_1byte_sliding_window.pcap b/test/http_decoder/http_pcap/http_req_1byte_sliding_window.pcap Binary files differdeleted file mode 100644 index 632c676..0000000 --- a/test/http_decoder/http_pcap/http_req_1byte_sliding_window.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_res_1byte_sliding_window.pcap b/test/http_decoder/http_pcap/http_res_1byte_sliding_window.pcap Binary files differdeleted file mode 100644 index 6d1d6a4..0000000 --- a/test/http_decoder/http_pcap/http_res_1byte_sliding_window.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_res_gzip.pcap b/test/http_decoder/http_pcap/http_res_gzip.pcap Binary files differdeleted file mode 100644 index 04b9998..0000000 --- a/test/http_decoder/http_pcap/http_res_gzip.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_session_exception_c2s.pcap b/test/http_decoder/http_pcap/http_session_exception_c2s.pcap Binary files differdeleted file mode 100644 index eb93c24..0000000 --- a/test/http_decoder/http_pcap/http_session_exception_c2s.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_session_exception_s2c.pcap b/test/http_decoder/http_pcap/http_session_exception_s2c.pcap Binary files differdeleted file mode 100644 index d5caa49..0000000 --- a/test/http_decoder/http_pcap/http_session_exception_s2c.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_trans_pipeline.pcap b/test/http_decoder/http_pcap/http_trans_pipeline.pcap Binary files differdeleted file mode 100644 index 43438e1..0000000 --- a/test/http_decoder/http_pcap/http_trans_pipeline.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_tunnel_for_http.pcap b/test/http_decoder/http_pcap/http_tunnel_for_http.pcap Binary files differdeleted file mode 100644 index 0654576..0000000 --- a/test/http_decoder/http_pcap/http_tunnel_for_http.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_tunnel_for_http_C2S.pcap b/test/http_decoder/http_pcap/http_tunnel_for_http_C2S.pcap Binary files differdeleted file mode 100644 index db336d9..0000000 --- a/test/http_decoder/http_pcap/http_tunnel_for_http_C2S.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_tunnel_for_http_S2C.pcap b/test/http_decoder/http_pcap/http_tunnel_for_http_S2C.pcap Binary files differdeleted file mode 100644 index f9bb2f5..0000000 --- a/test/http_decoder/http_pcap/http_tunnel_for_http_S2C.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_tunnel_for_pop3.pcap b/test/http_decoder/http_pcap/http_tunnel_for_pop3.pcap Binary files differdeleted file mode 100644 index 6df9669..0000000 --- a/test/http_decoder/http_pcap/http_tunnel_for_pop3.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_tunnel_s2c_only_hdr.pcap b/test/http_decoder/http_pcap/http_tunnel_s2c_only_hdr.pcap Binary files differdeleted file mode 100644 index 6887fec..0000000 --- a/test/http_decoder/http_pcap/http_tunnel_s2c_only_hdr.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_upgrade_http2.pcap b/test/http_decoder/http_pcap/http_upgrade_http2.pcap Binary files differdeleted file mode 100644 index a77847a..0000000 --- a/test/http_decoder/http_pcap/http_upgrade_http2.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_upgrade_websocket.pcap b/test/http_decoder/http_pcap/http_upgrade_websocket.pcap Binary files differdeleted file mode 100644 index b823d7e..0000000 --- a/test/http_decoder/http_pcap/http_upgrade_websocket.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_url_test_with_host.pcap b/test/http_decoder/http_pcap/http_url_test_with_host.pcap Binary files differdeleted file mode 100644 index 8a57c4a..0000000 --- a/test/http_decoder/http_pcap/http_url_test_with_host.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_url_test_without_host.pcap b/test/http_decoder/http_pcap/http_url_test_without_host.pcap Binary files differdeleted file mode 100644 index 0036379..0000000 --- a/test/http_decoder/http_pcap/http_url_test_without_host.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_url_test_without_host_v6.pcap b/test/http_decoder/http_pcap/http_url_test_without_host_v6.pcap Binary files differdeleted file mode 100644 index 70937c8..0000000 --- a/test/http_decoder/http_pcap/http_url_test_without_host_v6.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_whitespace_before_header.pcap b/test/http_decoder/http_pcap/http_whitespace_before_header.pcap Binary files differdeleted file mode 100644 index 8317361..0000000 --- a/test/http_decoder/http_pcap/http_whitespace_before_header.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/http_zlib_deadlock.pcap b/test/http_decoder/http_pcap/http_zlib_deadlock.pcap Binary files differdeleted file mode 100644 index 05862f8..0000000 --- a/test/http_decoder/http_pcap/http_zlib_deadlock.pcap +++ /dev/null diff --git a/test/http_decoder/http_pcap/non_http.pcap b/test/http_decoder/http_pcap/non_http.pcap Binary files differdeleted file mode 100644 index 931b43b..0000000 --- a/test/http_decoder/http_pcap/non_http.pcap +++ /dev/null diff --git a/test/http_decoder/http_stellar_mock.cpp b/test/http_decoder/http_stellar_mock.cpp deleted file mode 100644 index 4769613..0000000 --- a/test/http_decoder/http_stellar_mock.cpp +++ /dev/null @@ -1,287 +0,0 @@ -#include "uthash-2.3.0/include/utlist.h" -#include "http_decoder_gtest.h" -#include "http_stellar_mock.h" - -static int G_TCP_STREAM_TOPIC_ID = -1; -static int G_UDP_TOPIC_ID = -1; -static struct stellar *G_STELLAR; -static struct plugin_mgr *g_plugin_mgr_list_head = NULL; -static struct stellar *g_st; - -static void stellar_internal_msg_free_cb_func(void *msg, void *msg_free_arg) {/* do nothing*/} -static void stellar_register_internal_topic(struct stellar *st) -{ - G_TCP_STREAM_TOPIC_ID = stellar_mq_get_topic_id(st, TOPIC_TCP_STREAM); - if(G_TCP_STREAM_TOPIC_ID < 0){ - G_TCP_STREAM_TOPIC_ID = stellar_mq_create_topic(st, TOPIC_TCP_STREAM, stellar_internal_msg_free_cb_func, NULL); - } - G_UDP_TOPIC_ID = stellar_mq_get_topic_id(st, TOPIC_UDP); - if(G_UDP_TOPIC_ID < 0){ - G_UDP_TOPIC_ID = stellar_mq_create_topic(st, TOPIC_UDP, stellar_internal_msg_free_cb_func, NULL); - } -} -void stellar_session_plugin_dettach_current_session(struct session *sess) { return; } -int stellar_mq_destroy_topic(struct stellar *st, int topic_id) { return 0; } -int stellar_get_worker_thread_num(struct stellar *st) { return 1; } -uint16_t stellar_get_current_thread_index(void) { return 0; } -int stellar_get_current_thread_index(struct session *sess) { return 0; } -int session_mq_ignore_message(struct session *sess, int topic_id, int plugin_id) { return 0; } -int session_mq_unignore_message(struct session *sess, int topic_id, int plugin_id) { return 0; } -int stellar_session_exdata_new_index(struct stellar *st, const char *name, stellar_exdata_free *free_func,void *arg) -{ - int list_count = 0; - struct exdata_mgr *tmp, *new_exdata = (struct exdata_mgr *)calloc(1, sizeof(struct exdata_mgr)); - DL_FOREACH(st->exdata_mgr_head, tmp){ - if(0 == strcmp(tmp->name, name) && (strlen(tmp->name) == strlen(name))){ - return 0; //already exist - } - } - DL_COUNT(st->exdata_mgr_head, tmp, list_count); - new_exdata->exdata_id = list_count; - new_exdata->name = strdup(name); - new_exdata->free_func = free_func; - new_exdata->arg = arg; - DL_APPEND(st->exdata_mgr_head, new_exdata); - return 0; -} -int session_exdata_set(struct session *sess, int idx, void *ex_ptr) -{ - struct exdata_mgr *el = NULL; - DL_FOREACH(sess->runtime_exdata_head, el){ - if(el->exdata_id == idx){ - el->user_ptr = ex_ptr; - return 0; - } - } - struct exdata_mgr *new_exdata = (struct exdata_mgr *)calloc(1, sizeof(struct exdata_mgr)); - new_exdata->exdata_id = idx; - new_exdata->user_ptr = ex_ptr; - DL_APPEND(sess->runtime_exdata_head, new_exdata); - return 0; -} -void *session_exdata_get(struct session *sess, int idx) -{ - struct exdata_mgr *el = NULL; - DL_FOREACH(sess->runtime_exdata_head, el){ - if(el->exdata_id == idx){ - return el->user_ptr; - } - } - return NULL; -} -enum session_state session_get_current_state(struct session *sess) -{ - return sess->sess_state; -} -const char *session_get0_current_payload(struct session *sess, uint16_t *payload_len) -{ - const struct packet *test_payload = &sess->pkt; - *payload_len = test_payload->payload_len; - return test_payload->payload; -} -struct session_addr *session_get0_addr(struct session *sess, enum session_addr_type *addr_type) -{ - *addr_type = SESSION_ADDR_TYPE_IPV4_TCP; - return &sess->addr; -} - -const struct packet *session_get0_current_packet(struct session *sess) -{ - return &sess->pkt; -} -int session_is_symmetric(struct session *sess, unsigned char *flag) -{ - *flag = (SESSION_SEEN_C2S_FLOW | SESSION_SEEN_S2C_FLOW); - return 1; -} -static struct plugin_mgr *get_stat_by_plugin_id(int plugin_id) -{ - struct plugin_mgr *plugin = NULL; - DL_FOREACH(g_plugin_mgr_list_head, plugin){ - if(plugin->plugin_id == plugin_id){ - break; - } - } - return plugin; -} -int stellar_session_mq_subscribe(struct stellar *st, int topic_id, on_session_msg_cb_func *plugin_on_msg_cb, int plugin_id) -{ - struct topic_mgr *topic_el = NULL; - DL_FOREACH(st->topic_mgr_head, topic_el){ - if(topic_el->topic_id == topic_id){ - break; - } - } - if(NULL == topic_el){ - return -1; - } - struct plugin_mgr *plugin = get_stat_by_plugin_id(plugin_id); - struct sub_topic_cb_list *sub_cb_list = (struct sub_topic_cb_list *)calloc(1, sizeof(struct sub_topic_cb_list)); - sub_cb_list->sub_cb = plugin_on_msg_cb; - sub_cb_list->plugin_id = plugin_id; - sub_cb_list->plugin_env = plugin->plugin_env; - DL_APPEND(topic_el->sub_free_cb_list_head, sub_cb_list); - return 0; -} -int stellar_mq_get_topic_id(struct stellar *st, const char *topic_name) -{ - struct topic_mgr *el = NULL; - DL_FOREACH(st->topic_mgr_head, el){ - if(0 == strcmp(el->topic_name, topic_name) && (strlen(el->topic_name) == strlen(topic_name))){ - return el->topic_id; - } - } - return -1; -} -int stellar_session_mq_create_topic(struct stellar *st, const char *topic_name, stellar_msg_free_cb_func *msg_free_cb, void *msg_free_arg) -{ - int topic_id = stellar_mq_get_topic_id(st, topic_name); - if(topic_id >= 0){ - return topic_id;//already exist - } - struct topic_mgr *tmp, *new_topic = (struct topic_mgr *)calloc(1, sizeof(struct topic_mgr)); - int list_count; - DL_APPEND(st->topic_mgr_head, new_topic); - DL_COUNT(st->topic_mgr_head, tmp, list_count); - new_topic->topic_id = list_count; - new_topic->pub_free_cb = msg_free_cb; - new_topic->pub_free_arg = msg_free_arg; - new_topic->topic_name = strdup(topic_name); - return new_topic->topic_id; -} - -int stellar_session_plugin_register(struct stellar *st, session_ctx_new_func session_ctx_new, - session_ctx_free_func session_ctx_free, void *plugin_env) -{ - int list_count; - struct plugin_mgr *tmp, *plugin = (struct plugin_mgr *)calloc(1, sizeof(struct plugin_mgr)); - DL_APPEND(g_plugin_mgr_list_head, plugin); - DL_COUNT(g_plugin_mgr_list_head, tmp, list_count); - plugin->plugin_id = list_count; - plugin->plugin_env = plugin_env; - plugin->session_ctx_new = session_ctx_new; - plugin->session_ctx_free = session_ctx_free; - return plugin->plugin_id; -} -int session_mq_publish_message(struct session *sess, int topic_id, void *msg) -{ - struct topic_mgr *el = NULL; - DL_FOREACH(sess->st->topic_mgr_head, el){ - if(el->topic_id == topic_id){ - break; - } - } - if(NULL == el){ - return -1; - } - sub_topic_cb_list *sub_cb_node = NULL; - DL_FOREACH(el->sub_free_cb_list_head, sub_cb_node){ - (*sub_cb_node->sub_cb)(sess, topic_id, msg, NULL, sub_cb_node->plugin_env); //todo - } - el->pub_free_cb(msg, el->pub_free_arg); - return 0; -} -int stellar_load_plugin(struct stellar *st, void *(plugin_init_cb)(struct stellar *st)) -{ - plugin_init_cb(st); - return 0; -} -struct session *stellar_session_new(struct stellar *st, int topic_id, const char *payload, size_t payload_len, u_int8_t dir) -{ - struct session *sess = (struct session *)calloc(1, sizeof(struct session)); - sess->st = st; - sess->sess_state = SESSION_STATE_OPENING; - sess->addr.ipv4.saddr = 0x7f000001; - sess->addr.ipv4.daddr = 0x7f000002; - sess->addr.ipv4.sport = htons(12345); - sess->addr.ipv4.dport = htons(80); - if(G_TCP_STREAM_TOPIC_ID == topic_id){ - sess->addr_type = SESSION_ADDR_TYPE_IPV4_TCP; - }else{ - sess->addr_type = SESSION_ADDR_TYPE_IPV4_UDP; - } - sess->pkt.dir = dir; - sess->pkt.payload = payload; - sess->pkt.payload_len = payload_len; - stellar_message *message = (stellar_message *)&sess->pkt; - session_mq_publish_message(sess, topic_id, message); - return sess; -} -void stellar_session_active(struct stellar *st, struct session *sess, int topic_id, const char *payload, size_t payload_len, u_int8_t dir) -{ - sess->sess_state = SESSION_STATE_ACTIVE; - sess->pkt.dir = dir; - sess->pkt.payload = payload; - sess->pkt.payload_len = payload_len; - stellar_message *message = (stellar_message *)&sess->pkt; - session_mq_publish_message(sess, topic_id, message); - return; -} -static void session_plugin_exdata_free(struct stellar *st, struct session *sess, int exdata_idx, void *user_ptr) -{ - struct exdata_mgr *el = NULL; - DL_FOREACH(st->exdata_mgr_head, el){ - if(el->exdata_id == exdata_idx){ - el->free_func(exdata_idx, user_ptr, el->arg); - } - } -} -static void session_plugin_exdata_free_all(struct stellar *st, struct session *sess) -{ - struct exdata_mgr *el = NULL, *tmp = NULL; - DL_FOREACH_SAFE(sess->runtime_exdata_head, el, tmp){ - session_plugin_exdata_free(st, sess, el->exdata_id, el->user_ptr); - DL_DELETE(sess->runtime_exdata_head, el); - free(el); - } -} -static void stellar_session_free(struct stellar *st, struct session *sess) -{ - session_plugin_exdata_free_all(st, sess); - free(sess); -} -void stellar_session_close(struct stellar *st, struct session *sess, int topic_id) -{ - sess->sess_state = SESSION_STATE_CLOSING; - sess->pkt.payload = NULL; - sess->pkt.payload_len = 0; - stellar_message *message = (stellar_message *)&sess->pkt; - session_mq_publish_message(sess, topic_id, message); - stellar_session_free(st, sess); - return; -} -struct stellar *stellar_init(void) -{ - if(NULL == g_st){ - g_st = (struct stellar *)calloc(1, sizeof(struct stellar)); - } - stellar_register_internal_topic(g_st); - return g_st; -} -static void stellar_sub_topi_mgr_destroy(struct topic_mgr *topic_mgr) -{ - struct sub_topic_cb_list *sub_cb_node = NULL, *tmp = NULL; - DL_FOREACH_SAFE(topic_mgr->sub_free_cb_list_head, sub_cb_node, tmp){ - DL_DELETE(topic_mgr->sub_free_cb_list_head, sub_cb_node); - free(sub_cb_node); - } - return; -} -void stellar_destroy(struct stellar *st) -{ - struct exdata_mgr *el = NULL, *tmp; - DL_FOREACH_SAFE(st->exdata_mgr_head, el, tmp){ - free((void *)el->name); - DL_DELETE(st->exdata_mgr_head, el); - free(el); - } - struct topic_mgr *el_topic, *tmp_topic; - DL_FOREACH_SAFE(st->topic_mgr_head, el_topic, tmp_topic){ - DL_DELETE(st->topic_mgr_head, el_topic); - stellar_sub_topi_mgr_destroy(el_topic); - free((void *)el_topic->topic_name); - free(el_topic); - } - free(st); - return; -}
\ No newline at end of file diff --git a/test/http_decoder/http_stellar_mock.h b/test/http_decoder/http_stellar_mock.h deleted file mode 100644 index 8192a98..0000000 --- a/test/http_decoder/http_stellar_mock.h +++ /dev/null @@ -1,112 +0,0 @@ -#pragma once -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> -#include <time.h> -#include </usr/include/bits/types/struct_iovec.h> -#ifdef __cplusplus -extern "C" -{ -#endif -#include <stellar/session.h> -#include <stellar/stellar_mq.h> -#include <stellar/stellar_exdata.h> -#include <stellar/stellar.h> -#ifdef __cplusplus -} -#endif - -struct packet{ - const char *payload; - size_t payload_len; - u_int8_t dir; //FLOW_DIRECTION_C2S FLOW_DIRECTION_S2C -}; -typedef struct packet stellar_message; -struct exdata_mgr{ - const char *name; - int exdata_id; - void *arg; - void *user_ptr; - stellar_exdata_free *free_func; - struct exdata_mgr *next, *prev; -}; -struct sub_topic_mgr{ - int topic_id; - int plugin_id; - void *plugin_env; -}; -struct topic_mgr{ - struct topic_mgr *next, *prev; - const char *topic_name; - int topic_id; - stellar_msg_free_cb_func *pub_free_cb; - void *pub_free_arg; - struct sub_topic_cb_list *sub_free_cb_list_head; -}; -struct stellar{ - struct topic_mgr *topic_mgr_head; - struct exdata_mgr *exdata_mgr_head; -}; - -//todo, native stellar can't get addr -enum session_addr_type -{ - SESSION_ADDR_TYPE_IPV4_TCP, - SESSION_ADDR_TYPE_IPV4_UDP, - SESSION_ADDR_TYPE_IPV6_TCP, - SESSION_ADDR_TYPE_IPV6_UDP, - SESSION_ADDR_TYPE_UNKNOWN, - __SESSION_ADDR_TYPE_MAX, -}; -struct session_addr_ipv4{ - uint32_t saddr; /* network order */ - uint32_t daddr; /* network order */ - uint16_t sport; /* network order */ - uint16_t dport; /* network order */ -}; - -#include <netinet/in.h> -#ifndef IPV6_ADDR_LEN -#define IPV6_ADDR_LEN (sizeof(struct in6_addr)) -#endif -struct session_addr_ipv6 -{ - uint8_t saddr[IPV6_ADDR_LEN] ; - uint8_t daddr[IPV6_ADDR_LEN] ; - uint16_t sport; /* network order */ - uint16_t dport; /* network order */ -}; - -struct session_addr -{ - union - { - struct session_addr_ipv4 ipv4; - struct session_addr_ipv6 ipv6; - }; -}; - - -struct session{ - struct stellar *st; - enum session_state sess_state; - enum session_addr_type addr_type; - struct session_addr addr; - void *exdata; - struct packet pkt; - struct exdata_mgr *runtime_exdata_head; -}; -struct plugin_mgr{ - struct plugin_mgr *next, *prev; - int plugin_id; - void *plugin_env; - session_ctx_new_func *session_ctx_new; - session_ctx_free_func *session_ctx_free; -}; -struct sub_topic_cb_list{ - int plugin_id; - void *plugin_env; - on_session_msg_cb_func *sub_cb; - struct sub_topic_cb_list *next, *prev; -}; diff --git a/test/http_decoder/test_based_on_stellar/CMakeLists.txt b/test/http_decoder/test_based_on_stellar/CMakeLists.txt deleted file mode 100644 index be76c16..0000000 --- a/test/http_decoder/test_based_on_stellar/CMakeLists.txt +++ /dev/null @@ -1,142 +0,0 @@ -set(DECODER_NAME http_decoder) - -set(TEST_RUN_DIR ${CMAKE_INSTALL_PREFIX}/stellar) -set(SAPP_DEVEL_DIR ${TEST_RUN_DIR}/lib) -set(TEST_MAIN plugin_test_main) - -include_directories(${CMAKE_SOURCE_DIR}/include) -include_directories(${CMAKE_SOURCE_DIR}/test) -include_directories(/usr/local/include/cjson) -include_directories(/opt/tsg/framework/include/stellar) -include_directories(/opt/MESA/include/MESA) -include_directories(/opt/tsg/stellar/include/) - -#various ways to add -rdynamic for centos7, centos8, and different cmake version -add_definitions(-rdynamic) -link_directories(${SAPP_DEVEL_DIR}) - -add_executable(plugin_test_main plugin_test_main.cpp) -set_target_properties(plugin_test_main - PROPERTIES - LINK_OPTIONS - "-rdynamic" - ) -set_target_properties(plugin_test_main - PROPERTIES - LINK_FLAGS - "-rdynamic" - ) -set(LINK_FLAGS "-rdynamic") -target_link_libraries(plugin_test_main gtest cjson-static stellar_devel) - -# assemble test env -add_test(NAME STELLAR_MKDIR_METRIC COMMAND sh -c "mkdir -p ${TEST_RUN_DIR}/metrics; mkdir -p ${TEST_RUN_DIR}/plugin; mkdir -p ${TEST_RUN_DIR}/log; mkdir -p ${TEST_RUN_DIR}/pcap") -add_test(NAME STELLAR_INSTALL_TEST_MAIN COMMAND sh -c "cp ${CMAKE_CURRENT_BINARY_DIR}/${TEST_MAIN} ${TEST_RUN_DIR}/${TEST_MAIN}") -add_test(NAME STELLAR_COPY_SPEC COMMAND sh -c "mkdir -p ${TEST_RUN_DIR}/plugin/ && cp ${CMAKE_CURRENT_SOURCE_DIR}/env/spec.toml ${TEST_RUN_DIR}/plugin/spec.toml") -add_test(NAME STELLAR_COPY_STELLAR_CONF COMMAND sh -c "mkdir -p ${TEST_RUN_DIR}/conf/ && cp ${CMAKE_CURRENT_SOURCE_DIR}/env/stellar.toml ${TEST_RUN_DIR}/conf/stellar.toml") -add_test(NAME STELLAR_COPY_STELLAR_LOG_CONF COMMAND sh -c "mkdir -p ${TEST_RUN_DIR}/conf/ && cp ${CMAKE_CURRENT_SOURCE_DIR}/env/log.toml ${TEST_RUN_DIR}/conf/log.toml") -add_test(NAME STELLAR_COPY_HTTP_DECODER_CONF COMMAND sh -c "mkdir -p ${TEST_RUN_DIR}/etc/http && cp ${PROJECT_SOURCE_DIR}/conf/http_decoder.toml ${TEST_RUN_DIR}/etc/http/") -add_test(NAME STELLAR_COPY_HTTP_GTEST_ENTRY_CONF COMMAND sh -c "mkdir -p ${TEST_RUN_DIR}/etc/http && cp ${PROJECT_SOURCE_DIR}/conf/gtest_entry.toml ${TEST_RUN_DIR}/etc/http/") - -# update config files -add_test(NAME 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 UPDATE_GTEST_PLUG_TOPIC COMMAND bash -c "sed -i 's/topic=.*/topic=\\x22HTTP_DECODER_MESSAGE\\x22/' ${TEST_RUN_DIR}/etc/http/gtest_entry.toml") - -# update plugin to be tested -add_test(NAME STELLAR_HTTP_DECODER_SO COMMAND sh -c "cp ${CMAKE_BINARY_DIR}/src/${DECODER_NAME}.so ${TEST_RUN_DIR}/plugin/${DECODER_NAME}.so") -add_test(NAME STELLAR_HTTP_DECODER_GTEST_SO COMMAND sh -c "cp ${CMAKE_BINARY_DIR}/test/${DECODER_NAME}_test.so ${TEST_RUN_DIR}/plugin/${DECODER_NAME}_test.so") - -set_tests_properties(STELLAR_MKDIR_METRIC STELLAR_INSTALL_TEST_MAIN STELLAR_COPY_SPEC STELLAR_COPY_HTTP_DECODER_CONF STELLAR_COPY_HTTP_GTEST_ENTRY_CONF - STELLAR_COPY_STELLAR_CONF STELLAR_COPY_STELLAR_LOG_CONF - STELLAR_HTTP_DECODER_SO STELLAR_HTTP_DECODER_GTEST_SO - UPDATE_GTEST_PLUG_ENTRY UPDATE_GTEST_PLUG_TOPIC - PROPERTIES FIXTURES_SETUP TestFixture) - -set(TEST_JSON_DIR ${PROJECT_SOURCE_DIR}/test/test_result_json) -set(TEST_PCAP_DIR ${PROJECT_SOURCE_DIR}/test/http_pcap) - -# run tests -add_test(NAME STELLAR_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}) -add_test(NAME STELLAR_HTTP_GET_MULTI_TRANS_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_get_multi_trans.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_get_multi_trans.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_GET_LONG_COOKIE_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_get_long_cookie.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_get_long_cookie.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_GET_ENCODED_URI_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_get_encoded_uri.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_get_encoded_uri.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_RES_GZIP_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_res_gzip.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_res_gzip.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_CHUNKED_RES_GZIP_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_chunked_res_gzip.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_chunked_res_gzip.json"WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_OVER_TCP_KEEPALIVE_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_over_tcp_keepalive.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_over_tcp_keepalive.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_OVER_PPPOE_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_over_pppoe.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_over_pppoe.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_OVER_TLS_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_over_tls.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_over_tls.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_NON_HTTP_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/non_http.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/non_http.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_REQ_1BYTE_SLIDING_WINDOW_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_req_1byte_sliding_window.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_req_1byte_sliding_window.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_RES_1BYTE_SLIDING_WINDOW_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_res_1byte_sliding_window.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_res_1byte_sliding_window.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_NO_CONTENT_LENGTH_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_no_content_length.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_no_content_length.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_POST_MULTIPART_FORM_DATA_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_post_multipart_form_data.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_post_multipart_form_data.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_HEADERS_EXCEED_MAXIMUM_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_hdrs_exceed_maximum.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_hdrs_exceed_maximum.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_GET_MALFORMED_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_get_malformed.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_get_malformed.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_URL_WITHOUT_HOST_V4_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_url_test_without_host.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_url_test_without_host.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_URL_WITHOUT_HOST_V6_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_url_test_without_host_v6.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_url_test_without_host_v6.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -#no SYN, steallar not support ! -# add_test(NAME STELLAR_HTTP_HEADER_VALUE_EMPTY_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_hdr_value_empty.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_hdr_value_empty.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_UPGRADE_WEBSOCKET_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_upgrade_websocket.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_upgrade_websocket.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_MULTI_PARSE_ERROR_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_multi_parse_error.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_multi_parse_error.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_GET_REQ_PIPELINE_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_get_req_pipeline.pcap ${TEST_RUN_DIR}/pcap/test.pcap;./${TEST_MAIN} ${TEST_JSON_DIR}/http_get_req_pipeline.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_TRANS_PIPELINE_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_trans_pipeline.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_trans_pipeline.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -#no SYN, steallar not support ! -# add_test(NAME STELLAR_HTTP_HEADER_TRUNCATED_IN_KV_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_hdr_truncated_in_kv.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_hdr_truncated_in_kv.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -# add_test(NAME STELLAR_HTTP_HEADER_TRUNCATED_AFTER_KV_TEST COMMAND ./${TEST_MAIN} ${TEST_JSON_DIR}/http_hdr_truncated_after_kv.json -r ${TEST_PCAP_DIR}/http_hdr_truncated_after_kv.pcap WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_FIN_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_fin.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/non_http.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -# add_test(NAME STELLAR_HTTP_TUNNEL_ONLY_HDR_TEST COMMAND ./${TEST_MAIN} ${TEST_JSON_DIR}/http_tunnel_s2c_only_hdr.json -# -r ${TEST_PCAP_DIR}/http_tunnel_s2c_only_hdr.pcap WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_CHN_ENCODE_URL COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_chn_encode_url.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_chn_encode_url.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_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 STELLAR_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 STELLAR_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}) - -set_tests_properties(STELLAR_HTTP_GET_SINGLE_TRANS_TEST - STELLAR_HTTP_GET_MULTI_TRANS_TEST - STELLAR_HTTP_GET_LONG_COOKIE_TEST - STELLAR_HTTP_GET_ENCODED_URI_TEST - STELLAR_HTTP_RES_GZIP_TEST - STELLAR_HTTP_CHUNKED_RES_GZIP_TEST - STELLAR_HTTP_OVER_TCP_KEEPALIVE_TEST - STELLAR_HTTP_OVER_PPPOE_TEST - STELLAR_HTTP_OVER_TLS_TEST - STELLAR_NON_HTTP_TEST - STELLAR_HTTP_REQ_1BYTE_SLIDING_WINDOW_TEST - STELLAR_HTTP_RES_1BYTE_SLIDING_WINDOW_TEST - STELLAR_HTTP_NO_CONTENT_LENGTH_TEST - STELLAR_HTTP_POST_MULTIPART_FORM_DATA_TEST - STELLAR_HTTP_HEADERS_EXCEED_MAXIMUM_TEST - STELLAR_HTTP_GET_MALFORMED_TEST - STELLAR_HTTP_URL_WITHOUT_HOST_V4_TEST - STELLAR_HTTP_URL_WITHOUT_HOST_V6_TEST - STELLAR_HTTP_MULTI_PARSE_ERROR_TEST - STELLAR_HTTP_UPGRADE_WEBSOCKET_TEST - STELLAR_HTTP_GET_REQ_PIPELINE_TEST - STELLAR_HTTP_TRANS_PIPELINE_TEST - STELLAR_HTTP_FIN_TEST - STELLAR_HTTP_CHN_ENCODE_URL - STELLAR_HTTP_ZLIB_DEADLOCK - STELLAR_HTTP_OUT_OF_ORDER - STELLAR_HTTP_GZIP_OUT_OF_ORDER - PROPERTIES FIXTURES_REQUIRED TestFixture) - -add_test(NAME 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 UPDATE_STATE_PLUG_TOPIC COMMAND bash -c "sed -i 's/topic=.*/topic=\\x22HTTP_DECODER_MESSAGE\\x22/' ${TEST_RUN_DIR}/etc/http/gtest_entry.toml") - -set_tests_properties(UPDATE_STATE_PLUG_ENTRY UPDATE_STATE_PLUG_TOPIC STELLAR_HTTP_DECODER_SO STELLAR_HTTP_DECODER_GTEST_SO STELLAR_MKDIR_METRIC - PROPERTIES FIXTURES_SETUP TestState) - -add_test(NAME STELLAR_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 STELLAR_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}) -add_test(NAME STELLAR_HTTP_MSG_TYPE_STATE_S2C_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_post_s2c.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_msg_type_state_s2c.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_MSG_TYPE_STATE_PIPELINE_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_get_multi_trans.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_msg_type_state_pipeline.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_MSG_TYPE_STATE_SES_EXCEPTION_C2S_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_session_exception_c2s.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_msg_type_state_exception_c2s.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) -add_test(NAME STELLAR_HTTP_MSG_TYPE_STATE_SES_EXCEPTION_S2C_TEST COMMAND sh -c "ln -sf ${TEST_PCAP_DIR}/http_session_exception_s2c.pcap ${TEST_RUN_DIR}/pcap/test.pcap; ./${TEST_MAIN} ${TEST_JSON_DIR}/http_msg_type_state_exception_s2c.json" WORKING_DIRECTORY ${TEST_RUN_DIR}) - -set_tests_properties(STELLAR_HTTP_MSG_TYPE_STATE_TEST - STELLAR_HTTP_MSG_TYPE_STATE_C2S_TEST - STELLAR_HTTP_MSG_TYPE_STATE_S2C_TEST - STELLAR_HTTP_MSG_TYPE_STATE_PIPELINE_TEST - STELLAR_HTTP_MSG_TYPE_STATE_SES_EXCEPTION_C2S_TEST - STELLAR_HTTP_MSG_TYPE_STATE_SES_EXCEPTION_S2C_TEST - PROPERTIES FIXTURES_REQUIRED TestState) diff --git a/test/http_decoder/test_result_json/http_6over4_single_trans.json b/test/http_decoder/test_result_json/http_6over4_single_trans.json deleted file mode 100644 index 34d999d..0000000 --- a/test/http_decoder/test_result_json/http_6over4_single_trans.json +++ /dev/null @@ -1,34 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "2001:da8:200:900e:200:5efe:d24d:58a3.52556>2600:140e:6::1702:1058.80" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/ncsi.txt", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Connection": "Close", - "User-Agent": "Microsoft NCSI", - "Host": "www.msftncsi.com", - "__X_HTTP_URL": "www.msftncsi.com/ncsi.txt" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Content-Length": "14", - "Date": "Tue, 01 Dec 2015 03:41:27 GMT", - "Connection": "close", - "Content-Type": "text/plain", - "Cache-Control": "max-age=30, must-revalidate", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "cd5a4d3fdd5bffc16bf959ef75cf37bc", - "__X_HTTP_PAYLOAD": "TWljcm9zb2Z0IE5DU0k=" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_chn_encode_url.json b/test/http_decoder/test_result_json/http_chn_encode_url.json deleted file mode 100644 index 5453415..0000000 --- a/test/http_decoder/test_result_json/http_chn_encode_url.json +++ /dev/null @@ -1,42 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "2607:5d00:2:2::38:2:56343-240e:928:101:80::80:80-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/%E6%B5%8B%E8%AF%95%E4%B8%AD%E6%96%87URL%E7%BC%96%E8%A7%A3%E7%A0%81", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "www.airchina.com.cn", - "Connection": "keep-alive", - "DNT": "1", - "Upgrade-Insecure-Requests": "1", - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36", - "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8", - "Cookie": "_gcl_au=1.1.240068387.1720059437; _ga_CGYVD7S4G4=GS1.1.1720059448.3.0.1720059453.0.0.0; HMF_CI=7967e38cc3874dbbefa260b8dcbee31fa827a01fc2b7073105a5e05f4a1ea361c74f6d4c37fb199bfc9470036f06fb537da2a74e96450b7949e0b686f0569f9680; HMY_JC=84f9c8a99e076ee2dda5ba48cd953f61c4dc2707823205d8171c8818eea9d60fda,; _ga=GA1.3.822493162.1711101509; _gid=GA1.3.304369429.1721120134; arialoadData=true; ariawapChangeViewPort=false; C3VK=be8842; HBB_HC=faa7f3e2477e14525534a5560ed6a307b29ae2c324e1f631a428e53fb74c9d72575c155d682554ba15cc9e52afe31218b1; mbox=check#true#1721120252|session#1721120133635-517642#1721122052; s_pers=%20s_fid%3D52863027521849CD-3A72894997C48527%7C1878886591105%3B; s_sess=%20s_cc%3Dtrue%3B", - "__X_HTTP_URL": "www.airchina.com.cn/%E6%B5%8B%E8%AF%95%E4%B8%AD%E6%96%87URL%E7%BC%96%E8%A7%A3%E7%A0%81", - "__X_HTTP_DECODED_URL": "www.airchina.com.cn/测试中文URL编解码" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "Moved Temporarily", - "major_version": 1, - "minor_version": 1, - "status_code": 302, - "Date": "Tue, 16 Jul 2024 08:57:32 GMT", - "Content-Length": "0", - "Connection": "keep-alive", - "Server": "waf/4.39.0-0.el7", - "Location": "https://www.airchina.com.cn/%E6%B5%8B%E8%AF%95%E4%B8%AD%E6%96%87URL%E7%BC%96%E8%A7%A3%E7%A0%81", - "x-ws-origin-error": "-", - "X-Via": "1.1 PSjsczBGPiv194:0 (Cdn Cache Server V2.0), 1.1 PStjdxpn34:6 (Cdn Cache Server V2.0)", - "X-Ws-Request-Id": "669635fc_PStjdxks32_7630-15285" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_chunked_res_gzip.json b/test/http_decoder/test_result_json/http_chunked_res_gzip.json deleted file mode 100644 index 370b4a7..0000000 --- a/test/http_decoder/test_result_json/http_chunked_res_gzip.json +++ /dev/null @@ -1,46 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "127.0.0.1:33412-127.0.0.1:8080-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "www.wireshark.org:8080", - "User-Agent": "curl/7.46.0", - "Accept": "*/*", - "Connection": "close", - "Accept-Encoding": "chunked, gzip", - "__X_HTTP_URL": "www.wireshark.org:8080/" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Server": "cloudflare-nginx", - "Date": "Wed, 06 Jan 2016 20:42:10 GMT", - "Content-Type": "text/html", - "Transfer-Encoding": "chunked", - "Connection": "close", - "Set-Cookie": "__cfduid=d8d37b52eaa3137bdfd7fd67a4ffc8a7a1452112929; expires=Thu, 05-Jan-17 20:42:09 GMT; path=/; domain=.wireshark.org; HttpOnly", - "X-Frame-Options": "SAMEORIGIN", - "Strict-Transport-Security": "max-age=31536000;", - "X-Slogan": "It's a great product with a great story to tell. I'm pumped!", - "X-Mod-Pagespeed": "1.9.32.11-7550", - "Vary": "Accept-Encoding", - "Cache-control": "max-age=0, no-cache, no-store", - "X-Slogan1": "Go deep.", - "CF-RAY": "260a3f709d7b0761-AMS", - "Content-Encoding": "gzip", - "__X_HTTP_RAW_PAYLOAD_MD5": "5387fc115327b819ba920ad6ce8f3e3a", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "855f8310be999de806e89a420a95435d" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_connect_flood.json b/test/http_decoder/test_result_json/http_connect_flood.json deleted file mode 100644 index 199c038..0000000 --- a/test/http_decoder/test_result_json/http_connect_flood.json +++ /dev/null @@ -1,686 +0,0 @@ -[ - { - "Tuple4": "10.128.0.2.18762>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.16) Gecko/20110929 Iceweasel/3.5.16", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_1" - }, - { - "Tuple4": "10.128.0.2.18746>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:38 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_2" - }, - { - "Tuple4": "10.128.0.2.18744>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:38 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_3" - }, - { - "Tuple4": "10.128.0.2.18748>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:38 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_4" - }, - { - "Tuple4": "10.128.0.2.18750>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:38 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_5" - }, - { - "Tuple4": "10.128.0.2.18752>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:38 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_6" - }, - { - "Tuple4": "10.128.0.2.18754>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:38 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_7" - }, - { - "Tuple4": "10.128.0.2.18756>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:38 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_8" - }, - { - "Tuple4": "10.128.0.2.18758>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:38 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_9" - }, - { - "Tuple4": "10.128.0.2.18760>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:38 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_10" - }, - { - "Tuple4": "10.128.0.2.18762>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:38 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_11" - }, - { - "Tuple4": "10.128.0.2.18768>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "Safari/5.00 (Macintosh; U; en)", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_12" - }, - { - "Tuple4": "10.128.0.2.18766>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "Mozilla/5.0 (X11; Linux i686) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.120 Safari/537.36", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_13" - }, - { - "Tuple4": "10.128.0.2.18770>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "Opera/9.00 (Windows NT 5.1; U; en)", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_14" - }, - { - "Tuple4": "10.128.0.2.18772>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "Opera/9.00 (Windows NT 5.1; U; en)", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_15" - }, - { - "Tuple4": "10.128.0.2.18776>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "GooglePocket/2.1 ( http://www.googlePocket.com/Pocket.html)", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_16" - }, - { - "Tuple4": "10.128.0.2.18774>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Firefox/31.0 Iceweasel/31.4.0", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_17" - }, - { - "Tuple4": "10.128.0.2.18780>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4b) Gecko/20030505 Mozilla Firebird/0.6", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_18" - }, - { - "Tuple4": "10.128.0.2.18778>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "DoCoMo/2.0 SH902i (compatible; Y!J-SRD/1.0; http://help.yahoo.co.jp/help/jp/search/indexing/indexing-27.html)", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_19" - }, - { - "Tuple4": "10.128.0.2.18782>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "IE/5.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; .NET CLR 1.1.4322;)", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_20" - }, - { - "Tuple4": "10.128.0.2.18784>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.16) Gecko/20110929 Iceweasel/3.5.16", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_21" - }, - { - "Tuple4": "10.128.0.2.18768>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:39 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_22" - }, - { - "Tuple4": "10.128.0.2.18766>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:39 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_23" - }, - { - "Tuple4": "10.128.0.2.18770>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:39 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_24" - }, - { - "Tuple4": "10.128.0.2.18772>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:39 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_25" - }, - { - "Tuple4": "10.128.0.2.18776>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:39 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_26" - }, - { - "Tuple4": "10.128.0.2.18780>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:39 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_27" - }, - { - "Tuple4": "10.128.0.2.18774>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:39 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_28" - }, - { - "Tuple4": "10.128.0.2.18778>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:39 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_29" - }, - { - "Tuple4": "10.128.0.2.18782>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:39 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_30" - }, - { - "Tuple4": "10.128.0.2.18784>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:39 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_31" - }, - { - "Tuple4": "10.128.0.2.18790>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "Safari/5.00 (Macintosh; U; en)", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_32" - }, - { - "Tuple4": "10.128.0.2.18792>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "Mozilla/5.0 (X11; Linux i686) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.120 Safari/537.36", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_33" - }, - { - "Tuple4": "10.128.0.2.18796>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "Opera/9.00 (Windows NT 5.1; U; en)", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_34" - }, - { - "Tuple4": "10.128.0.2.18794>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "Opera/9.00 (Windows NT 5.1; U; en)", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_35" - }, - { - "Tuple4": "10.128.0.2.18798>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "GooglePocket/2.1 ( http://www.googlePocket.com/Pocket.html)", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_36" - }, - { - "Tuple4": "10.128.0.2.18800>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4b) Gecko/20030505 Mozilla Firebird/0.6", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_37" - }, - { - "Tuple4": "10.128.0.2.18804>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "DoCoMo/2.0 SH902i (compatible; Y!J-SRD/1.0; http://help.yahoo.co.jp/help/jp/search/indexing/indexing-27.html)", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_38" - }, - { - "Tuple4": "10.128.0.2.18802>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Firefox/31.0 Iceweasel/31.4.0", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_39" - }, - { - "Tuple4": "10.128.0.2.18806>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "IE/5.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; .NET CLR 1.1.4322;)", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_40" - }, - { - "Tuple4": "10.128.0.2.18808>10.0.0.2.80", - "method": "CONNECT", - "uri": "test.mazebolt.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.mazebolt.com", - "User-Agent": "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.16) Gecko/20110929 Iceweasel/3.5.16", - "Accept": "*/*", - "Accept-Encoding": "gzip, deflate", - "Content-Length": "0", - "name": "HTTP_DECODER_RESULT_41" - }, - { - "Tuple4": "10.128.0.2.18790>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:41 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_42" - }, - { - "Tuple4": "10.128.0.2.18792>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:41 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_43" - }, - { - "Tuple4": "10.128.0.2.18796>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:41 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_44" - }, - { - "Tuple4": "10.128.0.2.18798>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:41 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_45" - }, - { - "Tuple4": "10.128.0.2.18794>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:41 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_46" - }, - { - "Tuple4": "10.128.0.2.18800>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:41 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_47" - }, - { - "Tuple4": "10.128.0.2.18804>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:41 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_48" - }, - { - "Tuple4": "10.128.0.2.18802>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:41 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_49" - }, - { - "Tuple4": "10.128.0.2.18806>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:41 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_50" - }, - { - "Tuple4": "10.128.0.2.18808>10.0.0.2.80", - "res_version": "1.1", - "res_status": "Forbidden", - "major_version": 1, - "minor_version": 1, - "status_code": 403, - "Date": "Thu, 03 Sep 2020 10:26:41 GMT", - "Server": "Apache", - "Content-Length": "199", - "Content-Type": "text/html; charset=iso-8859-1", - "name": "HTTP_DECODER_RESULT_51" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_get_encoded_uri.json b/test/http_decoder/test_result_json/http_get_encoded_uri.json deleted file mode 100644 index de1419a..0000000 --- a/test/http_decoder/test_result_json/http_get_encoded_uri.json +++ /dev/null @@ -1,81 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.117.60:39655-58.16.70.122:80-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "POST", - "uri": "/disAll/tcCertType.html", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "User-Agent": "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.99 Safari/537.36", - "Accept": "*/*", - "Accept-Language": "en-US,en;q=0.8,en-us,en;q=0.5", - "Origin": "http://58.16.70.122", - "X-Requested-With": "XMLHttpRequest", - "Referer": "http://58.16.70.122/register.jsp?redirect:http://58.16.70.122.r87.com/?", - "Cache-Control": "no-cache", - "X-Scanner": "Netsparker", - "Cookie": "JSESSIONID=385C79E211D561C0CA13D90F150F603D", - "Host": "58.16.70.122", - "Content-Length": "0", - "Accept-Encoding": "gzip, deflate", - "__X_HTTP_URL": "58.16.70.122/disAll/tcCertType.html" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Server": "Apache-Coyote/1.1", - "Pragma": "No-cache", - "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", - "Content-Type": "text/html;charset=UTF-8", - "Transfer-Encoding": "chunked", - "Date": "Sat, 18 May 2019 01:36:57 GMT", - "__X_HTTP_RAW_PAYLOAD_MD5": "d545e0faf20f7ffe90e31cfc1aef1782", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "d545e0faf20f7ffe90e31cfc1aef1782" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 1, - "method": "GET", - "uri": "/upload/%E6%B3%95%E5%BE%8B%E6%B3%95%E8%A7%84/%E5%B8%82%E4%BA%BA%E6%B0%91%E6%94%BF%E5%BA%9C%E5%8A%9E%E5%85%AC%E5%8E%85%E5%8D%B0%E5%8F%91%E8%B4%B5%E9%98%B3%E5%B8%82%E5%85%B3%E4%BA%8E%E6%8E%A8%E8%BF%9B%E5%B7%A5%E5%95%86%E8%90%A5%E4%B8%9A%E6%89%A7%E7%85%A7%E3%80%81%E7%BB%84%E7%BB%87%E6%9C%BA%E6%9E%84%E4%BB%A3%E7%A0%81%E8%AF%81%E5%92%8C%E7%A8%8E%E5%8A%A1%E7%99%BB%E8%AE%B0%E8%AF%81%E2%80%9C%E4%B8%89%E8%AF%81%E5%90%88%E4%B8%80%E2%80%9D%E7%99%BB%E8%AE%B0%E5%88%B6%E5%BA%A6%E6%94%B9%E9%9D%A9%E5%AE%9E%E6%96%BD%E6%96%B9%E6%A1%88%E7%9A%84%E9%80%9A%E7%9F%A5%EF%BC%88%E7%AD%91%E5%BA%9C%E5%8A%9E%E5%87%BD%E3%80%902015%E3%80%91162%E5%8F%B7%EF%BC%89.docx?nsextt=N3TSP4RKE2", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8", - "User-Agent": "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.99 Safari/537.36", - "Cache-Control": "no-cache", - "Accept-Language": "en-us,en;q=0.5", - "X-Scanner": "Netsparker", - "Cookie": "JSESSIONID=385C79E211D561C0CA13D90F150F603D", - "Host": "58.16.70.122", - "Accept-Encoding": "gzip, deflate", - "__X_HTTP_URL": "58.16.70.122/upload/%E6%B3%95%E5%BE%8B%E6%B3%95%E8%A7%84/%E5%B8%82%E4%BA%BA%E6%B0%91%E6%94%BF%E5%BA%9C%E5%8A%9E%E5%85%AC%E5%8E%85%E5%8D%B0%E5%8F%91%E8%B4%B5%E9%98%B3%E5%B8%82%E5%85%B3%E4%BA%8E%E6%8E%A8%E8%BF%9B%E5%B7%A5%E5%95%86%E8%90%A5%E4%B8%9A%E6%89%A7%E7%85%A7%E3%80%81%E7%BB%84%E7%BB%87%E6%9C%BA%E6%9E%84%E4%BB%A3%E7%A0%81%E8%AF%81%E5%92%8C%E7%A8%8E%E5%8A%A1%E7%99%BB%E8%AE%B0%E8%AF%81%E2%80%9C%E4%B8%89%E8%AF%81%E5%90%88%E4%B8%80%E2%80%9D%E7%99%BB%E8%AE%B0%E5%88%B6%E5%BA%A6%E6%94%B9%E9%9D%A9%E5%AE%9E%E6%96%BD%E6%96%B9%E6%A1%88%E7%9A%84%E9%80%9A%E7%9F%A5%EF%BC%88%E7%AD%91%E5%BA%9C%E5%8A%9E%E5%87%BD%E3%80%902015%E3%80%91162%E5%8F%B7%EF%BC%89.docx?nsextt=N3TSP4RKE2", - "__X_HTTP_DECODED_URL": "58.16.70.122/upload/法律法规/市人民政府办公厅印发贵阳市关于推进工商营业执照、组织机构代码证和税务登记证“三证合一”登记制度改革实施方案的通知（筑府办函【2015】162号）.docx?nsextt=N3TSP4RKE2" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 1, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Server": "Apache-Coyote/1.1", - "Accept-Ranges": "bytes", - "ETag": "W/\"1703517-1546572172000\"", - "Last-Modified": "Fri, 04 Jan 2019 03:22:52 GMT", - "Content-Type": "application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8", - "Content-Length": "1703517", - "Date": "Sat, 18 May 2019 01:37:00 GMT", - "__X_HTTP_RAW_PAYLOAD_MD5": "3598c468910611a3128d068e20ae0e82", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "3598c468910611a3128d068e20ae0e82" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_get_long_cookie.json b/test/http_decoder/test_result_json/http_get_long_cookie.json deleted file mode 100644 index 118022d..0000000 --- a/test/http_decoder/test_result_json/http_get_long_cookie.json +++ /dev/null @@ -1,24 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "202.127.156.91:27282-14.17.32.203:80-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/livemsg?imagemd5=02f5efd8a349c50280f8540b2735bd54&tailroll=1&plugin=1.3.8&pf=out&si=3766845706&url=http%3A%2F%2Fsports.qq.com%2Fa%2F20160106%2F008987.htm&soid=CA7F9C5B0120568CDC2F68726300&chid=0&ping_data=dXNlcl9pbmZvPXVCWDluVDg5SFJhOUFQK0JQVGdKRUxVYi9Kdz0&t=0&iptype=0&vptag=&pid=7F993E38C0E676ACC07DE764D1F3DEF56AA8F90A&adtype=LD&oadid=6012&ev=3236&l=4020&ufc_filter=0&imagelog=1&pid2=7F993E38C0E676ACC07DE764D1F3DEF56AA8F90A&mt=15000&coverid=&reqtime=1452071981&requestl=4020&isthirdip=0&cid=0&isfloatindex=0&o=100654557&lcount=2&refluence=4020&from=0&vid=m01794rm5ej&cip=202.127.156.91&aver=0&ip_filter=0&adlength=30000&tagid=&v=TencentPlayerOutV3.2.19.346&live=0&dura=105", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "livep.l.qq.com", - "Connection": "keep-alive", - "User-Agent": "Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.63 Safari/537.36", - "Accept": "*/*", - "Referer": "http://imgcache.qq.com/tencentvideo_v1/player/TPout.swf?max_age=86400&v=20140714", - "Accept-Encoding": "gzip,deflate,sdch", - "Accept-Language": "zh-CN,zh;q=0.8", - "__X_HTTP_URL": "livep.l.qq.com/livemsg?imagemd5=02f5efd8a349c50280f8540b2735bd54&tailroll=1&plugin=1.3.8&pf=out&si=3766845706&url=http%3A%2F%2Fsports.qq.com%2Fa%2F20160106%2F008987.htm&soid=CA7F9C5B0120568CDC2F68726300&chid=0&ping_data=dXNlcl9pbmZvPXVCWDluVDg5SFJhOUFQK0JQVGdKRUxVYi9Kdz0&t=0&iptype=0&vptag=&pid=7F993E38C0E676ACC07DE764D1F3DEF56AA8F90A&adtype=LD&oadid=6012&ev=3236&l=4020&ufc_filter=0&imagelog=1&pid2=7F993E38C0E676ACC07DE764D1F3DEF56AA8F90A&mt=15000&coverid=&reqtime=1452071981&requestl=4020&isthirdip=0&cid=0&isfloatindex=0&o=100654557&lcount=2&refluence=4020&from=0&vid=m01794rm5ej&cip=202.127.156.91&aver=0&ip_filter=0&adlength=30000&tagid=&v=TencentPlayerOutV3.2.19.346&live=0&dura=105", - "__X_HTTP_DECODED_URL": "livep.l.qq.com/livemsg?imagemd5=02f5efd8a349c50280f8540b2735bd54&tailroll=1&plugin=1.3.8&pf=out&si=3766845706&url=http://sports.qq.com/a/20160106/008987.htm&soid=CA7F9C5B0120568CDC2F68726300&chid=0&ping_data=dXNlcl9pbmZvPXVCWDluVDg5SFJhOUFQK0JQVGdKRUxVYi9Kdz0&t=0&iptype=0&vptag=&pid=7F993E38C0E676ACC07DE764D1F3DEF56AA8F90A&adtype=LD&oadid=6012&ev=3236&l=4020&ufc_filter=0&imagelog=1&pid2=7F993E38C0E676ACC07DE764D1F3DEF56AA8F90A&mt=15000&coverid=&reqtime=1452071981&requestl=4020&isthirdip=0&cid=0&isfloatindex=0&o=100654557&lcount=2&refluence=4020&from=0&vid=m01794rm5ej&cip=202.127.156.91&aver=0&ip_filter=0&adlength=30000&tagid=&v=TencentPlayerOutV3.2.19.346&live=0&dura=105", - "Cookie": "flashuser=95621BA8CB862E09; piao_city=179; lv_irt_id=3628e1bbe25a6c941da9fac02ec2df8b; cm_cookie=V1,10017&-EP5mRruXhQarsCl5LD-2YzgjVTvyr2K&AQEBh7uoLMUB9lnaB5Tz9XdYnGIWflXmsDrU&150723&150723,10035&7t-tEmfJ076VAsM9&AQEBh7uoLMUB9lnc4tpW7vbazqdrRdBYOUCi&150724&150807,110054&ucO0Z0gctNn3&AQEBh7uoLMUB9llxMNl45F3RAIsKK0iMOJAG&150716&151008,10040&ACZ1r0A70NaEFcGT&AQEBh7uoLMUB9lmVgSoTwuuXZi896zSVsXIF&150818&151014,110015&1&AQEBh7uoLMUB9lkt2LUHO6ARwODHLI_Y51rj&150928&151103,10037&1433388364186289251984&AQEBh7uoLMUB9llIBencOqTAEh2aQ2SURSSQ&150909&151110,10011&jL40Z03uUFI0&AQEBh7uoLMUB9lkfw2sJVNx9g12Fzs12rPSN&150717&151125,10016&F64E6LFZs0W&AQEBh7uoLMUB9llE4yoPFNUykSj7WKaRK5lH&150805&151127,10019&WQAO-C1K9qI5OP8W_t2pSw&AQEBh7uoLMUB9llhpZE87GmOk3XGo_MJgV6K&150826&151130,10015&820490997316506147&AQEBh7uoLMUB9llXiynsGYRhMO3XuPnkuHUt&150715&151201,10012&x3X1yY6b&AQEBh7uoLMUB9ll9mraU_LJCDBYsE0Sbk_V9&151202&151202,110065&ucO0Z0gctNn3&AQEBh7uoLMUB9lkJcK3KDBQTKF0YfZ5wB7r5&150716&151203,110066&jL40Z03uUFI0&AQEBh7uoLMUB9lnyvKSYhcJD1X_rSs_DLVWx&150916&151221,10013&ePyYB2MSKa0TCbebpxKjmU&AQEBh7uoLMUB9ln6_6nGNidqml4nFKXhtE58&151221&151221,110061&d9cfa518d82abee&AQEBh7uoLMUB9llj2NYzmCjxaLWXALTcAGIH&150818&151224,10038&CAESEPZbUhToZJ39CS9MlgXGUSQ&AQEBh7uoLMUB9lmhnrDM5lIGtl6vc1NxMD6F&151110&151224,10077&820490997316506147&AQEBh7uoLMUB9lmkUdUe2xSHGkvM0IRu9Jt9&151214&151228,10008&0yPSvk92ie1nhB8wTUlTq&AQEBh7uoLMUB9lnL5ZCYvXJNvlv53G0CKEkj&150817&151228,10045&0&AQEBh7uoLMUB9llW3v1Vh7W72lv14RlAjUXn&151023&151228,110064&jL40Z03uUFI0&AQEBh7uoLMUB9lkBYuCUDLDrOcGURJcilogv&151016&160104,110069&26d49ecc&AQEBh7uoLMUB9lmlBLTxQY9BkCmimkMFqTo5&151204&160105,10079&B8hGto5y1e3uDXwCMsIun3rjk--dVCof&AQEBh7uoLMUB9llxnFrhDtdNMjZ1hs1il5J4&151214&160105; LHTturn=24; ptisp=ctc; RK=hRWyd82Gd8; pgv_pvi=7567882240; image_md5=bd21d5fb2f401b37cf3a02724dc06545; LTPturn=27; pt2gguin=o0583115900; uin=o0583115900; skey=@Mp9aCinaO; ptcz=10d4b1b7bde835d64663338a8008fd4f81e2c6b5f0ba81a90da3627ee617c7ee; pgv_info=ssid=s4768939310; pgv_pvid=6872592818; o_cookie=583115900; lv_play_index_textAd=47; lv_play_indexl.=32; dc_vplaying=1; LKBturn=29; Lturn=29; adid=583115900; appuser=95621BA8CB862E09; o_minduid=phhdxyNLkxBWMa74VTm5zU4y5EbUv5vR; appuser_95621BA8CB862E09_0=2b7gwp=1453219199_6&2btemv=1455551999_1&2c8311=1453305599_3&2cfx4j=1453651199_3&2cfx9l=1453651199_1&2d49y9=1453823999_2&2d67kl=1454255999_2&2d69mf=1454255999_3&2dxv8l=1455465599_6&2dzhfl=1452614399_1&f_pogvwp=1452095999_1&f_pogvwv=1452095999_2&f_pogw0m=1452095999_1&fd_15bm2t7=1452095999_1&fd_1h2pbsd=1452095999_2&fd_1k6so62=1452095999_1&fd_rhmjmq=1452095999_2&m_roiw0t=1452095999_3&m_xty8wl=1452095999_1&pogree=1452095999_2; TX.boid=100655474=1452072582_1&701041365=1452072585_1; appuser_95621BA8CB862E09_effect_0=fd_1ez2rcc=1452095999_1&fd_qdh7zw=1452095999_1&fd_ul215j=1452095999_1; psessionid=ca7f9c5b_1452071982_583115900_30754; psessiontime=1452071990" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_get_malformed.json b/test/http_decoder/test_result_json/http_get_malformed.json deleted file mode 100644 index 3a04d38..0000000 --- a/test/http_decoder/test_result_json/http_get_malformed.json +++ /dev/null @@ -1,2 +0,0 @@ - [ - ]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_get_multi_trans.json b/test/http_decoder/test_result_json/http_get_multi_trans.json deleted file mode 100644 index 917b1c7..0000000 --- a/test/http_decoder/test_result_json/http_get_multi_trans.json +++ /dev/null @@ -1,149 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.50.18:60400-192.168.42.1:80-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/account/login.htm", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.pro.testin.cn", - "Connection": "keep-alive", - "Upgrade-Insecure-Requests": "1", - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.0.0 Safari/537.36", - "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "zh-CN,zh;q=0.9", - "Cookie": "Hm_lvt_1b8c1194303ef64e02f003f0cb8a1906=1653898514; _gcl_au=1.1.1010551181.1653898515; _ga=GA1.2.1419569885.1653898515; _gid=GA1.2.2007113907.1653898515; authtoken_pro=tea83b3beef07488bb8571811385db42; userId_pro=1160; pid_pro=1; eid_pro=1; pname_pro=name; Hm_lpvt_1b8c1194303ef64e02f003f0cb8a1906=1653961741; JSESSIONID=531AACA879469EDAB825E28113490E10", - "__X_HTTP_URL": "test.pro.testin.cn/account/login.htm" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "major_version": 1, - "minor_version": 1, - "status_code": 302, - "Server": "nginx/1.16.1", - "Date": "Tue, 31 May 2022 06:41:23 GMT", - "Content-Length": "0", - "Connection": "keep-alive", - "Set-Cookie": "JSESSIONID=CFAB9C0C3F4D9D6C2837E3BA9425AFCA; Path=/; HttpOnly", - "Set-Cookie1": "authtoken_pro=tea83b3beef07488bb8571811385db42; Max-Age=28800; Expires=Tue, 31-May-2022 14:41:23 GMT; Domain=testin.cn; Path=/; HttpOnly", - "Set-Cookie2": "userId_pro=1160; Max-Age=28800; Expires=Tue, 31-May-2022 14:41:23 GMT; Domain=testin.cn; Path=/; HttpOnly", - "Location": "http://test.pro.testin.cn/enterprise/index.htm", - "Content-Language": "zh-CN" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 1, - "method": "GET", - "uri": "/enterprise/index.htm", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.pro.testin.cn", - "Connection": "keep-alive", - "Upgrade-Insecure-Requests": "1", - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.0.0 Safari/537.36", - "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "zh-CN,zh;q=0.9", - "Cookie": "Hm_lvt_1b8c1194303ef64e02f003f0cb8a1906=1653898514; _gcl_au=1.1.1010551181.1653898515; _ga=GA1.2.1419569885.1653898515; _gid=GA1.2.2007113907.1653898515; authtoken_pro=tea83b3beef07488bb8571811385db42; userId_pro=1160; pid_pro=1; eid_pro=1; pname_pro=name; Hm_lpvt_1b8c1194303ef64e02f003f0cb8a1906=1653961741; JSESSIONID=CFAB9C0C3F4D9D6C2837E3BA9425AFCA", - "__X_HTTP_URL": "test.pro.testin.cn/enterprise/index.htm" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 1, - "res_version": "1.1", - "major_version": 1, - "minor_version": 1, - "status_code": 302, - "Server": "nginx/1.16.1", - "Date": "Tue, 31 May 2022 06:41:23 GMT", - "Content-Length": "0", - "Connection": "keep-alive", - "Set-Cookie": "authtoken_pro=tea83b3beef07488bb8571811385db42; Max-Age=28800; Expires=Tue, 31-May-2022 14:41:23 GMT; Domain=testin.cn; Path=/; HttpOnly", - "Set-Cookie1": "userId_pro=1160; Max-Age=28800; Expires=Tue, 31-May-2022 14:41:23 GMT; Domain=testin.cn; Path=/; HttpOnly", - "Location": "http://test.pro.testin.cn/enterprise/into.htm?eid=1", - "Content-Language": "zh-CN" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 2, - "method": "GET", - "uri": "/enterprise/into.htm?eid=1", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.pro.testin.cn", - "Connection": "keep-alive", - "Upgrade-Insecure-Requests": "1", - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.0.0 Safari/537.36", - "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "zh-CN,zh;q=0.9", - "Cookie": "Hm_lvt_1b8c1194303ef64e02f003f0cb8a1906=1653898514; _gcl_au=1.1.1010551181.1653898515; _ga=GA1.2.1419569885.1653898515; _gid=GA1.2.2007113907.1653898515; authtoken_pro=tea83b3beef07488bb8571811385db42; userId_pro=1160; pid_pro=1; eid_pro=1; pname_pro=name; Hm_lpvt_1b8c1194303ef64e02f003f0cb8a1906=1653961741; JSESSIONID=CFAB9C0C3F4D9D6C2837E3BA9425AFCA", - "__X_HTTP_URL": "test.pro.testin.cn/enterprise/into.htm?eid=1" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 2, - "res_version": "1.1", - "major_version": 1, - "minor_version": 1, - "status_code": 302, - "Server": "nginx/1.16.1", - "Date": "Tue, 31 May 2022 06:41:23 GMT", - "Content-Length": "0", - "Connection": "keep-alive", - "Set-Cookie": "authtoken_pro=tea83b3beef07488bb8571811385db42; Max-Age=28800; Expires=Tue, 31-May-2022 14:41:23 GMT; Domain=testin.cn; Path=/; HttpOnly", - "Set-Cookie1": "userId_pro=1160; Max-Age=28800; Expires=Tue, 31-May-2022 14:41:23 GMT; Domain=testin.cn; Path=/; HttpOnly", - "Location": "http://test.pro.testin.cn/realmachine/index.htm", - "Content-Language": "zh-CN" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 3, - "method": "GET", - "uri": "/realmachine/index.htm", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "test.pro.testin.cn", - "Connection": "keep-alive", - "Upgrade-Insecure-Requests": "1", - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.0.0 Safari/537.36", - "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "zh-CN,zh;q=0.9", - "Cookie": "Hm_lvt_1b8c1194303ef64e02f003f0cb8a1906=1653898514; _gcl_au=1.1.1010551181.1653898515; _ga=GA1.2.1419569885.1653898515; _gid=GA1.2.2007113907.1653898515; authtoken_pro=tea83b3beef07488bb8571811385db42; userId_pro=1160; pid_pro=1; eid_pro=1; pname_pro=name; Hm_lpvt_1b8c1194303ef64e02f003f0cb8a1906=1653961741; JSESSIONID=CFAB9C0C3F4D9D6C2837E3BA9425AFCA", - "__X_HTTP_URL": "test.pro.testin.cn/realmachine/index.htm" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 3, - "res_version": "1.1", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Server": "nginx/1.16.1", - "Date": "Tue, 31 May 2022 06:41:23 GMT", - "Content-Type": "text/html;charset=UTF-8", - "Transfer-Encoding": "chunked", - "Connection": "keep-alive", - "Vary": "Accept-Encoding", - "Set-Cookie": "authtoken_pro=tea83b3beef07488bb8571811385db42; Max-Age=28800; Expires=Tue, 31-May-2022 14:41:23 GMT; Domain=testin.cn; Path=/; HttpOnly", - "Set-Cookie1": "userId_pro=1160; Max-Age=28800; Expires=Tue, 31-May-2022 14:41:23 GMT; Domain=testin.cn; Path=/; HttpOnly", - "Set-Cookie2": "pid_pro=1; Max-Age=28800; Expires=Tue, 31-May-2022 14:41:23 GMT; Domain=testin.cn; Path=/; HttpOnly", - "Set-Cookie3": "eid_pro=1; Max-Age=28800; Expires=Tue, 31-May-2022 14:41:23 GMT; Domain=testin.cn; Path=/; HttpOnly", - "Set-Cookie4": "pname_pro=name; Max-Age=28800; Expires=Tue, 31-May-2022 14:41:23 GMT; Domain=testin.cn; Path=/; HttpOnly", - "Content-Language": "zh-CN", - "Content-Encoding": "gzip", - "__X_HTTP_RAW_PAYLOAD_MD5": "5d761720e42f13d01ba981fb19b850ca", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "39cb5f3a9cbcfbd16f66e040ec49b8c4" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_get_req_pipeline.json b/test/http_decoder/test_result_json/http_get_req_pipeline.json deleted file mode 100644 index af8ff75..0000000 --- a/test/http_decoder/test_result_json/http_get_req_pipeline.json +++ /dev/null @@ -1,68 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.40.81:52802-192.168.40.137:80-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/aa.mp4?asf=sdaf", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "113.31.27.226", - "Connection": "keep-alive", - "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8", - "User-Agent": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1636.2 Safari/537.36", - "Accept-Encoding": "gzip,deflate,sdch", - "Accept-Language": "zh-CN,zh;q=0.8", - "__X_HTTP_URL": "113.31.27.226/aa.mp4?asf=sdaf" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 1, - "method": "GET", - "uri": "/fetch_ldns.png", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "ns.pb.cachecn.net", - "Connection": "keep-alive", - "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8", - "User-Agent": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1636.2 Safari/537.36", - "Accept-Encoding": "gzip,deflate,sdch", - "Accept-Language": "zh-CN,zh;q=0.8", - "__X_HTTP_URL": "ns.pb.cachecn.net/fetch_ldns.png" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 2, - "method": "GET", - "uri": "/40x.jpg", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "ns.pb.cachecn.net", - "Connection": "keep-alive", - "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8", - "User-Agent": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1636.2 Safari/537.36", - "Accept-Encoding": "gzip,deflate,sdch", - "Accept-Language": "zh-CN,zh;q=0.8", - "__X_HTTP_URL": "ns.pb.cachecn.net/40x.jpg" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.0", - "res_status": "File not found", - "major_version": 1, - "minor_version": 0, - "status_code": 404, - "Server": "SimpleHTTP/0.6 Python/2.7.5", - "Date": "Wed, 25 Oct 2023 06:43:35 GMT", - "Content-Type": "text/html", - "Connection": "close", - "__X_HTTP_RAW_PAYLOAD_MD5": "6fb335f443cfc8a9d952d27cf3dc1059", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "6fb335f443cfc8a9d952d27cf3dc1059" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_get_single_trans.json b/test/http_decoder/test_result_json/http_get_single_trans.json deleted file mode 100644 index 165bb65..0000000 --- a/test/http_decoder/test_result_json/http_get_single_trans.json +++ /dev/null @@ -1,34 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.38.73:50806-192.168.40.137:80-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/index.html", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "192.168.40.137", - "User-Agent": "curl/7.79.1", - "Accept": "*/*", - "__X_HTTP_URL": "192.168.40.137/index.html" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.0", - "res_status": "OK", - "major_version": 1, - "minor_version": 0, - "status_code": 200, - "Server": "SimpleHTTP/0.6 Python/2.7.5", - "Date": "Thu, 30 Nov 2023 08:42:24 GMT", - "Content-type": "text/html", - "Content-Length": "144", - "Last-Modified": "Thu, 30 Nov 2023 08:38:54 GMT", - "__X_HTTP_RAW_PAYLOAD_MD5": "3e11876cd3a234541ae37d833c088a76", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "3e11876cd3a234541ae37d833c088a76" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_gzip_out_of_order.json b/test/http_decoder/test_result_json/http_gzip_out_of_order.json deleted file mode 100644 index 1952b9d..0000000 --- a/test/http_decoder/test_result_json/http_gzip_out_of_order.json +++ /dev/null @@ -1,39 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.61.10:2064-192.168.40.139:8088-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "192.168.40.139:8088", - "Connection": "keep-alive", - "DNT": "1", - "Upgrade-Insecure-Requests": "1", - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36", - "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "zh-CN,zh;q=0.9", - "__X_HTTP_URL": "192.168.40.139:8088/" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.0", - "res_status": "OK", - "major_version": 1, - "minor_version": 0, - "status_code": 200, - "Server": "BaseHTTP/0.6 Python/3.6.8", - "Date": "Tue, 13 Aug 2024 14:21:42 GMT", - "Content-type": "text/html; charset=utf-8", - "Content-Encoding": "gzip", - "Content-length": "28425", - "__X_HTTP_RAW_PAYLOAD_MD5": "873ed9c8c691a5f9f144fbf0fbfca011", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "7047cf4ae8ce6fd7bcd363e2b626f338" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_hdr_truncated_after_kv.json b/test/http_decoder/test_result_json/http_hdr_truncated_after_kv.json deleted file mode 100644 index 01ec6bd..0000000 --- a/test/http_decoder/test_result_json/http_hdr_truncated_after_kv.json +++ /dev/null @@ -1,311 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "196.188.112.76.51494>23.246.50.149.80" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABQSwLpJi-yDFZ7k9eqarY3x3-b99vNxxOt5xDeIOapZB6Y5QXPSa54b7cbWYTXYdFimDKCeJ4s7ngqpqByvtt0aLh85nSucLTcR3-OKleuNwVltHUscQhSgVfHc.jpg?r=392", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Accept": "image/*", - "Accept-Encoding": "deflate, gzip", - "Connection": "Keep-Alive", - "Host": "occ-0-778-360.1.nflxso.net", - "Language": "en-ET,en", - "Referer": "https://secure.netflix.com/us/tvui/ql/patch/20211109_18752/2/release/darwinBootstrap.js?getMainUrlFromCodex=true&taskDefaultTimeoutV2=120000&bootloader_trace=apiusernotnull__false&nq=true&nq_control_tag=tvui-main&startup_key=e38d3c70814421931b0189d91d872546326f05d8f470150d07340df9e9d72275&device_type=TCL-TVS88L&e=TCL-TVS88L0000000000000000342914&env=prod&fromNM=true&nm_prefetch=true&nrdapp_version=2015.1.1&plain=true&dh=720&dw=1280&dar=16_9®=undefined&authType=login&authclid=845becf0-992c-46f7-a938-1bc22b097c58&q=source_type%3D1%26additionalDataUrl%3Dhttp%253A%252F%252Flocalhost%253A56789%252Fapps%252FNetflix%252Fdial_data%26source_type_payload%3D", - "User-Agent": "Gibbon/2015.1.1/2015.1.1: Netflix/2015.1.1 (DEVTYPE=TCL-TVS88L; CERTVER=1)", - "__X_HTTP_URL": "occ-0-778-360.1.nflxso.net/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABQSwLpJi-yDFZ7k9eqarY3x3-b99vNxxOt5xDeIOapZB6Y5QXPSa54b7cbWYTXYdFimDKCeJ4s7ngqpqByvtt0aLh85nSucLTcR3-OKleuNwVltHUscQhSgVfHc.jpg?r=392", - "X-Gibbon-Cache-Control": "max-age=2592000, priority=4, key=/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABQSwLpJi-yDFZ7k9eqarY3x3-b99vNxxOt5xDeIOapZB6Y5QXPSa54b7cbWYTXYdFimDKCeJ4s7ngqpqByvtt0aLh85nSucLTcR3-OKleuNwVltHUscQhSgVfHc.jpg?r=392" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 1, - "method": "GET", - "uri": "/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABUWN8S1k3yM2coX2bwxbP699Jdr0BUqBRzIfiAJXKC5Ywt7DXqJOCjrBSYs36Tny8277IXm2BF_cgTmY18NJlocglKjhaoJhFeGoIg1cwntFduyxyRPP2EJQL5Y.jpg?r=e0e", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Accept": "image/*", - "Accept-Encoding": "deflate, gzip", - "Connection": "Keep-Alive", - "Host": "occ-0-778-360.1.nflxso.net", - "Language": "en-ET,en", - "Referer": "https://secure.netflix.com/us/tvui/ql/patch/20211109_18752/2/release/darwinBootstrap.js?getMainUrlFromCodex=true&taskDefaultTimeoutV2=120000&bootloader_trace=apiusernotnull__false&nq=true&nq_control_tag=tvui-main&startup_key=e38d3c70814421931b0189d91d872546326f05d8f470150d07340df9e9d72275&device_type=TCL-TVS88L&e=TCL-TVS88L0000000000000000342914&env=prod&fromNM=true&nm_prefetch=true&nrdapp_version=2015.1.1&plain=true&dh=720&dw=1280&dar=16_9®=undefined&authType=login&authclid=845becf0-992c-46f7-a938-1bc22b097c58&q=source_type%3D1%26additionalDataUrl%3Dhttp%253A%252F%252Flocalhost%253A56789%252Fapps%252FNetflix%252Fdial_data%26source_type_payload%3D", - "User-Agent": "Gibbon/2015.1.1/2015.1.1: Netflix/2015.1.1 (DEVTYPE=TCL-TVS88L; CERTVER=1)", - "__X_HTTP_URL": "occ-0-778-360.1.nflxso.net/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABUWN8S1k3yM2coX2bwxbP699Jdr0BUqBRzIfiAJXKC5Ywt7DXqJOCjrBSYs36Tny8277IXm2BF_cgTmY18NJlocglKjhaoJhFeGoIg1cwntFduyxyRPP2EJQL5Y.jpg?r=e0e", - "X-Gibbon-Cache-Control": "max-age=2592000, priority=4, key=/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABUWN8S1k3yM2coX2bwxbP699Jdr0BUqBRzIfiAJXKC5Ywt7DXqJOCjrBSYs36Tny8277IXm2BF_cgTmY18NJlocglKjhaoJhFeGoIg1cwntFduyxyRPP2EJQL5Y.jpg?r=e0e" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 2, - "method": "GET", - "uri": "/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABR1YQS01SaHGzoxgWBJF1Gas0Gv9_DPebb4irdCTRjcQ_FUaVbXFTTrJ68_bvJds1sb28VMq22Qn3oSSKKJ7DdLN8ybgkJooYlCD3gAntrqgIFugqv5Z3kV8rRE.jpg?r=ec7", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Accept": "image/*", - "Accept-Encoding": "deflate, gzip", - "Connection": "Keep-Alive", - "Host": "occ-0-778-360.1.nflxso.net", - "Language": "en-ET,en", - "Referer": "https://secure.netflix.com/us/tvui/ql/patch/20211109_18752/2/release/darwinBootstrap.js?getMainUrlFromCodex=true&taskDefaultTimeoutV2=120000&bootloader_trace=apiusernotnull__false&nq=true&nq_control_tag=tvui-main&startup_key=e38d3c70814421931b0189d91d872546326f05d8f470150d07340df9e9d72275&device_type=TCL-TVS88L&e=TCL-TVS88L0000000000000000342914&env=prod&fromNM=true&nm_prefetch=true&nrdapp_version=2015.1.1&plain=true&dh=720&dw=1280&dar=16_9®=undefined&authType=login&authclid=845becf0-992c-46f7-a938-1bc22b097c58&q=source_type%3D1%26additionalDataUrl%3Dhttp%253A%252F%252Flocalhost%253A56789%252Fapps%252FNetflix%252Fdial_data%26source_type_payload%3D", - "__X_HTTP_URL": "occ-0-778-360.1.nflxso.net/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABR1YQS01SaHGzoxgWBJF1Gas0Gv9_DPebb4irdCTRjcQ_FUaVbXFTTrJ68_bvJds1sb28VMq22Qn3oSSKKJ7DdLN8ybgkJooYlCD3gAntrqgIFugqv5Z3kV8rRE.jpg?r=ec7", - "User-Agent": "Gibbon/2015.1.1/2015.1.1: Netflix/2015.1.1 (DEVTYPE=TCL-TVS88L; CERTVER=1)", - "X-Gibbon-Cache-Control": "max-age=2592000, priority=4, key=/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABR1YQS01SaHGzoxgWBJF1Gas0Gv9_DPebb4irdCTRjcQ_FUaVbXFTTrJ68_bvJds1sb28VMq22Qn3oSSKKJ7DdLN8ybgkJooYlCD3gAntrqgIFugqv5Z3kV8rRE.jpg?r=ec7" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Server": "nginx", - "Date": "Sat, 13 Nov 2021 14:15:58 GMT", - "Content-Type": "image/jpeg", - "Content-Length": "18377", - "Connection": "keep-alive", - "Cache-Control": "max-age=2592000", - "Last-Modified": "Wed, 10 Nov 2021 08:00:14 GMT", - "ETag": "\"c289a42885b30107ad119e2a6e405e4d\"", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "c289a42885b30107ad119e2a6e405e4d" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 3, - "method": "GET", - "uri": "/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABYo5IGwDn1LaWbeaa7amS0JhH3bU5MEVlcBsC4OK0mGbea97_xoi8EbqJt8_Zp0bMuuKPE80qUUjb4wq5po_lBtulA.jpg?r=c83", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Accept": "image/*", - "Accept-Encoding": "deflate, gzip", - "Connection": "Keep-Alive", - "Host": "occ-0-778-360.1.nflxso.net", - "Language": "en-ET,en", - "__X_HTTP_URL": "occ-0-778-360.1.nflxso.net/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABYo5IGwDn1LaWbeaa7amS0JhH3bU5MEVlcBsC4OK0mGbea97_xoi8EbqJt8_Zp0bMuuKPE80qUUjb4wq5po_lBtulA.jpg?r=c83", - "Referer": "https://secure.netflix.com/us/tvui/ql/patch/20211109_18752/2/release/darwinBootstrap.js?getMainUrlFromCodex=true&taskDefaultTimeoutV2=120000&bootloader_trace=apiusernotnull__false&nq=true&nq_control_tag=tvui-main&startup_key=e38d3c70814421931b0189d91d872546326f05d8f470150d07340df9e9d72275&device_type=TCL-TVS88L&e=TCL-TVS88L0000000000000000342914&env=prod&fromNM=true&nm_prefetch=true&nrdapp_version=2015.1.1&plain=true&dh=720&dw=1280&dar=16_9®=undefined&authType=login&authclid=845becf0-992c-46f7-a938-1bc22b097c58&q=source_type%3D1%26additionalDataUrl%3Dhttp%253A%252F%252Flocalhost%253A56789%252Fapps%252FNetflix%252Fdial_data%26source_type_payload%3D", - "User-Agent": "Gibbon/2015.1.1/2015.1.1: Netflix/2015.1.1 (DEVTYPE=TCL-TVS88L; CERTVER=1)", - "X-Gibbon-Cache-Control": "max-age=2592000, priority=4, key=/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABYo5IGwDn1LaWbeaa7amS0JhH3bU5MEVlcBsC4OK0mGbea97_xoi8EbqJt8_Zp0bMuuKPE80qUUjb4wq5po_lBtulA.jpg?r=c83" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 4, - "method": "GET", - "uri": "/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABaYF3Rmi954cg6Afu9jOtirnvF3iIMHPZCCnP34eDeYQXfRGG9Vg0qgn7hHpMVV4jOr8OZmcD2Nb7MhQv6gl-fNmVQ.jpg?r=257", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Accept": "image/*", - "Accept-Encoding": "deflate, gzip", - "Connection": "Keep-Alive", - "Host": "occ-0-778-360.1.nflxso.net", - "Language": "en-ET,en", - "__X_HTTP_URL": "occ-0-778-360.1.nflxso.net/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABaYF3Rmi954cg6Afu9jOtirnvF3iIMHPZCCnP34eDeYQXfRGG9Vg0qgn7hHpMVV4jOr8OZmcD2Nb7MhQv6gl-fNmVQ.jpg?r=257", - "Referer": "https://secure.netflix.com/us/tvui/ql/patch/20211109_18752/2/release/darwinBootstrap.js?getMainUrlFromCodex=true&taskDefaultTimeoutV2=120000&bootloader_trace=apiusernotnull__false&nq=true&nq_control_tag=tvui-main&startup_key=e38d3c70814421931b0189d91d872546326f05d8f470150d07340df9e9d72275&device_type=TCL-TVS88L&e=TCL-TVS88L0000000000000000342914&env=prod&fromNM=true&nm_prefetch=true&nrdapp_version=2015.1.1&plain=true&dh=720&dw=1280&dar=16_9®=undefined&authType=login&authclid=845becf0-992c-46f7-a938-1bc22b097c58&q=source_type%3D1%26additionalDataUrl%3Dhttp%253A%252F%252Flocalhost%253A56789%252Fapps%252FNetflix%252Fdial_data%26source_type_payload%3D", - "User-Agent": "Gibbon/2015.1.1/2015.1.1: Netflix/2015.1.1 (DEVTYPE=TCL-TVS88L; CERTVER=1)", - "X-Gibbon-Cache-Control": "max-age=2592000, priority=4, key=/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABaYF3Rmi954cg6Afu9jOtirnvF3iIMHPZCCnP34eDeYQXfRGG9Vg0qgn7hHpMVV4jOr8OZmcD2Nb7MhQv6gl-fNmVQ.jpg?r=257" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 5, - "method": "GET", - "uri": "/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABfC-ByjFJSfWZf7MFtjVl3ONnaQ69824xWP1l-cpAFGgAfaNFk4XR9uoHNWwnbG8N2UVDctVKz0a4Uyv0mEnC2kI9Q.jpg?r=532", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Accept": "image/*", - "Accept-Encoding": "deflate, gzip", - "Connection": "Keep-Alive", - "Host": "occ-0-778-360.1.nflxso.net", - "Language": "en-ET,en", - "__X_HTTP_URL": "occ-0-778-360.1.nflxso.net/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABfC-ByjFJSfWZf7MFtjVl3ONnaQ69824xWP1l-cpAFGgAfaNFk4XR9uoHNWwnbG8N2UVDctVKz0a4Uyv0mEnC2kI9Q.jpg?r=532", - "Referer": "https://secure.netflix.com/us/tvui/ql/patch/20211109_18752/2/release/darwinBootstrap.js?getMainUrlFromCodex=true&taskDefaultTimeoutV2=120000&bootloader_trace=apiusernotnull__false&nq=true&nq_control_tag=tvui-main&startup_key=e38d3c70814421931b0189d91d872546326f05d8f470150d07340df9e9d72275&device_type=TCL-TVS88L&e=TCL-TVS88L0000000000000000342914&env=prod&fromNM=true&nm_prefetch=true&nrdapp_version=2015.1.1&plain=true&dh=720&dw=1280&dar=16_9®=undefined&authType=login&authclid=845becf0-992c-46f7-a938-1bc22b097c58&q=source_type%3D1%26additionalDataUrl%3Dhttp%253A%252F%252Flocalhost%253A56789%252Fapps%252FNetflix%252Fdial_data%26source_type_payload%3D", - "User-Agent": "Gibbon/2015.1.1/2015.1.1: Netflix/2015.1.1 (DEVTYPE=TCL-TVS88L; CERTVER=1)", - "X-Gibbon-Cache-Control": "max-age=2592000, priority=4, key=/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABfC-ByjFJSfWZf7MFtjVl3ONnaQ69824xWP1l-cpAFGgAfaNFk4XR9uoHNWwnbG8N2UVDctVKz0a4Uyv0mEnC2kI9Q.jpg?r=532" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 6, - "method": "GET", - "uri": "/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABSyGFXaB0IqQ6VR92uKMi38mNtoz7eeWxDziAf9VYKfauhh5Qo7FnnCRb31ff6Ez9yTXsqRszsGuz0GA9FVDf_NLn-9F60IcUHm59J73eYX6BD0h4wLLK0Da6YM.jpg?r=aaa", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Accept": "image/*", - "Accept-Encoding": "deflate, gzip", - "Connection": "Keep-Alive", - "Host": "occ-0-778-360.1.nflxso.net", - "Language": "en-ET,en", - "__X_HTTP_URL": "occ-0-778-360.1.nflxso.net/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABSyGFXaB0IqQ6VR92uKMi38mNtoz7eeWxDziAf9VYKfauhh5Qo7FnnCRb31ff6Ez9yTXsqRszsGuz0GA9FVDf_NLn-9F60IcUHm59J73eYX6BD0h4wLLK0Da6YM.jpg?r=aaa", - "Referer": "https://secure.netflix.com/us/tvui/ql/patch/20211109_18752/2/release/darwinBootstrap.js?getMainUrlFromCodex=true&taskDefaultTimeoutV2=120000&bootloader_trace=apiusernotnull__false&nq=true&nq_control_tag=tvui-main&startup_key=e38d3c70814421931b0189d91d872546326f05d8f470150d07340df9e9d72275&device_type=TCL-TVS88L&e=TCL-TVS88L0000000000000000342914&env=prod&fromNM=true&nm_prefetch=true&nrdapp_version=2015.1.1&plain=true&dh=720&dw=1280&dar=16_9®=undefined&authType=login&authclid=845becf0-992c-46f7-a938-1bc22b097c58&q=source_type%3D1%26additionalDataUrl%3Dhttp%253A%252F%252Flocalhost%253A56789%252Fapps%252FNetflix%252Fdial_data%26source_type_payload%3D", - "User-Agent": "Gibbon/2015.1.1/2015.1.1: Netflix/2015.1.1 (DEVTYPE=TCL-TVS88L; CERTVER=1)", - "X-Gibbon-Cache-Control": "max-age=2592000, priority=4, key=/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABSyGFXaB0IqQ6VR92uKMi38mNtoz7eeWxDziAf9VYKfauhh5Qo7FnnCRb31ff6Ez9yTXsqRszsGuz0GA9FVDf_NLn-9F60IcUHm59J73eYX6BD0h4wLLK0Da6YM.jpg?r=aaa" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 7, - "method": "GET", - "uri": "/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABZbHXQr7bRUpSQ2vQe8F8p3xODTJjUbSjEcLgQrFVyGsPgQT1GVhqGWFetJhebcGrVeZGOTmQ3qvHTe9eBRJdjFsVg.jpg?r=723", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Accept": "image/*", - "Accept-Encoding": "deflate, gzip", - "Connection": "Keep-Alive", - "Host": "occ-0-778-360.1.nflxso.net", - "Language": "en-ET,en", - "__X_HTTP_URL": "occ-0-778-360.1.nflxso.net/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABZbHXQr7bRUpSQ2vQe8F8p3xODTJjUbSjEcLgQrFVyGsPgQT1GVhqGWFetJhebcGrVeZGOTmQ3qvHTe9eBRJdjFsVg.jpg?r=723", - "Referer": "https://secure.netflix.com/us/tvui/ql/patch/20211109_18752/2/release/darwinBootstrap.js?getMainUrlFromCodex=true&taskDefaultTimeoutV2=120000&bootloader_trace=apiusernotnull__false&nq=true&nq_control_tag=tvui-main&startup_key=e38d3c70814421931b0189d91d872546326f05d8f470150d07340df9e9d72275&device_type=TCL-TVS88L&e=TCL-TVS88L0000000000000000342914&env=prod&fromNM=true&nm_prefetch=true&nrdapp_version=2015.1.1&plain=true&dh=720&dw=1280&dar=16_9®=undefined&authType=login&authclid=845becf0-992c-46f7-a938-1bc22b097c58&q=source_type%3D1%26additionalDataUrl%3Dhttp%253A%252F%252Flocalhost%253A56789%252Fapps%252FNetflix%252Fdial_data%26source_type_payload%3D", - "User-Agent": "Gibbon/2015.1.1/2015.1.1: Netflix/2015.1.1 (DEVTYPE=TCL-TVS88L; CERTVER=1)", - "X-Gibbon-Cache-Control": "max-age=2592000, priority=4, key=/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABZbHXQr7bRUpSQ2vQe8F8p3xODTJjUbSjEcLgQrFVyGsPgQT1GVhqGWFetJhebcGrVeZGOTmQ3qvHTe9eBRJdjFsVg.jpg?r=723" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 1, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Server": "nginx", - "Date": "Sat, 13 Nov 2021 14:15:58 GMT", - "Content-Type": "image/jpeg", - "Content-Length": "13488", - "Connection": "keep-alive", - "Cache-Control": "max-age=2592000", - "Last-Modified": "Mon, 08 Nov 2021 19:50:54 GMT", - "ETag": "\"35d56b6a0ef3b5857013f44620bd8888\"", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "35d56b6a0ef3b5857013f44620bd8888" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 2, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Server": "nginx", - "Date": "Sat, 13 Nov 2021 14:15:58 GMT", - "Content-Type": "image/jpeg", - "Content-Length": "14129", - "Connection": "keep-alive", - "Cache-Control": "max-age=2592000", - "Last-Modified": "Tue, 26 Oct 2021 15:12:58 GMT", - "ETag": "\"bb83961ad5fe366dcbb5240ead69f650\"", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "bb83961ad5fe366dcbb5240ead69f650" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 3, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Server": "nginx", - "Date": "Sat, 13 Nov 2021 14:15:58 GMT", - "Content-Type": "image/jpeg", - "Content-Length": "11493", - "Connection": "keep-alive", - "Cache-Control": "max-age=2592000", - "Last-Modified": "Thu, 04 Nov 2021 20:44:22 GMT", - "ETag": "\"c5be6a7137482da270bb2adc8d44a28d\"", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "c5be6a7137482da270bb2adc8d44a28d" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 4, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Server": "nginx", - "Date": "Sat, 13 Nov 2021 14:15:58 GMT", - "Content-Type": "image/jpeg", - "Content-Length": "14219", - "Connection": "keep-alive", - "Cache-Control": "max-age=2592000", - "Last-Modified": "Sat, 25 Sep 2021 05:02:49 GMT", - "ETag": "\"61bec96775876749bb57139f86f6b0ca\"", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "61bec96775876749bb57139f86f6b0ca" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 5, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Server": "nginx", - "Date": "Sat, 13 Nov 2021 14:15:58 GMT", - "Content-Type": "image/jpeg", - "Content-Length": "21967", - "Connection": "keep-alive", - "Cache-Control": "max-age=2592000", - "Last-Modified": "Fri, 02 Jul 2021 10:15:04 GMT", - "ETag": "\"841065529f1e89eabd0ef235a3d3291c\"", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "841065529f1e89eabd0ef235a3d3291c" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 6, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Server": "nginx", - "Date": "Sat, 13 Nov 2021 14:15:58 GMT", - "Content-Type": "image/jpeg", - "Content-Length": "21670", - "Connection": "keep-alive", - "Cache-Control": "max-age=2592000", - "Last-Modified": "Tue, 19 Oct 2021 14:00:02 GMT", - "ETag": "\"21d4b2c21a3a2f26ba665670e8513940\"", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "21d4b2c21a3a2f26ba665670e8513940" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 8, - "method": "GET", - "uri": "/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABSFXjTUaVrddq_nehO4yuLziSjuekxJuv3oEsyUpmt3oK3InJcXjtZUHrBBuu0EP05WRC8wFVe78VtxtW_ZuZQ65MIcApb0oZF4JoFlHHnv363RbgJn898Q4tQc.jpg?r=590", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Accept": "image/*", - "Accept-Encoding": "deflate, gzip", - "Connection": "Keep-Alive", - "Host": "occ-0-778-360.1.nflxso.net", - "Language": "en-ET,en", - "Referer": "https://secure.netflix.com/us/tvui/ql/patch/20211109_18752/2/release/darwinBootstrap.js?getMainUrlFromCodex=true&taskDefaultTimeoutV2=120000&bootloader_trace=apiusernotnull__false&nq=true&nq_control_tag=tvui-main&startup_key=e38d3c70814421931b0189d91d872546326f05d8f470150d07340df9e9d72275&device_type=TCL-TVS88L&e=TCL-TVS88L0000000000000000342914&env=prod&fromNM=true&nm_prefetch=true&nrdapp_version=2015.1.1&plain=true&dh=720&dw=1280&dar=16_9®=undefined&authType=login&authclid=845becf0-992c-46f7-a938-1bc22b097c58&q=source_type%3D1%26additionalDataUrl%3Dhttp%253A%252F%252Flocalhost%253A56789%252Fapps%252FNetflix%252Fdial_data%26source_type_payload%3D", - "User-Agent": "Gibbon/2015.1.1/2015.1.1: Netflix/2015.1.1 (DEVTYPE=TCL-TVS88L; CERTVER=1)", - "__X_HTTP_URL": "occ-0-778-360.1.nflxso.net/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABSFXjTUaVrddq_nehO4yuLziSjuekxJuv3oEsyUpmt3oK3InJcXjtZUHrBBuu0EP05WRC8wFVe78VtxtW_ZuZQ65MIcApb0oZF4JoFlHHnv363RbgJn898Q4tQc.jpg?r=590", - "X-Gibbon-Cache-Control": "max-age=2592000, priority=4, key=/dnm/api/v6/Da_vleYcahiCE7JMYt8LJRyoenc/AAAABSFXjTUaVrddq_nehO4yuLziSjuekxJuv3oEsyUpmt3oK3InJcXjtZUHrBBuu0EP05WRC8wFVe78VtxtW_ZuZQ65MIcApb0oZF4JoFlHHnv363RbgJn898Q4tQc.jpg?r=590" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 7, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Server": "nginx", - "Date": "Sat, 13 Nov 2021 14:15:58 GMT", - "Content-Type": "image/jpeg", - "Content-Length": "14215", - "Connection": "keep-alive", - "Cache-Control": "max-age=2592000", - "Last-Modified": "Thu, 11 Nov 2021 17:32:01 GMT", - "ETag": "\"837a2051f7d0f2899baf54ff20b3d9ad\"", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "f18a76ecf35648cb46ea6f42e4391cb8" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_hdr_truncated_in_kv.json b/test/http_decoder/test_result_json/http_hdr_truncated_in_kv.json deleted file mode 100644 index 66edef3..0000000 --- a/test/http_decoder/test_result_json/http_hdr_truncated_in_kv.json +++ /dev/null @@ -1,53 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "196.190.248.93.32727>94.130.141.49.80" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/iframes2/e38f4959d33f4fa390045b0d7123997d.html?subid=65843620", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "tsyndicate.com", - "Connection": "keep-alive", - "Upgrade-Insecure-Requests": "1", - "User-Agent": "Mozilla/5.0 (Linux; Android 11; SM-A217F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.74 Mobile Safari/537.36", - "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9", - "Referer": "http://the-sexy-tube.com/", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-GB,en-US;q=0.9,en;q=0.8", - "__X_HTTP_URL": "tsyndicate.com/iframes2/e38f4959d33f4fa390045b0d7123997d.html?subid=65843620" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Server": "nginx", - "Date": "Sat, 13 Nov 2021 13:58:01 GMT", - "Content-Type": "text/html; charset=utf-8", - "Transfer-Encoding": "chunked", - "Connection": "keep-alive", - "Vary": "Accept-Encoding", - "Cache-Control": "no-cache, no-store, no-transform, must-revalidate", - "Pragma": "no-cache", - "Expires": "0", - "Vary1": "*", - "X-Api-Version": "2", - "Link": "<http://lcdn.tsyndicate.com/sdk/v1/b.b.js>; rel=preload; as=script", - "X-Request-Id": "2ceed9968bf8c648", - "Set-Cookie": "ts_uid=6ec96511-9fa6-4e10-86b8-31fdb4531864; expires=Fri, 13 May 2022 13:58:01 GMT; domain=.tsyndicate.com; path=/; HttpOnly; secure; SameSite=None", - "Set-Cookie2": "bfq=e0SIEaFjiwwZNWjkkDGjCwsRYwpuifFQRJmJMWzMsIEjBw4ZOCr2URAQ; expires=Sun, 14 Nov 2021 13:58:01 GMT; domain=.tsyndicate.com; path=/; secure; SameSite=None", - "X-Robots-Tag": "none", - "Cache-Control3": "no-transform", - "X-Robots-Tag4": "noindex, nofollow", - "Report-To": "{ \"url\": \"https://pxl.tsyndicate.com/api/v1/heavy-ad/report\", \"max_age\": 86401 }", - "Content-Encoding": "gzip", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "075802aa31b42d465d56b213915fb0a2" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_hdr_value_empty.json b/test/http_decoder/test_result_json/http_hdr_value_empty.json deleted file mode 100644 index 86ac4a5..0000000 --- a/test/http_decoder/test_result_json/http_hdr_value_empty.json +++ /dev/null @@ -1,36 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.131.33.47164>192.168.204.67.4445" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "POST", - "uri": "http://:4445/RPC2", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "User-Agent": "ulxmlrpcpp/1.7.5", - "Connection": "Close", - "Content-Type": "text/xml", - "Date": "Sat Sep 7 10:04:57 2019", - "Content-Length": "468", - "__X_HTTP_URL": ":4445/RPC2", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "033e27f72bc41b4a7e222df464749420" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Connection": "Close", - "Content-Type": "text/xml", - "Transfer-Encoding": "chunked", - "X-Powered-By": "ulxmlrpcpp/1.7.4", - "Date": "Sat Sep 7 01:09:08 2019", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "69db29507d10b0d57fcaa5afffd81934" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_hdrs_exceed_maximum.json b/test/http_decoder/test_result_json/http_hdrs_exceed_maximum.json deleted file mode 100644 index 9bc751b..0000000 --- a/test/http_decoder/test_result_json/http_hdrs_exceed_maximum.json +++ /dev/null @@ -1,51 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "10.0.0.1:61462-10.0.0.2:80-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/x/xx/xxxxxxxxxxxxxxxxxxx/x/xxxxxx/xxxxxxxxxxxxxxx?xxx=1&xxx=1&x=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&vmf=xxxxxxxxxx.xxx.xxx.xxx&ce=UTF-8&ns=xxxxxxxxxx&pageName=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&g=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.jsp&r=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&events=xxxxxxxxxxxxxxxxxxxxxxxxxxx&products=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&v1=xxxxxxxxxxxxxxx&v2=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&v17=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&c49=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&AQE=1", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "xxxxx.xxxxxxxx.xxxxxxxxxx.xxx", - "Connection": "keep-alive", - "Accept": "image/webp,*/*;q=0.8", - "User-Agent": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.153 Safari/537.36", - "Referer": "http://www.xxxxxxxxxx.xxx/xx/xxxxxxxxxxxxxxxxx/xxxxxxxxxxxxxxxxxxxxxx/xxxxxxxxxxxx.jsp", - "Accept-Encoding": "gzip,deflate,sdch", - "Accept-Language": "en-US,en;q=0.8,en-GB;q=0.6", - "__X_HTTP_URL": "xxxxx.xxxxxxxx.xxxxxxxxxx.xxx/x/xx/xxxxxxxxxxxxxxxxxxx/x/xxxxxx/xxxxxxxxxxxxxxx?xxx=1&xxx=1&x=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&vmf=xxxxxxxxxx.xxx.xxx.xxx&ce=UTF-8&ns=xxxxxxxxxx&pageName=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&g=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.jsp&r=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&events=xxxxxxxxxxxxxxxxxxxxxxxxxxx&products=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&v1=xxxxxxxxxxxxxxx&v2=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&v17=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&c49=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&AQE=1", - "Cookie": "xxxxxxxxxxxxxxxxxxx=ie; xxxxxxxxxxxxxxxxxxxxxx=true; lp=xxxxxx; rememberUn=false; xxx.xxxxxxxxxx.xxxxxxxxxx=xx; xxxxx=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx; autocomplete=1; xxxx=xxxx; xxxx=xxxxv1|xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx; xxxxxx=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx2xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Date": "Mon, 30 Jun 2014 13:35:21 GMT", - "Server": "xxxxxxxxxxxxxxxxx", - "Access-Control-Allow-Origin": "*", - "Set-Cookie": "xxxx=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx; Expires=Wed, 29 Jun 2016 13:35:21 GMT; Domain=.xxxxxxxxxx.xxx; Path=/", - "X-C": "ms-4.9", - "Expires": "Sun, 29 Jun 2014 13:35:21 GMT", - "Last-Modified": "Tue, 01 Jul 2014 13:35:21 GMT", - "Cache-Control": "no-cache, no-store, max-age=0, no-transform, private", - "Pragma": "no-cache", - "ETag": "\"xxxxxxxxxxxxxxxxxxxxxx\"", - "Vary": "*", - "P3P": "policyref=\"/w3c/p3p.xml\", CP=\"NOI DSP COR NID PSA OUR IND COM NAV STA\"", - "xserver": "xxxxxx", - "Content-Length": "43", - "Keep-Alive": "timeout=15", - "Connection": "Keep-Alive", - "Content-Type": "image/gif", - "__X_HTTP_RAW_PAYLOAD_MD5": "ad480fd0732d0f6f1a8b06359e3a42bb", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "ad480fd0732d0f6f1a8b06359e3a42bb" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_inner_tunnel_for_http.json b/test/http_decoder/test_result_json/http_inner_tunnel_for_http.json deleted file mode 100644 index 973556a..0000000 --- a/test/http_decoder/test_result_json/http_inner_tunnel_for_http.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.40.139.59234>192.168.38.83.8080" - }, - { - "flow": "C2S", - "payload_block": 1, - "payload_size": 77 - }, - { - "flow": "S2C", - "payload_block": 3, - "payload_size": 2781 - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_inner_tunnel_for_pop3.json b/test/http_decoder/test_result_json/http_inner_tunnel_for_pop3.json deleted file mode 100644 index b4f9784..0000000 --- a/test/http_decoder/test_result_json/http_inner_tunnel_for_pop3.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.10.58.51798>192.168.10.144.808" - }, - { - "flow": "C2S", - "payload_block": 6, - "payload_size": 68 - }, - { - "flow": "S2C", - "payload_block": 7, - "payload_size": 1737 - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_msg_type_state.json b/test/http_decoder/test_result_json/http_msg_type_state.json deleted file mode 100644 index 5dc0564..0000000 --- a/test/http_decoder/test_result_json/http_msg_type_state.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "msg_0": "HTTP_TRANSACTION_START_transaction_0", - "msg_1": "HTTP_MESSAGE_REQ_LINE", - "msg_2": "HTTP_MESSAGE_REQ_HEADER", - "msg_3": "HTTP_MESSAGE_REQ_HEADER_END", - "msg_4": "HTTP_MESSAGE_REQ_BODY_START", - "msg_5": "HTTP_MESSAGE_REQ_BODY", - "msg_6": "HTTP_MESSAGE_REQ_BODY_END" - }, - { - "msg_7": "HTTP_MESSAGE_RES_LINE", - "msg_8": "HTTP_MESSAGE_RES_HEADER", - "msg_9": "HTTP_MESSAGE_RES_HEADER_END", - "msg_10": "HTTP_MESSAGE_RES_BODY_START", - "msg_11": "HTTP_MESSAGE_RES_BODY", - "msg_12": "HTTP_MESSAGE_RES_BODY_END", - "msg_13": "HTTP_TRANSACTION_END_transaction_0" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_msg_type_state_c2s.json b/test/http_decoder/test_result_json/http_msg_type_state_c2s.json deleted file mode 100644 index 8533bb9..0000000 --- a/test/http_decoder/test_result_json/http_msg_type_state_c2s.json +++ /dev/null @@ -1,13 +0,0 @@ -[ - { - "msg_0": "HTTP_TRANSACTION_START_transaction_0", - "msg_1": "HTTP_MESSAGE_REQ_LINE", - "msg_2": "HTTP_MESSAGE_REQ_HEADER", - "msg_3": "HTTP_MESSAGE_REQ_HEADER_END", - "msg_4": "HTTP_MESSAGE_REQ_BODY_START", - "msg_5": "HTTP_MESSAGE_REQ_BODY", - "msg_6": "HTTP_MESSAGE_REQ_BODY_END", - "msg_7": "HTTP_TRANSACTION_END_transaction_0" - }, - {} -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_msg_type_state_exception_c2s.json b/test/http_decoder/test_result_json/http_msg_type_state_exception_c2s.json deleted file mode 100644 index e694238..0000000 --- a/test/http_decoder/test_result_json/http_msg_type_state_exception_c2s.json +++ /dev/null @@ -1,13 +0,0 @@ -[ - { - "msg_0": "HTTP_TRANSACTION_START_transaction_0", - "msg_1": "HTTP_MESSAGE_REQ_LINE", - "msg_2": "HTTP_MESSAGE_REQ_HEADER", - "msg_3": "HTTP_MESSAGE_REQ_HEADER_END", - "msg_4": "HTTP_MESSAGE_REQ_BODY_START", - "msg_5": "HTTP_MESSAGE_REQ_BODY" - }, - { - "msg_6": "HTTP_TRANSACTION_END_transaction_0" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_msg_type_state_exception_s2c.json b/test/http_decoder/test_result_json/http_msg_type_state_exception_s2c.json deleted file mode 100644 index cf03270..0000000 --- a/test/http_decoder/test_result_json/http_msg_type_state_exception_s2c.json +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "msg_0": "HTTP_TRANSACTION_START_transaction_0", - "msg_1": "HTTP_MESSAGE_REQ_LINE", - "msg_2": "HTTP_MESSAGE_REQ_HEADER", - "msg_3": "HTTP_MESSAGE_REQ_HEADER_END" - }, - { - "msg_4": "HTTP_MESSAGE_RES_LINE", - "msg_5": "HTTP_MESSAGE_RES_HEADER", - "msg_6": "HTTP_MESSAGE_RES_HEADER_END", - "msg_7": "HTTP_MESSAGE_RES_BODY_START", - "msg_8": "HTTP_MESSAGE_RES_BODY", - "msg_9": "HTTP_TRANSACTION_END_transaction_0" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_msg_type_state_pipeline.json b/test/http_decoder/test_result_json/http_msg_type_state_pipeline.json deleted file mode 100644 index d50f4ac..0000000 --- a/test/http_decoder/test_result_json/http_msg_type_state_pipeline.json +++ /dev/null @@ -1,61 +0,0 @@ -[ - { - "msg_0": "HTTP_TRANSACTION_START_transaction_0", - "msg_1": "HTTP_MESSAGE_REQ_LINE", - "msg_2": "HTTP_MESSAGE_REQ_HEADER", - "msg_3": "HTTP_MESSAGE_REQ_HEADER_END", - "msg_8": "HTTP_TRANSACTION_START_transaction_1", - "msg_9": "HTTP_MESSAGE_REQ_LINE", - "msg_10": "HTTP_MESSAGE_REQ_HEADER", - "msg_11": "HTTP_MESSAGE_REQ_HEADER_END", - "msg_16": "HTTP_TRANSACTION_START_transaction_2", - "msg_17": "HTTP_MESSAGE_REQ_LINE", - "msg_18": "HTTP_MESSAGE_REQ_HEADER", - "msg_19": "HTTP_MESSAGE_REQ_HEADER_END", - "msg_24": "HTTP_TRANSACTION_START_transaction_3", - "msg_25": "HTTP_MESSAGE_REQ_LINE", - "msg_26": "HTTP_MESSAGE_REQ_HEADER", - "msg_27": "HTTP_MESSAGE_REQ_HEADER_END" - }, - { - "msg_4": "HTTP_MESSAGE_RES_LINE", - "msg_5": "HTTP_MESSAGE_RES_HEADER", - "msg_6": "HTTP_MESSAGE_RES_HEADER_END", - "msg_7": "HTTP_TRANSACTION_END_transaction_0", - "msg_12": "HTTP_MESSAGE_RES_LINE", - "msg_13": "HTTP_MESSAGE_RES_HEADER", - "msg_14": "HTTP_MESSAGE_RES_HEADER_END", - "msg_15": "HTTP_TRANSACTION_END_transaction_1", - "msg_20": "HTTP_MESSAGE_RES_LINE", - "msg_21": "HTTP_MESSAGE_RES_HEADER", - "msg_22": "HTTP_MESSAGE_RES_HEADER_END", - "msg_23": "HTTP_TRANSACTION_END_transaction_2", - "msg_28": "HTTP_MESSAGE_RES_LINE", - "msg_29": "HTTP_MESSAGE_RES_HEADER", - "msg_30": "HTTP_MESSAGE_RES_HEADER_END", - "msg_31": "HTTP_MESSAGE_RES_BODY_START", - "msg_32": "HTTP_MESSAGE_RES_BODY", - "msg_33": "HTTP_MESSAGE_RES_BODY", - "msg_34": "HTTP_MESSAGE_RES_BODY", - "msg_35": "HTTP_MESSAGE_RES_BODY", - "msg_36": "HTTP_MESSAGE_RES_BODY", - "msg_37": "HTTP_MESSAGE_RES_BODY", - "msg_38": "HTTP_MESSAGE_RES_BODY", - "msg_39": "HTTP_MESSAGE_RES_BODY", - "msg_40": "HTTP_MESSAGE_RES_BODY", - "msg_41": "HTTP_MESSAGE_RES_BODY", - "msg_42": "HTTP_MESSAGE_RES_BODY", - "msg_43": "HTTP_MESSAGE_RES_BODY", - "msg_44": "HTTP_MESSAGE_RES_BODY", - "msg_45": "HTTP_MESSAGE_RES_BODY", - "msg_46": "HTTP_MESSAGE_RES_BODY", - "msg_47": "HTTP_MESSAGE_RES_BODY", - "msg_48": "HTTP_MESSAGE_RES_BODY", - "msg_49": "HTTP_MESSAGE_RES_BODY", - "msg_50": "HTTP_MESSAGE_RES_BODY", - "msg_51": "HTTP_MESSAGE_RES_BODY", - "msg_52": "HTTP_MESSAGE_RES_BODY", - "msg_53": "HTTP_MESSAGE_RES_BODY_END", - "msg_54": "HTTP_TRANSACTION_END_transaction_3" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_msg_type_state_s2c.json b/test/http_decoder/test_result_json/http_msg_type_state_s2c.json deleted file mode 100644 index c59d0bb..0000000 --- a/test/http_decoder/test_result_json/http_msg_type_state_s2c.json +++ /dev/null @@ -1,13 +0,0 @@ -[ - {}, - { - "msg_0": "HTTP_TRANSACTION_START_transaction_0", - "msg_1": "HTTP_MESSAGE_RES_LINE", - "msg_2": "HTTP_MESSAGE_RES_HEADER", - "msg_3": "HTTP_MESSAGE_RES_HEADER_END", - "msg_4": "HTTP_MESSAGE_RES_BODY_START", - "msg_5": "HTTP_MESSAGE_RES_BODY", - "msg_6": "HTTP_MESSAGE_RES_BODY_END", - "msg_7": "HTTP_TRANSACTION_END_transaction_0" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_msg_type_state_tunnel.json b/test/http_decoder/test_result_json/http_msg_type_state_tunnel.json deleted file mode 100644 index 4a66f37..0000000 --- a/test/http_decoder/test_result_json/http_msg_type_state_tunnel.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "msg_0": "HTTP_TRANSACTION_START_transaction_0", - "msg_1": "HTTP_MESSAGE_REQ_LINE", - "msg_2": "HTTP_MESSAGE_REQ_HEADER", - "msg_3": "HTTP_MESSAGE_REQ_HEADER_END", - "msg_8": "HTTP_TRANSACTION_START_transaction_1", - "msg_9": "HTTP_MESSAGE_REQ_LINE", - "msg_10": "HTTP_MESSAGE_REQ_HEADER", - "msg_11": "HTTP_MESSAGE_REQ_HEADER_END" - }, - { - "msg_4": "HTTP_MESSAGE_RES_LINE", - "msg_5": "HTTP_MESSAGE_RES_HEADER", - "msg_6": "HTTP_MESSAGE_RES_HEADER_END", - "msg_7": "HTTP_TRANSACTION_END_transaction_0", - "msg_12": "HTTP_MESSAGE_RES_LINE", - "msg_13": "HTTP_MESSAGE_RES_HEADER", - "msg_14": "HTTP_MESSAGE_RES_HEADER_END", - "msg_15": "HTTP_MESSAGE_RES_BODY", - "msg_16": "HTTP_MESSAGE_RES_BODY", - "msg_17": "HTTP_MESSAGE_RES_BODY", - "msg_18": "HTTP_MESSAGE_RES_BODY_END", - "msg_19": "HTTP_TRANSACTION_END_transaction_1" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_msg_type_state_tunnel_c2s.json b/test/http_decoder/test_result_json/http_msg_type_state_tunnel_c2s.json deleted file mode 100644 index 5b7e588..0000000 --- a/test/http_decoder/test_result_json/http_msg_type_state_tunnel_c2s.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - { - "msg_0": "HTTP_TRANSACTION_START_transaction_0", - "msg_1": "HTTP_MESSAGE_REQ_LINE", - "msg_2": "HTTP_MESSAGE_REQ_HEADER", - "msg_3": "HTTP_MESSAGE_REQ_HEADER_END", - "msg_4": "HTTP_TRANSACTION_END_transaction_0", - "msg_5": "HTTP_TRANSACTION_START_transaction_1", - "msg_6": "HTTP_MESSAGE_REQ_LINE", - "msg_7": "HTTP_MESSAGE_REQ_HEADER", - "msg_8": "HTTP_MESSAGE_REQ_HEADER_END", - "msg_9": "HTTP_TRANSACTION_END_transaction_1" - }, - {} -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_msg_type_state_tunnel_s2c.json b/test/http_decoder/test_result_json/http_msg_type_state_tunnel_s2c.json deleted file mode 100644 index 07a1451..0000000 --- a/test/http_decoder/test_result_json/http_msg_type_state_tunnel_s2c.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - {}, - { - "msg_0": "HTTP_TRANSACTION_START_transaction_0", - "msg_1": "HTTP_MESSAGE_RES_LINE", - "msg_2": "HTTP_MESSAGE_RES_HEADER", - "msg_3": "HTTP_MESSAGE_RES_HEADER_END", - "msg_4": "HTTP_TRANSACTION_END_transaction_0", - "msg_5": "HTTP_TRANSACTION_START_transaction_1", - "msg_6": "HTTP_MESSAGE_RES_LINE", - "msg_7": "HTTP_MESSAGE_RES_HEADER", - "msg_8": "HTTP_MESSAGE_RES_HEADER_END", - "msg_9": "HTTP_MESSAGE_RES_BODY", - "msg_10": "HTTP_MESSAGE_RES_BODY", - "msg_11": "HTTP_MESSAGE_RES_BODY", - "msg_12": "HTTP_MESSAGE_RES_BODY_END", - "msg_13": "HTTP_TRANSACTION_END_transaction_1" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_multi_parse_error.json b/test/http_decoder/test_result_json/http_multi_parse_error.json deleted file mode 100644 index c49d41e..0000000 --- a/test/http_decoder/test_result_json/http_multi_parse_error.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.131.33:47172-192.168.204.67:4445-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "POST", - "uri": "http://:4445/RPC2", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "User-Agent": "ulxmlrpcpp/1.7.5", - "Connection": "Close", - "Content-Type": "text/xml", - "Date": "Sat Sep 7 10:05:13 2019", - "Content-Length": "468", - "__X_HTTP_URL": ":4445/RPC2", - "__X_HTTP_RAW_PAYLOAD_MD5": "6eccbcf261f04aabfa69884aa283f4f3", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "6eccbcf261f04aabfa69884aa283f4f3" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Connection": "Close", - "Content-Type": "text/xml", - "Transfer-Encoding": "chunked", - "X-Powered-By": "ulxmlrpcpp/1.7.4", - "Date": "Sat Sep 7 01:09:24 2019", - "__X_HTTP_RAW_PAYLOAD_MD5": "5cf8a4aa9a54e7f2d05b55ed05bf9071", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "5cf8a4aa9a54e7f2d05b55ed05bf9071" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_no_content_length.json b/test/http_decoder/test_result_json/http_no_content_length.json deleted file mode 100644 index 9310d04..0000000 --- a/test/http_decoder/test_result_json/http_no_content_length.json +++ /dev/null @@ -1,46 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "10.0.0.1:50384-10.0.0.2:80-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/js/xxxxxx.js", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "xxxxxxx.xxxxxx.xx", - "User-Agent": "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3", - "Accept": "*/*", - "Accept-Language": "en-us,en;q=0.5", - "Accept-Encoding": "gzip,deflate", - "Accept-Charset": "ISO-8859-1,utf-8;q=0.7,*;q=0.7", - "Keep-Alive": "115", - "Connection": "keep-alive", - "Referer": "http://www.xxxxxxxx.com/xxxxxxxxxxxxxxx/xxxxxxxxxxxxxxxx.html", - "Cookie": "trafic_ranking=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", - "__X_HTTP_URL": "xxxxxxx.xxxxxx.xx/js/xxxxxx.js" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.0", - "res_status": "OK", - "major_version": 1, - "minor_version": 0, - "status_code": 200, - "Date": "Mon, 10 May 2010 08:31:02 GMT", - "Server": "Apache", - "Content-type": "application/x-javascript", - "Expires": "Thu, 11 Jan 1973 16:00:00 GMT", - "Last-Modified": "Mon, 10 May 2010 08:31:02 GMT", - "Cache-Control": "no-store, no-cache, must-revalidate, post-check=0, pre-check=0", - "Pragma": "no-cache", - "P3P": "policyref=\"/w3c/p3p.xml\", CP=\"ALL IND DSP COR ADM CONo CUR IVAo IVDo PSA PSD TAI TELo OUR SAMo CNT COM INT NAV ONL PHY PRE PUR UNI\"", - "Set-Cookie": "trafic_ranking=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx; expires=Sun, 11-Jan-2037 14:00:00 GMT; path=/; domain=.xxxxxx.xx", - "connection": "close", - "__X_HTTP_RAW_PAYLOAD_MD5": "9fb54a2726ca3cf54a82804d0e66d08a", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "9fb54a2726ca3cf54a82804d0e66d08a" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_out_of_order.json b/test/http_decoder/test_result_json/http_out_of_order.json deleted file mode 100644 index 489b7c1..0000000 --- a/test/http_decoder/test_result_json/http_out_of_order.json +++ /dev/null @@ -1,44 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.38.2:49243-202.96.17.37:80-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/cn/images/globesite/airchina.jpg", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "www.airchina.com", - "Connection": "keep-alive", - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36", - "DNT": "1", - "Accept": "image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8", - "Referer": "http://www.airchina.com/website/ip2.jsp?v=20230128", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8", - "Cookie": "_ga=GA1.2.1223391296.1710844147; _ga_CGYVD7S4G4=GS1.1.1711101500.1.1.1711101524.0.0.0; _gcl_au=1.1.45985360.1720059434; arialoadData=true; ariawapChangeViewPort=false; JSESSIONID=ZoFJbBlIeHCsA5414j6JC-vO6jvcBw7_xphcV3qerj5Q8htV6XH8!-1677015109", - "__X_HTTP_URL": "www.airchina.com/cn/images/globesite/airchina.jpg" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Date": "Tue, 13 Aug 2024 01:48:28 GMT", - "Server": "Apache", - "X-Frame-Options": "SAMEORIGIN", - "Last-Modified": "Tue, 06 Aug 2019 02:10:09 GMT", - "Accept-Ranges": "bytes", - "Content-Length": "67424", - "Keep-Alive": "timeout=120, max=1000", - "Connection": "Keep-Alive", - "Content-Type": "image/jpeg", - "__X_HTTP_RAW_PAYLOAD_MD5": "c4c9d459415e922f877a2af6afd9d316", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "c4c9d459415e922f877a2af6afd9d316" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_over_pppoe.json b/test/http_decoder/test_result_json/http_over_pppoe.json deleted file mode 100644 index b4b4bfb..0000000 --- a/test/http_decoder/test_result_json/http_over_pppoe.json +++ /dev/null @@ -1,36 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "2a00:5e80:101:212d:504:7b1:2572:db22:37034-2606:f200:0:7:bad:f00d:d00d:1:80-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "User-Agent": "curl/7.34.0", - "Host": "ipv6.icanhazip.com", - "Accept": "*/*", - "__X_HTTP_URL": "ipv6.icanhazip.com/" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Date": "Thu, 02 Jan 2014 08:38:06 GMT", - "Server": "Apache", - "Content-Length": "38", - "Content-Type": "text/plain; charset=UTF-8", - "X-RTFM": "Learn about this site at http://bit.ly/14DAh2o and don't abuse the service", - "X-YOU-SHOULD-APPLY-FOR-A-JOB": "If you're reading this, apply here: http://rackertalent.com/", - "X-ICANHAZNODE": "icanhazip1.nugget", - "__X_HTTP_RAW_PAYLOAD_MD5": "624520ac54235ac2284ed2dd2b17e1ad", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "624520ac54235ac2284ed2dd2b17e1ad" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_over_tcp_keepalive.json b/test/http_decoder/test_result_json/http_over_tcp_keepalive.json deleted file mode 100644 index 2754249..0000000 --- a/test/http_decoder/test_result_json/http_over_tcp_keepalive.json +++ /dev/null @@ -1,45 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.56.66:55356-60.190.243.167:80-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "www.yumi.com", - "Connection": "keep-alive", - "Cache-Control": "max-age=0", - "Upgrade-Insecure-Requests": "1", - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.61 Safari/537.36", - "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "zh-CN,zh;q=0.9", - "Cookie": "UM_distinctid=17d37645f9c1a1-0281befa480414-b7a1a38-144000-17d37645f9d336; CNZZDATA1258295942=1778021578-1637307701-%7C1637307701; Hm_lvt_a6dc86f6e27435039966e994bd7f0792=1637311872; yumi_sid=JaMlFyTA07ikpZjTHZsRTWyGdMqFyFy%2B4hXGj%2FSoQRJYbrfBUQuOTIMZ8jUGmugDC594AYcbeRhg75xidhRxCW4zq9Y0gPwTmkhq4LQuprp4DrtDMLI3L5wLMqkG%2FuAX1aVFPfud5GRNxNFTSp%2Bos%2FKhfCFKhfN5%2BuT2xyVYSAjy2ftiSOGDi7FN13icuuyPhFCoWqOxWVu1CZ3AiYPJssv6kXqiR6paf75icdeROZY2bkFCDKkcIQcPy7o9EKpkL1Mbimeb40JMg9hUsWdmyhDkzVjSHJmC4z2ujpzSDTsjRIQOnxTy1PHZi%2FMwg3uyGLCusDwqbagpO4pcgEJ5ONDy%2BGwO7FmHXU3mFfR56c9HxxiiuLPnBt9ErpqqWKsxH6lUrlHaUp6AzyrgX7PFdksiMfPSk6%2F3%2FWOYr%2FkYuI4fopw7z8%2FLhxC9AiLr9Czz3MngFUGzkmaMVvAhZOSPzg%3D%3D; Hm_lpvt_a6dc86f6e27435039966e994bd7f0792=1637313847", - "__X_HTTP_URL": "www.yumi.com/" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Server": "Tengine", - "Date": "Fri, 19 Nov 2021 09:57:40 GMT", - "Content-Type": "text/html", - "Transfer-Encoding": "chunked", - "Connection": "keep-alive", - "Vary": "Accept-Encoding", - "Set-Cookie": "yumi_sid=V6EhlyovLp46BBzQWLVOBg%2F73RUD5E%2FfaRlkR8RLa8aKhGrPVdVHvHfFWRKKd9wZ%2BfFF4Tb2wnVOOn%2F9iXbBpyHsbxjmUqnbFSoAX7QIJjt%2BEEjAL3M7O7VSpAyMnrFKt7qu46oXV%2B6teyyTUY7Ucy285v6otvZcu8bN%2B5YxKZ1gYh56iJ0bHxnrnQ0vvAx3l%2BLwfw2y0c5IaF2tjrL%2Fn83nrHsPoYYRWAR2zLIXD%2FEMKRtyerwsM5LKhZZteFGWD2w%2B15alKF5T65i0lPvPcAdaqpceL5xz23twQULhs1tIJsOfJZ8JudLlRy6x3DvxQYqRe2xTCex5c77zJqfq%2FdryNbBycIq9gf6C2hXDRwDqRqVgXDMadwGnooKFkv%2ByCbohjHyBCZJypBcYFmglYhin23UC9i%2B%2BOA%2FxhlxcnU8kT8udpTNCktSmF950SQLOmvdvYuXGydKs8v05cxe5fg%3D%3D; expires=Fri, 19-Nov-2021 11:57:38 GMT; Max-Age=7200; path=/; domain=.yumi.com", - "Pragma": "no-cache", - "Cache-Control": "no-store", - "Content-Encoding": "gzip", - "__X_HTTP_RAW_PAYLOAD_MD5": "3f80dc84438b2f2d6b5e58084e31671c", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "af9b1a0118edd2920db355f9eee4ab75" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_over_tls.json b/test/http_decoder/test_result_json/http_over_tls.json deleted file mode 100644 index 32960f8..0000000 --- a/test/http_decoder/test_result_json/http_over_tls.json +++ /dev/null @@ -1,2 +0,0 @@ -[ -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_post_multipart_form_data.json b/test/http_decoder/test_result_json/http_post_multipart_form_data.json deleted file mode 100644 index ac524f6..0000000 --- a/test/http_decoder/test_result_json/http_post_multipart_form_data.json +++ /dev/null @@ -1,108 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.8.97:11371-192.168.57.14:8080-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/fileupload/", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "192.168.57.14:8080", - "Connection": "keep-alive", - "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8", - "User-Agent": "Mozilla/5.0 (Windows NT 5.2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.154 Safari/537.36", - "Accept-Encoding": "gzip,deflate,sdch", - "Accept-Language": "zh-CN,zh;q=0.8", - "Cookie": "JSESSIONID=969AC5FBD069EE6218EB10513726B244; JSESSIONID=400CC78DF5784F303702CC7F02C6122C", - "__X_HTTP_URL": "192.168.57.14:8080/fileupload/" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Server": "Apache-Coyote/1.1", - "Content-Type": "text/html;charset=UTF-8", - "Content-Length": "468", - "Date": "Thu, 28 Mar 2019 08:13:33 GMT", - "__X_HTTP_RAW_PAYLOAD_MD5": "2b8cd757ab5ffba85acac26c008a1ffc", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "2b8cd757ab5ffba85acac26c008a1ffc" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 1, - "method": "GET", - "uri": "/fileupload/", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "192.168.57.14:8080", - "Connection": "keep-alive", - "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8", - "User-Agent": "Mozilla/5.0 (Windows NT 5.2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.154 Safari/537.36", - "Accept-Encoding": "gzip,deflate,sdch", - "Accept-Language": "zh-CN,zh;q=0.8", - "Cookie": "JSESSIONID=969AC5FBD069EE6218EB10513726B244; JSESSIONID=400CC78DF5784F303702CC7F02C6122C", - "__X_HTTP_URL": "192.168.57.14:8080/fileupload/" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 1, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Server": "Apache-Coyote/1.1", - "Content-Type": "text/html;charset=UTF-8", - "Content-Length": "468", - "Date": "Thu, 28 Mar 2019 08:13:33 GMT", - "__X_HTTP_RAW_PAYLOAD_MD5": "2b8cd757ab5ffba85acac26c008a1ffc", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "2b8cd757ab5ffba85acac26c008a1ffc" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 2, - "method": "POST", - "uri": "/fileupload/servlet/UploadHandleServlet", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "192.168.57.14:8080", - "Connection": "keep-alive", - "Content-Length": "449", - "Cache-Control": "max-age=0", - "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8", - "Origin": "http://192.168.57.14:8080", - "User-Agent": "Mozilla/5.0 (Windows NT 5.2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.154 Safari/537.36", - "Content-Type": "multipart/form-data; boundary=----WebKitFormBoundaryAe47vGj7ybAe6RwO", - "Referer": "http://192.168.57.14:8080/fileupload/", - "Accept-Encoding": "gzip,deflate,sdch", - "Accept-Language": "zh-CN,zh;q=0.8", - "Cookie": "JSESSIONID=969AC5FBD069EE6218EB10513726B244; JSESSIONID=400CC78DF5784F303702CC7F02C6122C", - "__X_HTTP_URL": "192.168.57.14:8080/fileupload/servlet/UploadHandleServlet", - "__X_HTTP_RAW_PAYLOAD_MD5": "550be33bf0ac01b6f7ac175bb8f4522a", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "550be33bf0ac01b6f7ac175bb8f4522a" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 2, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Server": "Apache-Coyote/1.1", - "Content-Type": "text/html;charset=UTF-8", - "Content-Length": "144", - "Date": "Thu, 28 Mar 2019 08:13:37 GMT", - "__X_HTTP_RAW_PAYLOAD_MD5": "3fa07f3ec9f9fefed96e9886f80760bb", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "3fa07f3ec9f9fefed96e9886f80760bb" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_post_single_trans.json b/test/http_decoder/test_result_json/http_post_single_trans.json deleted file mode 100644 index 823c310..0000000 --- a/test/http_decoder/test_result_json/http_post_single_trans.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.38.83.55186>192.168.40.139.8080" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "POST", - "uri": "/", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Content-Type": "application/json", - "User-Agent": "PostmanRuntime/7.37.3", - "Accept": "*/*", - "Cache-Control": "no-cache", - "Postman-Token": "71a004ad-901b-4461-ac3c-db9adb303c47", - "Host": "192.168.40.139:8080", - "Accept-Encoding": "gzip, deflate, br", - "Connection": "keep-alive", - "Content-Length": "26", - "__X_HTTP_URL": "192.168.40.139:8080/", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "5ffe2871e6d5f6ee25ad7c1bfdd9f7b3" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.0", - "res_status": "OK", - "major_version": 1, - "minor_version": 0, - "status_code": 200, - "Server": "BaseHTTP/0.6 Python/3.6.8", - "Date": "Mon, 08 Apr 2024 07:19:16 GMT", - "Content-length": "84", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "cd8a54dd3e915946c4df262111e5aa05" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_req_1byte_sliding_window.json b/test/http_decoder/test_result_json/http_req_1byte_sliding_window.json deleted file mode 100644 index 13b360d..0000000 --- a/test/http_decoder/test_result_json/http_req_1byte_sliding_window.json +++ /dev/null @@ -1,35 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.40.137:46180-192.168.42.40:80-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/index.html", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "User-Agent": "Wget/1.14 (linux-gnu)", - "Accept": "*/*", - "Host": "192.168.42.40", - "__X_HTTP_URL": "192.168.42.40/index.html", - "Connection": "Keep-Alive" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.0", - "res_status": "OK", - "major_version": 1, - "minor_version": 0, - "status_code": 200, - "Server": "SimpleHTTP/0.6 Python/2.7.5", - "Date": "Fri, 29 Dec 2023 09:11:12 GMT", - "Content-type": "text/html", - "Content-Length": "144", - "Last-Modified": "Fri, 29 Dec 2023 08:50:53 GMT", - "__X_HTTP_RAW_PAYLOAD_MD5": "3e11876cd3a234541ae37d833c088a76", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "3e11876cd3a234541ae37d833c088a76" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_res_1byte_sliding_window.json b/test/http_decoder/test_result_json/http_res_1byte_sliding_window.json deleted file mode 100644 index f527839..0000000 --- a/test/http_decoder/test_result_json/http_res_1byte_sliding_window.json +++ /dev/null @@ -1,35 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.42.40:36338-192.168.40.137:80-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/index.html", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "User-Agent": "Wget/1.14 (linux-gnu)", - "Accept": "*/*", - "Host": "192.168.40.137", - "Connection": "Keep-Alive", - "__X_HTTP_URL": "192.168.40.137/index.html" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.0", - "res_status": "OK", - "major_version": 1, - "minor_version": 0, - "status_code": 200, - "Server": "SimpleHTTP/0.6 Python/2.7.5", - "Date": "Fri, 29 Dec 2023 09:32:21 GMT", - "Content-type": "text/html", - "Content-Length": "144", - "Last-Modified": "Fri, 29 Dec 2023 08:50:53 GMT", - "__X_HTTP_RAW_PAYLOAD_MD5": "3e11876cd3a234541ae37d833c088a76", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "3e11876cd3a234541ae37d833c088a76" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_res_gzip.json b/test/http_decoder/test_result_json/http_res_gzip.json deleted file mode 100644 index 9d3e9c7..0000000 --- a/test/http_decoder/test_result_json/http_res_gzip.json +++ /dev/null @@ -1,45 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.69.2:34059-192.168.69.1:80-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/test/ethereal.html", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "cerberus", - "User-Agent": "Mozilla/5.0 (X11; U; Linux ppc; rv:1.7.3) Gecko/20041004 Firefox/0.10.1", - "Accept": "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5", - "Accept-Language": "en-us,en;q=0.5", - "Accept-Encoding": "gzip,deflate", - "Accept-Charset": "ISO-8859-1,utf-8;q=0.7,*;q=0.7", - "Keep-Alive": "300", - "Connection": "keep-alive", - "Cookie": "FGNCLIID=05c04axp1yaqynldtcdiwis0ag1", - "__X_HTTP_URL": "cerberus/test/ethereal.html" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Date": "Fri, 29 Oct 2004 05:21:00 GMT", - "Server": "Apache/2.0.50 (Fedora)", - "Last-Modified": "Fri, 29 Oct 2004 05:20:21 GMT", - "ETag": "\"126e1f-6d-371b2f40\"", - "Accept-Ranges": "bytes", - "Vary": "Accept-Encoding", - "Content-Encoding": "gzip", - "Content-Length": "92", - "Connection": "close", - "Content-Type": "text/html; charset=UTF-8", - "__X_HTTP_RAW_PAYLOAD_MD5": "dc2c0aff94148ca24acb516113a4d018", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "61b9e97f96045587bb55db781f7543ad" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_trans_pipeline.json b/test/http_decoder/test_result_json/http_trans_pipeline.json deleted file mode 100644 index 4bd0879..0000000 --- a/test/http_decoder/test_result_json/http_trans_pipeline.json +++ /dev/null @@ -1,389 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "223.72.39.14:2545-192.168.182.147:80-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/postinfo.html", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "116.181.2.152", - "User-Agent": "Mozilla/5.0 (compatible; Nmap Scripting Engine; https://nmap.org/book/nse.html)", - "Connection": "keep-alive", - "__X_HTTP_URL": "116.181.2.152/postinfo.html" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 1, - "method": "GET", - "uri": "/_vti_bin/_vti_aut/author.dll", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "116.181.2.152", - "User-Agent": "Mozilla/5.0 (compatible; Nmap Scripting Engine; https://nmap.org/book/nse.html)", - "Connection": "keep-alive", - "__X_HTTP_URL": "116.181.2.152/_vti_bin/_vti_aut/author.dll" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 2, - "method": "GET", - "uri": "/_vti_bin/_vti_aut/author.exe", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "116.181.2.152", - "User-Agent": "Mozilla/5.0 (compatible; Nmap Scripting Engine; https://nmap.org/book/nse.html)", - "Connection": "keep-alive", - "__X_HTTP_URL": "116.181.2.152/_vti_bin/_vti_aut/author.exe" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 3, - "method": "GET", - "uri": "/_vti_bin/_vti_aut/dvwssr.dll", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "116.181.2.152", - "User-Agent": "Mozilla/5.0 (compatible; Nmap Scripting Engine; https://nmap.org/book/nse.html)", - "Connection": "keep-alive", - "__X_HTTP_URL": "116.181.2.152/_vti_bin/_vti_aut/dvwssr.dll" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 4, - "method": "GET", - "uri": "/_vti_bin/_vti_adm/admin.dll", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "116.181.2.152", - "User-Agent": "Mozilla/5.0 (compatible; Nmap Scripting Engine; https://nmap.org/book/nse.html)", - "Connection": "keep-alive", - "__X_HTTP_URL": "116.181.2.152/_vti_bin/_vti_adm/admin.dll" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 5, - "method": "GET", - "uri": "/_vti_bin/_vti_adm/admin.exe", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "116.181.2.152", - "User-Agent": "Mozilla/5.0 (compatible; Nmap Scripting Engine; https://nmap.org/book/nse.html)", - "Connection": "keep-alive", - "__X_HTTP_URL": "116.181.2.152/_vti_bin/_vti_adm/admin.exe" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 6, - "method": "GET", - "uri": "/_vti_bin/fpcount.exe?Page=default.asp|Image=3", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "116.181.2.152", - "User-Agent": "Mozilla/5.0 (compatible; Nmap Scripting Engine; https://nmap.org/book/nse.html)", - "Connection": "keep-alive", - "__X_HTTP_URL": "116.181.2.152/_vti_bin/fpcount.exe?Page=default.asp|Image=3" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "Not Found", - "major_version": 1, - "minor_version": 1, - "status_code": 404, - "Server": "nginx", - "Date": "Thu, 29 Oct 2020 09:59:01 GMT", - "Content-Type": "text/html", - "Content-Length": "146", - "Connection": "keep-alive", - "__X_HTTP_RAW_PAYLOAD_MD5": "32dc0b2772bd73a952abba009291a399", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "32dc0b2772bd73a952abba009291a399" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 1, - "res_version": "1.1", - "res_status": "Not Found", - "major_version": 1, - "minor_version": 1, - "status_code": 404, - "Server": "nginx", - "Date": "Thu, 29 Oct 2020 09:59:02 GMT", - "Content-Type": "text/html", - "Content-Length": "146", - "Connection": "keep-alive", - "__X_HTTP_RAW_PAYLOAD_MD5": "db2ff8008149d8e70d8a2929acbb0f56", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "db2ff8008149d8e70d8a2929acbb0f56" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 2, - "res_version": "1.1", - "res_status": "Not Found", - "major_version": 1, - "minor_version": 1, - "status_code": 404, - "Server": "nginx", - "Date": "Thu, 29 Oct 2020 09:59:03 GMT", - "Content-Type": "text/html", - "Content-Length": "146", - "Connection": "keep-alive", - "__X_HTTP_RAW_PAYLOAD_MD5": "f5df152f7d8f34c630f298d2fcb46ed3", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "f5df152f7d8f34c630f298d2fcb46ed3" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 3, - "res_version": "1.1", - "res_status": "Not Found", - "major_version": 1, - "minor_version": 1, - "status_code": 404, - "Server": "nginx", - "Date": "Thu, 29 Oct 2020 09:59:04 GMT", - "Content-Type": "text/html", - "Content-Length": "146", - "Connection": "keep-alive", - "__X_HTTP_RAW_PAYLOAD_MD5": "73e98ca7b62764869357b3e3c40dcd68", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "73e98ca7b62764869357b3e3c40dcd68" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 4, - "res_version": "1.1", - "res_status": "Not Found", - "major_version": 1, - "minor_version": 1, - "status_code": 404, - "Server": "nginx", - "Date": "Thu, 29 Oct 2020 09:59:05 GMT", - "Content-Type": "text/html", - "Content-Length": "146", - "Connection": "keep-alive", - "__X_HTTP_RAW_PAYLOAD_MD5": "a5733c8989bde7f08506fa68c20f0c62", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "a5733c8989bde7f08506fa68c20f0c62" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 7, - "method": "GET", - "uri": "/_vti_bin/shtml.dll", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "116.181.2.152", - "User-Agent": "Mozilla/5.0 (compatible; Nmap Scripting Engine; https://nmap.org/book/nse.html)", - "__X_HTTP_URL": "116.181.2.152/_vti_bin/shtml.dll", - "Connection": "keep-alive" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 8, - "method": "GET", - "uri": "/_vti_bin/shtml.exe", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "116.181.2.152", - "User-Agent": "Mozilla/5.0 (compatible; Nmap Scripting Engine; https://nmap.org/book/nse.html)", - "Connection": "keep-alive", - "__X_HTTP_URL": "116.181.2.152/_vti_bin/shtml.exe" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 9, - "method": "GET", - "uri": "/_vti_pvt/_x_todo.htm", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "116.181.2.152", - "User-Agent": "Mozilla/5.0 (compatible; Nmap Scripting Engine; https://nmap.org/book/nse.html)", - "Connection": "keep-alive", - "__X_HTTP_URL": "116.181.2.152/_vti_pvt/_x_todo.htm" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 10, - "method": "GET", - "uri": "/_vti_pvt/_x_todoh.htm", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "116.181.2.152", - "User-Agent": "Mozilla/5.0 (compatible; Nmap Scripting Engine; https://nmap.org/book/nse.html)", - "Connection": "keep-alive", - "__X_HTTP_URL": "116.181.2.152/_vti_pvt/_x_todoh.htm" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 11, - "method": "GET", - "uri": "/_vti_pvt/access.cnf", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "116.181.2.152", - "User-Agent": "Mozilla/5.0 (compatible; Nmap Scripting Engine; https://nmap.org/book/nse.html)", - "Connection": "keep-alive", - "__X_HTTP_URL": "116.181.2.152/_vti_pvt/access.cnf" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 12, - "method": "GET", - "uri": "/_vti_pvt/administrator.pwd", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "116.181.2.152", - "User-Agent": "Mozilla/5.0 (compatible; Nmap Scripting Engine; https://nmap.org/book/nse.html)", - "Connection": "keep-alive", - "__X_HTTP_URL": "116.181.2.152/_vti_pvt/administrator.pwd" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 13, - "method": "GET", - "uri": "/_vti_pvt/administrators.pwd", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "116.181.2.152", - "User-Agent": "Mozilla/5.0 (compatible; Nmap Scripting Engine; https://nmap.org/book/nse.html)", - "Connection": "keep-alive", - "__X_HTTP_URL": "116.181.2.152/_vti_pvt/administrators.pwd" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 14, - "method": "GET", - "uri": "/_vti_pvt/authors.pwd", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "116.181.2.152", - "User-Agent": "Mozilla/5.0 (compatible; Nmap Scripting Engine; https://nmap.org/book/nse.html)", - "Connection": "keep-alive", - "__X_HTTP_URL": "116.181.2.152/_vti_pvt/authors.pwd" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 5, - "res_version": "1.1", - "res_status": "Not Found", - "major_version": 1, - "minor_version": 1, - "status_code": 404, - "Server": "nginx", - "Date": "Thu, 29 Oct 2020 09:59:06 GMT", - "Content-Type": "text/html", - "Content-Length": "146", - "Connection": "keep-alive", - "__X_HTTP_RAW_PAYLOAD_MD5": "4bc0dde3722f76d60fef6f1d878cbb14", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "4bc0dde3722f76d60fef6f1d878cbb14" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 6, - "res_version": "1.1", - "res_status": "Not Found", - "major_version": 1, - "minor_version": 1, - "status_code": 404, - "Server": "nginx", - "Date": "Thu, 29 Oct 2020 09:59:07 GMT", - "Content-Type": "text/html", - "Content-Length": "146", - "Connection": "keep-alive", - "__X_HTTP_RAW_PAYLOAD_MD5": "728dc2eafd49c9be8149add7c6aff207", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "728dc2eafd49c9be8149add7c6aff207" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 7, - "res_version": "1.1", - "res_status": "Not Found", - "major_version": 1, - "minor_version": 1, - "status_code": 404, - "Server": "nginx", - "Date": "Thu, 29 Oct 2020 09:59:08 GMT", - "Content-Type": "text/html", - "Content-Length": "146", - "Connection": "keep-alive", - "__X_HTTP_RAW_PAYLOAD_MD5": "0cde98e33181ee0ded49e8d0a3178d55", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "0cde98e33181ee0ded49e8d0a3178d55" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 8, - "res_version": "1.1", - "res_status": "Not Found", - "major_version": 1, - "minor_version": 1, - "status_code": 404, - "Server": "nginx", - "Date": "Thu, 29 Oct 2020 09:59:09 GMT", - "Content-Type": "text/html", - "Content-Length": "146", - "Connection": "keep-alive", - "__X_HTTP_RAW_PAYLOAD_MD5": "d627268e0aba817d818b6e2b7e41aa11", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "d627268e0aba817d818b6e2b7e41aa11" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 9, - "res_version": "1.1", - "res_status": "Not Found", - "major_version": 1, - "minor_version": 1, - "status_code": 404, - "Server": "nginx", - "Date": "Thu, 29 Oct 2020 09:59:10 GMT", - "Content-Type": "text/html", - "Content-Length": "146", - "Connection": "keep-alive", - "__X_HTTP_RAW_PAYLOAD_MD5": "e99d9829d50bd94b3497b91011f6e349", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "e99d9829d50bd94b3497b91011f6e349" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 15, - "method": "GET", - "uri": "/_vti_pvt/bots.cnf", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "116.181.2.152", - "User-Agent": "Mozilla/5.0 (compatible; Nmap Scripting Engine; https://nmap.org/book/nse.html)", - "Connection": "keep-alive", - "__X_HTTP_URL": "116.181.2.152/_vti_pvt/bots.cnf" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 10, - "res_version": "1.1", - "res_status": "Not Found", - "major_version": 1, - "minor_version": 1, - "status_code": 404, - "Server": "nginx", - "Date": "Thu, 29 Oct 2020 09:59:11 GMT", - "Content-Type": "text/html", - "Content-Length": "146", - "Connection": "keep-alive", - "__X_HTTP_RAW_PAYLOAD_MD5": "99a813d29c5da4e6f7269be4c1a31c8e", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "99a813d29c5da4e6f7269be4c1a31c8e" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_tunnel_for_http.json b/test/http_decoder/test_result_json/http_tunnel_for_http.json deleted file mode 100644 index ad653d5..0000000 --- a/test/http_decoder/test_result_json/http_tunnel_for_http.json +++ /dev/null @@ -1,62 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.40.139.59234>192.168.38.83.8080" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "CONNECT", - "uri": "www.baidu.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "www.baidu.com:80", - "User-Agent": "curl/7.29.0", - "Proxy-Connection": "Keep-Alive", - "__X_HTTP_URL": "www.baidu.com:80" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "Connection established", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Proxy-agent": "CCProxy" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 1, - "method": "GET", - "uri": "/", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "User-Agent": "curl/7.29.0", - "Host": "www.baidu.com", - "Accept": "*/*", - "__X_HTTP_URL": "www.baidu.com/" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 1, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Accept-Ranges": "bytes", - "Cache-Control": "private, no-cache, no-store, proxy-revalidate, no-transform", - "Connection": "keep-alive", - "Content-Length": "2381", - "Content-Type": "text/html", - "Date": "Mon, 08 Apr 2024 09:45:51 GMT", - "Etag": "\"588604c1-94d\"", - "Last-Modified": "Mon, 23 Jan 2017 13:27:29 GMT", - "Pragma": "no-cache", - "Server": "bfe/1.0.8.18", - "Set-Cookie": "BDORZ=27315; max-age=86400; domain=.baidu.com; path=/", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "090fe607a5be1228362614ccaa088577" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_tunnel_for_http_c2s.json b/test/http_decoder/test_result_json/http_tunnel_for_http_c2s.json deleted file mode 100644 index 5e17067..0000000 --- a/test/http_decoder/test_result_json/http_tunnel_for_http_c2s.json +++ /dev/null @@ -1,31 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.40.139.59234>192.168.38.83.8080" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "CONNECT", - "uri": "www.baidu.com:80", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "www.baidu.com:80", - "User-Agent": "curl/7.29.0", - "Proxy-Connection": "Keep-Alive", - "__X_HTTP_URL": "www.baidu.com:80" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 1, - "method": "GET", - "uri": "/", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "User-Agent": "curl/7.29.0", - "Host": "www.baidu.com", - "Accept": "*/*", - "__X_HTTP_URL": "www.baidu.com/" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_tunnel_for_http_s2c.json b/test/http_decoder/test_result_json/http_tunnel_for_http_s2c.json deleted file mode 100644 index 851d652..0000000 --- a/test/http_decoder/test_result_json/http_tunnel_for_http_s2c.json +++ /dev/null @@ -1,36 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.40.139.59234>192.168.38.83.8080" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "Connection established", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Proxy-agent": "CCProxy" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 1, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Accept-Ranges": "bytes", - "Cache-Control": "private, no-cache, no-store, proxy-revalidate, no-transform", - "Connection": "keep-alive", - "Content-Length": "2381", - "Content-Type": "text/html", - "Date": "Mon, 08 Apr 2024 09:45:51 GMT", - "Etag": "\"588604c1-94d\"", - "Last-Modified": "Mon, 23 Jan 2017 13:27:29 GMT", - "Pragma": "no-cache", - "Server": "bfe/1.0.8.18", - "Set-Cookie": "BDORZ=27315; max-age=86400; domain=.baidu.com; path=/", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "090fe607a5be1228362614ccaa088577" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_tunnel_for_pop3.json b/test/http_decoder/test_result_json/http_tunnel_for_pop3.json deleted file mode 100644 index a69ac7b..0000000 --- a/test/http_decoder/test_result_json/http_tunnel_for_pop3.json +++ /dev/null @@ -1,32 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.10.58.51798>192.168.10.144.808" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "CONNECT", - "uri": "pop.163.com:110", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Content-Length": "0", - "Accept": "*/*", - "User-Agent": "Foxmail 7, 1, 3, 48[cn]", - "Accept-Encoding": "gzip, deflate", - "Proxy-Connection": "Keep-Alive", - "Connection": "Keep-Alive", - "Host": "192.168.10.144", - "__X_HTTP_URL": "pop.163.com:110" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "Connection established", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Proxy-agent": "CCProxy" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_tunnel_s2c_only_hdr.json b/test/http_decoder/test_result_json/http_tunnel_s2c_only_hdr.json deleted file mode 100644 index 4f11604..0000000 --- a/test/http_decoder/test_result_json/http_tunnel_s2c_only_hdr.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "36.255.45.61.29079>68.28.1.153.80" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.0", - "res_status": "Connection Established", - "major_version": 1, - "minor_version": 0, - "status_code": 200, - "Proxy-agent": "Apache/2.0.55 (Unix) proxy_html/2.5" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_upgrade_http2.json b/test/http_decoder/test_result_json/http_upgrade_http2.json deleted file mode 100644 index 5d05db4..0000000 --- a/test/http_decoder/test_result_json/http_upgrade_http2.json +++ /dev/null @@ -1,41 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "10.9.0.2.58038>139.162.123.134.80" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/robots.txt", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "nghttp2.org", - "User-Agent": "curl/7.61.0", - "Accept": "*/*", - "Connection": "Upgrade, HTTP2-Settings", - "Upgrade": "h2c", - "HTTP2-Settings": "AAMAAABkAARAAAAAAAIAAAAA", - "__X_HTTP_URL": "nghttp2.org/robots.txt" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 1, - "method": "PRI", - "uri": "*", - "req_version": "2.0", - "major_version": 2, - "minor_version": 0 - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "Switching Protocols", - "major_version": 1, - "minor_version": 1, - "status_code": 101, - "Connection": "Upgrade", - "Upgrade": "h2c" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_upgrade_websocket.json b/test/http_decoder/test_result_json/http_upgrade_websocket.json deleted file mode 100644 index 6a7dfc3..0000000 --- a/test/http_decoder/test_result_json/http_upgrade_websocket.json +++ /dev/null @@ -1,41 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "131.179.196.220:59631-131.179.196.46:9696-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "spurs.cs.ucla.edu:9696", - "Connection": "Upgrade", - "Pragma": "no-cache", - "Cache-Control": "no-cache", - "Upgrade": "websocket", - "Origin": "null", - "Sec-WebSocket-Version": "13", - "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/43.0.2357.124 Safari/537.36", - "Accept-Encoding": "gzip, deflate, sdch", - "Accept-Language": "en-US,en;q=0.8,lv;q=0.6,ru;q=0.4", - "Cookie": "s_cc=true; s_sq=%5B%5BB%5D%5D; iwe_user_noticecount_urn%3amace%3aucla.edu%3appid%3aperson%3a1223EF7211FC4EC1965579D0B8D85FBA=2; __utma=125574670.1759122974.1407127284.1407127284.1415755402.2; __utmc=125574670; __utma=126236063.2139843507.1390525421.1433785187.1435706244.46; __utmc=126236063; __utmz=126236063.1427934389.33.5.utmcsr=google|utmccn=(organic)|utmcmd=organic|utmctr=(not%20provided); _ucla_sso=2015-07-02T11%3A34%3A30-07%3A00; _ga=GA1.2.1759122974.1407127284", - "Sec-WebSocket-Key": "sgD1adxQ3mk6BbBqab7owA==", - "Sec-WebSocket-Extensions": "permessage-deflate; client_max_window_bits", - "__X_HTTP_URL": "spurs.cs.ucla.edu:9696/" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "Switching Protocols", - "major_version": 1, - "minor_version": 1, - "status_code": 101, - "Connection": "upgrade", - "Sec-WebSocket-Accept": "FRh9fmH0UaoLdY5BSFO4hP2Pcjw=", - "Server": "WebSocket++/0.5.1", - "Upgrade": "websocket" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_url_test_with_host.json b/test/http_decoder/test_result_json/http_url_test_with_host.json deleted file mode 100644 index ab91ded..0000000 --- a/test/http_decoder/test_result_json/http_url_test_with_host.json +++ /dev/null @@ -1,35 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.244.1.52412>192.168.244.128.8080" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/urltest/ttt", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Host": "192.168.244.128:8080", - "Connection": "keep-alive", - "Upgrade-Insecure-Requests": "1", - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36", - "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8", - "__X_HTTP_URL": "192.168.244.128:8080/urltest/ttt" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.0", - "res_status": "OK", - "major_version": 1, - "minor_version": 0, - "status_code": 200, - "Server": "BaseHTTP/0.6 Python/3.6.8", - "Date": "Thu, 14 Mar 2024 07:37:43 GMT", - "Content-type": "application/json", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "49dfdd54b01cbcd2d2ab5e9e5ee6b9b9" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_url_test_without_host.json b/test/http_decoder/test_result_json/http_url_test_without_host.json deleted file mode 100644 index 09427a7..0000000 --- a/test/http_decoder/test_result_json/http_url_test_without_host.json +++ /dev/null @@ -1,30 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "192.168.244.128:44868-192.168.244.128:8080-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/urltest/ttt", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "User-Agent": "no h", - "__X_HTTP_URL": "192.168.244.128:8080/urltest/ttt" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.0", - "res_status": "OK", - "major_version": 1, - "minor_version": 0, - "status_code": 200, - "Server": "BaseHTTP/0.6 Python/3.6.8", - "Date": "Thu, 14 Mar 2024 06:15:20 GMT", - "Content-type": "application/json", - "__X_HTTP_RAW_PAYLOAD_MD5": "49dfdd54b01cbcd2d2ab5e9e5ee6b9b9", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "49dfdd54b01cbcd2d2ab5e9e5ee6b9b9" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_url_test_without_host_v6.json b/test/http_decoder/test_result_json/http_url_test_without_host_v6.json deleted file mode 100644 index 2bc3934..0000000 --- a/test/http_decoder/test_result_json/http_url_test_without_host_v6.json +++ /dev/null @@ -1,42 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "2607:5d00:2:2::38:2:54676-2408:8722:840:f8::83:80-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/dist/aria.js?appid=1cea560ed256bea7ae52761bd9042164", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "_HOT": "ent.govwza.cn", - "Connection": "keep-alive", - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36", - "DNT": "1", - "Accept": "*/*", - "Referer": "http://www.airchina.com/", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8", - "If-Modified-Since": "Mon, 05 Aug 2024 00:26:26 GMT", - "__X_HTTP_URL": "2408:8722:840:f8::83:80/dist/aria.js?appid=1cea560ed256bea7ae52761bd9042164" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "Not Modified", - "major_version": 1, - "minor_version": 1, - "status_code": 304, - "Date": "Mon, 05 Aug 2024 07:51:04 GMT", - "Content-Type": "application/javascript;charset=UTF-8", - "Vary": "origin,access-control-request-method,access-control-request-headers,accept-encoding", - "Server": "SLT-MID", - "X-NWS-LOG-UUID": "1242198743243161630", - "Connection": "close", - "X-Cache-Lookup": "Cache Hit", - "Access-Control-Allow-Origin": "*", - "Cache-Control": "max-age=86400" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/http_zlib_deadlock.json b/test/http_decoder/test_result_json/http_zlib_deadlock.json deleted file mode 100644 index 0ea9b7f..0000000 --- a/test/http_decoder/test_result_json/http_zlib_deadlock.json +++ /dev/null @@ -1,43 +0,0 @@ -[ - { - "__X_HTTP_TUPLE4": "100.107.59.2:47242-106.122.255.251:80-6-0" - }, - { - "__X_HTTP_TRANSACTION": "request", - "__X_HTTP_TRANSACTION_SEQ": 0, - "method": "GET", - "uri": "/xmlymain-login-web/login/ts-1657244122966?appId=mainApp&appStatus=2&clientType=android&isFirstReq=false&lastSuccessIp=180.153.250.247:3814&userId=175776850", - "req_version": "1.1", - "major_version": 1, - "minor_version": 1, - "Cookie2": "$version=1", - "Accept": "*/*", - "user-agent": "ting_xmim1.0(Mi+10,Android29)", - "xmTraceId": "f30c74a5-c62d-46a0-80bd-d51dbf139976163", - "Host": "xmc.ximalaya.com", - "Connection": "Keep-Alive", - "Accept-Encoding": "gzip", - "__X_HTTP_URL": "xmc.ximalaya.com/xmlymain-login-web/login/ts-1657244122966?appId=mainApp&appStatus=2&clientType=android&isFirstReq=false&lastSuccessIp=180.153.250.247:3814&userId=175776850" - }, - { - "__X_HTTP_TRANSACTION": "response", - "__X_HTTP_TRANSACTION_SEQ": 0, - "res_version": "1.1", - "res_status": "OK", - "major_version": 1, - "minor_version": 1, - "status_code": 200, - "Server": "Tengine", - "Date": "Fri, 08 Jul 2022 01:35:24 GMT", - "Content-Type": "application/json;charset=UTF-8", - "Vary": "Accept-Encoding", - "x-idc-gw": "0", - "Content-Encoding": "gzip", - "Transfer-Encoding": "chunked", - "X-NWS-LOG-UUID": "12197298277844186084", - "Connection": "keep-alive", - "X-Cache-Lookup": "Cache Miss", - "__X_HTTP_RAW_PAYLOAD_MD5": "3979c98326c16f482f364ee94be3c382", - "__X_HTTP_DECOMPRESS_PAYLOAD_MD5": "d383effc464d797b5fdb4d98f4ab0111" - } -]
\ No newline at end of file diff --git a/test/http_decoder/test_result_json/non_http.json b/test/http_decoder/test_result_json/non_http.json deleted file mode 100644 index 0637a08..0000000 --- a/test/http_decoder/test_result_json/non_http.json +++ /dev/null @@ -1 +0,0 @@ -[]
\ No newline at end of file diff --git a/test/http_decoder/uthash-2.3.0/include/utarray.h b/test/http_decoder/uthash-2.3.0/include/utarray.h deleted file mode 100644 index 992fe7c..0000000 --- a/test/http_decoder/uthash-2.3.0/include/utarray.h +++ /dev/null @@ -1,248 +0,0 @@ -/* -Copyright (c) 2008-2021, Troy D. Hanson http://troydhanson.github.com/uthash/ -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* a dynamic array implementation using macros - */ -#ifndef UTARRAY_H -#define UTARRAY_H - -#define UTARRAY_VERSION 2.3.0 - -#include <stddef.h> /* size_t */ -#include <string.h> /* memset, etc */ -#include <stdlib.h> /* exit */ - -#ifdef __GNUC__ -#define UTARRAY_UNUSED __attribute__((__unused__)) -#else -#define UTARRAY_UNUSED -#endif - -#ifdef oom -#error "The name of macro 'oom' has been changed to 'utarray_oom'. Please update your code." -#define utarray_oom() oom() -#endif - -#ifndef utarray_oom -#define utarray_oom() exit(-1) -#endif - -typedef void (ctor_f)(void *dst, const void *src); -typedef void (dtor_f)(void *elt); -typedef void (init_f)(void *elt); -typedef struct { - size_t sz; - init_f *init; - ctor_f *copy; - dtor_f *dtor; -} UT_icd; - -typedef struct { - unsigned i,n;/* i: index of next available slot, n: num slots */ - UT_icd icd; /* initializer, copy and destructor functions */ - char *d; /* n slots of size icd->sz*/ -} UT_array; - -#define utarray_init(a,_icd) do { \ - memset(a,0,sizeof(UT_array)); \ - (a)->icd = *(_icd); \ -} while(0) - -#define utarray_done(a) do { \ - if ((a)->n) { \ - if ((a)->icd.dtor) { \ - unsigned _ut_i; \ - for(_ut_i=0; _ut_i < (a)->i; _ut_i++) { \ - (a)->icd.dtor(utarray_eltptr(a,_ut_i)); \ - } \ - } \ - free((a)->d); \ - } \ - (a)->n=0; \ -} while(0) - -#define utarray_new(a,_icd) do { \ - (a) = (UT_array*)malloc(sizeof(UT_array)); \ - if ((a) == NULL) { \ - utarray_oom(); \ - } \ - utarray_init(a,_icd); \ -} while(0) - -#define utarray_free(a) do { \ - utarray_done(a); \ - free(a); \ -} while(0) - -#define utarray_reserve(a,by) do { \ - if (((a)->i+(by)) > (a)->n) { \ - char *utarray_tmp; \ - while (((a)->i+(by)) > (a)->n) { (a)->n = ((a)->n ? (2*(a)->n) : 8); } \ - utarray_tmp=(char*)realloc((a)->d, (a)->n*(a)->icd.sz); \ - if (utarray_tmp == NULL) { \ - utarray_oom(); \ - } \ - (a)->d=utarray_tmp; \ - } \ -} while(0) - -#define utarray_push_back(a,p) do { \ - utarray_reserve(a,1); \ - if ((a)->icd.copy) { (a)->icd.copy( _utarray_eltptr(a,(a)->i++), p); } \ - else { memcpy(_utarray_eltptr(a,(a)->i++), p, (a)->icd.sz); }; \ -} while(0) - -#define utarray_pop_back(a) do { \ - if ((a)->icd.dtor) { (a)->icd.dtor( _utarray_eltptr(a,--((a)->i))); } \ - else { (a)->i--; } \ -} while(0) - -#define utarray_extend_back(a) do { \ - utarray_reserve(a,1); \ - if ((a)->icd.init) { (a)->icd.init(_utarray_eltptr(a,(a)->i)); } \ - else { memset(_utarray_eltptr(a,(a)->i),0,(a)->icd.sz); } \ - (a)->i++; \ -} while(0) - -#define utarray_len(a) ((a)->i) - -#define utarray_eltptr(a,j) (((j) < (a)->i) ? _utarray_eltptr(a,j) : NULL) -#define _utarray_eltptr(a,j) ((void*)((a)->d + ((a)->icd.sz * (j)))) - -#define utarray_insert(a,p,j) do { \ - if ((j) > (a)->i) utarray_resize(a,j); \ - utarray_reserve(a,1); \ - if ((j) < (a)->i) { \ - memmove( _utarray_eltptr(a,(j)+1), _utarray_eltptr(a,j), \ - ((a)->i - (j))*((a)->icd.sz)); \ - } \ - if ((a)->icd.copy) { (a)->icd.copy( _utarray_eltptr(a,j), p); } \ - else { memcpy(_utarray_eltptr(a,j), p, (a)->icd.sz); }; \ - (a)->i++; \ -} while(0) - -#define utarray_inserta(a,w,j) do { \ - if (utarray_len(w) == 0) break; \ - if ((j) > (a)->i) utarray_resize(a,j); \ - utarray_reserve(a,utarray_len(w)); \ - if ((j) < (a)->i) { \ - memmove(_utarray_eltptr(a,(j)+utarray_len(w)), \ - _utarray_eltptr(a,j), \ - ((a)->i - (j))*((a)->icd.sz)); \ - } \ - if ((a)->icd.copy) { \ - unsigned _ut_i; \ - for(_ut_i=0;_ut_i<(w)->i;_ut_i++) { \ - (a)->icd.copy(_utarray_eltptr(a, (j) + _ut_i), _utarray_eltptr(w, _ut_i)); \ - } \ - } else { \ - memcpy(_utarray_eltptr(a,j), _utarray_eltptr(w,0), \ - utarray_len(w)*((a)->icd.sz)); \ - } \ - (a)->i += utarray_len(w); \ -} while(0) - -#define utarray_resize(dst,num) do { \ - unsigned _ut_i; \ - if ((dst)->i > (unsigned)(num)) { \ - if ((dst)->icd.dtor) { \ - for (_ut_i = (num); _ut_i < (dst)->i; ++_ut_i) { \ - (dst)->icd.dtor(_utarray_eltptr(dst, _ut_i)); \ - } \ - } \ - } else if ((dst)->i < (unsigned)(num)) { \ - utarray_reserve(dst, (num) - (dst)->i); \ - if ((dst)->icd.init) { \ - for (_ut_i = (dst)->i; _ut_i < (unsigned)(num); ++_ut_i) { \ - (dst)->icd.init(_utarray_eltptr(dst, _ut_i)); \ - } \ - } else { \ - memset(_utarray_eltptr(dst, (dst)->i), 0, (dst)->icd.sz*((num) - (dst)->i)); \ - } \ - } \ - (dst)->i = (num); \ -} while(0) - -#define utarray_concat(dst,src) do { \ - utarray_inserta(dst, src, utarray_len(dst)); \ -} while(0) - -#define utarray_erase(a,pos,len) do { \ - if ((a)->icd.dtor) { \ - unsigned _ut_i; \ - for (_ut_i = 0; _ut_i < (len); _ut_i++) { \ - (a)->icd.dtor(utarray_eltptr(a, (pos) + _ut_i)); \ - } \ - } \ - if ((a)->i > ((pos) + (len))) { \ - memmove(_utarray_eltptr(a, pos), _utarray_eltptr(a, (pos) + (len)), \ - ((a)->i - ((pos) + (len))) * (a)->icd.sz); \ - } \ - (a)->i -= (len); \ -} while(0) - -#define utarray_renew(a,u) do { \ - if (a) utarray_clear(a); \ - else utarray_new(a, u); \ -} while(0) - -#define utarray_clear(a) do { \ - if ((a)->i > 0) { \ - if ((a)->icd.dtor) { \ - unsigned _ut_i; \ - for(_ut_i=0; _ut_i < (a)->i; _ut_i++) { \ - (a)->icd.dtor(_utarray_eltptr(a, _ut_i)); \ - } \ - } \ - (a)->i = 0; \ - } \ -} while(0) - -#define utarray_sort(a,cmp) do { \ - qsort((a)->d, (a)->i, (a)->icd.sz, cmp); \ -} while(0) - -#define utarray_find(a,v,cmp) bsearch((v),(a)->d,(a)->i,(a)->icd.sz,cmp) - -#define utarray_front(a) (((a)->i) ? (_utarray_eltptr(a,0)) : NULL) -#define utarray_next(a,e) (((e)==NULL) ? utarray_front(a) : (((a)->i != utarray_eltidx(a,e)+1) ? _utarray_eltptr(a,utarray_eltidx(a,e)+1) : NULL)) -#define utarray_prev(a,e) (((e)==NULL) ? utarray_back(a) : ((utarray_eltidx(a,e) != 0) ? _utarray_eltptr(a,utarray_eltidx(a,e)-1) : NULL)) -#define utarray_back(a) (((a)->i) ? (_utarray_eltptr(a,(a)->i-1)) : NULL) -#define utarray_eltidx(a,e) (((char*)(e) - (a)->d) / (a)->icd.sz) - -/* last we pre-define a few icd for common utarrays of ints and strings */ -static void utarray_str_cpy(void *dst, const void *src) { - char *const *srcc = (char *const *)src; - char **dstc = (char**)dst; - *dstc = (*srcc == NULL) ? NULL : strdup(*srcc); -} -static void utarray_str_dtor(void *elt) { - char **eltc = (char**)elt; - if (*eltc != NULL) free(*eltc); -} -static const UT_icd ut_str_icd UTARRAY_UNUSED = {sizeof(char*),NULL,utarray_str_cpy,utarray_str_dtor}; -static const UT_icd ut_int_icd UTARRAY_UNUSED = {sizeof(int),NULL,NULL,NULL}; -static const UT_icd ut_ptr_icd UTARRAY_UNUSED = {sizeof(void*),NULL,NULL,NULL}; - - -#endif /* UTARRAY_H */ diff --git a/test/http_decoder/uthash-2.3.0/include/uthash.h b/test/http_decoder/uthash-2.3.0/include/uthash.h deleted file mode 100644 index ac78fda..0000000 --- a/test/http_decoder/uthash-2.3.0/include/uthash.h +++ /dev/null @@ -1,1136 +0,0 @@ -/* -Copyright (c) 2003-2021, Troy D. Hanson http://troydhanson.github.com/uthash/ -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef UTHASH_H -#define UTHASH_H - -#define UTHASH_VERSION 2.3.0 - -#include <string.h> /* memcmp, memset, strlen */ -#include <stddef.h> /* ptrdiff_t */ -#include <stdlib.h> /* exit */ - -#if defined(HASH_DEFINE_OWN_STDINT) && HASH_DEFINE_OWN_STDINT -/* This codepath is provided for backward compatibility, but I plan to remove it. */ -#warning "HASH_DEFINE_OWN_STDINT is deprecated; please use HASH_NO_STDINT instead" -typedef unsigned int uint32_t; -typedef unsigned char uint8_t; -#elif defined(HASH_NO_STDINT) && HASH_NO_STDINT -#else -#include <stdint.h> /* uint8_t, uint32_t */ -#endif - -/* These macros use decltype or the earlier __typeof GNU extension. - As decltype is only available in newer compilers (VS2010 or gcc 4.3+ - when compiling c++ source) this code uses whatever method is needed - or, for VS2008 where neither is available, uses casting workarounds. */ -#if !defined(DECLTYPE) && !defined(NO_DECLTYPE) -#if defined(_MSC_VER) /* MS compiler */ -#if _MSC_VER >= 1600 && defined(__cplusplus) /* VS2010 or newer in C++ mode */ -#define DECLTYPE(x) (decltype(x)) -#else /* VS2008 or older (or VS2010 in C mode) */ -#define NO_DECLTYPE -#endif -#elif defined(__BORLANDC__) || defined(__ICCARM__) || defined(__LCC__) || defined(__WATCOMC__) -#define NO_DECLTYPE -#else /* GNU, Sun and other compilers */ -#define DECLTYPE(x) (__typeof(x)) -#endif -#endif - -#ifdef NO_DECLTYPE -#define DECLTYPE(x) -#define DECLTYPE_ASSIGN(dst,src) \ -do { \ - char **_da_dst = (char**)(&(dst)); \ - *_da_dst = (char*)(src); \ -} while (0) -#else -#define DECLTYPE_ASSIGN(dst,src) \ -do { \ - (dst) = DECLTYPE(dst)(src); \ -} while (0) -#endif - -#ifndef uthash_malloc -#define uthash_malloc(sz) malloc(sz) /* malloc fcn */ -#endif -#ifndef uthash_free -#define uthash_free(ptr,sz) free(ptr) /* free fcn */ -#endif -#ifndef uthash_bzero -#define uthash_bzero(a,n) memset(a,'\0',n) -#endif -#ifndef uthash_strlen -#define uthash_strlen(s) strlen(s) -#endif - -#ifndef HASH_FUNCTION -#define HASH_FUNCTION(keyptr,keylen,hashv) HASH_JEN(keyptr, keylen, hashv) -#endif - -#ifndef HASH_KEYCMP -#define HASH_KEYCMP(a,b,n) memcmp(a,b,n) -#endif - -#ifndef uthash_noexpand_fyi -#define uthash_noexpand_fyi(tbl) /* can be defined to log noexpand */ -#endif -#ifndef uthash_expand_fyi -#define uthash_expand_fyi(tbl) /* can be defined to log expands */ -#endif - -#ifndef HASH_NONFATAL_OOM -#define HASH_NONFATAL_OOM 0 -#endif - -#if HASH_NONFATAL_OOM -/* malloc failures can be recovered from */ - -#ifndef uthash_nonfatal_oom -#define uthash_nonfatal_oom(obj) do {} while (0) /* non-fatal OOM error */ -#endif - -#define HASH_RECORD_OOM(oomed) do { (oomed) = 1; } while (0) -#define IF_HASH_NONFATAL_OOM(x) x - -#else -/* malloc failures result in lost memory, hash tables are unusable */ - -#ifndef uthash_fatal -#define uthash_fatal(msg) exit(-1) /* fatal OOM error */ -#endif - -#define HASH_RECORD_OOM(oomed) uthash_fatal("out of memory") -#define IF_HASH_NONFATAL_OOM(x) - -#endif - -/* initial number of buckets */ -#define HASH_INITIAL_NUM_BUCKETS 32U /* initial number of buckets */ -#define HASH_INITIAL_NUM_BUCKETS_LOG2 5U /* lg2 of initial number of buckets */ -#define HASH_BKT_CAPACITY_THRESH 10U /* expand when bucket count reaches */ - -/* calculate the element whose hash handle address is hhp */ -#define ELMT_FROM_HH(tbl,hhp) ((void*)(((char*)(hhp)) - ((tbl)->hho))) -/* calculate the hash handle from element address elp */ -#define HH_FROM_ELMT(tbl,elp) ((UT_hash_handle*)(void*)(((char*)(elp)) + ((tbl)->hho))) - -#define HASH_ROLLBACK_BKT(hh, head, itemptrhh) \ -do { \ - struct UT_hash_handle *_hd_hh_item = (itemptrhh); \ - unsigned _hd_bkt; \ - HASH_TO_BKT(_hd_hh_item->hashv, (head)->hh.tbl->num_buckets, _hd_bkt); \ - (head)->hh.tbl->buckets[_hd_bkt].count++; \ - _hd_hh_item->hh_next = NULL; \ - _hd_hh_item->hh_prev = NULL; \ -} while (0) - -#define HASH_VALUE(keyptr,keylen,hashv) \ -do { \ - HASH_FUNCTION(keyptr, keylen, hashv); \ -} while (0) - -#define HASH_FIND_BYHASHVALUE(hh,head,keyptr,keylen,hashval,out) \ -do { \ - (out) = NULL; \ - if (head) { \ - unsigned _hf_bkt; \ - HASH_TO_BKT(hashval, (head)->hh.tbl->num_buckets, _hf_bkt); \ - if (HASH_BLOOM_TEST((head)->hh.tbl, hashval) != 0) { \ - HASH_FIND_IN_BKT((head)->hh.tbl, hh, (head)->hh.tbl->buckets[ _hf_bkt ], keyptr, keylen, hashval, out); \ - } \ - } \ -} while (0) - -#define HASH_FIND(hh,head,keyptr,keylen,out) \ -do { \ - (out) = NULL; \ - if (head) { \ - unsigned _hf_hashv; \ - HASH_VALUE(keyptr, keylen, _hf_hashv); \ - HASH_FIND_BYHASHVALUE(hh, head, keyptr, keylen, _hf_hashv, out); \ - } \ -} while (0) - -#ifdef HASH_BLOOM -#define HASH_BLOOM_BITLEN (1UL << HASH_BLOOM) -#define HASH_BLOOM_BYTELEN (HASH_BLOOM_BITLEN/8UL) + (((HASH_BLOOM_BITLEN%8UL)!=0UL) ? 1UL : 0UL) -#define HASH_BLOOM_MAKE(tbl,oomed) \ -do { \ - (tbl)->bloom_nbits = HASH_BLOOM; \ - (tbl)->bloom_bv = (uint8_t*)uthash_malloc(HASH_BLOOM_BYTELEN); \ - if (!(tbl)->bloom_bv) { \ - HASH_RECORD_OOM(oomed); \ - } else { \ - uthash_bzero((tbl)->bloom_bv, HASH_BLOOM_BYTELEN); \ - (tbl)->bloom_sig = HASH_BLOOM_SIGNATURE; \ - } \ -} while (0) - -#define HASH_BLOOM_FREE(tbl) \ -do { \ - uthash_free((tbl)->bloom_bv, HASH_BLOOM_BYTELEN); \ -} while (0) - -#define HASH_BLOOM_BITSET(bv,idx) (bv[(idx)/8U] |= (1U << ((idx)%8U))) -#define HASH_BLOOM_BITTEST(bv,idx) (bv[(idx)/8U] & (1U << ((idx)%8U))) - -#define HASH_BLOOM_ADD(tbl,hashv) \ - HASH_BLOOM_BITSET((tbl)->bloom_bv, ((hashv) & (uint32_t)((1UL << (tbl)->bloom_nbits) - 1U))) - -#define HASH_BLOOM_TEST(tbl,hashv) \ - HASH_BLOOM_BITTEST((tbl)->bloom_bv, ((hashv) & (uint32_t)((1UL << (tbl)->bloom_nbits) - 1U))) - -#else -#define HASH_BLOOM_MAKE(tbl,oomed) -#define HASH_BLOOM_FREE(tbl) -#define HASH_BLOOM_ADD(tbl,hashv) -#define HASH_BLOOM_TEST(tbl,hashv) (1) -#define HASH_BLOOM_BYTELEN 0U -#endif - -#define HASH_MAKE_TABLE(hh,head,oomed) \ -do { \ - (head)->hh.tbl = (UT_hash_table*)uthash_malloc(sizeof(UT_hash_table)); \ - if (!(head)->hh.tbl) { \ - HASH_RECORD_OOM(oomed); \ - } else { \ - uthash_bzero((head)->hh.tbl, sizeof(UT_hash_table)); \ - (head)->hh.tbl->tail = &((head)->hh); \ - (head)->hh.tbl->num_buckets = HASH_INITIAL_NUM_BUCKETS; \ - (head)->hh.tbl->log2_num_buckets = HASH_INITIAL_NUM_BUCKETS_LOG2; \ - (head)->hh.tbl->hho = (char*)(&(head)->hh) - (char*)(head); \ - (head)->hh.tbl->buckets = (UT_hash_bucket*)uthash_malloc( \ - HASH_INITIAL_NUM_BUCKETS * sizeof(struct UT_hash_bucket)); \ - (head)->hh.tbl->signature = HASH_SIGNATURE; \ - if (!(head)->hh.tbl->buckets) { \ - HASH_RECORD_OOM(oomed); \ - uthash_free((head)->hh.tbl, sizeof(UT_hash_table)); \ - } else { \ - uthash_bzero((head)->hh.tbl->buckets, \ - HASH_INITIAL_NUM_BUCKETS * sizeof(struct UT_hash_bucket)); \ - HASH_BLOOM_MAKE((head)->hh.tbl, oomed); \ - IF_HASH_NONFATAL_OOM( \ - if (oomed) { \ - uthash_free((head)->hh.tbl->buckets, \ - HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket)); \ - uthash_free((head)->hh.tbl, sizeof(UT_hash_table)); \ - } \ - ) \ - } \ - } \ -} while (0) - -#define HASH_REPLACE_BYHASHVALUE_INORDER(hh,head,fieldname,keylen_in,hashval,add,replaced,cmpfcn) \ -do { \ - (replaced) = NULL; \ - HASH_FIND_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, replaced); \ - if (replaced) { \ - HASH_DELETE(hh, head, replaced); \ - } \ - HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh, head, &((add)->fieldname), keylen_in, hashval, add, cmpfcn); \ -} while (0) - -#define HASH_REPLACE_BYHASHVALUE(hh,head,fieldname,keylen_in,hashval,add,replaced) \ -do { \ - (replaced) = NULL; \ - HASH_FIND_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, replaced); \ - if (replaced) { \ - HASH_DELETE(hh, head, replaced); \ - } \ - HASH_ADD_KEYPTR_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, add); \ -} while (0) - -#define HASH_REPLACE(hh,head,fieldname,keylen_in,add,replaced) \ -do { \ - unsigned _hr_hashv; \ - HASH_VALUE(&((add)->fieldname), keylen_in, _hr_hashv); \ - HASH_REPLACE_BYHASHVALUE(hh, head, fieldname, keylen_in, _hr_hashv, add, replaced); \ -} while (0) - -#define HASH_REPLACE_INORDER(hh,head,fieldname,keylen_in,add,replaced,cmpfcn) \ -do { \ - unsigned _hr_hashv; \ - HASH_VALUE(&((add)->fieldname), keylen_in, _hr_hashv); \ - HASH_REPLACE_BYHASHVALUE_INORDER(hh, head, fieldname, keylen_in, _hr_hashv, add, replaced, cmpfcn); \ -} while (0) - -#define HASH_APPEND_LIST(hh, head, add) \ -do { \ - (add)->hh.next = NULL; \ - (add)->hh.prev = ELMT_FROM_HH((head)->hh.tbl, (head)->hh.tbl->tail); \ - (head)->hh.tbl->tail->next = (add); \ - (head)->hh.tbl->tail = &((add)->hh); \ -} while (0) - -#define HASH_AKBI_INNER_LOOP(hh,head,add,cmpfcn) \ -do { \ - do { \ - if (cmpfcn(DECLTYPE(head)(_hs_iter), add) > 0) { \ - break; \ - } \ - } while ((_hs_iter = HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->next)); \ -} while (0) - -#ifdef NO_DECLTYPE -#undef HASH_AKBI_INNER_LOOP -#define HASH_AKBI_INNER_LOOP(hh,head,add,cmpfcn) \ -do { \ - char *_hs_saved_head = (char*)(head); \ - do { \ - DECLTYPE_ASSIGN(head, _hs_iter); \ - if (cmpfcn(head, add) > 0) { \ - DECLTYPE_ASSIGN(head, _hs_saved_head); \ - break; \ - } \ - DECLTYPE_ASSIGN(head, _hs_saved_head); \ - } while ((_hs_iter = HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->next)); \ -} while (0) -#endif - -#if HASH_NONFATAL_OOM - -#define HASH_ADD_TO_TABLE(hh,head,keyptr,keylen_in,hashval,add,oomed) \ -do { \ - if (!(oomed)) { \ - unsigned _ha_bkt; \ - (head)->hh.tbl->num_items++; \ - HASH_TO_BKT(hashval, (head)->hh.tbl->num_buckets, _ha_bkt); \ - HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt], hh, &(add)->hh, oomed); \ - if (oomed) { \ - HASH_ROLLBACK_BKT(hh, head, &(add)->hh); \ - HASH_DELETE_HH(hh, head, &(add)->hh); \ - (add)->hh.tbl = NULL; \ - uthash_nonfatal_oom(add); \ - } else { \ - HASH_BLOOM_ADD((head)->hh.tbl, hashval); \ - HASH_EMIT_KEY(hh, head, keyptr, keylen_in); \ - } \ - } else { \ - (add)->hh.tbl = NULL; \ - uthash_nonfatal_oom(add); \ - } \ -} while (0) - -#else - -#define HASH_ADD_TO_TABLE(hh,head,keyptr,keylen_in,hashval,add,oomed) \ -do { \ - unsigned _ha_bkt; \ - (head)->hh.tbl->num_items++; \ - HASH_TO_BKT(hashval, (head)->hh.tbl->num_buckets, _ha_bkt); \ - HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt], hh, &(add)->hh, oomed); \ - HASH_BLOOM_ADD((head)->hh.tbl, hashval); \ - HASH_EMIT_KEY(hh, head, keyptr, keylen_in); \ -} while (0) - -#endif - - -#define HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh,head,keyptr,keylen_in,hashval,add,cmpfcn) \ -do { \ - IF_HASH_NONFATAL_OOM( int _ha_oomed = 0; ) \ - (add)->hh.hashv = (hashval); \ - (add)->hh.key = (char*) (keyptr); \ - (add)->hh.keylen = (unsigned) (keylen_in); \ - if (!(head)) { \ - (add)->hh.next = NULL; \ - (add)->hh.prev = NULL; \ - HASH_MAKE_TABLE(hh, add, _ha_oomed); \ - IF_HASH_NONFATAL_OOM( if (!_ha_oomed) { ) \ - (head) = (add); \ - IF_HASH_NONFATAL_OOM( } ) \ - } else { \ - void *_hs_iter = (head); \ - (add)->hh.tbl = (head)->hh.tbl; \ - HASH_AKBI_INNER_LOOP(hh, head, add, cmpfcn); \ - if (_hs_iter) { \ - (add)->hh.next = _hs_iter; \ - if (((add)->hh.prev = HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->prev)) { \ - HH_FROM_ELMT((head)->hh.tbl, (add)->hh.prev)->next = (add); \ - } else { \ - (head) = (add); \ - } \ - HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->prev = (add); \ - } else { \ - HASH_APPEND_LIST(hh, head, add); \ - } \ - } \ - HASH_ADD_TO_TABLE(hh, head, keyptr, keylen_in, hashval, add, _ha_oomed); \ - HASH_FSCK(hh, head, "HASH_ADD_KEYPTR_BYHASHVALUE_INORDER"); \ -} while (0) - -#define HASH_ADD_KEYPTR_INORDER(hh,head,keyptr,keylen_in,add,cmpfcn) \ -do { \ - unsigned _hs_hashv; \ - HASH_VALUE(keyptr, keylen_in, _hs_hashv); \ - HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh, head, keyptr, keylen_in, _hs_hashv, add, cmpfcn); \ -} while (0) - -#define HASH_ADD_BYHASHVALUE_INORDER(hh,head,fieldname,keylen_in,hashval,add,cmpfcn) \ - HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh, head, &((add)->fieldname), keylen_in, hashval, add, cmpfcn) - -#define HASH_ADD_INORDER(hh,head,fieldname,keylen_in,add,cmpfcn) \ - HASH_ADD_KEYPTR_INORDER(hh, head, &((add)->fieldname), keylen_in, add, cmpfcn) - -#define HASH_ADD_KEYPTR_BYHASHVALUE(hh,head,keyptr,keylen_in,hashval,add) \ -do { \ - IF_HASH_NONFATAL_OOM( int _ha_oomed = 0; ) \ - (add)->hh.hashv = (hashval); \ - (add)->hh.key = (const void*) (keyptr); \ - (add)->hh.keylen = (unsigned) (keylen_in); \ - if (!(head)) { \ - (add)->hh.next = NULL; \ - (add)->hh.prev = NULL; \ - HASH_MAKE_TABLE(hh, add, _ha_oomed); \ - IF_HASH_NONFATAL_OOM( if (!_ha_oomed) { ) \ - (head) = (add); \ - IF_HASH_NONFATAL_OOM( } ) \ - } else { \ - (add)->hh.tbl = (head)->hh.tbl; \ - HASH_APPEND_LIST(hh, head, add); \ - } \ - HASH_ADD_TO_TABLE(hh, head, keyptr, keylen_in, hashval, add, _ha_oomed); \ - HASH_FSCK(hh, head, "HASH_ADD_KEYPTR_BYHASHVALUE"); \ -} while (0) - -#define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add) \ -do { \ - unsigned _ha_hashv; \ - HASH_VALUE(keyptr, keylen_in, _ha_hashv); \ - HASH_ADD_KEYPTR_BYHASHVALUE(hh, head, keyptr, keylen_in, _ha_hashv, add); \ -} while (0) - -#define HASH_ADD_BYHASHVALUE(hh,head,fieldname,keylen_in,hashval,add) \ - HASH_ADD_KEYPTR_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, add) - -#define HASH_ADD(hh,head,fieldname,keylen_in,add) \ - HASH_ADD_KEYPTR(hh, head, &((add)->fieldname), keylen_in, add) - -#define HASH_TO_BKT(hashv,num_bkts,bkt) \ -do { \ - bkt = ((hashv) & ((num_bkts) - 1U)); \ -} while (0) - -/* delete "delptr" from the hash table. - * "the usual" patch-up process for the app-order doubly-linked-list. - * The use of _hd_hh_del below deserves special explanation. - * These used to be expressed using (delptr) but that led to a bug - * if someone used the same symbol for the head and deletee, like - * HASH_DELETE(hh,users,users); - * We want that to work, but by changing the head (users) below - * we were forfeiting our ability to further refer to the deletee (users) - * in the patch-up process. Solution: use scratch space to - * copy the deletee pointer, then the latter references are via that - * scratch pointer rather than through the repointed (users) symbol. - */ -#define HASH_DELETE(hh,head,delptr) \ - HASH_DELETE_HH(hh, head, &(delptr)->hh) - -#define HASH_DELETE_HH(hh,head,delptrhh) \ -do { \ - struct UT_hash_handle *_hd_hh_del = (delptrhh); \ - if ((_hd_hh_del->prev == NULL) && (_hd_hh_del->next == NULL)) { \ - HASH_BLOOM_FREE((head)->hh.tbl); \ - uthash_free((head)->hh.tbl->buckets, \ - (head)->hh.tbl->num_buckets * sizeof(struct UT_hash_bucket)); \ - uthash_free((head)->hh.tbl, sizeof(UT_hash_table)); \ - (head) = NULL; \ - } else { \ - unsigned _hd_bkt; \ - if (_hd_hh_del == (head)->hh.tbl->tail) { \ - (head)->hh.tbl->tail = HH_FROM_ELMT((head)->hh.tbl, _hd_hh_del->prev); \ - } \ - if (_hd_hh_del->prev != NULL) { \ - HH_FROM_ELMT((head)->hh.tbl, _hd_hh_del->prev)->next = _hd_hh_del->next; \ - } else { \ - DECLTYPE_ASSIGN(head, _hd_hh_del->next); \ - } \ - if (_hd_hh_del->next != NULL) { \ - HH_FROM_ELMT((head)->hh.tbl, _hd_hh_del->next)->prev = _hd_hh_del->prev; \ - } \ - HASH_TO_BKT(_hd_hh_del->hashv, (head)->hh.tbl->num_buckets, _hd_bkt); \ - HASH_DEL_IN_BKT((head)->hh.tbl->buckets[_hd_bkt], _hd_hh_del); \ - (head)->hh.tbl->num_items--; \ - } \ - HASH_FSCK(hh, head, "HASH_DELETE_HH"); \ -} while (0) - -/* convenience forms of HASH_FIND/HASH_ADD/HASH_DEL */ -#define HASH_FIND_STR(head,findstr,out) \ -do { \ - unsigned _uthash_hfstr_keylen = (unsigned)uthash_strlen(findstr); \ - HASH_FIND(hh, head, findstr, _uthash_hfstr_keylen, out); \ -} while (0) -#define HASH_ADD_STR(head,strfield,add) \ -do { \ - unsigned _uthash_hastr_keylen = (unsigned)uthash_strlen((add)->strfield); \ - HASH_ADD(hh, head, strfield[0], _uthash_hastr_keylen, add); \ -} while (0) -#define HASH_REPLACE_STR(head,strfield,add,replaced) \ -do { \ - unsigned _uthash_hrstr_keylen = (unsigned)uthash_strlen((add)->strfield); \ - HASH_REPLACE(hh, head, strfield[0], _uthash_hrstr_keylen, add, replaced); \ -} while (0) -#define HASH_FIND_INT(head,findint,out) \ - HASH_FIND(hh,head,findint,sizeof(int),out) -#define HASH_ADD_INT(head,intfield,add) \ - HASH_ADD(hh,head,intfield,sizeof(int),add) -#define HASH_REPLACE_INT(head,intfield,add,replaced) \ - HASH_REPLACE(hh,head,intfield,sizeof(int),add,replaced) -#define HASH_FIND_PTR(head,findptr,out) \ - HASH_FIND(hh,head,findptr,sizeof(void *),out) -#define HASH_ADD_PTR(head,ptrfield,add) \ - HASH_ADD(hh,head,ptrfield,sizeof(void *),add) -#define HASH_REPLACE_PTR(head,ptrfield,add,replaced) \ - HASH_REPLACE(hh,head,ptrfield,sizeof(void *),add,replaced) -#define HASH_DEL(head,delptr) \ - HASH_DELETE(hh,head,delptr) - -/* HASH_FSCK checks hash integrity on every add/delete when HASH_DEBUG is defined. - * This is for uthash developer only; it compiles away if HASH_DEBUG isn't defined. - */ -#ifdef HASH_DEBUG -#include <stdio.h> /* fprintf, stderr */ -#define HASH_OOPS(...) do { fprintf(stderr, __VA_ARGS__); exit(-1); } while (0) -#define HASH_FSCK(hh,head,where) \ -do { \ - struct UT_hash_handle *_thh; \ - if (head) { \ - unsigned _bkt_i; \ - unsigned _count = 0; \ - char *_prev; \ - for (_bkt_i = 0; _bkt_i < (head)->hh.tbl->num_buckets; ++_bkt_i) { \ - unsigned _bkt_count = 0; \ - _thh = (head)->hh.tbl->buckets[_bkt_i].hh_head; \ - _prev = NULL; \ - while (_thh) { \ - if (_prev != (char*)(_thh->hh_prev)) { \ - HASH_OOPS("%s: invalid hh_prev %p, actual %p\n", \ - (where), (void*)_thh->hh_prev, (void*)_prev); \ - } \ - _bkt_count++; \ - _prev = (char*)(_thh); \ - _thh = _thh->hh_next; \ - } \ - _count += _bkt_count; \ - if ((head)->hh.tbl->buckets[_bkt_i].count != _bkt_count) { \ - HASH_OOPS("%s: invalid bucket count %u, actual %u\n", \ - (where), (head)->hh.tbl->buckets[_bkt_i].count, _bkt_count); \ - } \ - } \ - if (_count != (head)->hh.tbl->num_items) { \ - HASH_OOPS("%s: invalid hh item count %u, actual %u\n", \ - (where), (head)->hh.tbl->num_items, _count); \ - } \ - _count = 0; \ - _prev = NULL; \ - _thh = &(head)->hh; \ - while (_thh) { \ - _count++; \ - if (_prev != (char*)_thh->prev) { \ - HASH_OOPS("%s: invalid prev %p, actual %p\n", \ - (where), (void*)_thh->prev, (void*)_prev); \ - } \ - _prev = (char*)ELMT_FROM_HH((head)->hh.tbl, _thh); \ - _thh = (_thh->next ? HH_FROM_ELMT((head)->hh.tbl, _thh->next) : NULL); \ - } \ - if (_count != (head)->hh.tbl->num_items) { \ - HASH_OOPS("%s: invalid app item count %u, actual %u\n", \ - (where), (head)->hh.tbl->num_items, _count); \ - } \ - } \ -} while (0) -#else -#define HASH_FSCK(hh,head,where) -#endif - -/* When compiled with -DHASH_EMIT_KEYS, length-prefixed keys are emitted to - * the descriptor to which this macro is defined for tuning the hash function. - * The app can #include <unistd.h> to get the prototype for write(2). */ -#ifdef HASH_EMIT_KEYS -#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen) \ -do { \ - unsigned _klen = fieldlen; \ - write(HASH_EMIT_KEYS, &_klen, sizeof(_klen)); \ - write(HASH_EMIT_KEYS, keyptr, (unsigned long)fieldlen); \ -} while (0) -#else -#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen) -#endif - -/* The Bernstein hash function, used in Perl prior to v5.6. Note (x<<5+x)=x*33. */ -#define HASH_BER(key,keylen,hashv) \ -do { \ - unsigned _hb_keylen = (unsigned)keylen; \ - const unsigned char *_hb_key = (const unsigned char*)(key); \ - (hashv) = 0; \ - while (_hb_keylen-- != 0U) { \ - (hashv) = (((hashv) << 5) + (hashv)) + *_hb_key++; \ - } \ -} while (0) - - -/* SAX/FNV/OAT/JEN hash functions are macro variants of those listed at - * http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx */ -#define HASH_SAX(key,keylen,hashv) \ -do { \ - unsigned _sx_i; \ - const unsigned char *_hs_key = (const unsigned char*)(key); \ - hashv = 0; \ - for (_sx_i=0; _sx_i < keylen; _sx_i++) { \ - hashv ^= (hashv << 5) + (hashv >> 2) + _hs_key[_sx_i]; \ - } \ -} while (0) -/* FNV-1a variation */ -#define HASH_FNV(key,keylen,hashv) \ -do { \ - unsigned _fn_i; \ - const unsigned char *_hf_key = (const unsigned char*)(key); \ - (hashv) = 2166136261U; \ - for (_fn_i=0; _fn_i < keylen; _fn_i++) { \ - hashv = hashv ^ _hf_key[_fn_i]; \ - hashv = hashv * 16777619U; \ - } \ -} while (0) - -#define HASH_OAT(key,keylen,hashv) \ -do { \ - unsigned _ho_i; \ - const unsigned char *_ho_key=(const unsigned char*)(key); \ - hashv = 0; \ - for(_ho_i=0; _ho_i < keylen; _ho_i++) { \ - hashv += _ho_key[_ho_i]; \ - hashv += (hashv << 10); \ - hashv ^= (hashv >> 6); \ - } \ - hashv += (hashv << 3); \ - hashv ^= (hashv >> 11); \ - hashv += (hashv << 15); \ -} while (0) - -#define HASH_JEN_MIX(a,b,c) \ -do { \ - a -= b; a -= c; a ^= ( c >> 13 ); \ - b -= c; b -= a; b ^= ( a << 8 ); \ - c -= a; c -= b; c ^= ( b >> 13 ); \ - a -= b; a -= c; a ^= ( c >> 12 ); \ - b -= c; b -= a; b ^= ( a << 16 ); \ - c -= a; c -= b; c ^= ( b >> 5 ); \ - a -= b; a -= c; a ^= ( c >> 3 ); \ - b -= c; b -= a; b ^= ( a << 10 ); \ - c -= a; c -= b; c ^= ( b >> 15 ); \ -} while (0) - -#define HASH_JEN(key,keylen,hashv) \ -do { \ - unsigned _hj_i,_hj_j,_hj_k; \ - unsigned const char *_hj_key=(unsigned const char*)(key); \ - hashv = 0xfeedbeefu; \ - _hj_i = _hj_j = 0x9e3779b9u; \ - _hj_k = (unsigned)(keylen); \ - while (_hj_k >= 12U) { \ - _hj_i += (_hj_key[0] + ( (unsigned)_hj_key[1] << 8 ) \ - + ( (unsigned)_hj_key[2] << 16 ) \ - + ( (unsigned)_hj_key[3] << 24 ) ); \ - _hj_j += (_hj_key[4] + ( (unsigned)_hj_key[5] << 8 ) \ - + ( (unsigned)_hj_key[6] << 16 ) \ - + ( (unsigned)_hj_key[7] << 24 ) ); \ - hashv += (_hj_key[8] + ( (unsigned)_hj_key[9] << 8 ) \ - + ( (unsigned)_hj_key[10] << 16 ) \ - + ( (unsigned)_hj_key[11] << 24 ) ); \ - \ - HASH_JEN_MIX(_hj_i, _hj_j, hashv); \ - \ - _hj_key += 12; \ - _hj_k -= 12U; \ - } \ - hashv += (unsigned)(keylen); \ - switch ( _hj_k ) { \ - case 11: hashv += ( (unsigned)_hj_key[10] << 24 ); /* FALLTHROUGH */ \ - case 10: hashv += ( (unsigned)_hj_key[9] << 16 ); /* FALLTHROUGH */ \ - case 9: hashv += ( (unsigned)_hj_key[8] << 8 ); /* FALLTHROUGH */ \ - case 8: _hj_j += ( (unsigned)_hj_key[7] << 24 ); /* FALLTHROUGH */ \ - case 7: _hj_j += ( (unsigned)_hj_key[6] << 16 ); /* FALLTHROUGH */ \ - case 6: _hj_j += ( (unsigned)_hj_key[5] << 8 ); /* FALLTHROUGH */ \ - case 5: _hj_j += _hj_key[4]; /* FALLTHROUGH */ \ - case 4: _hj_i += ( (unsigned)_hj_key[3] << 24 ); /* FALLTHROUGH */ \ - case 3: _hj_i += ( (unsigned)_hj_key[2] << 16 ); /* FALLTHROUGH */ \ - case 2: _hj_i += ( (unsigned)_hj_key[1] << 8 ); /* FALLTHROUGH */ \ - case 1: _hj_i += _hj_key[0]; /* FALLTHROUGH */ \ - default: ; \ - } \ - HASH_JEN_MIX(_hj_i, _hj_j, hashv); \ -} while (0) - -/* The Paul Hsieh hash function */ -#undef get16bits -#if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__) \ - || defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__) -#define get16bits(d) (*((const uint16_t *) (d))) -#endif - -#if !defined (get16bits) -#define get16bits(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8) \ - +(uint32_t)(((const uint8_t *)(d))[0]) ) -#endif -#define HASH_SFH(key,keylen,hashv) \ -do { \ - unsigned const char *_sfh_key=(unsigned const char*)(key); \ - uint32_t _sfh_tmp, _sfh_len = (uint32_t)keylen; \ - \ - unsigned _sfh_rem = _sfh_len & 3U; \ - _sfh_len >>= 2; \ - hashv = 0xcafebabeu; \ - \ - /* Main loop */ \ - for (;_sfh_len > 0U; _sfh_len--) { \ - hashv += get16bits (_sfh_key); \ - _sfh_tmp = ((uint32_t)(get16bits (_sfh_key+2)) << 11) ^ hashv; \ - hashv = (hashv << 16) ^ _sfh_tmp; \ - _sfh_key += 2U*sizeof (uint16_t); \ - hashv += hashv >> 11; \ - } \ - \ - /* Handle end cases */ \ - switch (_sfh_rem) { \ - case 3: hashv += get16bits (_sfh_key); \ - hashv ^= hashv << 16; \ - hashv ^= (uint32_t)(_sfh_key[sizeof (uint16_t)]) << 18; \ - hashv += hashv >> 11; \ - break; \ - case 2: hashv += get16bits (_sfh_key); \ - hashv ^= hashv << 11; \ - hashv += hashv >> 17; \ - break; \ - case 1: hashv += *_sfh_key; \ - hashv ^= hashv << 10; \ - hashv += hashv >> 1; \ - break; \ - default: ; \ - } \ - \ - /* Force "avalanching" of final 127 bits */ \ - hashv ^= hashv << 3; \ - hashv += hashv >> 5; \ - hashv ^= hashv << 4; \ - hashv += hashv >> 17; \ - hashv ^= hashv << 25; \ - hashv += hashv >> 6; \ -} while (0) - -/* iterate over items in a known bucket to find desired item */ -#define HASH_FIND_IN_BKT(tbl,hh,head,keyptr,keylen_in,hashval,out) \ -do { \ - if ((head).hh_head != NULL) { \ - DECLTYPE_ASSIGN(out, ELMT_FROM_HH(tbl, (head).hh_head)); \ - } else { \ - (out) = NULL; \ - } \ - while ((out) != NULL) { \ - if ((out)->hh.hashv == (hashval) && (out)->hh.keylen == (keylen_in)) { \ - if (HASH_KEYCMP((out)->hh.key, keyptr, keylen_in) == 0) { \ - break; \ - } \ - } \ - if ((out)->hh.hh_next != NULL) { \ - DECLTYPE_ASSIGN(out, ELMT_FROM_HH(tbl, (out)->hh.hh_next)); \ - } else { \ - (out) = NULL; \ - } \ - } \ -} while (0) - -/* add an item to a bucket */ -#define HASH_ADD_TO_BKT(head,hh,addhh,oomed) \ -do { \ - UT_hash_bucket *_ha_head = &(head); \ - _ha_head->count++; \ - (addhh)->hh_next = _ha_head->hh_head; \ - (addhh)->hh_prev = NULL; \ - if (_ha_head->hh_head != NULL) { \ - _ha_head->hh_head->hh_prev = (addhh); \ - } \ - _ha_head->hh_head = (addhh); \ - if ((_ha_head->count >= ((_ha_head->expand_mult + 1U) * HASH_BKT_CAPACITY_THRESH)) \ - && !(addhh)->tbl->noexpand) { \ - HASH_EXPAND_BUCKETS(addhh,(addhh)->tbl, oomed); \ - IF_HASH_NONFATAL_OOM( \ - if (oomed) { \ - HASH_DEL_IN_BKT(head,addhh); \ - } \ - ) \ - } \ -} while (0) - -/* remove an item from a given bucket */ -#define HASH_DEL_IN_BKT(head,delhh) \ -do { \ - UT_hash_bucket *_hd_head = &(head); \ - _hd_head->count--; \ - if (_hd_head->hh_head == (delhh)) { \ - _hd_head->hh_head = (delhh)->hh_next; \ - } \ - if ((delhh)->hh_prev) { \ - (delhh)->hh_prev->hh_next = (delhh)->hh_next; \ - } \ - if ((delhh)->hh_next) { \ - (delhh)->hh_next->hh_prev = (delhh)->hh_prev; \ - } \ -} while (0) - -/* Bucket expansion has the effect of doubling the number of buckets - * and redistributing the items into the new buckets. Ideally the - * items will distribute more or less evenly into the new buckets - * (the extent to which this is true is a measure of the quality of - * the hash function as it applies to the key domain). - * - * With the items distributed into more buckets, the chain length - * (item count) in each bucket is reduced. Thus by expanding buckets - * the hash keeps a bound on the chain length. This bounded chain - * length is the essence of how a hash provides constant time lookup. - * - * The calculation of tbl->ideal_chain_maxlen below deserves some - * explanation. First, keep in mind that we're calculating the ideal - * maximum chain length based on the *new* (doubled) bucket count. - * In fractions this is just n/b (n=number of items,b=new num buckets). - * Since the ideal chain length is an integer, we want to calculate - * ceil(n/b). We don't depend on floating point arithmetic in this - * hash, so to calculate ceil(n/b) with integers we could write - * - * ceil(n/b) = (n/b) + ((n%b)?1:0) - * - * and in fact a previous version of this hash did just that. - * But now we have improved things a bit by recognizing that b is - * always a power of two. We keep its base 2 log handy (call it lb), - * so now we can write this with a bit shift and logical AND: - * - * ceil(n/b) = (n>>lb) + ( (n & (b-1)) ? 1:0) - * - */ -#define HASH_EXPAND_BUCKETS(hh,tbl,oomed) \ -do { \ - unsigned _he_bkt; \ - unsigned _he_bkt_i; \ - struct UT_hash_handle *_he_thh, *_he_hh_nxt; \ - UT_hash_bucket *_he_new_buckets, *_he_newbkt; \ - _he_new_buckets = (UT_hash_bucket*)uthash_malloc( \ - sizeof(struct UT_hash_bucket) * (tbl)->num_buckets * 2U); \ - if (!_he_new_buckets) { \ - HASH_RECORD_OOM(oomed); \ - } else { \ - uthash_bzero(_he_new_buckets, \ - sizeof(struct UT_hash_bucket) * (tbl)->num_buckets * 2U); \ - (tbl)->ideal_chain_maxlen = \ - ((tbl)->num_items >> ((tbl)->log2_num_buckets+1U)) + \ - ((((tbl)->num_items & (((tbl)->num_buckets*2U)-1U)) != 0U) ? 1U : 0U); \ - (tbl)->nonideal_items = 0; \ - for (_he_bkt_i = 0; _he_bkt_i < (tbl)->num_buckets; _he_bkt_i++) { \ - _he_thh = (tbl)->buckets[ _he_bkt_i ].hh_head; \ - while (_he_thh != NULL) { \ - _he_hh_nxt = _he_thh->hh_next; \ - HASH_TO_BKT(_he_thh->hashv, (tbl)->num_buckets * 2U, _he_bkt); \ - _he_newbkt = &(_he_new_buckets[_he_bkt]); \ - if (++(_he_newbkt->count) > (tbl)->ideal_chain_maxlen) { \ - (tbl)->nonideal_items++; \ - if (_he_newbkt->count > _he_newbkt->expand_mult * (tbl)->ideal_chain_maxlen) { \ - _he_newbkt->expand_mult++; \ - } \ - } \ - _he_thh->hh_prev = NULL; \ - _he_thh->hh_next = _he_newbkt->hh_head; \ - if (_he_newbkt->hh_head != NULL) { \ - _he_newbkt->hh_head->hh_prev = _he_thh; \ - } \ - _he_newbkt->hh_head = _he_thh; \ - _he_thh = _he_hh_nxt; \ - } \ - } \ - uthash_free((tbl)->buckets, (tbl)->num_buckets * sizeof(struct UT_hash_bucket)); \ - (tbl)->num_buckets *= 2U; \ - (tbl)->log2_num_buckets++; \ - (tbl)->buckets = _he_new_buckets; \ - (tbl)->ineff_expands = ((tbl)->nonideal_items > ((tbl)->num_items >> 1)) ? \ - ((tbl)->ineff_expands+1U) : 0U; \ - if ((tbl)->ineff_expands > 1U) { \ - (tbl)->noexpand = 1; \ - uthash_noexpand_fyi(tbl); \ - } \ - uthash_expand_fyi(tbl); \ - } \ -} while (0) - - -/* This is an adaptation of Simon Tatham's O(n log(n)) mergesort */ -/* Note that HASH_SORT assumes the hash handle name to be hh. - * HASH_SRT was added to allow the hash handle name to be passed in. */ -#define HASH_SORT(head,cmpfcn) HASH_SRT(hh,head,cmpfcn) -#define HASH_SRT(hh,head,cmpfcn) \ -do { \ - unsigned _hs_i; \ - unsigned _hs_looping,_hs_nmerges,_hs_insize,_hs_psize,_hs_qsize; \ - struct UT_hash_handle *_hs_p, *_hs_q, *_hs_e, *_hs_list, *_hs_tail; \ - if (head != NULL) { \ - _hs_insize = 1; \ - _hs_looping = 1; \ - _hs_list = &((head)->hh); \ - while (_hs_looping != 0U) { \ - _hs_p = _hs_list; \ - _hs_list = NULL; \ - _hs_tail = NULL; \ - _hs_nmerges = 0; \ - while (_hs_p != NULL) { \ - _hs_nmerges++; \ - _hs_q = _hs_p; \ - _hs_psize = 0; \ - for (_hs_i = 0; _hs_i < _hs_insize; ++_hs_i) { \ - _hs_psize++; \ - _hs_q = ((_hs_q->next != NULL) ? \ - HH_FROM_ELMT((head)->hh.tbl, _hs_q->next) : NULL); \ - if (_hs_q == NULL) { \ - break; \ - } \ - } \ - _hs_qsize = _hs_insize; \ - while ((_hs_psize != 0U) || ((_hs_qsize != 0U) && (_hs_q != NULL))) { \ - if (_hs_psize == 0U) { \ - _hs_e = _hs_q; \ - _hs_q = ((_hs_q->next != NULL) ? \ - HH_FROM_ELMT((head)->hh.tbl, _hs_q->next) : NULL); \ - _hs_qsize--; \ - } else if ((_hs_qsize == 0U) || (_hs_q == NULL)) { \ - _hs_e = _hs_p; \ - if (_hs_p != NULL) { \ - _hs_p = ((_hs_p->next != NULL) ? \ - HH_FROM_ELMT((head)->hh.tbl, _hs_p->next) : NULL); \ - } \ - _hs_psize--; \ - } else if ((cmpfcn( \ - DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl, _hs_p)), \ - DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl, _hs_q)) \ - )) <= 0) { \ - _hs_e = _hs_p; \ - if (_hs_p != NULL) { \ - _hs_p = ((_hs_p->next != NULL) ? \ - HH_FROM_ELMT((head)->hh.tbl, _hs_p->next) : NULL); \ - } \ - _hs_psize--; \ - } else { \ - _hs_e = _hs_q; \ - _hs_q = ((_hs_q->next != NULL) ? \ - HH_FROM_ELMT((head)->hh.tbl, _hs_q->next) : NULL); \ - _hs_qsize--; \ - } \ - if ( _hs_tail != NULL ) { \ - _hs_tail->next = ((_hs_e != NULL) ? \ - ELMT_FROM_HH((head)->hh.tbl, _hs_e) : NULL); \ - } else { \ - _hs_list = _hs_e; \ - } \ - if (_hs_e != NULL) { \ - _hs_e->prev = ((_hs_tail != NULL) ? \ - ELMT_FROM_HH((head)->hh.tbl, _hs_tail) : NULL); \ - } \ - _hs_tail = _hs_e; \ - } \ - _hs_p = _hs_q; \ - } \ - if (_hs_tail != NULL) { \ - _hs_tail->next = NULL; \ - } \ - if (_hs_nmerges <= 1U) { \ - _hs_looping = 0; \ - (head)->hh.tbl->tail = _hs_tail; \ - DECLTYPE_ASSIGN(head, ELMT_FROM_HH((head)->hh.tbl, _hs_list)); \ - } \ - _hs_insize *= 2U; \ - } \ - HASH_FSCK(hh, head, "HASH_SRT"); \ - } \ -} while (0) - -/* This function selects items from one hash into another hash. - * The end result is that the selected items have dual presence - * in both hashes. There is no copy of the items made; rather - * they are added into the new hash through a secondary hash - * hash handle that must be present in the structure. */ -#define HASH_SELECT(hh_dst, dst, hh_src, src, cond) \ -do { \ - unsigned _src_bkt, _dst_bkt; \ - void *_last_elt = NULL, *_elt; \ - UT_hash_handle *_src_hh, *_dst_hh, *_last_elt_hh=NULL; \ - ptrdiff_t _dst_hho = ((char*)(&(dst)->hh_dst) - (char*)(dst)); \ - if ((src) != NULL) { \ - for (_src_bkt=0; _src_bkt < (src)->hh_src.tbl->num_buckets; _src_bkt++) { \ - for (_src_hh = (src)->hh_src.tbl->buckets[_src_bkt].hh_head; \ - _src_hh != NULL; \ - _src_hh = _src_hh->hh_next) { \ - _elt = ELMT_FROM_HH((src)->hh_src.tbl, _src_hh); \ - if (cond(_elt)) { \ - IF_HASH_NONFATAL_OOM( int _hs_oomed = 0; ) \ - _dst_hh = (UT_hash_handle*)(void*)(((char*)_elt) + _dst_hho); \ - _dst_hh->key = _src_hh->key; \ - _dst_hh->keylen = _src_hh->keylen; \ - _dst_hh->hashv = _src_hh->hashv; \ - _dst_hh->prev = _last_elt; \ - _dst_hh->next = NULL; \ - if (_last_elt_hh != NULL) { \ - _last_elt_hh->next = _elt; \ - } \ - if ((dst) == NULL) { \ - DECLTYPE_ASSIGN(dst, _elt); \ - HASH_MAKE_TABLE(hh_dst, dst, _hs_oomed); \ - IF_HASH_NONFATAL_OOM( \ - if (_hs_oomed) { \ - uthash_nonfatal_oom(_elt); \ - (dst) = NULL; \ - continue; \ - } \ - ) \ - } else { \ - _dst_hh->tbl = (dst)->hh_dst.tbl; \ - } \ - HASH_TO_BKT(_dst_hh->hashv, _dst_hh->tbl->num_buckets, _dst_bkt); \ - HASH_ADD_TO_BKT(_dst_hh->tbl->buckets[_dst_bkt], hh_dst, _dst_hh, _hs_oomed); \ - (dst)->hh_dst.tbl->num_items++; \ - IF_HASH_NONFATAL_OOM( \ - if (_hs_oomed) { \ - HASH_ROLLBACK_BKT(hh_dst, dst, _dst_hh); \ - HASH_DELETE_HH(hh_dst, dst, _dst_hh); \ - _dst_hh->tbl = NULL; \ - uthash_nonfatal_oom(_elt); \ - continue; \ - } \ - ) \ - HASH_BLOOM_ADD(_dst_hh->tbl, _dst_hh->hashv); \ - _last_elt = _elt; \ - _last_elt_hh = _dst_hh; \ - } \ - } \ - } \ - } \ - HASH_FSCK(hh_dst, dst, "HASH_SELECT"); \ -} while (0) - -#define HASH_CLEAR(hh,head) \ -do { \ - if ((head) != NULL) { \ - HASH_BLOOM_FREE((head)->hh.tbl); \ - uthash_free((head)->hh.tbl->buckets, \ - (head)->hh.tbl->num_buckets*sizeof(struct UT_hash_bucket)); \ - uthash_free((head)->hh.tbl, sizeof(UT_hash_table)); \ - (head) = NULL; \ - } \ -} while (0) - -#define HASH_OVERHEAD(hh,head) \ - (((head) != NULL) ? ( \ - (size_t)(((head)->hh.tbl->num_items * sizeof(UT_hash_handle)) + \ - ((head)->hh.tbl->num_buckets * sizeof(UT_hash_bucket)) + \ - sizeof(UT_hash_table) + \ - (HASH_BLOOM_BYTELEN))) : 0U) - -#ifdef NO_DECLTYPE -#define HASH_ITER(hh,head,el,tmp) \ -for(((el)=(head)), ((*(char**)(&(tmp)))=(char*)((head!=NULL)?(head)->hh.next:NULL)); \ - (el) != NULL; ((el)=(tmp)), ((*(char**)(&(tmp)))=(char*)((tmp!=NULL)?(tmp)->hh.next:NULL))) -#else -#define HASH_ITER(hh,head,el,tmp) \ -for(((el)=(head)), ((tmp)=DECLTYPE(el)((head!=NULL)?(head)->hh.next:NULL)); \ - (el) != NULL; ((el)=(tmp)), ((tmp)=DECLTYPE(el)((tmp!=NULL)?(tmp)->hh.next:NULL))) -#endif - -/* obtain a count of items in the hash */ -#define HASH_COUNT(head) HASH_CNT(hh,head) -#define HASH_CNT(hh,head) ((head != NULL)?((head)->hh.tbl->num_items):0U) - -typedef struct UT_hash_bucket { - struct UT_hash_handle *hh_head; - unsigned count; - - /* expand_mult is normally set to 0. In this situation, the max chain length - * threshold is enforced at its default value, HASH_BKT_CAPACITY_THRESH. (If - * the bucket's chain exceeds this length, bucket expansion is triggered). - * However, setting expand_mult to a non-zero value delays bucket expansion - * (that would be triggered by additions to this particular bucket) - * until its chain length reaches a *multiple* of HASH_BKT_CAPACITY_THRESH. - * (The multiplier is simply expand_mult+1). The whole idea of this - * multiplier is to reduce bucket expansions, since they are expensive, in - * situations where we know that a particular bucket tends to be overused. - * It is better to let its chain length grow to a longer yet-still-bounded - * value, than to do an O(n) bucket expansion too often. - */ - unsigned expand_mult; - -} UT_hash_bucket; - -/* random signature used only to find hash tables in external analysis */ -#define HASH_SIGNATURE 0xa0111fe1u -#define HASH_BLOOM_SIGNATURE 0xb12220f2u - -typedef struct UT_hash_table { - UT_hash_bucket *buckets; - unsigned num_buckets, log2_num_buckets; - unsigned num_items; - struct UT_hash_handle *tail; /* tail hh in app order, for fast append */ - ptrdiff_t hho; /* hash handle offset (byte pos of hash handle in element */ - - /* in an ideal situation (all buckets used equally), no bucket would have - * more than ceil(#items/#buckets) items. that's the ideal chain length. */ - unsigned ideal_chain_maxlen; - - /* nonideal_items is the number of items in the hash whose chain position - * exceeds the ideal chain maxlen. these items pay the penalty for an uneven - * hash distribution; reaching them in a chain traversal takes >ideal steps */ - unsigned nonideal_items; - - /* ineffective expands occur when a bucket doubling was performed, but - * afterward, more than half the items in the hash had nonideal chain - * positions. If this happens on two consecutive expansions we inhibit any - * further expansion, as it's not helping; this happens when the hash - * function isn't a good fit for the key domain. When expansion is inhibited - * the hash will still work, albeit no longer in constant time. */ - unsigned ineff_expands, noexpand; - - uint32_t signature; /* used only to find hash tables in external analysis */ -#ifdef HASH_BLOOM - uint32_t bloom_sig; /* used only to test bloom exists in external analysis */ - uint8_t *bloom_bv; - uint8_t bloom_nbits; -#endif - -} UT_hash_table; - -typedef struct UT_hash_handle { - struct UT_hash_table *tbl; - void *prev; /* prev element in app order */ - void *next; /* next element in app order */ - struct UT_hash_handle *hh_prev; /* previous hh in bucket order */ - struct UT_hash_handle *hh_next; /* next hh in bucket order */ - const void *key; /* ptr to enclosing struct's key */ - unsigned keylen; /* enclosing struct's key len */ - unsigned hashv; /* result of hash-fcn(key) */ -} UT_hash_handle; - -#endif /* UTHASH_H */ diff --git a/test/http_decoder/uthash-2.3.0/include/utlist.h b/test/http_decoder/uthash-2.3.0/include/utlist.h deleted file mode 100644 index 6230a67..0000000 --- a/test/http_decoder/uthash-2.3.0/include/utlist.h +++ /dev/null @@ -1,1073 +0,0 @@ -/* -Copyright (c) 2007-2021, Troy D. Hanson http://troydhanson.github.com/uthash/ -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef UTLIST_H -#define UTLIST_H - -#define UTLIST_VERSION 2.3.0 - -#include <assert.h> - -/* - * This file contains macros to manipulate singly and doubly-linked lists. - * - * 1. LL_ macros: singly-linked lists. - * 2. DL_ macros: doubly-linked lists. - * 3. CDL_ macros: circular doubly-linked lists. - * - * To use singly-linked lists, your structure must have a "next" pointer. - * To use doubly-linked lists, your structure must "prev" and "next" pointers. - * Either way, the pointer to the head of the list must be initialized to NULL. - * - * ----------------.EXAMPLE ------------------------- - * struct item { - * int id; - * struct item *prev, *next; - * } - * - * struct item *list = NULL: - * - * int main() { - * struct item *item; - * ... allocate and populate item ... - * DL_APPEND(list, item); - * } - * -------------------------------------------------- - * - * For doubly-linked lists, the append and delete macros are O(1) - * For singly-linked lists, append and delete are O(n) but prepend is O(1) - * The sort macro is O(n log(n)) for all types of single/double/circular lists. - */ - -/* These macros use decltype or the earlier __typeof GNU extension. - As decltype is only available in newer compilers (VS2010 or gcc 4.3+ - when compiling c++ source) this code uses whatever method is needed - or, for VS2008 where neither is available, uses casting workarounds. */ -#if !defined(LDECLTYPE) && !defined(NO_DECLTYPE) -#if defined(_MSC_VER) /* MS compiler */ -#if _MSC_VER >= 1600 && defined(__cplusplus) /* VS2010 or newer in C++ mode */ -#define LDECLTYPE(x) decltype(x) -#else /* VS2008 or older (or VS2010 in C mode) */ -#define NO_DECLTYPE -#endif -#elif defined(__BORLANDC__) || defined(__ICCARM__) || defined(__LCC__) || defined(__WATCOMC__) -#define NO_DECLTYPE -#else /* GNU, Sun and other compilers */ -#define LDECLTYPE(x) __typeof(x) -#endif -#endif - -/* for VS2008 we use some workarounds to get around the lack of decltype, - * namely, we always reassign our tmp variable to the list head if we need - * to dereference its prev/next pointers, and save/restore the real head.*/ -#ifdef NO_DECLTYPE -#define IF_NO_DECLTYPE(x) x -#define LDECLTYPE(x) char* -#define UTLIST_SV(elt,list) _tmp = (char*)(list); {char **_alias = (char**)&(list); *_alias = (elt); } -#define UTLIST_NEXT(elt,list,next) ((char*)((list)->next)) -#define UTLIST_NEXTASGN(elt,list,to,next) { char **_alias = (char**)&((list)->next); *_alias=(char*)(to); } -/* #define UTLIST_PREV(elt,list,prev) ((char*)((list)->prev)) */ -#define UTLIST_PREVASGN(elt,list,to,prev) { char **_alias = (char**)&((list)->prev); *_alias=(char*)(to); } -#define UTLIST_RS(list) { char **_alias = (char**)&(list); *_alias=_tmp; } -#define UTLIST_CASTASGN(a,b) { char **_alias = (char**)&(a); *_alias=(char*)(b); } -#else -#define IF_NO_DECLTYPE(x) -#define UTLIST_SV(elt,list) -#define UTLIST_NEXT(elt,list,next) ((elt)->next) -#define UTLIST_NEXTASGN(elt,list,to,next) ((elt)->next)=(to) -/* #define UTLIST_PREV(elt,list,prev) ((elt)->prev) */ -#define UTLIST_PREVASGN(elt,list,to,prev) ((elt)->prev)=(to) -#define UTLIST_RS(list) -#define UTLIST_CASTASGN(a,b) (a)=(b) -#endif - -/****************************************************************************** - * The sort macro is an adaptation of Simon Tatham's O(n log(n)) mergesort * - * Unwieldy variable names used here to avoid shadowing passed-in variables. * - *****************************************************************************/ -#define LL_SORT(list, cmp) \ - LL_SORT2(list, cmp, next) - -#define LL_SORT2(list, cmp, next) \ -do { \ - LDECLTYPE(list) _ls_p; \ - LDECLTYPE(list) _ls_q; \ - LDECLTYPE(list) _ls_e; \ - LDECLTYPE(list) _ls_tail; \ - IF_NO_DECLTYPE(LDECLTYPE(list) _tmp;) \ - int _ls_insize, _ls_nmerges, _ls_psize, _ls_qsize, _ls_i, _ls_looping; \ - if (list) { \ - _ls_insize = 1; \ - _ls_looping = 1; \ - while (_ls_looping) { \ - UTLIST_CASTASGN(_ls_p,list); \ - (list) = NULL; \ - _ls_tail = NULL; \ - _ls_nmerges = 0; \ - while (_ls_p) { \ - _ls_nmerges++; \ - _ls_q = _ls_p; \ - _ls_psize = 0; \ - for (_ls_i = 0; _ls_i < _ls_insize; _ls_i++) { \ - _ls_psize++; \ - UTLIST_SV(_ls_q,list); _ls_q = UTLIST_NEXT(_ls_q,list,next); UTLIST_RS(list); \ - if (!_ls_q) break; \ - } \ - _ls_qsize = _ls_insize; \ - while (_ls_psize > 0 || (_ls_qsize > 0 && _ls_q)) { \ - if (_ls_psize == 0) { \ - _ls_e = _ls_q; UTLIST_SV(_ls_q,list); _ls_q = \ - UTLIST_NEXT(_ls_q,list,next); UTLIST_RS(list); _ls_qsize--; \ - } else if (_ls_qsize == 0 || !_ls_q) { \ - _ls_e = _ls_p; UTLIST_SV(_ls_p,list); _ls_p = \ - UTLIST_NEXT(_ls_p,list,next); UTLIST_RS(list); _ls_psize--; \ - } else if (cmp(_ls_p,_ls_q) <= 0) { \ - _ls_e = _ls_p; UTLIST_SV(_ls_p,list); _ls_p = \ - UTLIST_NEXT(_ls_p,list,next); UTLIST_RS(list); _ls_psize--; \ - } else { \ - _ls_e = _ls_q; UTLIST_SV(_ls_q,list); _ls_q = \ - UTLIST_NEXT(_ls_q,list,next); UTLIST_RS(list); _ls_qsize--; \ - } \ - if (_ls_tail) { \ - UTLIST_SV(_ls_tail,list); UTLIST_NEXTASGN(_ls_tail,list,_ls_e,next); UTLIST_RS(list); \ - } else { \ - UTLIST_CASTASGN(list,_ls_e); \ - } \ - _ls_tail = _ls_e; \ - } \ - _ls_p = _ls_q; \ - } \ - if (_ls_tail) { \ - UTLIST_SV(_ls_tail,list); UTLIST_NEXTASGN(_ls_tail,list,NULL,next); UTLIST_RS(list); \ - } \ - if (_ls_nmerges <= 1) { \ - _ls_looping=0; \ - } \ - _ls_insize *= 2; \ - } \ - } \ -} while (0) - - -#define DL_SORT(list, cmp) \ - DL_SORT2(list, cmp, prev, next) - -#define DL_SORT2(list, cmp, prev, next) \ -do { \ - LDECLTYPE(list) _ls_p; \ - LDECLTYPE(list) _ls_q; \ - LDECLTYPE(list) _ls_e; \ - LDECLTYPE(list) _ls_tail; \ - IF_NO_DECLTYPE(LDECLTYPE(list) _tmp;) \ - int _ls_insize, _ls_nmerges, _ls_psize, _ls_qsize, _ls_i, _ls_looping; \ - if (list) { \ - _ls_insize = 1; \ - _ls_looping = 1; \ - while (_ls_looping) { \ - UTLIST_CASTASGN(_ls_p,list); \ - (list) = NULL; \ - _ls_tail = NULL; \ - _ls_nmerges = 0; \ - while (_ls_p) { \ - _ls_nmerges++; \ - _ls_q = _ls_p; \ - _ls_psize = 0; \ - for (_ls_i = 0; _ls_i < _ls_insize; _ls_i++) { \ - _ls_psize++; \ - UTLIST_SV(_ls_q,list); _ls_q = UTLIST_NEXT(_ls_q,list,next); UTLIST_RS(list); \ - if (!_ls_q) break; \ - } \ - _ls_qsize = _ls_insize; \ - while ((_ls_psize > 0) || ((_ls_qsize > 0) && _ls_q)) { \ - if (_ls_psize == 0) { \ - _ls_e = _ls_q; UTLIST_SV(_ls_q,list); _ls_q = \ - UTLIST_NEXT(_ls_q,list,next); UTLIST_RS(list); _ls_qsize--; \ - } else if ((_ls_qsize == 0) || (!_ls_q)) { \ - _ls_e = _ls_p; UTLIST_SV(_ls_p,list); _ls_p = \ - UTLIST_NEXT(_ls_p,list,next); UTLIST_RS(list); _ls_psize--; \ - } else if (cmp(_ls_p,_ls_q) <= 0) { \ - _ls_e = _ls_p; UTLIST_SV(_ls_p,list); _ls_p = \ - UTLIST_NEXT(_ls_p,list,next); UTLIST_RS(list); _ls_psize--; \ - } else { \ - _ls_e = _ls_q; UTLIST_SV(_ls_q,list); _ls_q = \ - UTLIST_NEXT(_ls_q,list,next); UTLIST_RS(list); _ls_qsize--; \ - } \ - if (_ls_tail) { \ - UTLIST_SV(_ls_tail,list); UTLIST_NEXTASGN(_ls_tail,list,_ls_e,next); UTLIST_RS(list); \ - } else { \ - UTLIST_CASTASGN(list,_ls_e); \ - } \ - UTLIST_SV(_ls_e,list); UTLIST_PREVASGN(_ls_e,list,_ls_tail,prev); UTLIST_RS(list); \ - _ls_tail = _ls_e; \ - } \ - _ls_p = _ls_q; \ - } \ - UTLIST_CASTASGN((list)->prev, _ls_tail); \ - UTLIST_SV(_ls_tail,list); UTLIST_NEXTASGN(_ls_tail,list,NULL,next); UTLIST_RS(list); \ - if (_ls_nmerges <= 1) { \ - _ls_looping=0; \ - } \ - _ls_insize *= 2; \ - } \ - } \ -} while (0) - -#define CDL_SORT(list, cmp) \ - CDL_SORT2(list, cmp, prev, next) - -#define CDL_SORT2(list, cmp, prev, next) \ -do { \ - LDECLTYPE(list) _ls_p; \ - LDECLTYPE(list) _ls_q; \ - LDECLTYPE(list) _ls_e; \ - LDECLTYPE(list) _ls_tail; \ - LDECLTYPE(list) _ls_oldhead; \ - LDECLTYPE(list) _tmp; \ - int _ls_insize, _ls_nmerges, _ls_psize, _ls_qsize, _ls_i, _ls_looping; \ - if (list) { \ - _ls_insize = 1; \ - _ls_looping = 1; \ - while (_ls_looping) { \ - UTLIST_CASTASGN(_ls_p,list); \ - UTLIST_CASTASGN(_ls_oldhead,list); \ - (list) = NULL; \ - _ls_tail = NULL; \ - _ls_nmerges = 0; \ - while (_ls_p) { \ - _ls_nmerges++; \ - _ls_q = _ls_p; \ - _ls_psize = 0; \ - for (_ls_i = 0; _ls_i < _ls_insize; _ls_i++) { \ - _ls_psize++; \ - UTLIST_SV(_ls_q,list); \ - if (UTLIST_NEXT(_ls_q,list,next) == _ls_oldhead) { \ - _ls_q = NULL; \ - } else { \ - _ls_q = UTLIST_NEXT(_ls_q,list,next); \ - } \ - UTLIST_RS(list); \ - if (!_ls_q) break; \ - } \ - _ls_qsize = _ls_insize; \ - while (_ls_psize > 0 || (_ls_qsize > 0 && _ls_q)) { \ - if (_ls_psize == 0) { \ - _ls_e = _ls_q; UTLIST_SV(_ls_q,list); _ls_q = \ - UTLIST_NEXT(_ls_q,list,next); UTLIST_RS(list); _ls_qsize--; \ - if (_ls_q == _ls_oldhead) { _ls_q = NULL; } \ - } else if (_ls_qsize == 0 || !_ls_q) { \ - _ls_e = _ls_p; UTLIST_SV(_ls_p,list); _ls_p = \ - UTLIST_NEXT(_ls_p,list,next); UTLIST_RS(list); _ls_psize--; \ - if (_ls_p == _ls_oldhead) { _ls_p = NULL; } \ - } else if (cmp(_ls_p,_ls_q) <= 0) { \ - _ls_e = _ls_p; UTLIST_SV(_ls_p,list); _ls_p = \ - UTLIST_NEXT(_ls_p,list,next); UTLIST_RS(list); _ls_psize--; \ - if (_ls_p == _ls_oldhead) { _ls_p = NULL; } \ - } else { \ - _ls_e = _ls_q; UTLIST_SV(_ls_q,list); _ls_q = \ - UTLIST_NEXT(_ls_q,list,next); UTLIST_RS(list); _ls_qsize--; \ - if (_ls_q == _ls_oldhead) { _ls_q = NULL; } \ - } \ - if (_ls_tail) { \ - UTLIST_SV(_ls_tail,list); UTLIST_NEXTASGN(_ls_tail,list,_ls_e,next); UTLIST_RS(list); \ - } else { \ - UTLIST_CASTASGN(list,_ls_e); \ - } \ - UTLIST_SV(_ls_e,list); UTLIST_PREVASGN(_ls_e,list,_ls_tail,prev); UTLIST_RS(list); \ - _ls_tail = _ls_e; \ - } \ - _ls_p = _ls_q; \ - } \ - UTLIST_CASTASGN((list)->prev,_ls_tail); \ - UTLIST_CASTASGN(_tmp,list); \ - UTLIST_SV(_ls_tail,list); UTLIST_NEXTASGN(_ls_tail,list,_tmp,next); UTLIST_RS(list); \ - if (_ls_nmerges <= 1) { \ - _ls_looping=0; \ - } \ - _ls_insize *= 2; \ - } \ - } \ -} while (0) - -/****************************************************************************** - * singly linked list macros (non-circular) * - *****************************************************************************/ -#define LL_PREPEND(head,add) \ - LL_PREPEND2(head,add,next) - -#define LL_PREPEND2(head,add,next) \ -do { \ - (add)->next = (head); \ - (head) = (add); \ -} while (0) - -#define LL_CONCAT(head1,head2) \ - LL_CONCAT2(head1,head2,next) - -#define LL_CONCAT2(head1,head2,next) \ -do { \ - LDECLTYPE(head1) _tmp; \ - if (head1) { \ - _tmp = (head1); \ - while (_tmp->next) { _tmp = _tmp->next; } \ - _tmp->next=(head2); \ - } else { \ - (head1)=(head2); \ - } \ -} while (0) - -#define LL_APPEND(head,add) \ - LL_APPEND2(head,add,next) - -#define LL_APPEND2(head,add,next) \ -do { \ - LDECLTYPE(head) _tmp; \ - (add)->next=NULL; \ - if (head) { \ - _tmp = (head); \ - while (_tmp->next) { _tmp = _tmp->next; } \ - _tmp->next=(add); \ - } else { \ - (head)=(add); \ - } \ -} while (0) - -#define LL_INSERT_INORDER(head,add,cmp) \ - LL_INSERT_INORDER2(head,add,cmp,next) - -#define LL_INSERT_INORDER2(head,add,cmp,next) \ -do { \ - LDECLTYPE(head) _tmp; \ - if (head) { \ - LL_LOWER_BOUND2(head, _tmp, add, cmp, next); \ - LL_APPEND_ELEM2(head, _tmp, add, next); \ - } else { \ - (head) = (add); \ - (head)->next = NULL; \ - } \ -} while (0) - -#define LL_LOWER_BOUND(head,elt,like,cmp) \ - LL_LOWER_BOUND2(head,elt,like,cmp,next) - -#define LL_LOWER_BOUND2(head,elt,like,cmp,next) \ - do { \ - if ((head) == NULL || (cmp(head, like)) >= 0) { \ - (elt) = NULL; \ - } else { \ - for ((elt) = (head); (elt)->next != NULL; (elt) = (elt)->next) { \ - if (cmp((elt)->next, like) >= 0) { \ - break; \ - } \ - } \ - } \ - } while (0) - -#define LL_DELETE(head,del) \ - LL_DELETE2(head,del,next) - -#define LL_DELETE2(head,del,next) \ -do { \ - LDECLTYPE(head) _tmp; \ - if ((head) == (del)) { \ - (head)=(head)->next; \ - } else { \ - _tmp = (head); \ - while (_tmp->next && (_tmp->next != (del))) { \ - _tmp = _tmp->next; \ - } \ - if (_tmp->next) { \ - _tmp->next = (del)->next; \ - } \ - } \ -} while (0) - -#define LL_COUNT(head,el,counter) \ - LL_COUNT2(head,el,counter,next) \ - -#define LL_COUNT2(head,el,counter,next) \ -do { \ - (counter) = 0; \ - LL_FOREACH2(head,el,next) { ++(counter); } \ -} while (0) - -#define LL_FOREACH(head,el) \ - LL_FOREACH2(head,el,next) - -#define LL_FOREACH2(head,el,next) \ - for ((el) = (head); el; (el) = (el)->next) - -#define LL_FOREACH_SAFE(head,el,tmp) \ - LL_FOREACH_SAFE2(head,el,tmp,next) - -#define LL_FOREACH_SAFE2(head,el,tmp,next) \ - for ((el) = (head); (el) && ((tmp) = (el)->next, 1); (el) = (tmp)) - -#define LL_SEARCH_SCALAR(head,out,field,val) \ - LL_SEARCH_SCALAR2(head,out,field,val,next) - -#define LL_SEARCH_SCALAR2(head,out,field,val,next) \ -do { \ - LL_FOREACH2(head,out,next) { \ - if ((out)->field == (val)) break; \ - } \ -} while (0) - -#define LL_SEARCH(head,out,elt,cmp) \ - LL_SEARCH2(head,out,elt,cmp,next) - -#define LL_SEARCH2(head,out,elt,cmp,next) \ -do { \ - LL_FOREACH2(head,out,next) { \ - if ((cmp(out,elt))==0) break; \ - } \ -} while (0) - -#define LL_REPLACE_ELEM2(head, el, add, next) \ -do { \ - LDECLTYPE(head) _tmp; \ - assert((head) != NULL); \ - assert((el) != NULL); \ - assert((add) != NULL); \ - (add)->next = (el)->next; \ - if ((head) == (el)) { \ - (head) = (add); \ - } else { \ - _tmp = (head); \ - while (_tmp->next && (_tmp->next != (el))) { \ - _tmp = _tmp->next; \ - } \ - if (_tmp->next) { \ - _tmp->next = (add); \ - } \ - } \ -} while (0) - -#define LL_REPLACE_ELEM(head, el, add) \ - LL_REPLACE_ELEM2(head, el, add, next) - -#define LL_PREPEND_ELEM2(head, el, add, next) \ -do { \ - if (el) { \ - LDECLTYPE(head) _tmp; \ - assert((head) != NULL); \ - assert((add) != NULL); \ - (add)->next = (el); \ - if ((head) == (el)) { \ - (head) = (add); \ - } else { \ - _tmp = (head); \ - while (_tmp->next && (_tmp->next != (el))) { \ - _tmp = _tmp->next; \ - } \ - if (_tmp->next) { \ - _tmp->next = (add); \ - } \ - } \ - } else { \ - LL_APPEND2(head, add, next); \ - } \ -} while (0) \ - -#define LL_PREPEND_ELEM(head, el, add) \ - LL_PREPEND_ELEM2(head, el, add, next) - -#define LL_APPEND_ELEM2(head, el, add, next) \ -do { \ - if (el) { \ - assert((head) != NULL); \ - assert((add) != NULL); \ - (add)->next = (el)->next; \ - (el)->next = (add); \ - } else { \ - LL_PREPEND2(head, add, next); \ - } \ -} while (0) \ - -#define LL_APPEND_ELEM(head, el, add) \ - LL_APPEND_ELEM2(head, el, add, next) - -#ifdef NO_DECLTYPE -/* Here are VS2008 / NO_DECLTYPE replacements for a few functions */ - -#undef LL_CONCAT2 -#define LL_CONCAT2(head1,head2,next) \ -do { \ - char *_tmp; \ - if (head1) { \ - _tmp = (char*)(head1); \ - while ((head1)->next) { (head1) = (head1)->next; } \ - (head1)->next = (head2); \ - UTLIST_RS(head1); \ - } else { \ - (head1)=(head2); \ - } \ -} while (0) - -#undef LL_APPEND2 -#define LL_APPEND2(head,add,next) \ -do { \ - if (head) { \ - (add)->next = head; /* use add->next as a temp variable */ \ - while ((add)->next->next) { (add)->next = (add)->next->next; } \ - (add)->next->next=(add); \ - } else { \ - (head)=(add); \ - } \ - (add)->next=NULL; \ -} while (0) - -#undef LL_INSERT_INORDER2 -#define LL_INSERT_INORDER2(head,add,cmp,next) \ -do { \ - if ((head) == NULL || (cmp(head, add)) >= 0) { \ - (add)->next = (head); \ - (head) = (add); \ - } else { \ - char *_tmp = (char*)(head); \ - while ((head)->next != NULL && (cmp((head)->next, add)) < 0) { \ - (head) = (head)->next; \ - } \ - (add)->next = (head)->next; \ - (head)->next = (add); \ - UTLIST_RS(head); \ - } \ -} while (0) - -#undef LL_DELETE2 -#define LL_DELETE2(head,del,next) \ -do { \ - if ((head) == (del)) { \ - (head)=(head)->next; \ - } else { \ - char *_tmp = (char*)(head); \ - while ((head)->next && ((head)->next != (del))) { \ - (head) = (head)->next; \ - } \ - if ((head)->next) { \ - (head)->next = ((del)->next); \ - } \ - UTLIST_RS(head); \ - } \ -} while (0) - -#undef LL_REPLACE_ELEM2 -#define LL_REPLACE_ELEM2(head, el, add, next) \ -do { \ - assert((head) != NULL); \ - assert((el) != NULL); \ - assert((add) != NULL); \ - if ((head) == (el)) { \ - (head) = (add); \ - } else { \ - (add)->next = head; \ - while ((add)->next->next && ((add)->next->next != (el))) { \ - (add)->next = (add)->next->next; \ - } \ - if ((add)->next->next) { \ - (add)->next->next = (add); \ - } \ - } \ - (add)->next = (el)->next; \ -} while (0) - -#undef LL_PREPEND_ELEM2 -#define LL_PREPEND_ELEM2(head, el, add, next) \ -do { \ - if (el) { \ - assert((head) != NULL); \ - assert((add) != NULL); \ - if ((head) == (el)) { \ - (head) = (add); \ - } else { \ - (add)->next = (head); \ - while ((add)->next->next && ((add)->next->next != (el))) { \ - (add)->next = (add)->next->next; \ - } \ - if ((add)->next->next) { \ - (add)->next->next = (add); \ - } \ - } \ - (add)->next = (el); \ - } else { \ - LL_APPEND2(head, add, next); \ - } \ -} while (0) \ - -#endif /* NO_DECLTYPE */ - -/****************************************************************************** - * doubly linked list macros (non-circular) * - *****************************************************************************/ -#define DL_PREPEND(head,add) \ - DL_PREPEND2(head,add,prev,next) - -#define DL_PREPEND2(head,add,prev,next) \ -do { \ - (add)->next = (head); \ - if (head) { \ - (add)->prev = (head)->prev; \ - (head)->prev = (add); \ - } else { \ - (add)->prev = (add); \ - } \ - (head) = (add); \ -} while (0) - -#define DL_APPEND(head,add) \ - DL_APPEND2(head,add,prev,next) - -#define DL_APPEND2(head,add,prev,next) \ -do { \ - if (head) { \ - (add)->prev = (head)->prev; \ - (head)->prev->next = (add); \ - (head)->prev = (add); \ - (add)->next = NULL; \ - } else { \ - (head)=(add); \ - (head)->prev = (head); \ - (head)->next = NULL; \ - } \ -} while (0) - -#define DL_INSERT_INORDER(head,add,cmp) \ - DL_INSERT_INORDER2(head,add,cmp,prev,next) - -#define DL_INSERT_INORDER2(head,add,cmp,prev,next) \ -do { \ - LDECLTYPE(head) _tmp; \ - if (head) { \ - DL_LOWER_BOUND2(head, _tmp, add, cmp, next); \ - DL_APPEND_ELEM2(head, _tmp, add, prev, next); \ - } else { \ - (head) = (add); \ - (head)->prev = (head); \ - (head)->next = NULL; \ - } \ -} while (0) - -#define DL_LOWER_BOUND(head,elt,like,cmp) \ - DL_LOWER_BOUND2(head,elt,like,cmp,next) - -#define DL_LOWER_BOUND2(head,elt,like,cmp,next) \ -do { \ - if ((head) == NULL || (cmp(head, like)) >= 0) { \ - (elt) = NULL; \ - } else { \ - for ((elt) = (head); (elt)->next != NULL; (elt) = (elt)->next) { \ - if ((cmp((elt)->next, like)) >= 0) { \ - break; \ - } \ - } \ - } \ -} while (0) - -#define DL_CONCAT(head1,head2) \ - DL_CONCAT2(head1,head2,prev,next) - -#define DL_CONCAT2(head1,head2,prev,next) \ -do { \ - LDECLTYPE(head1) _tmp; \ - if (head2) { \ - if (head1) { \ - UTLIST_CASTASGN(_tmp, (head2)->prev); \ - (head2)->prev = (head1)->prev; \ - (head1)->prev->next = (head2); \ - UTLIST_CASTASGN((head1)->prev, _tmp); \ - } else { \ - (head1)=(head2); \ - } \ - } \ -} while (0) - -#define DL_DELETE(head,del) \ - DL_DELETE2(head,del,prev,next) - -#define DL_DELETE2(head,del,prev,next) \ -do { \ - assert((head) != NULL); \ - assert((del)->prev != NULL); \ - if ((del)->prev == (del)) { \ - (head)=NULL; \ - } else if ((del)==(head)) { \ - (del)->next->prev = (del)->prev; \ - (head) = (del)->next; \ - } else { \ - (del)->prev->next = (del)->next; \ - if ((del)->next) { \ - (del)->next->prev = (del)->prev; \ - } else { \ - (head)->prev = (del)->prev; \ - } \ - } \ -} while (0) - -#define DL_COUNT(head,el,counter) \ - DL_COUNT2(head,el,counter,next) \ - -#define DL_COUNT2(head,el,counter,next) \ -do { \ - (counter) = 0; \ - DL_FOREACH2(head,el,next) { ++(counter); } \ -} while (0) - -#define DL_FOREACH(head,el) \ - DL_FOREACH2(head,el,next) - -#define DL_FOREACH2(head,el,next) \ - for ((el) = (head); el; (el) = (el)->next) - -/* this version is safe for deleting the elements during iteration */ -#define DL_FOREACH_SAFE(head,el,tmp) \ - DL_FOREACH_SAFE2(head,el,tmp,next) - -#define DL_FOREACH_SAFE2(head,el,tmp,next) \ - for ((el) = (head); (el) && ((tmp) = (el)->next, 1); (el) = (tmp)) - -/* these are identical to their singly-linked list counterparts */ -#define DL_SEARCH_SCALAR LL_SEARCH_SCALAR -#define DL_SEARCH LL_SEARCH -#define DL_SEARCH_SCALAR2 LL_SEARCH_SCALAR2 -#define DL_SEARCH2 LL_SEARCH2 - -#define DL_REPLACE_ELEM2(head, el, add, prev, next) \ -do { \ - assert((head) != NULL); \ - assert((el) != NULL); \ - assert((add) != NULL); \ - if ((head) == (el)) { \ - (head) = (add); \ - (add)->next = (el)->next; \ - if ((el)->next == NULL) { \ - (add)->prev = (add); \ - } else { \ - (add)->prev = (el)->prev; \ - (add)->next->prev = (add); \ - } \ - } else { \ - (add)->next = (el)->next; \ - (add)->prev = (el)->prev; \ - (add)->prev->next = (add); \ - if ((el)->next == NULL) { \ - (head)->prev = (add); \ - } else { \ - (add)->next->prev = (add); \ - } \ - } \ -} while (0) - -#define DL_REPLACE_ELEM(head, el, add) \ - DL_REPLACE_ELEM2(head, el, add, prev, next) - -#define DL_PREPEND_ELEM2(head, el, add, prev, next) \ -do { \ - if (el) { \ - assert((head) != NULL); \ - assert((add) != NULL); \ - (add)->next = (el); \ - (add)->prev = (el)->prev; \ - (el)->prev = (add); \ - if ((head) == (el)) { \ - (head) = (add); \ - } else { \ - (add)->prev->next = (add); \ - } \ - } else { \ - DL_APPEND2(head, add, prev, next); \ - } \ -} while (0) \ - -#define DL_PREPEND_ELEM(head, el, add) \ - DL_PREPEND_ELEM2(head, el, add, prev, next) - -#define DL_APPEND_ELEM2(head, el, add, prev, next) \ -do { \ - if (el) { \ - assert((head) != NULL); \ - assert((add) != NULL); \ - (add)->next = (el)->next; \ - (add)->prev = (el); \ - (el)->next = (add); \ - if ((add)->next) { \ - (add)->next->prev = (add); \ - } else { \ - (head)->prev = (add); \ - } \ - } else { \ - DL_PREPEND2(head, add, prev, next); \ - } \ -} while (0) \ - -#define DL_APPEND_ELEM(head, el, add) \ - DL_APPEND_ELEM2(head, el, add, prev, next) - -#ifdef NO_DECLTYPE -/* Here are VS2008 / NO_DECLTYPE replacements for a few functions */ - -#undef DL_INSERT_INORDER2 -#define DL_INSERT_INORDER2(head,add,cmp,prev,next) \ -do { \ - if ((head) == NULL) { \ - (add)->prev = (add); \ - (add)->next = NULL; \ - (head) = (add); \ - } else if ((cmp(head, add)) >= 0) { \ - (add)->prev = (head)->prev; \ - (add)->next = (head); \ - (head)->prev = (add); \ - (head) = (add); \ - } else { \ - char *_tmp = (char*)(head); \ - while ((head)->next && (cmp((head)->next, add)) < 0) { \ - (head) = (head)->next; \ - } \ - (add)->prev = (head); \ - (add)->next = (head)->next; \ - (head)->next = (add); \ - UTLIST_RS(head); \ - if ((add)->next) { \ - (add)->next->prev = (add); \ - } else { \ - (head)->prev = (add); \ - } \ - } \ -} while (0) -#endif /* NO_DECLTYPE */ - -/****************************************************************************** - * circular doubly linked list macros * - *****************************************************************************/ -#define CDL_APPEND(head,add) \ - CDL_APPEND2(head,add,prev,next) - -#define CDL_APPEND2(head,add,prev,next) \ -do { \ - if (head) { \ - (add)->prev = (head)->prev; \ - (add)->next = (head); \ - (head)->prev = (add); \ - (add)->prev->next = (add); \ - } else { \ - (add)->prev = (add); \ - (add)->next = (add); \ - (head) = (add); \ - } \ -} while (0) - -#define CDL_PREPEND(head,add) \ - CDL_PREPEND2(head,add,prev,next) - -#define CDL_PREPEND2(head,add,prev,next) \ -do { \ - if (head) { \ - (add)->prev = (head)->prev; \ - (add)->next = (head); \ - (head)->prev = (add); \ - (add)->prev->next = (add); \ - } else { \ - (add)->prev = (add); \ - (add)->next = (add); \ - } \ - (head) = (add); \ -} while (0) - -#define CDL_INSERT_INORDER(head,add,cmp) \ - CDL_INSERT_INORDER2(head,add,cmp,prev,next) - -#define CDL_INSERT_INORDER2(head,add,cmp,prev,next) \ -do { \ - LDECLTYPE(head) _tmp; \ - if (head) { \ - CDL_LOWER_BOUND2(head, _tmp, add, cmp, next); \ - CDL_APPEND_ELEM2(head, _tmp, add, prev, next); \ - } else { \ - (head) = (add); \ - (head)->next = (head); \ - (head)->prev = (head); \ - } \ -} while (0) - -#define CDL_LOWER_BOUND(head,elt,like,cmp) \ - CDL_LOWER_BOUND2(head,elt,like,cmp,next) - -#define CDL_LOWER_BOUND2(head,elt,like,cmp,next) \ -do { \ - if ((head) == NULL || (cmp(head, like)) >= 0) { \ - (elt) = NULL; \ - } else { \ - for ((elt) = (head); (elt)->next != (head); (elt) = (elt)->next) { \ - if ((cmp((elt)->next, like)) >= 0) { \ - break; \ - } \ - } \ - } \ -} while (0) - -#define CDL_DELETE(head,del) \ - CDL_DELETE2(head,del,prev,next) - -#define CDL_DELETE2(head,del,prev,next) \ -do { \ - if (((head)==(del)) && ((head)->next == (head))) { \ - (head) = NULL; \ - } else { \ - (del)->next->prev = (del)->prev; \ - (del)->prev->next = (del)->next; \ - if ((del) == (head)) (head)=(del)->next; \ - } \ -} while (0) - -#define CDL_COUNT(head,el,counter) \ - CDL_COUNT2(head,el,counter,next) \ - -#define CDL_COUNT2(head, el, counter,next) \ -do { \ - (counter) = 0; \ - CDL_FOREACH2(head,el,next) { ++(counter); } \ -} while (0) - -#define CDL_FOREACH(head,el) \ - CDL_FOREACH2(head,el,next) - -#define CDL_FOREACH2(head,el,next) \ - for ((el)=(head);el;(el)=(((el)->next==(head)) ? NULL : (el)->next)) - -#define CDL_FOREACH_SAFE(head,el,tmp1,tmp2) \ - CDL_FOREACH_SAFE2(head,el,tmp1,tmp2,prev,next) - -#define CDL_FOREACH_SAFE2(head,el,tmp1,tmp2,prev,next) \ - for ((el) = (head), (tmp1) = (head) ? (head)->prev : NULL; \ - (el) && ((tmp2) = (el)->next, 1); \ - (el) = ((el) == (tmp1) ? NULL : (tmp2))) - -#define CDL_SEARCH_SCALAR(head,out,field,val) \ - CDL_SEARCH_SCALAR2(head,out,field,val,next) - -#define CDL_SEARCH_SCALAR2(head,out,field,val,next) \ -do { \ - CDL_FOREACH2(head,out,next) { \ - if ((out)->field == (val)) break; \ - } \ -} while (0) - -#define CDL_SEARCH(head,out,elt,cmp) \ - CDL_SEARCH2(head,out,elt,cmp,next) - -#define CDL_SEARCH2(head,out,elt,cmp,next) \ -do { \ - CDL_FOREACH2(head,out,next) { \ - if ((cmp(out,elt))==0) break; \ - } \ -} while (0) - -#define CDL_REPLACE_ELEM2(head, el, add, prev, next) \ -do { \ - assert((head) != NULL); \ - assert((el) != NULL); \ - assert((add) != NULL); \ - if ((el)->next == (el)) { \ - (add)->next = (add); \ - (add)->prev = (add); \ - (head) = (add); \ - } else { \ - (add)->next = (el)->next; \ - (add)->prev = (el)->prev; \ - (add)->next->prev = (add); \ - (add)->prev->next = (add); \ - if ((head) == (el)) { \ - (head) = (add); \ - } \ - } \ -} while (0) - -#define CDL_REPLACE_ELEM(head, el, add) \ - CDL_REPLACE_ELEM2(head, el, add, prev, next) - -#define CDL_PREPEND_ELEM2(head, el, add, prev, next) \ -do { \ - if (el) { \ - assert((head) != NULL); \ - assert((add) != NULL); \ - (add)->next = (el); \ - (add)->prev = (el)->prev; \ - (el)->prev = (add); \ - (add)->prev->next = (add); \ - if ((head) == (el)) { \ - (head) = (add); \ - } \ - } else { \ - CDL_APPEND2(head, add, prev, next); \ - } \ -} while (0) - -#define CDL_PREPEND_ELEM(head, el, add) \ - CDL_PREPEND_ELEM2(head, el, add, prev, next) - -#define CDL_APPEND_ELEM2(head, el, add, prev, next) \ -do { \ - if (el) { \ - assert((head) != NULL); \ - assert((add) != NULL); \ - (add)->next = (el)->next; \ - (add)->prev = (el); \ - (el)->next = (add); \ - (add)->next->prev = (add); \ - } else { \ - CDL_PREPEND2(head, add, prev, next); \ - } \ -} while (0) - -#define CDL_APPEND_ELEM(head, el, add) \ - CDL_APPEND_ELEM2(head, el, add, prev, next) - -#ifdef NO_DECLTYPE -/* Here are VS2008 / NO_DECLTYPE replacements for a few functions */ - -#undef CDL_INSERT_INORDER2 -#define CDL_INSERT_INORDER2(head,add,cmp,prev,next) \ -do { \ - if ((head) == NULL) { \ - (add)->prev = (add); \ - (add)->next = (add); \ - (head) = (add); \ - } else if ((cmp(head, add)) >= 0) { \ - (add)->prev = (head)->prev; \ - (add)->next = (head); \ - (add)->prev->next = (add); \ - (head)->prev = (add); \ - (head) = (add); \ - } else { \ - char *_tmp = (char*)(head); \ - while ((char*)(head)->next != _tmp && (cmp((head)->next, add)) < 0) { \ - (head) = (head)->next; \ - } \ - (add)->prev = (head); \ - (add)->next = (head)->next; \ - (add)->next->prev = (add); \ - (head)->next = (add); \ - UTLIST_RS(head); \ - } \ -} while (0) -#endif /* NO_DECLTYPE */ - -#endif /* UTLIST_H */ diff --git a/test/http_decoder/uthash-2.3.0/include/utringbuffer.h b/test/http_decoder/uthash-2.3.0/include/utringbuffer.h deleted file mode 100644 index cf48131..0000000 --- a/test/http_decoder/uthash-2.3.0/include/utringbuffer.h +++ /dev/null @@ -1,108 +0,0 @@ -/* -Copyright (c) 2015-2021, Troy D. Hanson http://troydhanson.github.com/uthash/ -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* a ring-buffer implementation using macros - */ -#ifndef UTRINGBUFFER_H -#define UTRINGBUFFER_H - -#define UTRINGBUFFER_VERSION 2.3.0 - -#include <stdlib.h> -#include <string.h> -#include "utarray.h" // for "UT_icd" - -typedef struct { - unsigned i; /* index of next available slot; wraps at n */ - unsigned n; /* capacity */ - unsigned char f; /* full */ - UT_icd icd; /* initializer, copy and destructor functions */ - char *d; /* n slots of size icd->sz */ -} UT_ringbuffer; - -#define utringbuffer_init(a, _n, _icd) do { \ - memset(a, 0, sizeof(UT_ringbuffer)); \ - (a)->icd = *(_icd); \ - (a)->n = (_n); \ - if ((a)->n) { (a)->d = (char*)malloc((a)->n * (_icd)->sz); } \ -} while(0) - -#define utringbuffer_clear(a) do { \ - if ((a)->icd.dtor) { \ - if ((a)->f) { \ - unsigned _ut_i; \ - for (_ut_i = 0; _ut_i < (a)->n; ++_ut_i) { \ - (a)->icd.dtor(utringbuffer_eltptr(a, _ut_i)); \ - } \ - } else { \ - unsigned _ut_i; \ - for (_ut_i = 0; _ut_i < (a)->i; ++_ut_i) { \ - (a)->icd.dtor(utringbuffer_eltptr(a, _ut_i)); \ - } \ - } \ - } \ - (a)->i = 0; \ - (a)->f = 0; \ -} while(0) - -#define utringbuffer_done(a) do { \ - utringbuffer_clear(a); \ - free((a)->d); (a)->d = NULL; \ - (a)->n = 0; \ -} while(0) - -#define utringbuffer_new(a,n,_icd) do { \ - a = (UT_ringbuffer*)malloc(sizeof(UT_ringbuffer)); \ - utringbuffer_init(a, n, _icd); \ -} while(0) - -#define utringbuffer_free(a) do { \ - utringbuffer_done(a); \ - free(a); \ -} while(0) - -#define utringbuffer_push_back(a,p) do { \ - if ((a)->icd.dtor && (a)->f) { (a)->icd.dtor(_utringbuffer_internalptr(a,(a)->i)); } \ - if ((a)->icd.copy) { (a)->icd.copy( _utringbuffer_internalptr(a,(a)->i), p); } \ - else { memcpy(_utringbuffer_internalptr(a,(a)->i), p, (a)->icd.sz); }; \ - if (++(a)->i == (a)->n) { (a)->i = 0; (a)->f = 1; } \ -} while(0) - -#define utringbuffer_len(a) ((a)->f ? (a)->n : (a)->i) -#define utringbuffer_empty(a) ((a)->i == 0 && !(a)->f) -#define utringbuffer_full(a) ((a)->f != 0) - -#define _utringbuffer_real_idx(a,j) ((a)->f ? ((j) + (a)->i) % (a)->n : (j)) -#define _utringbuffer_internalptr(a,j) ((void*)((a)->d + ((a)->icd.sz * (j)))) -#define utringbuffer_eltptr(a,j) ((0 <= (j) && (j) < utringbuffer_len(a)) ? _utringbuffer_internalptr(a,_utringbuffer_real_idx(a,j)) : NULL) - -#define _utringbuffer_fake_idx(a,j) ((a)->f ? ((j) + (a)->n - (a)->i) % (a)->n : (j)) -#define _utringbuffer_internalidx(a,e) (((char*)(e) >= (a)->d) ? (((char*)(e) - (a)->d)/(a)->icd.sz) : -1) -#define utringbuffer_eltidx(a,e) _utringbuffer_fake_idx(a, _utringbuffer_internalidx(a,e)) - -#define utringbuffer_front(a) utringbuffer_eltptr(a,0) -#define utringbuffer_next(a,e) ((e)==NULL ? utringbuffer_front(a) : utringbuffer_eltptr(a, utringbuffer_eltidx(a,e)+1)) -#define utringbuffer_prev(a,e) ((e)==NULL ? utringbuffer_back(a) : utringbuffer_eltptr(a, utringbuffer_eltidx(a,e)-1)) -#define utringbuffer_back(a) (utringbuffer_empty(a) ? NULL : utringbuffer_eltptr(a, utringbuffer_len(a) - 1)) - -#endif /* UTRINGBUFFER_H */ diff --git a/test/http_decoder/uthash-2.3.0/include/utstack.h b/test/http_decoder/uthash-2.3.0/include/utstack.h deleted file mode 100644 index 2dbfec8..0000000 --- a/test/http_decoder/uthash-2.3.0/include/utstack.h +++ /dev/null @@ -1,88 +0,0 @@ -/* -Copyright (c) 2018-2021, Troy D. Hanson http://troydhanson.github.com/uthash/ -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef UTSTACK_H -#define UTSTACK_H - -#define UTSTACK_VERSION 2.3.0 - -/* - * This file contains macros to manipulate a singly-linked list as a stack. - * - * To use utstack, your structure must have a "next" pointer. - * - * ----------------.EXAMPLE ------------------------- - * struct item { - * int id; - * struct item *next; - * } - * - * struct item *stack = NULL: - * - * int main() { - * int count; - * struct item *tmp; - * struct item *item = malloc(sizeof *item); - * item->id = 42; - * STACK_COUNT(stack, tmp, count); assert(count == 0); - * STACK_PUSH(stack, item); - * STACK_COUNT(stack, tmp, count); assert(count == 1); - * STACK_POP(stack, item); - * free(item); - * STACK_COUNT(stack, tmp, count); assert(count == 0); - * } - * -------------------------------------------------- - */ - -#define STACK_TOP(head) (head) - -#define STACK_EMPTY(head) (!(head)) - -#define STACK_PUSH(head,add) \ - STACK_PUSH2(head,add,next) - -#define STACK_PUSH2(head,add,next) \ -do { \ - (add)->next = (head); \ - (head) = (add); \ -} while (0) - -#define STACK_POP(head,result) \ - STACK_POP2(head,result,next) - -#define STACK_POP2(head,result,next) \ -do { \ - (result) = (head); \ - (head) = (head)->next; \ -} while (0) - -#define STACK_COUNT(head,el,counter) \ - STACK_COUNT2(head,el,counter,next) \ - -#define STACK_COUNT2(head,el,counter,next) \ -do { \ - (counter) = 0; \ - for ((el) = (head); el; (el) = (el)->next) { ++(counter); } \ -} while (0) - -#endif /* UTSTACK_H */ diff --git a/test/http_decoder/uthash-2.3.0/include/utstring.h b/test/http_decoder/uthash-2.3.0/include/utstring.h deleted file mode 100644 index 009b4c8..0000000 --- a/test/http_decoder/uthash-2.3.0/include/utstring.h +++ /dev/null @@ -1,407 +0,0 @@ -/* -Copyright (c) 2008-2021, Troy D. Hanson http://troydhanson.github.com/uthash/ -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* a dynamic string implementation using macros - */ -#ifndef UTSTRING_H -#define UTSTRING_H - -#define UTSTRING_VERSION 2.3.0 - -#include <stdlib.h> -#include <string.h> -#include <stdio.h> -#include <stdarg.h> - -#ifdef __GNUC__ -#define UTSTRING_UNUSED __attribute__((__unused__)) -#else -#define UTSTRING_UNUSED -#endif - -#ifdef oom -#error "The name of macro 'oom' has been changed to 'utstring_oom'. Please update your code." -#define utstring_oom() oom() -#endif - -#ifndef utstring_oom -#define utstring_oom() exit(-1) -#endif - -typedef struct { - char *d; /* pointer to allocated buffer */ - size_t n; /* allocated capacity */ - size_t i; /* index of first unused byte */ -} UT_string; - -#define utstring_reserve(s,amt) \ -do { \ - if (((s)->n - (s)->i) < (size_t)(amt)) { \ - char *utstring_tmp = (char*)realloc( \ - (s)->d, (s)->n + (amt)); \ - if (!utstring_tmp) { \ - utstring_oom(); \ - } \ - (s)->d = utstring_tmp; \ - (s)->n += (amt); \ - } \ -} while(0) - -#define utstring_init(s) \ -do { \ - (s)->n = 0; (s)->i = 0; (s)->d = NULL; \ - utstring_reserve(s,100); \ - (s)->d[0] = '\0'; \ -} while(0) - -#define utstring_done(s) \ -do { \ - if ((s)->d != NULL) free((s)->d); \ - (s)->n = 0; \ -} while(0) - -#define utstring_free(s) \ -do { \ - utstring_done(s); \ - free(s); \ -} while(0) - -#define utstring_new(s) \ -do { \ - (s) = (UT_string*)malloc(sizeof(UT_string)); \ - if (!(s)) { \ - utstring_oom(); \ - } \ - utstring_init(s); \ -} while(0) - -#define utstring_renew(s) \ -do { \ - if (s) { \ - utstring_clear(s); \ - } else { \ - utstring_new(s); \ - } \ -} while(0) - -#define utstring_clear(s) \ -do { \ - (s)->i = 0; \ - (s)->d[0] = '\0'; \ -} while(0) - -#define utstring_bincpy(s,b,l) \ -do { \ - utstring_reserve((s),(l)+1); \ - if (l) memcpy(&(s)->d[(s)->i], b, l); \ - (s)->i += (l); \ - (s)->d[(s)->i]='\0'; \ -} while(0) - -#define utstring_concat(dst,src) \ -do { \ - utstring_reserve((dst),((src)->i)+1); \ - if ((src)->i) memcpy(&(dst)->d[(dst)->i], (src)->d, (src)->i); \ - (dst)->i += (src)->i; \ - (dst)->d[(dst)->i]='\0'; \ -} while(0) - -#define utstring_len(s) ((s)->i) - -#define utstring_body(s) ((s)->d) - -UTSTRING_UNUSED static void utstring_printf_va(UT_string *s, const char *fmt, va_list ap) { - int n; - va_list cp; - for (;;) { -#ifdef _WIN32 - cp = ap; -#else - va_copy(cp, ap); -#endif - n = vsnprintf (&s->d[s->i], s->n-s->i, fmt, cp); - va_end(cp); - - if ((n > -1) && ((size_t) n < (s->n-s->i))) { - s->i += n; - return; - } - - /* Else try again with more space. */ - if (n > -1) utstring_reserve(s,n+1); /* exact */ - else utstring_reserve(s,(s->n)*2); /* 2x */ - } -} -#ifdef __GNUC__ -/* support printf format checking (2=the format string, 3=start of varargs) */ -static void utstring_printf(UT_string *s, const char *fmt, ...) - __attribute__ (( format( printf, 2, 3) )); -#endif -UTSTRING_UNUSED static void utstring_printf(UT_string *s, const char *fmt, ...) { - va_list ap; - va_start(ap,fmt); - utstring_printf_va(s,fmt,ap); - va_end(ap); -} - -/******************************************************************************* - * begin substring search functions * - ******************************************************************************/ -/* Build KMP table from left to right. */ -UTSTRING_UNUSED static void _utstring_BuildTable( - const char *P_Needle, - size_t P_NeedleLen, - long *P_KMP_Table) -{ - long i, j; - - i = 0; - j = i - 1; - P_KMP_Table[i] = j; - while (i < (long) P_NeedleLen) - { - while ( (j > -1) && (P_Needle[i] != P_Needle[j]) ) - { - j = P_KMP_Table[j]; - } - i++; - j++; - if (i < (long) P_NeedleLen) - { - if (P_Needle[i] == P_Needle[j]) - { - P_KMP_Table[i] = P_KMP_Table[j]; - } - else - { - P_KMP_Table[i] = j; - } - } - else - { - P_KMP_Table[i] = j; - } - } - - return; -} - - -/* Build KMP table from right to left. */ -UTSTRING_UNUSED static void _utstring_BuildTableR( - const char *P_Needle, - size_t P_NeedleLen, - long *P_KMP_Table) -{ - long i, j; - - i = P_NeedleLen - 1; - j = i + 1; - P_KMP_Table[i + 1] = j; - while (i >= 0) - { - while ( (j < (long) P_NeedleLen) && (P_Needle[i] != P_Needle[j]) ) - { - j = P_KMP_Table[j + 1]; - } - i--; - j--; - if (i >= 0) - { - if (P_Needle[i] == P_Needle[j]) - { - P_KMP_Table[i + 1] = P_KMP_Table[j + 1]; - } - else - { - P_KMP_Table[i + 1] = j; - } - } - else - { - P_KMP_Table[i + 1] = j; - } - } - - return; -} - - -/* Search data from left to right. ( Multiple search mode. ) */ -UTSTRING_UNUSED static long _utstring_find( - const char *P_Haystack, - size_t P_HaystackLen, - const char *P_Needle, - size_t P_NeedleLen, - long *P_KMP_Table) -{ - long i, j; - long V_FindPosition = -1; - - /* Search from left to right. */ - i = j = 0; - while ( (j < (int)P_HaystackLen) && (((P_HaystackLen - j) + i) >= P_NeedleLen) ) - { - while ( (i > -1) && (P_Needle[i] != P_Haystack[j]) ) - { - i = P_KMP_Table[i]; - } - i++; - j++; - if (i >= (int)P_NeedleLen) - { - /* Found. */ - V_FindPosition = j - i; - break; - } - } - - return V_FindPosition; -} - - -/* Search data from right to left. ( Multiple search mode. ) */ -UTSTRING_UNUSED static long _utstring_findR( - const char *P_Haystack, - size_t P_HaystackLen, - const char *P_Needle, - size_t P_NeedleLen, - long *P_KMP_Table) -{ - long i, j; - long V_FindPosition = -1; - - /* Search from right to left. */ - j = (P_HaystackLen - 1); - i = (P_NeedleLen - 1); - while ( (j >= 0) && (j >= i) ) - { - while ( (i < (int)P_NeedleLen) && (P_Needle[i] != P_Haystack[j]) ) - { - i = P_KMP_Table[i + 1]; - } - i--; - j--; - if (i < 0) - { - /* Found. */ - V_FindPosition = j + 1; - break; - } - } - - return V_FindPosition; -} - - -/* Search data from left to right. ( One time search mode. ) */ -UTSTRING_UNUSED static long utstring_find( - UT_string *s, - long P_StartPosition, /* Start from 0. -1 means last position. */ - const char *P_Needle, - size_t P_NeedleLen) -{ - long V_StartPosition; - long V_HaystackLen; - long *V_KMP_Table; - long V_FindPosition = -1; - - if (P_StartPosition < 0) - { - V_StartPosition = s->i + P_StartPosition; - } - else - { - V_StartPosition = P_StartPosition; - } - V_HaystackLen = s->i - V_StartPosition; - if ( (V_HaystackLen >= (long) P_NeedleLen) && (P_NeedleLen > 0) ) - { - V_KMP_Table = (long *)malloc(sizeof(long) * (P_NeedleLen + 1)); - if (V_KMP_Table != NULL) - { - _utstring_BuildTable(P_Needle, P_NeedleLen, V_KMP_Table); - - V_FindPosition = _utstring_find(s->d + V_StartPosition, - V_HaystackLen, - P_Needle, - P_NeedleLen, - V_KMP_Table); - if (V_FindPosition >= 0) - { - V_FindPosition += V_StartPosition; - } - - free(V_KMP_Table); - } - } - - return V_FindPosition; -} - - -/* Search data from right to left. ( One time search mode. ) */ -UTSTRING_UNUSED static long utstring_findR( - UT_string *s, - long P_StartPosition, /* Start from 0. -1 means last position. */ - const char *P_Needle, - size_t P_NeedleLen) -{ - long V_StartPosition; - long V_HaystackLen; - long *V_KMP_Table; - long V_FindPosition = -1; - - if (P_StartPosition < 0) - { - V_StartPosition = s->i + P_StartPosition; - } - else - { - V_StartPosition = P_StartPosition; - } - V_HaystackLen = V_StartPosition + 1; - if ( (V_HaystackLen >= (long) P_NeedleLen) && (P_NeedleLen > 0) ) - { - V_KMP_Table = (long *)malloc(sizeof(long) * (P_NeedleLen + 1)); - if (V_KMP_Table != NULL) - { - _utstring_BuildTableR(P_Needle, P_NeedleLen, V_KMP_Table); - - V_FindPosition = _utstring_findR(s->d, - V_HaystackLen, - P_Needle, - P_NeedleLen, - V_KMP_Table); - - free(V_KMP_Table); - } - } - - return V_FindPosition; -} -/******************************************************************************* - * end substring search functions * - ******************************************************************************/ - -#endif /* UTSTRING_H */ |