add udp init -> opening test case

src/session/session_manager.cpp

@@ -75,6 +75,7 @@ static void session_manager_update_session_timer(struct session_manager *mgr, st
 static void session_manager_update_session_base(struct session_manager *mgr, struct session *sess, const struct tuple6 *key, enum session_dir curr_dir);
 static void session_manager_update_session_packet(struct session_manager *mgr, struct session *sess, const struct packet *pkt, enum session_dir curr_dir);
 
+static void session_manager_update_udp_to_opening(struct session_manager *mgr, struct session *sess);
 static void session_manager_update_udp_to_active(struct session_manager *mgr, struct session *sess);
 static void session_manager_update_udp_to_closing(struct session_manager *mgr, struct session *sess);
 static void session_manager_update_tcp_to_opening(struct session_manager *mgr, struct session *sess, int opening_by_syn);
@@ -82,8 +83,6 @@ static void session_manager_update_tcp_to_active(struct session_manager *mgr, st
 static void session_manager_update_tcp_to_closing(struct session_manager *mgr, struct session *sess, int enable_time_wait);
 static void session_manager_update_session_to_closed(struct session_manager *mgr, struct session *sess);
 
-static void session_manager_handle_udp_on_active(struct session_manager *mgr, struct session *sess);
-static void session_manager_handle_udp_on_closing(struct session_manager *mgr, struct session *sess);
 static void session_manager_handle_tcp_on_opening(struct session_manager *mgr, struct session *sess, enum tcp_state tcp_old_state, enum tcp_state tcp_curr_state);
 static void session_manager_handle_tcp_on_active(struct session_manager *mgr, struct session *sess, enum tcp_state tcp_old_state, enum tcp_state tcp_curr_state);
 static void session_manager_handle_tcp_on_closing(struct session_manager *mgr, struct session *sess, enum tcp_state tcp_old_state, enum tcp_state tcp_curr_state);
@@ -613,6 +612,12 @@ static void session_manager_update_session_packet(struct session_manager *mgr, s
      session_set_last_time(sess, timestamp_get_msec());
 }
 
+static void session_manager_update_udp_to_opening(struct session_manager *mgr, struct session *sess)
+{
+     session_manager_update_session_state(mgr, sess, SESSION_STATE_OPENING);
+     session_manager_update_session_timer(mgr, sess, udp_data_timeout_cb, mgr->config.udp_timeout_data);
+}
+
 static void session_manager_update_udp_to_active(struct session_manager *mgr, struct session *sess)
 {
      session_manager_update_session_state(mgr, sess, SESSION_STATE_ACTIVE);
@@ -663,17 +668,6 @@ static void session_manager_update_session_to_closed(struct session_manager *mgr
      session_timer_del_session(mgr->sess_timer, sess);
 }
 
-static void session_manager_handle_udp_on_active(struct session_manager *mgr, struct session *sess)
-{
-     session_manager_update_session_timer(mgr, sess, udp_data_timeout_cb, mgr->config.udp_timeout_data);
-}
-
-static void session_manager_handle_udp_on_closing(struct session_manager *mgr, struct session *sess)
-{
-     assert(0);
-     session_manager_update_session_timer(mgr, sess, udp_data_timeout_cb, mgr->config.udp_timeout_data);
-}
-
 // opening -> opening
 // opening -> active
 // opening -> closing
@@ -846,7 +840,7 @@ static struct session *session_manager_new_udp_session(struct session_manager *m
      session_manager_update_session_base(mgr, sess, key, curr_dir);
      session_manager_update_session_packet(mgr, sess, pkt, curr_dir);
      session_update_udp_state(sess, NULL, curr_dir);
-     session_manager_update_udp_to_active(mgr, sess); // change session state to active
+     session_manager_update_udp_to_opening(mgr, sess);
      session_table_add_session(mgr->udp_sess_table, key, sess);
 
      return sess;
@@ -906,13 +900,13 @@ static struct session *session_manager_update_udp_session(struct session_manager
      switch (sess_state)
      {
      case SESSION_STATE_OPENING:
-          assert(0);
+          session_manager_update_udp_to_active(mgr, sess);
           break;
      case SESSION_STATE_ACTIVE:
-          session_manager_handle_udp_on_active(mgr, sess);
+          session_manager_update_udp_to_active(mgr, sess);
           return sess;
      case SESSION_STATE_CLOSING:
-          session_manager_handle_udp_on_closing(mgr, sess);
+          assert(0);
           break;
      case SESSION_STATE_CLOSED:
           assert(0);

src/session/test/CMakeLists.txt

@@ -32,6 +32,9 @@ target_link_libraries(gtest_tcp_opening_to_closing session_manager gtest)
 add_executable(gtest_tcp_init_to_opening_to_active_to_closing_to_closed gtest_tcp_init_to_opening_to_active_to_closing_to_closed.cpp)
 target_link_libraries(gtest_tcp_init_to_opening_to_active_to_closing_to_closed session_manager gtest)
 
+add_executable(gtest_udp_init_to_opening gtest_udp_init_to_opening.cpp)
+target_link_libraries(gtest_udp_init_to_opening session_manager gtest)
+
 include(GoogleTest)
 gtest_discover_tests(gtest_session)
 gtest_discover_tests(gtest_session_pool)
@@ -42,4 +45,5 @@ gtest_discover_tests(gtest_tcp_init_to_opening)
 gtest_discover_tests(gtest_tcp_opening_to_active)
 gtest_discover_tests(gtest_tcp_active_to_closing)
 gtest_discover_tests(gtest_tcp_opening_to_closing)
-gtest_discover_tests(gtest_tcp_init_to_opening_to_active_to_closing_to_closed)
+gtest_discover_tests(gtest_tcp_init_to_opening_to_active_to_closing_to_closed)
+gtest_discover_tests(gtest_udp_init_to_opening)

src/session/test/gtest_udp_init_to_opening.cpp

@@ -0,0 +1,119 @@
+// UDP state machine test: init -> opening
+
+#include "test_utils.h"
+
+/******************************************************************************
+ * case: UDP init -> opening (by C2S Packet)
+ ******************************************************************************/
+
+#if 1
+TEST(UDP_INIT_TO_OPENING, BY_C2S)
+{
+    char buffer[1024] = {0};
+    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);
+
+    EXPECT_TRUE(session_get_id(sess) == 0);
+    tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer));
+    EXPECT_STREQ(buffer, "192.168.38.105:61099 -> 121.14.154.93:53, proto: 17, domain: 0");
+    EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_C2S);
+    EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
+    EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_UDP);
+    EXPECT_TRUE(session_get_dup_traffic_flag(sess) == 0);
+    EXPECT_TRUE(session_get_closing_reasion(sess) == 0);
+    EXPECT_TRUE(session_get_c2s_bytes(sess) == 74);
+    EXPECT_TRUE(session_get_s2c_bytes(sess) == 0);
+    EXPECT_TRUE(session_get_c2s_packets(sess) == 1);
+    EXPECT_TRUE(session_get_s2c_packets(sess) == 0);
+    EXPECT_TRUE(session_get_create_time(sess) == timestamp_get_msec());
+    EXPECT_TRUE(session_get_last_time(sess) == timestamp_get_msec());
+    EXPECT_TRUE(session_get0_cur_pkt(sess) == &pkt);
+    EXPECT_TRUE(session_get_cur_dir(sess) == SESSION_DIR_C2S);
+    EXPECT_TRUE(session_get_udp_state(sess) == UDP_C2S_RECVED);
+    EXPECT_TRUE(session_get0_c2s_1st_pkt(sess) != NULL);
+    EXPECT_TRUE(session_get0_s2c_1st_pkt(sess) == NULL);
+    EXPECT_TRUE(session_get0_1st_pkt(sess) == session_get0_c2s_1st_pkt(sess));
+
+    __session_dispatch(sess);
+
+    __session_manager_count(mgr, 0, 0, 0, 1, 0, 0);
+    __session_manager_dispatch(mgr, CLOSING_BY_TIMEOUT);
+    __session_manager_count(mgr, 0, 0, 0, 0, 0, 0);
+
+    session_manager_destroy(mgr);
+}
+#endif
+
+/******************************************************************************
+ * case: UDP init -> opening (by S2C Packet)
+ ******************************************************************************/
+
+#if 1
+TEST(UDP_INIT_TO_OPENING, BY_S2C)
+{
+    char buffer[1024] = {0};
+    struct packet pkt;
+    struct session *sess = NULL;
+    struct session_manager *mgr = NULL;
+
+    timestamp_update();
+
+    mgr = session_manager_create(&config);
+    EXPECT_TRUE(mgr != NULL);
+
+    // S2C RESP Packet
+    printf("=> packet parse: UDP S2C RESP packet\n");
+    packet_parse(&pkt, (const char *)udp_pkt2_dns_resp, sizeof(udp_pkt2_dns_resp));
+    printf("<= packet parse\n\n");
+    sess = session_manager_update_session(mgr, &pkt);
+    EXPECT_TRUE(sess);
+
+    EXPECT_TRUE(session_get_id(sess) == 0);
+    tuple6_tostring(session_get0_key(sess), buffer, sizeof(buffer));
+    EXPECT_STREQ(buffer, "121.14.154.93:53 -> 192.168.38.105:61099, proto: 17, domain: 0");
+    EXPECT_TRUE(session_get_key_dir(sess) == SESSION_DIR_S2C);
+    EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
+    EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_UDP);
+    EXPECT_TRUE(session_get_dup_traffic_flag(sess) == 0);
+    EXPECT_TRUE(session_get_closing_reasion(sess) == 0);
+    EXPECT_TRUE(session_get_c2s_bytes(sess) == 0);
+    EXPECT_TRUE(session_get_s2c_bytes(sess) == 550);
+    EXPECT_TRUE(session_get_c2s_packets(sess) == 0);
+    EXPECT_TRUE(session_get_s2c_packets(sess) == 1);
+    EXPECT_TRUE(session_get_create_time(sess) == timestamp_get_msec());
+    EXPECT_TRUE(session_get_last_time(sess) == timestamp_get_msec());
+    EXPECT_TRUE(session_get0_cur_pkt(sess) == &pkt);
+    EXPECT_TRUE(session_get_cur_dir(sess) == SESSION_DIR_S2C);
+    EXPECT_TRUE(session_get_udp_state(sess) == UDP_S2C_RECVED);
+    EXPECT_TRUE(session_get0_c2s_1st_pkt(sess) == NULL);
+    EXPECT_TRUE(session_get0_s2c_1st_pkt(sess) != NULL);
+    EXPECT_TRUE(session_get0_1st_pkt(sess) == session_get0_s2c_1st_pkt(sess));
+
+    __session_dispatch(sess);
+
+    __session_manager_count(mgr, 0, 0, 0, 1, 0, 0);
+    __session_manager_dispatch(mgr, CLOSING_BY_TIMEOUT);
+    __session_manager_count(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();
+}