Add packet IO module

* support marsio
    * support dumpfile ( 1 thread read dumpfile & N thread handle packet)

src/packet/CMakeLists.txt

@@ -2,7 +2,7 @@
 # packet
 ###############################################################################
 
-add_library(packet packet.cpp)
+add_library(packet packet.cpp packet_utils.cpp)
 target_include_directories(packet PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 target_include_directories(packet PUBLIC ${CMAKE_SOURCE_DIR}/deps/uthash)
 target_link_libraries(packet tuple log)

src/packet/packet.cpp

@@ -1115,7 +1115,6 @@ const char *packet_parse(struct packet *handler, const char *data, uint16_t len)
     handler->data_ptr = data;
     handler->data_len = len;
     handler->domain = 0;
-    handler->user_data = NULL;
 
     // TESTED
     return parse_ether(handler, data, len);

src/packet/packet.h

@@ -14,7 +14,7 @@ extern "C"
 #define PACKET_MAX_LAYERS 16
 #define PACKET_LOG_ERROR(format, ...) LOG_ERROR("packet", format, ##__VA_ARGS__)
 #define PACKET_LOG_DEBUG(format, ...) void(0)
-//#define PACKET_LOG_DEBUG(format, ...) LOG_DEBUG("packet", format, ##__VA_ARGS__)
+// #define PACKET_LOG_DEBUG(format, ...) LOG_DEBUG("packet", format, ##__VA_ARGS__)
 
 enum layer_type
 {
@@ -71,6 +71,9 @@ struct layer_record
     uint16_t pld_len;    // payload length
 };
 
+#define MAX_SID_NUM 8
+#define MAX_ROUTE_LEN 64
+
 struct packet
 {
     struct layer_record layers[PACKET_MAX_LAYERS];
@@ -81,8 +84,21 @@ struct packet
     const char *data_ptr;
     uint16_t data_len;
     uint64_t domain;
+    bool need_free;
 
-    const void *user_data;
+    // metadata
+    void *io_ctx;
+
+    uint16_t sid_list[MAX_SID_NUM];
+    uint16_t sid_used;
+
+    char route_ctx[MAX_ROUTE_LEN];
+    uint16_t route_len;
+
+    uint64_t session_id;
+    uint8_t direction;
+    uint8_t type;
+    uint8_t action;
 };
 
 // return innermost payload

src/packet/packet_helpers.h

@@ -1,158 +0,0 @@
-#ifndef _PACKET_HELPERS_H
-#define _PACKET_HELPERS_H
-
-#ifdef __cpluscplus
-extern "C"
-{
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <netinet/ip.h>
-#include <netinet/ip6.h>
-
-#include "packet.h"
-#include "ipv4_utils.h"
-#include "ipv6_utils.h"
-
-struct metadata
-{
-    char data[64];
-    // TODO
-};
-
-/******************************************************************************
- * metadata
- ******************************************************************************/
-
-static inline struct metadata *metadata_dup(const struct metadata *metadata)
-{
-    if (metadata == NULL)
-    {
-        return NULL;
-    }
-
-    struct metadata *metadata_dup = (struct metadata *)calloc(1, sizeof(struct metadata));
-    if (metadata_dup == NULL)
-    {
-        return NULL;
-    }
-    memcpy(metadata_dup, metadata, sizeof(struct metadata));
-
-    return metadata_dup;
-}
-
-static inline void metadata_free(struct metadata *metadata)
-{
-    if (metadata)
-    {
-        free(metadata);
-        metadata = NULL;
-    }
-}
-
-static inline void packet_set0_metadata(struct packet *pkt, const struct metadata *metadata)
-{
-    pkt->user_data = (const void *)metadata;
-}
-
-static inline const struct metadata *packet_get0_metadata(const struct packet *pkt)
-{
-    return (const struct metadata *)pkt->user_data;
-}
-
-/******************************************************************************
- * packet
- ******************************************************************************/
-
-static inline bool paket_is_fragment(const struct packet *pkt)
-{
-    for (int8_t i = 0; i < pkt->layers_used; i++)
-    {
-        if (pkt->layers[i].type == LAYER_TYPE_IPV4)
-        {
-            struct ip *ip_hdr = (struct ip *)pkt->layers[i].hdr_ptr;
-            if (ipv4_hdr_get_mf_flag(ip_hdr) || ipv4_hdr_get_frag_offset(ip_hdr))
-            {
-                return true;
-            }
-        }
-
-        if (pkt->layers[i].type == LAYER_TYPE_IPV6)
-        {
-            const struct ip6_hdr *ip6_hdr = (const struct ip6_hdr *)pkt->layers[i].hdr_ptr;
-            if (ipv6_hdr_get_next_header(ip6_hdr) == IPPROTO_FRAGMENT)
-            {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-static inline struct packet *packet_dup(const struct packet *pkt)
-{
-    if (pkt == NULL)
-    {
-        return NULL;
-    }
-
-    struct packet *pkt_dup = (struct packet *)calloc(1, sizeof(struct packet) + pkt->data_len);
-    if (pkt_dup == NULL)
-    {
-        return NULL;
-    }
-    memcpy(pkt_dup, pkt, sizeof(struct packet));
-    pkt_dup->user_data = NULL;
-
-    pkt_dup->data_ptr = (const char *)pkt_dup + sizeof(struct packet);
-    if (pkt_dup->data_ptr == NULL)
-    {
-        free(pkt_dup);
-        return NULL;
-    }
-    memcpy((char *)pkt_dup->data_ptr, pkt->data_ptr, pkt->data_len);
-
-    for (int8_t i = 0; i < pkt->layers_used; i++)
-    {
-        pkt_dup->layers[i].hdr_ptr = pkt_dup->data_ptr + pkt->layers[i].hdr_offset;
-        pkt_dup->layers[i].pld_ptr = pkt_dup->data_ptr + pkt->layers[i].hdr_offset + pkt->layers[i].hdr_len;
-    }
-
-    if (pkt->frag_layer)
-    {
-        pkt_dup->frag_layer = &pkt_dup->layers[pkt->frag_layer - pkt->layers];
-    }
-    packet_set0_metadata(pkt_dup, metadata_dup(packet_get0_metadata(pkt)));
-
-    return pkt_dup;
-}
-
-static inline void packet_free(struct packet *pkt)
-{
-    if (pkt)
-    {
-        metadata_free((struct metadata *)packet_get0_metadata(pkt));
-        packet_set0_metadata(pkt, NULL);
-
-        free(pkt);
-        pkt = NULL;
-    }
-}
-
-static inline uint16_t packet_get_len(const struct packet *pkt)
-{
-    return pkt->data_len;
-}
-
-static inline const char *packet_get_data(const struct packet *pkt)
-{
-    return pkt->data_ptr;
-}
-
-#ifdef __cpluscplus
-}
-#endif
-
-#endif

src/packet/packet_utils.cpp

@@ -0,0 +1,202 @@
+#include "packet_utils.h"
+
+void packet_set_io_ctx(struct packet *pkt, void *ctx)
+{
+    pkt->io_ctx = ctx;
+}
+
+void *packet_get_io_ctx(const struct packet *pkt)
+{
+    return pkt->io_ctx;
+}
+
+// return 0 success; return -1 failed
+int packet_set_sid(struct packet *pkt, uint16_t *sid, int num)
+{
+    if (num > MAX_SID_NUM)
+    {
+        return -1;
+    }
+
+    pkt->sid_used = num;
+    memcpy(pkt->sid_list, sid, num * sizeof(uint16_t));
+    return 0;
+}
+
+// return number of sid
+int packet_get_sid(const struct packet *pkt, uint16_t *sid, int size)
+{
+    if (size < pkt->sid_used)
+    {
+        return 0;
+    }
+
+    memcpy(sid, pkt->sid_list, pkt->sid_used * sizeof(uint16_t));
+    return pkt->sid_used;
+}
+
+// return 0 success; return -1 failed
+int packet_prepend_sid(struct packet *pkt, uint16_t sid)
+{
+    if (pkt->sid_used >= MAX_SID_NUM)
+    {
+        return -1;
+    }
+    memmove(pkt->sid_list + 1, pkt->sid_list, pkt->sid_used * sizeof(uint16_t));
+    pkt->sid_list[0] = sid;
+    pkt->sid_used++;
+    return 0;
+}
+
+// return 0 success; return -1 failed
+int packet_append_sid(struct packet *pkt, uint16_t sid)
+{
+    if (pkt->sid_used >= MAX_SID_NUM)
+    {
+        return -1;
+    }
+    pkt->sid_list[pkt->sid_used] = sid;
+    pkt->sid_used++;
+    return 0;
+}
+
+// return 0 success; return -1 failed
+int packet_set_route_ctx(struct packet *pkt, const char *route, int len)
+{
+    if (len > MAX_ROUTE_LEN)
+    {
+        return -1;
+    }
+
+    memcpy(pkt->route_ctx, route, len);
+    pkt->route_len = len;
+    return 0;
+}
+
+// return len of route ctx
+int packet_get_route_ctx(const struct packet *pkt, char *buff, int size)
+{
+    if (pkt->route_len > size)
+    {
+        return 0;
+    }
+    memcpy(buff, pkt->route_ctx, pkt->route_len);
+    return pkt->route_len;
+}
+
+void packet_set_session_id(struct packet *pkt, uint64_t session_id)
+{
+    pkt->session_id = session_id;
+}
+
+uint64_t packet_get_session_id(const struct packet *pkt)
+{
+    return pkt->session_id;
+}
+
+void packet_set_direction(struct packet *pkt, uint8_t direction)
+{
+    pkt->direction = direction;
+}
+
+uint8_t packet_get_direction(const struct packet *pkt)
+{
+    return pkt->direction;
+}
+
+void packet_set_type(struct packet *pkt, uint8_t type)
+{
+    pkt->type = type;
+}
+
+uint8_t packet_get_type(const struct packet *pkt)
+{
+    return pkt->type;
+}
+
+void packet_set_action(struct packet *pkt, uint8_t action)
+{
+    pkt->action = action;
+}
+
+uint8_t packet_get_action(const struct packet *pkt)
+{
+    return pkt->action;
+}
+
+struct packet *packet_new(uint16_t len)
+{
+    struct packet *pkt = (struct packet *)calloc(1, sizeof(struct packet) + len);
+    if (pkt == NULL)
+    {
+        return NULL;
+    }
+    pkt->data_len = len;
+    pkt->data_ptr = (const char *)pkt + sizeof(struct packet);
+    pkt->need_free = true;
+
+    return pkt;
+}
+
+void packet_free(struct packet *pkt)
+{
+    if (pkt && pkt->need_free)
+    {
+        free(pkt);
+        pkt = NULL;
+    }
+}
+
+struct packet *packet_dup(const struct packet *pkt)
+{
+    if (pkt == NULL)
+    {
+        return NULL;
+    }
+
+    struct packet *pkt_dup = packet_new(pkt->data_len);
+    if (pkt_dup == NULL)
+    {
+        return NULL;
+    }
+    memcpy(pkt_dup, pkt, sizeof(struct packet));
+    memcpy((char *)pkt_dup->data_ptr, pkt->data_ptr, pkt->data_len);
+    pkt_dup->need_free = true;
+
+    // update layers
+    for (int8_t i = 0; i < pkt->layers_used; i++)
+    {
+        pkt_dup->layers[i].hdr_ptr = pkt_dup->data_ptr + pkt->layers[i].hdr_offset;
+        pkt_dup->layers[i].pld_ptr = pkt_dup->data_ptr + pkt->layers[i].hdr_offset + pkt->layers[i].hdr_len;
+    }
+
+    // update frag_layer
+    if (pkt->frag_layer)
+    {
+        pkt_dup->frag_layer = &pkt_dup->layers[pkt->frag_layer - pkt->layers];
+    }
+
+    return pkt_dup;
+}
+
+const char *packet_get_data(const struct packet *pkt)
+{
+    return pkt->data_ptr;
+}
+
+uint16_t packet_get_len(const struct packet *pkt)
+{
+    return pkt->data_len;
+}
+
+bool paket_is_fragment(const struct packet *pkt)
+{
+    if (pkt->frag_layer)
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}

src/packet/packet_utils.h

@@ -0,0 +1,59 @@
+#ifndef _PACKET_UTILS_H
+#define _PACKET_UTILS_H
+
+#ifdef __cpluscplus
+extern "C"
+{
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "packet.h"
+
+void packet_set_io_ctx(struct packet *pkt, void *ctx);
+void *packet_get_io_ctx(const struct packet *pkt);
+
+int packet_set_sid(struct packet *pkt, uint16_t *sid, int num);        // return 0 success; return -1 failed
+int packet_get_sid(const struct packet *pkt, uint16_t *sid, int size); // return number of sid
+int packet_prepend_sid(struct packet *pkt, uint16_t sid);              // return 0 success; return -1 failed
+int packet_append_sid(struct packet *pkt, uint16_t sid);               // return 0 success; return -1 failed
+
+int packet_set_route_ctx(struct packet *pkt, const char *route, int len); // return 0 success; return -1 failed
+int packet_get_route_ctx(const struct packet *pkt, char *buff, int size); // return len of route ctx
+
+void packet_set_session_id(struct packet *pkt, uint64_t session_id);
+uint64_t packet_get_session_id(const struct packet *pkt);
+
+#define PACKET_DIRECTION_I2E 0
+#define PACKET_DIRECTION_E2I 1
+
+void packet_set_direction(struct packet *pkt, uint8_t direction);
+uint8_t packet_get_direction(const struct packet *pkt);
+
+#define PACKET_TYPE_DATA 0
+#define PACKET_TYPE_CTRL 1
+
+void packet_set_type(struct packet *pkt, uint8_t type);
+uint8_t packet_get_type(const struct packet *pkt);
+
+#define PACKET_ACTION_FORWARD 0
+#define PACKET_ACTION_DROP 1
+
+void packet_set_action(struct packet *pkt, uint8_t action);
+uint8_t packet_get_action(const struct packet *pkt);
+
+struct packet *packet_new(uint16_t len);
+void packet_free(struct packet *pkt);
+struct packet *packet_dup(const struct packet *pkt);
+
+const char *packet_get_data(const struct packet *pkt);
+uint16_t packet_get_len(const struct packet *pkt);
+
+bool paket_is_fragment(const struct packet *pkt);
+
+#ifdef __cpluscplus
+}
+#endif
+
+#endif

src/packet/test/CMakeLists.txt

@@ -17,8 +17,8 @@ target_link_libraries(gtest_ipv4_utils packet gtest)
 add_executable(gtest_ipv6_utils gtest_ipv6_utils.cpp)
 target_link_libraries(gtest_ipv6_utils packet gtest)
 
-add_executable(gtest_packet_helpers gtest_packet_helpers.cpp)
-target_link_libraries(gtest_packet_helpers packet gtest)
+add_executable(gtest_packet_utils gtest_packet_utils.cpp)
+target_link_libraries(gtest_packet_utils packet gtest)
 
 include(GoogleTest)
 gtest_discover_tests(gtest_packet)
@@ -26,4 +26,4 @@ gtest_discover_tests(gtest_udp_utils)
 gtest_discover_tests(gtest_tcp_utils)
 gtest_discover_tests(gtest_ipv4_utils)
 gtest_discover_tests(gtest_ipv6_utils)
-gtest_discover_tests(gtest_packet_helpers)
+gtest_discover_tests(gtest_packet_utils)

src/packet/test/gtest_packet_utils.cpp

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "packet_helpers.h"
+#include "packet_utils.h"
 
 /******************************************************************************
  * [Protocols in frame: eth:ethertype:ip:data]