session manager add udp eviction filter test case

src/session/session_manager.cpp

@@ -628,6 +628,8 @@ static void session_manager_update_udp_to_closing(struct session_manager *mgr, s
 {
      session_manager_update_session_state(mgr, sess, SESSION_STATE_CLOSING);
      session_timer_del_session(mgr->sess_timer, sess);
+     session_queue_push(mgr->sess_toclosed_queue, sess);
+     eviction_filter_add(mgr->udp_eviction_filter, session_get0_1st_pkt(sess));
 }
 
 static void session_manager_update_tcp_to_opening(struct session_manager *mgr, struct session *sess, int opening_by_syn)
@@ -922,7 +924,14 @@ static void session_manager_free_session(struct session_manager *mgr, struct ses
      {
           SESSION_LOG_DEBUG("%s, session %lu closing -> closed", session_closing_reasion_tostring(session_get_closing_reasion(sess)), session_get_id(sess));
           session_manager_update_session_to_closed(mgr, sess);
+          if (session_get_type(sess) == SESSION_TYPE_TCP)
+          {
                session_table_del_session(mgr->tcp_sess_table, session_get0_key(sess));
+          }
+          if (session_get_type(sess) == SESSION_TYPE_UDP)
+          {
+               session_table_del_session(mgr->udp_sess_table, session_get0_key(sess));
+          }
           session_set0_cur_pkt(sess, NULL);
           session_set_cur_dir(sess, SESSION_DIR_NONE);
           session_free(sess);
@@ -947,8 +956,9 @@ static void session_manager_recycle_session(struct session_manager *mgr)
 static void session_manager_evicte_session(struct session_manager *mgr, struct session *sess)
 {
      session_set_closing_reasion(sess, CLOSING_BY_EVICTED);
-     session_manager_update_tcp_to_closing(mgr, sess, 0);
+     session_manager_update_session_state(mgr, sess, SESSION_STATE_CLOSING);
      session_queue_push(mgr->sess_evicted_queue, sess);
+     session_timer_del_session(mgr->sess_timer, sess);
 
      if (session_get_type(sess) == SESSION_TYPE_UDP)
      {

src/session/test/CMakeLists.txt

@@ -70,12 +70,15 @@ add_executable(gtest_timeout_udp_data gtest_timeout_udp_data.cpp)
 target_link_libraries(gtest_timeout_udp_data session_manager gtest)
 
 ###############################################################################
-# gtest filter (TCP dupkt)
+# gtest filter
 ###############################################################################
 
 add_executable(gtest_filter_tcp_dupkt gtest_filter_tcp_dupkt.cpp)
 target_link_libraries(gtest_filter_tcp_dupkt session_manager gtest)
 
+add_executable(gtest_filter_udp_eviction gtest_filter_udp_eviction.cpp)
+target_link_libraries(gtest_filter_udp_eviction session_manager gtest)
+
 ###############################################################################
 # gtest
 ###############################################################################
@@ -104,3 +107,4 @@ gtest_discover_tests(gtest_timeout_tcp_half_closed)
 gtest_discover_tests(gtest_timeout_udp_data)
 
 gtest_discover_tests(gtest_filter_tcp_dupkt)
+gtest_discover_tests(gtest_filter_udp_eviction)

src/session/test/gtest_filter_udp_eviction.cpp

@@ -0,0 +1,136 @@
+#include "test_utils.h"
+
+#if 1
+TEST(UDP_EVICTION_FILTER_ENABLE, HIT_FILTER_THEN_EVICT_SESS)
+{
+    struct packet pkt;
+    struct session *sess = NULL;
+    struct session_manager *mgr = NULL;
+
+    timestamp_update();
+
+    mgr = session_manager_create(&config);
+    EXPECT_TRUE(mgr != NULL);
+
+    // C2S REQ Packet
+    printf("=> packet parse: UDP C2S REQ packet\n");
+    packet_parse(&pkt, (const char *)udp_pkt1_dns_req, sizeof(udp_pkt1_dns_req));
+    printf("<= packet parse\n\n");
+    sess = session_manager_update_session(mgr, &pkt);
+    EXPECT_TRUE(sess);
+    __session_dispatch(sess);
+
+    // wait session timeout
+    __session_manager_check_counter(mgr, 0, 0, 0, 1, 0, 0);
+    __session_manager_wait(mgr, CLOSING_BY_TIMEOUT);
+    __session_manager_check_counter(mgr, 0, 0, 0, 0, 0, 0);
+
+    // C2S REQ Packet
+    printf("=> packet parse: UDP C2S REQ packet\n");
+    packet_parse(&pkt, (const char *)udp_pkt1_dns_req, sizeof(udp_pkt1_dns_req));
+    printf("<= packet parse\n\n");
+    sess = session_manager_update_session(mgr, &pkt);
+    EXPECT_TRUE(sess == NULL);
+    __session_dispatch(sess);
+
+    session_manager_destroy(mgr);
+}
+#endif
+
+#if 1
+TEST(UDP_EVICTION_FILTER_ENABLE, MISS_FILTER_THEN_NEW_SESS)
+{
+    struct packet pkt;
+    struct session *sess = NULL;
+    struct session_manager *mgr = NULL;
+    struct session_manager_config _config;
+    memcpy(&_config, &config, sizeof(struct session_manager_config));
+    _config.udp_eviction_filter_timeout = 2;
+
+    timestamp_update();
+
+    mgr = session_manager_create(&_config);
+    EXPECT_TRUE(mgr != NULL);
+
+    // C2S REQ Packet
+    printf("=> packet parse: UDP C2S REQ packet\n");
+    packet_parse(&pkt, (const char *)udp_pkt1_dns_req, sizeof(udp_pkt1_dns_req));
+    printf("<= packet parse\n\n");
+    sess = session_manager_update_session(mgr, &pkt);
+    EXPECT_TRUE(sess);
+    __session_dispatch(sess);
+
+    // wait session timeout
+    __session_manager_check_counter(mgr, 0, 0, 0, 1, 0, 0);
+    __session_manager_wait(mgr, CLOSING_BY_TIMEOUT);
+    __session_manager_check_counter(mgr, 0, 0, 0, 0, 0, 0);
+
+    // wait udp eviction filter timeout
+    sleep(_config.udp_eviction_filter_timeout);
+    timestamp_update();
+
+    // C2S REQ Packet
+    printf("=> packet parse: UDP C2S REQ packet\n");
+    packet_parse(&pkt, (const char *)udp_pkt1_dns_req, sizeof(udp_pkt1_dns_req));
+    printf("<= packet parse\n\n");
+    sess = session_manager_update_session(mgr, &pkt);
+    EXPECT_TRUE(sess); // add new udp session
+    __session_dispatch(sess);
+
+    __session_manager_check_counter(mgr, 0, 0, 0, 1, 0, 0);
+    __session_manager_wait(mgr, CLOSING_BY_TIMEOUT);
+    __session_manager_check_counter(mgr, 0, 0, 0, 0, 0, 0);
+
+    session_manager_destroy(mgr);
+}
+#endif
+
+#if 1
+TEST(UDP_EVICTION_FILTER_DISABLE, MISS_FILTER_THEN_NEW_SESS)
+{
+    struct packet pkt;
+    struct session *sess = NULL;
+    struct session_manager *mgr = NULL;
+    struct session_manager_config _config;
+    memcpy(&_config, &config, sizeof(struct session_manager_config));
+    _config.udp_eviction_filter_enable = 0;
+
+    timestamp_update();
+
+    mgr = session_manager_create(&_config);
+    EXPECT_TRUE(mgr != NULL);
+
+    // C2S REQ Packet
+    printf("=> packet parse: UDP C2S REQ packet\n");
+    packet_parse(&pkt, (const char *)udp_pkt1_dns_req, sizeof(udp_pkt1_dns_req));
+    printf("<= packet parse\n\n");
+    sess = session_manager_update_session(mgr, &pkt);
+    EXPECT_TRUE(sess);
+    __session_dispatch(sess);
+
+    // wait session timeout
+    __session_manager_check_counter(mgr, 0, 0, 0, 1, 0, 0);
+    __session_manager_wait(mgr, CLOSING_BY_TIMEOUT);
+    __session_manager_check_counter(mgr, 0, 0, 0, 0, 0, 0);
+
+    // C2S REQ Packet
+    printf("=> packet parse: UDP C2S REQ packet\n");
+    packet_parse(&pkt, (const char *)udp_pkt1_dns_req, sizeof(udp_pkt1_dns_req));
+    printf("<= packet parse\n\n");
+    sess = session_manager_update_session(mgr, &pkt);
+    EXPECT_TRUE(sess); // add new udp session
+    __session_dispatch(sess);
+
+    __session_manager_check_counter(mgr, 0, 0, 0, 1, 0, 0);
+    __session_manager_wait(mgr, CLOSING_BY_TIMEOUT);
+    __session_manager_check_counter(mgr, 0, 0, 0, 0, 0, 0);
+
+    session_manager_destroy(mgr);
+}
+#endif
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}