Add test case for tunnel

2 files changed, 29 insertions, 35 deletions

diff --git a/include/stellar/layer.h b/include/stellar/layer.h
index f77e021..7687102 100644
--- a/include/stellar/layer.h
+++ b/include/stellar/layer.h
@@ -47,14 +47,13 @@ enum layer_proto
 
     // L4 -- tunnel
     LAYER_PROTO_VXLAN = 61,
-    LAYER_PROTO_GTPV1_U = 62,
+    LAYER_PROTO_GTP = 62,
 };
 
 struct layer
 {
     enum layer_proto proto;
-    uint16_t payload_len;
-    uint16_t header_len;
+    uint16_t hdr_len;
     union
     {
         struct ethhdr *eth;
@@ -65,26 +64,25 @@ struct layer
         struct icmphdr *icmp4;
         struct icmp6_hdr *icmp6;
         struct mpls_label *mpls;
-        const char *raw;
-    } header;
-    const char *payload;
+        char *raw;
+    } hdr;
 };
 
 int packet_get_layer_count(const struct packet *pkt);
 // return  0: success 
 // return -1: failed
-int packet_get_layer(const struct packet *pkt, int idx, struct layer *out);
+int packet_get_layer_by_idx(const struct packet *pkt, int idx, struct layer *out);
 
 #define PACKET_FOREACH_LAYER_INORDER(pkt, layer) \
-    for (int i = 0; i < packet_get_layer_count(pkt) && packet_get_layer(pkt, i, &layer) == 0; i++)
+    for (int i = 0; i < packet_get_layer_count(pkt) && packet_get_layer_by_idx(pkt, i, &layer) == 0; i++)
 
 #define PACKET_FOREACH_LAYER_REVERSE(pkt, layer) \
-    for (int i = packet_get_layer_count(pkt) - 1; i >= 0 && packet_get_layer(pkt, i, &layer) == 0; i--)
+    for (int i = packet_get_layer_count(pkt) - 1; i >= 0 && packet_get_layer_by_idx(pkt, i, &layer) == 0; i--)
 
 #define PACKET_GETALL_LAYERS(pkt, layers)                                                 \
     {                                                                                     \
         int num = MIN(packet_get_layer_count(pkt), (sizeof(layers) / sizeof(layers[0]))); \
-        for (int i = 0; i < num && packet_get_layer(pkt, i, &layers[i]) == 0; i++)        \
+        for (int i = 0; i < num && packet_get_layer_by_idx(pkt, i, &layers[i]) == 0; i++) \
             /* void */;                                                                   \
         return num;                                                                       \
     }
diff --git a/include/stellar/tunnel.h b/include/stellar/tunnel.h
index b1ef626..e51cc99 100644
--- a/include/stellar/tunnel.h
+++ b/include/stellar/tunnel.h
@@ -6,30 +6,26 @@ extern "C"
 {
 #endif
 
-#include <stdint.h>
 #include "layer.h"
 
 enum tunnel_type
 {
-    // none tunnel
-    TUNNEL_NONE = 0, // contain layers: IPv4 + TCP
-                     // contain layers: IPv4 + UDP
-                     // contain layers: IPv4
-                     // contain layers: IPv6 + TCP
-                     // contain layers: IPv6 + UDP
-                     // contain layers: IPv6
-
-    // GRE tunnel
-    TUNNEL_GRE, // contain layers: IPv4 + GRE
-                // contain layers: IPv6 + GRE
-
-    // GTP tunnel
-    TUNNEL_GTP, // contain layers: IPv4 + UDP + GTP
-                // contain layers: IPv6 + UDP + GTP
-
-    // IP tunnel
-    TUNNEL_IPV4, // contain layers: IPv4, (next inner layer must be IPv4 / IPv6)
-    TUNNEL_IPV6, // contain layers: IPv6, (next inner layer must be IPv4 / IPv6)
+    TUNNEL_IPV4 = 1, // contain layers: IPv4, (next inner layer must be IPv4 / IPv6)
+    TUNNEL_IPV6 = 2, // contain layers: IPv6, (next inner layer must be IPv4 / IPv6)
+
+    TUNNEL_GRE = 3, // contain layers: IPv4 + GRE
+                    // contain layers: IPv6 + GRE
+
+    TUNNEL_GTP = 4, // contain layers: IPv4 + UDP + GTP
+                    // contain layers: IPv6 + UDP + GTP
+
+    TUNNEL_VXLAN = 5, // contain layers: IPv4 + UDP + VXLAN
+                      // contain layers: IPv6 + UDP + VXLAN
+
+    TUNNEL_L2TP = 6, // contain layers: IPv4 + UDP + L2TP
+                     // contain layers: IPv6 + UDP + L2TP
+
+    TUNNEL_TEREDO = 7, // contain layers: IPv4 + UDP, (next inner layer must be IPv6)
 };
 
 #define MAX_LAYERS_PER_TUNNEL 3
@@ -37,25 +33,25 @@ struct tunnel
 {
     enum tunnel_type type;
 
-    int used;
+    int layer_count;
     struct layer layers[MAX_LAYERS_PER_TUNNEL];
 };
 
 int packet_get_tunnel_count(const struct packet *pkt);
 // return  0: success 
 // return -1: failed
-int packet_get_tunnel(const struct packet *pkt, int idx, struct tunnel *out);
+int packet_get_tunnel_by_idx(const struct packet *pkt, int idx, struct tunnel *out);
 
 #define PACKET_FOREACH_TUNNEL_INORDER(pkt, tunnel) \
-    for (int i = 0; i < packet_get_tunnel_count(pkt) && packet_get_tunnel(pkt, i, &tunnel) == 0; i++)
+    for (int i = 0; i < packet_get_tunnel_count(pkt) && packet_get_tunnel_by_idx(pkt, i, &tunnel) == 0; i++)
 
 #define PACKET_FOREACH_TUNNEL_REVERSE(pkt, tunnel) \
-    for (int i = packet_get_tunnel_count(pkt) - 1; i >= 0 && packet_get_tunnel(pkt, i, &tunnel) == 0; i--)
+    for (int i = packet_get_tunnel_count(pkt) - 1; i >= 0 && packet_get_tunnel_by_idx(pkt, i, &tunnel) == 0; i--)
 
 #define PACKET_GETALL_TUNNELS(pkt, tunnels)                                                  \
     {                                                                                        \
         int num = MIN(packet_get_tunnel_count(pkt), (sizeof(tunnels) / sizeof(tunnels[0]))); \
-        for (int i = 0; i < num && packet_get_tunnel(pkt, i, &tunnels[i]) == 0; i++)         \
+        for (int i = 0; i < num && packet_get_tunnel_by_idx(pkt, i, &tunnels[i]) == 0; i++)  \
             /* void */;                                                                      \
         return num;                                                                          \
     }