Update API of manipulation session
This commit is contained in:
@@ -83,7 +83,7 @@ TEST(SESS_MGR_TCP_REASSEMBLY, OUT_OF_ORDER)
|
||||
sess = session_manager_new_session(mgr, &pkt, 1);
|
||||
EXPECT_TRUE(sess);
|
||||
|
||||
payload = session_peek_tcp_payload(sess, &len);
|
||||
payload = tcp_data_peek(sess, &len);
|
||||
EXPECT_TRUE(payload == NULL);
|
||||
EXPECT_TRUE(len == 0);
|
||||
|
||||
@@ -98,7 +98,7 @@ TEST(SESS_MGR_TCP_REASSEMBLY, OUT_OF_ORDER)
|
||||
// update session
|
||||
EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == 0);
|
||||
|
||||
payload = session_peek_tcp_payload(sess, &len);
|
||||
payload = tcp_data_peek(sess, &len);
|
||||
EXPECT_TRUE(payload == NULL);
|
||||
EXPECT_TRUE(len == 0);
|
||||
|
||||
@@ -113,7 +113,7 @@ TEST(SESS_MGR_TCP_REASSEMBLY, OUT_OF_ORDER)
|
||||
// update session
|
||||
EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 3) == 0);
|
||||
|
||||
payload = session_peek_tcp_payload(sess, &len);
|
||||
payload = tcp_data_peek(sess, &len);
|
||||
EXPECT_TRUE(payload == NULL);
|
||||
EXPECT_TRUE(len == 0);
|
||||
|
||||
@@ -128,7 +128,7 @@ TEST(SESS_MGR_TCP_REASSEMBLY, OUT_OF_ORDER)
|
||||
// update session
|
||||
EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 4) == 0);
|
||||
|
||||
payload = session_peek_tcp_payload(sess, &len);
|
||||
payload = tcp_data_peek(sess, &len);
|
||||
EXPECT_TRUE(payload == NULL);
|
||||
EXPECT_TRUE(len == 0);
|
||||
|
||||
@@ -143,7 +143,7 @@ TEST(SESS_MGR_TCP_REASSEMBLY, OUT_OF_ORDER)
|
||||
// update session
|
||||
EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 5) == 0);
|
||||
|
||||
payload = session_peek_tcp_payload(sess, &len);
|
||||
payload = tcp_data_peek(sess, &len);
|
||||
EXPECT_TRUE(payload == NULL);
|
||||
EXPECT_TRUE(len == 0);
|
||||
|
||||
@@ -158,7 +158,7 @@ TEST(SESS_MGR_TCP_REASSEMBLY, OUT_OF_ORDER)
|
||||
// update session
|
||||
EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 6) == 0);
|
||||
|
||||
payload = session_peek_tcp_payload(sess, &len);
|
||||
payload = tcp_data_peek(sess, &len);
|
||||
EXPECT_TRUE(payload == NULL);
|
||||
EXPECT_TRUE(len == 0);
|
||||
|
||||
@@ -202,40 +202,40 @@ TEST(SESS_MGR_TCP_REASSEMBLY, OUT_OF_ORDER)
|
||||
0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
|
||||
0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x0a};
|
||||
|
||||
payload = session_peek_tcp_payload(sess, &len);
|
||||
payload = tcp_data_peek(sess, &len);
|
||||
EXPECT_TRUE(payload != NULL);
|
||||
EXPECT_TRUE(len == sizeof(payload1));
|
||||
EXPECT_TRUE(memcmp((void *)payload, payload1, sizeof(payload1)) == 0);
|
||||
hex_dump(payload, len);
|
||||
session_consume_tcp_payload(sess, len);
|
||||
tcp_data_dequeue(sess, len);
|
||||
|
||||
payload = session_peek_tcp_payload(sess, &len);
|
||||
payload = tcp_data_peek(sess, &len);
|
||||
EXPECT_TRUE(payload != NULL);
|
||||
EXPECT_TRUE(len == sizeof(payload2));
|
||||
EXPECT_TRUE(memcmp((void *)payload, payload2, sizeof(payload2)) == 0);
|
||||
hex_dump(payload, len);
|
||||
session_consume_tcp_payload(sess, len);
|
||||
tcp_data_dequeue(sess, len);
|
||||
|
||||
payload = session_peek_tcp_payload(sess, &len);
|
||||
payload = tcp_data_peek(sess, &len);
|
||||
EXPECT_TRUE(payload != NULL);
|
||||
EXPECT_TRUE(len == sizeof(payload3));
|
||||
EXPECT_TRUE(memcmp((void *)payload, payload3, sizeof(payload3)) == 0);
|
||||
hex_dump(payload, len);
|
||||
session_consume_tcp_payload(sess, len);
|
||||
tcp_data_dequeue(sess, len);
|
||||
|
||||
payload = session_peek_tcp_payload(sess, &len);
|
||||
payload = tcp_data_peek(sess, &len);
|
||||
EXPECT_TRUE(payload != NULL);
|
||||
EXPECT_TRUE(len == sizeof(payload4));
|
||||
EXPECT_TRUE(memcmp((void *)payload, payload4, sizeof(payload4)) == 0);
|
||||
hex_dump(payload, len);
|
||||
session_consume_tcp_payload(sess, len);
|
||||
tcp_data_dequeue(sess, len);
|
||||
|
||||
payload = session_peek_tcp_payload(sess, &len);
|
||||
payload = tcp_data_peek(sess, &len);
|
||||
EXPECT_TRUE(payload != NULL);
|
||||
EXPECT_TRUE(len == sizeof(payload5));
|
||||
EXPECT_TRUE(memcmp((void *)payload, payload5, sizeof(payload5)) == 0);
|
||||
hex_dump(payload, len);
|
||||
session_consume_tcp_payload(sess, len);
|
||||
tcp_data_dequeue(sess, len);
|
||||
|
||||
// expire session
|
||||
EXPECT_TRUE(session_manager_get_expired_session(mgr, 7 + opts.tcp_data_timeout) == NULL); // active -> closing
|
||||
@@ -274,7 +274,7 @@ TEST(SESS_MGR_TCP_REASSEMBLY, SEQ_WRAPAROUND)
|
||||
sess = session_manager_new_session(mgr, &pkt, 1);
|
||||
EXPECT_TRUE(sess);
|
||||
|
||||
payload = session_peek_tcp_payload(sess, &len);
|
||||
payload = tcp_data_peek(sess, &len);
|
||||
EXPECT_TRUE(payload == NULL);
|
||||
EXPECT_TRUE(len == 0);
|
||||
|
||||
@@ -289,7 +289,7 @@ TEST(SESS_MGR_TCP_REASSEMBLY, SEQ_WRAPAROUND)
|
||||
// update session
|
||||
EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == 0);
|
||||
|
||||
payload = session_peek_tcp_payload(sess, &len);
|
||||
payload = tcp_data_peek(sess, &len);
|
||||
EXPECT_TRUE(payload == NULL);
|
||||
EXPECT_TRUE(len == 0);
|
||||
|
||||
@@ -304,12 +304,12 @@ TEST(SESS_MGR_TCP_REASSEMBLY, SEQ_WRAPAROUND)
|
||||
// update session
|
||||
EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 3) == 0);
|
||||
|
||||
payload = session_peek_tcp_payload(sess, &len);
|
||||
payload = tcp_data_peek(sess, &len);
|
||||
EXPECT_TRUE(payload != NULL);
|
||||
EXPECT_TRUE(len == sizeof(tcp_seq_wraparound_pkt3_payload));
|
||||
EXPECT_TRUE(memcmp((void *)payload, tcp_seq_wraparound_pkt3_payload, sizeof(tcp_seq_wraparound_pkt3_payload)) == 0);
|
||||
hex_dump(payload, len);
|
||||
session_consume_tcp_payload(sess, len);
|
||||
tcp_data_dequeue(sess, len);
|
||||
|
||||
// C2S Data Packet
|
||||
printf("\n=> Packet Parse: TCP C2S Data packet\n");
|
||||
@@ -322,12 +322,12 @@ TEST(SESS_MGR_TCP_REASSEMBLY, SEQ_WRAPAROUND)
|
||||
// update session
|
||||
EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 4) == 0);
|
||||
|
||||
payload = session_peek_tcp_payload(sess, &len);
|
||||
payload = tcp_data_peek(sess, &len);
|
||||
EXPECT_TRUE(payload != NULL);
|
||||
EXPECT_TRUE(len == sizeof(tcp_seq_wraparound_pkt4_payload));
|
||||
EXPECT_TRUE(memcmp((void *)payload, tcp_seq_wraparound_pkt4_payload, sizeof(tcp_seq_wraparound_pkt4_payload)) == 0);
|
||||
hex_dump(payload, len);
|
||||
session_consume_tcp_payload(sess, len);
|
||||
tcp_data_dequeue(sess, len);
|
||||
|
||||
// expire session
|
||||
EXPECT_TRUE(session_manager_get_expired_session(mgr, 4 + opts.tcp_data_timeout) == NULL); // active -> closing
|
||||
|
||||
Reference in New Issue
Block a user