integration http decoder

72 files changed, 16 insertions, 8 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 44718f1..c73425d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,7 @@ add_subdirectory(log)
 add_subdirectory(times)
 add_subdirectory(tuple)
 add_subdirectory(hexdump)
-add_subdirectory(packet)
+add_subdirectory(parsers)
 add_subdirectory(packet_io)
 add_subdirectory(id_generator)
 add_subdirectory(ip_reassembly)
@@ -10,5 +10,5 @@ add_subdirectory(tcp_reassembly)
 add_subdirectory(duplicated_packet_filter)
 add_subdirectory(evicted_session_filter)
 add_subdirectory(session)
-add_subdirectory(plugin)
-add_subdirectory(stellar)
\ No newline at end of file
+add_subdirectory(plugin_manager)
+add_subdirectory(core)
\ No newline at end of file
diff --git a/src/stellar/CMakeLists.txt b/src/core/CMakeLists.txt
index bc2c897..59461d0 100644
--- a/src/stellar/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(SOURCE stellar_config.cpp stellar_stat.cpp stellar_core.cpp)
-set(LIBRARY times session_manager plugin_manager ip_reassembly packet_io packet pthread fieldstat4 toml hexdump)
+set(LIBRARY times session_manager plugin_manager ip_reassembly 
+	packet_io packet pthread fieldstat4 toml hexdump mempool
+	http_decoder)
 
 add_library(stellar_core STATIC ${SOURCE})
 target_link_libraries(stellar_core PUBLIC ${LIBRARY})
diff --git a/src/stellar/logo.h b/src/core/logo.h
index 2bd85b9..2bd85b9 100644
--- a/src/stellar/logo.h
+++ b/src/core/logo.h
diff --git a/src/stellar/macro.h b/src/core/macro.h
index 705dd58..705dd58 100644
--- a/src/stellar/macro.h
+++ b/src/core/macro.h
diff --git a/src/stellar/main.cpp b/src/core/main.cpp
index 69a7405..69a7405 100644
--- a/src/stellar/main.cpp
+++ b/src/core/main.cpp
diff --git a/src/stellar/stellar_config.cpp b/src/core/stellar_config.cpp
index f42b451..f42b451 100644
--- a/src/stellar/stellar_config.cpp
+++ b/src/core/stellar_config.cpp
diff --git a/src/stellar/stellar_config.h b/src/core/stellar_config.h
index d0724d1..d0724d1 100644
--- a/src/stellar/stellar_config.h
+++ b/src/core/stellar_config.h
diff --git a/src/stellar/stellar_core.cpp b/src/core/stellar_core.cpp
index 80f437c..80f437c 100644
--- a/src/stellar/stellar_core.cpp
+++ b/src/core/stellar_core.cpp
diff --git a/src/stellar/stellar_core.h b/src/core/stellar_core.h
index 788ef1d..788ef1d 100644
--- a/src/stellar/stellar_core.h
+++ b/src/core/stellar_core.h
diff --git a/src/stellar/stellar_stat.cpp b/src/core/stellar_stat.cpp
index 63a88a3..63a88a3 100644
--- a/src/stellar/stellar_stat.cpp
+++ b/src/core/stellar_stat.cpp
diff --git a/src/stellar/stellar_stat.h b/src/core/stellar_stat.h
index b309373..b309373 100644
--- a/src/stellar/stellar_stat.h
+++ b/src/core/stellar_stat.h
diff --git a/src/stellar/version.map b/src/core/version.map
index 39855e1..25b803e 100644
--- a/src/stellar/version.map
+++ b/src/core/version.map
@@ -59,5 +59,11 @@ global:
 	stellar_send_crafted_packet;
 	stellar_run;
 
+    http_message_*;
+	http_decoder_init;
+	http_decoder_exit;
+	http_decoder_tcp_stream_msg_cb;
+	http_tunnel_message_*;
+
 local: *;
 };
diff --git a/src/packet_io/CMakeLists.txt b/src/packet_io/CMakeLists.txt
index b2e55fc..1324ecb 100644
--- a/src/packet_io/CMakeLists.txt
+++ b/src/packet_io/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_library(packet_io dumpfile_io.cpp marsio_io.cpp lock_free_queue.cpp packet_io.cpp)
 target_include_directories(packet_io PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_include_directories(packet_io PUBLIC ${CMAKE_SOURCE_DIR}/src/stellar)
+target_include_directories(packet_io PUBLIC ${CMAKE_SOURCE_DIR}/src/core)
 target_link_libraries(packet_io marsio pcap packet)
\ No newline at end of file
diff --git a/src/packet/CMakeLists.txt b/src/parsers/CMakeLists.txt
index 55f2812..55f2812 100644
--- a/src/packet/CMakeLists.txt
+++ b/src/parsers/CMakeLists.txt
diff --git a/src/packet/checksum.cpp b/src/parsers/checksum.cpp
index a984598..a984598 100644
--- a/src/packet/checksum.cpp
+++ b/src/parsers/checksum.cpp
diff --git a/src/packet/checksum.h b/src/parsers/checksum.h
index 56c5b5e..56c5b5e 100644
--- a/src/packet/checksum.h
+++ b/src/parsers/checksum.h
diff --git a/src/packet/eth_utils.h b/src/parsers/eth_utils.h
index 0b14bac..0b14bac 100644
--- a/src/packet/eth_utils.h
+++ b/src/parsers/eth_utils.h
diff --git a/src/packet/gre0_utils.h b/src/parsers/gre0_utils.h
index ea44d48..ea44d48 100644
--- a/src/packet/gre0_utils.h
+++ b/src/parsers/gre0_utils.h
diff --git a/src/packet/gre1_utils.h b/src/parsers/gre1_utils.h
index 2dca44b..2dca44b 100644
--- a/src/packet/gre1_utils.h
+++ b/src/parsers/gre1_utils.h
diff --git a/src/packet/gre_utils.h b/src/parsers/gre_utils.h
index 640fcec..640fcec 100644
--- a/src/packet/gre_utils.h
+++ b/src/parsers/gre_utils.h
diff --git a/src/packet/gtp1_utils.h b/src/parsers/gtp1_utils.h
index 23be8c2..23be8c2 100644
--- a/src/packet/gtp1_utils.h
+++ b/src/parsers/gtp1_utils.h
diff --git a/src/packet/gtp2_utils.h b/src/parsers/gtp2_utils.h
index c7e6cf5..c7e6cf5 100644
--- a/src/packet/gtp2_utils.h
+++ b/src/parsers/gtp2_utils.h
diff --git a/src/packet/gtp_utils.h b/src/parsers/gtp_utils.h
index 8b0fc00..8b0fc00 100644
--- a/src/packet/gtp_utils.h
+++ b/src/parsers/gtp_utils.h
diff --git a/src/packet/ip4_utils.h b/src/parsers/ip4_utils.h
index 9ce17a7..9ce17a7 100644
--- a/src/packet/ip4_utils.h
+++ b/src/parsers/ip4_utils.h
diff --git a/src/packet/ip6_utils.h b/src/parsers/ip6_utils.h
index e2af6c9..e2af6c9 100644
--- a/src/packet/ip6_utils.h
+++ b/src/parsers/ip6_utils.h
diff --git a/src/packet/l2tp_utils.h b/src/parsers/l2tp_utils.h
index 9d4ff97..9d4ff97 100644
--- a/src/packet/l2tp_utils.h
+++ b/src/parsers/l2tp_utils.h
diff --git a/src/packet/mpls_utils.h b/src/parsers/mpls_utils.h
index e0b91e9..e0b91e9 100644
--- a/src/packet/mpls_utils.h
+++ b/src/parsers/mpls_utils.h
diff --git a/src/packet/packet_craft.cpp b/src/parsers/packet_craft.cpp
index 47b6de4..47b6de4 100644
--- a/src/packet/packet_craft.cpp
+++ b/src/parsers/packet_craft.cpp
diff --git a/src/packet/packet_craft.h b/src/parsers/packet_craft.h
index cfd7cf4..cfd7cf4 100644
--- a/src/packet/packet_craft.h
+++ b/src/parsers/packet_craft.h
diff --git a/src/packet/packet_def.h b/src/parsers/packet_def.h
index 774b67d..774b67d 100644
--- a/src/packet/packet_def.h
+++ b/src/parsers/packet_def.h
diff --git a/src/packet/packet_dump.cpp b/src/parsers/packet_dump.cpp
index 854d9c2..854d9c2 100644
--- a/src/packet/packet_dump.cpp
+++ b/src/parsers/packet_dump.cpp
diff --git a/src/packet/packet_dump.h b/src/parsers/packet_dump.h
index 047a061..047a061 100644
--- a/src/packet/packet_dump.h
+++ b/src/parsers/packet_dump.h
diff --git a/src/packet/packet_layer.cpp b/src/parsers/packet_layer.cpp
index 3104cd6..3104cd6 100644
--- a/src/packet/packet_layer.cpp
+++ b/src/parsers/packet_layer.cpp
diff --git a/src/packet/packet_layer.h b/src/parsers/packet_layer.h
index 8121ea5..8121ea5 100644
--- a/src/packet/packet_layer.h
+++ b/src/parsers/packet_layer.h
diff --git a/src/packet/packet_ldbc.cpp b/src/parsers/packet_ldbc.cpp
index 0597a23..0597a23 100644
--- a/src/packet/packet_ldbc.cpp
+++ b/src/parsers/packet_ldbc.cpp
diff --git a/src/packet/packet_ldbc.h b/src/parsers/packet_ldbc.h
index 76d174f..76d174f 100644
--- a/src/packet/packet_ldbc.h
+++ b/src/parsers/packet_ldbc.h
diff --git a/src/packet/packet_parse.cpp b/src/parsers/packet_parse.cpp
index 204c981..204c981 100644
--- a/src/packet/packet_parse.cpp
+++ b/src/parsers/packet_parse.cpp
diff --git a/src/packet/packet_parse.h b/src/parsers/packet_parse.h
index 5a8ce86..5a8ce86 100644
--- a/src/packet/packet_parse.h
+++ b/src/parsers/packet_parse.h
diff --git a/src/packet/packet_tunnel.cpp b/src/parsers/packet_tunnel.cpp
index 1d61b5f..1d61b5f 100644
--- a/src/packet/packet_tunnel.cpp
+++ b/src/parsers/packet_tunnel.cpp
diff --git a/src/packet/packet_utils.cpp b/src/parsers/packet_utils.cpp
index e207826..e207826 100644
--- a/src/packet/packet_utils.cpp
+++ b/src/parsers/packet_utils.cpp
diff --git a/src/packet/packet_utils.h b/src/parsers/packet_utils.h
index aa9315d..aa9315d 100644
--- a/src/packet/packet_utils.h
+++ b/src/parsers/packet_utils.h
diff --git a/src/packet/tcp_utils.h b/src/parsers/tcp_utils.h
index f01fe62..f01fe62 100644
--- a/src/packet/tcp_utils.h
+++ b/src/parsers/tcp_utils.h
diff --git a/src/packet/test/CMakeLists.txt b/src/parsers/test/CMakeLists.txt
index 1308737..1308737 100644
--- a/src/packet/test/CMakeLists.txt
+++ b/src/parsers/test/CMakeLists.txt
diff --git a/src/packet/test/gtest_eth_utils.cpp b/src/parsers/test/gtest_eth_utils.cpp
index 07704f2..07704f2 100644
--- a/src/packet/test/gtest_eth_utils.cpp
+++ b/src/parsers/test/gtest_eth_utils.cpp
diff --git a/src/packet/test/gtest_gre0_utils.cpp b/src/parsers/test/gtest_gre0_utils.cpp
index 03852c0..03852c0 100644
--- a/src/packet/test/gtest_gre0_utils.cpp
+++ b/src/parsers/test/gtest_gre0_utils.cpp
diff --git a/src/packet/test/gtest_gre1_utils.cpp b/src/parsers/test/gtest_gre1_utils.cpp
index cb91e12..cb91e12 100644
--- a/src/packet/test/gtest_gre1_utils.cpp
+++ b/src/parsers/test/gtest_gre1_utils.cpp
diff --git a/src/packet/test/gtest_gtp1_utils.cpp b/src/parsers/test/gtest_gtp1_utils.cpp
index 45b220a..45b220a 100644
--- a/src/packet/test/gtest_gtp1_utils.cpp
+++ b/src/parsers/test/gtest_gtp1_utils.cpp
diff --git a/src/packet/test/gtest_gtp2_utils.cpp b/src/parsers/test/gtest_gtp2_utils.cpp
index e02e4a7..e02e4a7 100644
--- a/src/packet/test/gtest_gtp2_utils.cpp
+++ b/src/parsers/test/gtest_gtp2_utils.cpp
diff --git a/src/packet/test/gtest_ip4_utils.cpp b/src/parsers/test/gtest_ip4_utils.cpp
index b830e3f..b830e3f 100644
--- a/src/packet/test/gtest_ip4_utils.cpp
+++ b/src/parsers/test/gtest_ip4_utils.cpp
diff --git a/src/packet/test/gtest_ip6_utils.cpp b/src/parsers/test/gtest_ip6_utils.cpp
index 533ed2c..533ed2c 100644
--- a/src/packet/test/gtest_ip6_utils.cpp
+++ b/src/parsers/test/gtest_ip6_utils.cpp
diff --git a/src/packet/test/gtest_l2tp_utils.cpp b/src/parsers/test/gtest_l2tp_utils.cpp
index 321b61f..321b61f 100644
--- a/src/packet/test/gtest_l2tp_utils.cpp
+++ b/src/parsers/test/gtest_l2tp_utils.cpp
diff --git a/src/packet/test/gtest_mpls_utils.cpp b/src/parsers/test/gtest_mpls_utils.cpp
index 1ec38ce..1ec38ce 100644
--- a/src/packet/test/gtest_mpls_utils.cpp
+++ b/src/parsers/test/gtest_mpls_utils.cpp
diff --git a/src/packet/test/gtest_packet_craft.cpp b/src/parsers/test/gtest_packet_craft.cpp
index fa954c2..fa954c2 100644
--- a/src/packet/test/gtest_packet_craft.cpp
+++ b/src/parsers/test/gtest_packet_craft.cpp
diff --git a/src/packet/test/gtest_packet_frag.cpp b/src/parsers/test/gtest_packet_frag.cpp
index 82ad3c1..82ad3c1 100644
--- a/src/packet/test/gtest_packet_frag.cpp
+++ b/src/parsers/test/gtest_packet_frag.cpp
diff --git a/src/packet/test/gtest_packet_ldbc.cpp b/src/parsers/test/gtest_packet_ldbc.cpp
index 2f74c77..2f74c77 100644
--- a/src/packet/test/gtest_packet_ldbc.cpp
+++ b/src/parsers/test/gtest_packet_ldbc.cpp
diff --git a/src/packet/test/gtest_packet_parse.cpp b/src/parsers/test/gtest_packet_parse.cpp
index 5d1c1e0..5d1c1e0 100644
--- a/src/packet/test/gtest_packet_parse.cpp
+++ b/src/parsers/test/gtest_packet_parse.cpp
diff --git a/src/packet/test/gtest_tcp_utils.cpp b/src/parsers/test/gtest_tcp_utils.cpp
index fd13102..fd13102 100644
--- a/src/packet/test/gtest_tcp_utils.cpp
+++ b/src/parsers/test/gtest_tcp_utils.cpp
diff --git a/src/packet/test/gtest_tunnel.cpp b/src/parsers/test/gtest_tunnel.cpp
index 04e1f32..04e1f32 100644
--- a/src/packet/test/gtest_tunnel.cpp
+++ b/src/parsers/test/gtest_tunnel.cpp
diff --git a/src/packet/test/gtest_udp_utils.cpp b/src/parsers/test/gtest_udp_utils.cpp
index 62dbc81..62dbc81 100644
--- a/src/packet/test/gtest_udp_utils.cpp
+++ b/src/parsers/test/gtest_udp_utils.cpp
diff --git a/src/packet/test/gtest_vlan_utils.cpp b/src/parsers/test/gtest_vlan_utils.cpp
index 1506f69..1506f69 100644
--- a/src/packet/test/gtest_vlan_utils.cpp
+++ b/src/parsers/test/gtest_vlan_utils.cpp
diff --git a/src/packet/test/gtest_vxlan_utils.cpp b/src/parsers/test/gtest_vxlan_utils.cpp
index 5e22f2a..5e22f2a 100644
--- a/src/packet/test/gtest_vxlan_utils.cpp
+++ b/src/parsers/test/gtest_vxlan_utils.cpp
diff --git a/src/packet/udp_utils.h b/src/parsers/udp_utils.h
index 0c2a767..0c2a767 100644
--- a/src/packet/udp_utils.h
+++ b/src/parsers/udp_utils.h
diff --git a/src/packet/vlan_utils.h b/src/parsers/vlan_utils.h
index 69793a2..69793a2 100644
--- a/src/packet/vlan_utils.h
+++ b/src/parsers/vlan_utils.h
diff --git a/src/packet/vxlan_utils.h b/src/parsers/vxlan_utils.h
index 125edd8..125edd8 100644
--- a/src/packet/vxlan_utils.h
+++ b/src/parsers/vxlan_utils.h
diff --git a/src/plugin/CMakeLists.txt b/src/plugin_manager/CMakeLists.txt
index 3c08c28..3c08c28 100644
--- a/src/plugin/CMakeLists.txt
+++ b/src/plugin_manager/CMakeLists.txt
diff --git a/src/plugin/plugin_manager.cpp b/src/plugin_manager/plugin_manager.cpp
index 85728b0..69b0be3 100644
--- a/src/plugin/plugin_manager.cpp
+++ b/src/plugin_manager/plugin_manager.cpp
@@ -4,10 +4,10 @@
 #include "toml/toml.h"
 #include "uthash/utlist.h"
 
-#include "stellar/stellar_core.h"
+#include "core/stellar_core.h"
 #include "session/session_utils.h"
 #include "tuple/tuple.h"
-#include "packet/packet_utils.h"
+#include "parsers/packet_utils.h"
 
 UT_icd plugin_specs_icd = {sizeof(struct plugin_specific), NULL, NULL, NULL};
 
diff --git a/src/plugin/plugin_manager.h b/src/plugin_manager/plugin_manager.h
index 1de5878..1de5878 100644
--- a/src/plugin/plugin_manager.h
+++ b/src/plugin_manager/plugin_manager.h
diff --git a/src/plugin/plugin_manager_interna.h b/src/plugin_manager/plugin_manager_interna.h
index 07e462d..07e462d 100644
--- a/src/plugin/plugin_manager_interna.h
+++ b/src/plugin_manager/plugin_manager_interna.h
diff --git a/src/plugin/test/CMakeLists.txt b/src/plugin_manager/test/CMakeLists.txt
index 7698640..7698640 100644
--- a/src/plugin/test/CMakeLists.txt
+++ b/src/plugin_manager/test/CMakeLists.txt
diff --git a/src/plugin/test/plugin_manager_gtest_main.cpp b/src/plugin_manager/test/plugin_manager_gtest_main.cpp
index 44cb3d4..44cb3d4 100644
--- a/src/plugin/test/plugin_manager_gtest_main.cpp
+++ b/src/plugin_manager/test/plugin_manager_gtest_main.cpp
diff --git a/src/plugin/test/plugin_manager_gtest_mock.h b/src/plugin_manager/test/plugin_manager_gtest_mock.h
index b25fb63..b25fb63 100644
--- a/src/plugin/test/plugin_manager_gtest_mock.h
+++ b/src/plugin_manager/test/plugin_manager_gtest_mock.h
diff --git a/src/session/CMakeLists.txt b/src/session/CMakeLists.txt
index 1573f66..3a24f49 100644
--- a/src/session/CMakeLists.txt
+++ b/src/session/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library(session_manager
     session_transition.cpp
 )
 target_include_directories(session_manager PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_include_directories(session_manager PUBLIC ${CMAKE_SOURCE_DIR}/src/stellar)
+target_include_directories(session_manager PUBLIC ${CMAKE_SOURCE_DIR}/src/core)
 target_include_directories(session_manager PUBLIC ${CMAKE_SOURCE_DIR}/include)
 target_link_libraries(session_manager timeout id_generator duplicated_packet_filter evicted_session_filter log tcp_reassembly)