Update API of manipulation session
This commit is contained in:
@@ -55,7 +55,7 @@ static inline void set_tuple2(const char *data, enum layer_type type, struct tup
|
||||
static inline void set_tuple4(const char *data, enum layer_type type, struct tuple4 *tuple);
|
||||
static inline void set_tuple6(const char *data, enum layer_type type, struct tuple6 *tuple, uint64_t domain);
|
||||
|
||||
static inline struct layer *get_free_layer(struct packet *pkt);
|
||||
static inline struct pkt_layer *get_free_layer(struct packet *pkt);
|
||||
|
||||
static inline uint16_t get_gtp_hdr_len(const char *data, uint16_t len);
|
||||
static inline uint16_t get_gre_hdr_len(const char *data, uint16_t len);
|
||||
@@ -412,7 +412,7 @@ static inline void set_tuple6(const char *data, enum layer_type type, struct tup
|
||||
}
|
||||
}
|
||||
|
||||
static inline struct layer *get_free_layer(struct packet *pkt)
|
||||
static inline struct pkt_layer *get_free_layer(struct packet *pkt)
|
||||
{
|
||||
if (pkt->layers_used >= pkt->layers_size)
|
||||
{
|
||||
@@ -650,7 +650,7 @@ static inline const char *parse_ether(struct packet *pkt, const char *data, uint
|
||||
return data;
|
||||
}
|
||||
|
||||
struct layer *layer = get_free_layer(pkt);
|
||||
struct pkt_layer *layer = get_free_layer(pkt);
|
||||
if (unlikely(layer == NULL))
|
||||
{
|
||||
return data;
|
||||
@@ -670,7 +670,7 @@ static inline const char *parse_ppp(struct packet *pkt, const char *data, uint16
|
||||
return data;
|
||||
}
|
||||
|
||||
struct layer *layer = get_free_layer(pkt);
|
||||
struct pkt_layer *layer = get_free_layer(pkt);
|
||||
if (unlikely(layer == NULL))
|
||||
{
|
||||
return data;
|
||||
@@ -705,7 +705,7 @@ static inline const char *parse_vlan(struct packet *pkt, const char *data, uint1
|
||||
return data;
|
||||
}
|
||||
|
||||
struct layer *layer = get_free_layer(pkt);
|
||||
struct pkt_layer *layer = get_free_layer(pkt);
|
||||
if (unlikely(layer == NULL))
|
||||
{
|
||||
return data;
|
||||
@@ -728,7 +728,7 @@ static inline const char *parse_pppoe_ses(struct packet *pkt, const char *data,
|
||||
return data;
|
||||
}
|
||||
|
||||
struct layer *layer = get_free_layer(pkt);
|
||||
struct pkt_layer *layer = get_free_layer(pkt);
|
||||
if (unlikely(layer == NULL))
|
||||
{
|
||||
return data;
|
||||
@@ -784,7 +784,7 @@ static inline const char *parse_mpls(struct packet *pkt, const char *data, uint1
|
||||
return data;
|
||||
}
|
||||
|
||||
struct layer *layer = get_free_layer(pkt);
|
||||
struct pkt_layer *layer = get_free_layer(pkt);
|
||||
if (unlikely(layer == NULL))
|
||||
{
|
||||
return data;
|
||||
@@ -860,7 +860,7 @@ static inline const char *parse_ipv4(struct packet *pkt, const char *data, uint1
|
||||
return data;
|
||||
}
|
||||
|
||||
struct layer *layer = get_free_layer(pkt);
|
||||
struct pkt_layer *layer = get_free_layer(pkt);
|
||||
if (unlikely(layer == NULL))
|
||||
{
|
||||
return data;
|
||||
@@ -895,7 +895,7 @@ static inline const char *parse_ipv6(struct packet *pkt, const char *data, uint1
|
||||
return data;
|
||||
}
|
||||
|
||||
struct layer *layer = get_free_layer(pkt);
|
||||
struct pkt_layer *layer = get_free_layer(pkt);
|
||||
if (unlikely(layer == NULL))
|
||||
{
|
||||
return data;
|
||||
@@ -929,7 +929,7 @@ static inline const char *parse_gre(struct packet *pkt, const char *data, uint16
|
||||
return data;
|
||||
}
|
||||
|
||||
struct layer *layer = get_free_layer(pkt);
|
||||
struct pkt_layer *layer = get_free_layer(pkt);
|
||||
if (unlikely(layer == NULL))
|
||||
{
|
||||
return data;
|
||||
@@ -960,7 +960,7 @@ static inline const char *parse_udp(struct packet *pkt, const char *data, uint16
|
||||
return data;
|
||||
}
|
||||
|
||||
struct layer *layer = get_free_layer(pkt);
|
||||
struct pkt_layer *layer = get_free_layer(pkt);
|
||||
if (unlikely(layer == NULL))
|
||||
{
|
||||
return data;
|
||||
@@ -993,7 +993,7 @@ static inline const char *parse_tcp(struct packet *pkt, const char *data, uint16
|
||||
return data;
|
||||
}
|
||||
|
||||
struct layer *layer = get_free_layer(pkt);
|
||||
struct pkt_layer *layer = get_free_layer(pkt);
|
||||
if (unlikely(layer == NULL))
|
||||
{
|
||||
return data;
|
||||
@@ -1025,7 +1025,7 @@ static inline const char *parse_vxlan(struct packet *pkt, const char *data, uint
|
||||
return data;
|
||||
}
|
||||
|
||||
struct layer *layer = get_free_layer(pkt);
|
||||
struct pkt_layer *layer = get_free_layer(pkt);
|
||||
if (unlikely(layer == NULL))
|
||||
{
|
||||
return data;
|
||||
@@ -1045,7 +1045,7 @@ static inline const char *parse_gtpv1_u(struct packet *pkt, const char *data, ui
|
||||
return data;
|
||||
}
|
||||
|
||||
struct layer *layer = get_free_layer(pkt);
|
||||
struct pkt_layer *layer = get_free_layer(pkt);
|
||||
if (unlikely(layer == NULL))
|
||||
{
|
||||
return data;
|
||||
@@ -1149,7 +1149,7 @@ void packet_print(const struct packet *pkt)
|
||||
pkt->layers_used, pkt->layers_size);
|
||||
for (uint8_t i = 0; i < pkt->layers_used; i++)
|
||||
{
|
||||
const struct layer *layer = &pkt->layers[i];
|
||||
const struct pkt_layer *layer = &pkt->layers[i];
|
||||
printf(" layer[%u]: %p, type: %s, hdr_offset: %u, hdr_ptr: %p, hdr_len: %u, pld_ptr: %p, pld_len: %u\n",
|
||||
i, layer, layer_type_to_str(layer->type), layer->hdr_offset,
|
||||
layer->hdr_ptr, layer->hdr_len, layer->pld_ptr, layer->pld_len);
|
||||
@@ -1166,7 +1166,7 @@ void packet_print(const struct packet *pkt)
|
||||
int packet_get_innermost_tuple2(const struct packet *pkt, struct tuple2 *tuple)
|
||||
{
|
||||
memset(tuple, 0, sizeof(struct tuple2));
|
||||
const struct layer *layer = NULL;
|
||||
const struct pkt_layer *layer = NULL;
|
||||
|
||||
for (int8_t i = pkt->layers_used - 1; i >= 0; i--)
|
||||
{
|
||||
@@ -1187,7 +1187,7 @@ int packet_get_innermost_tuple2(const struct packet *pkt, struct tuple2 *tuple)
|
||||
int packet_get_outermost_tuple2(const struct packet *pkt, struct tuple2 *tuple)
|
||||
{
|
||||
memset(tuple, 0, sizeof(struct tuple2));
|
||||
const struct layer *layer = NULL;
|
||||
const struct pkt_layer *layer = NULL;
|
||||
|
||||
for (int8_t i = 0; i < pkt->layers_used; i++)
|
||||
{
|
||||
@@ -1208,9 +1208,9 @@ int packet_get_outermost_tuple2(const struct packet *pkt, struct tuple2 *tuple)
|
||||
int packet_get_innermost_tuple4(const struct packet *pkt, struct tuple4 *tuple)
|
||||
{
|
||||
memset(tuple, 0, sizeof(struct tuple4));
|
||||
const struct layer *layer_l3 = NULL;
|
||||
const struct layer *layer_l4 = NULL;
|
||||
const struct layer *layer = NULL;
|
||||
const struct pkt_layer *layer_l3 = NULL;
|
||||
const struct pkt_layer *layer_l4 = NULL;
|
||||
const struct pkt_layer *layer = NULL;
|
||||
|
||||
for (int8_t i = pkt->layers_used - 1; i >= 0; i--)
|
||||
{
|
||||
@@ -1248,9 +1248,9 @@ int packet_get_innermost_tuple4(const struct packet *pkt, struct tuple4 *tuple)
|
||||
int packet_get_outermost_tuple4(const struct packet *pkt, struct tuple4 *tuple)
|
||||
{
|
||||
memset(tuple, 0, sizeof(struct tuple4));
|
||||
const struct layer *layer_l3 = NULL;
|
||||
const struct layer *layer_l4 = NULL;
|
||||
const struct layer *layer = NULL;
|
||||
const struct pkt_layer *layer_l3 = NULL;
|
||||
const struct pkt_layer *layer_l4 = NULL;
|
||||
const struct pkt_layer *layer = NULL;
|
||||
|
||||
for (int8_t i = 0; i < pkt->layers_used; i++)
|
||||
{
|
||||
@@ -1288,9 +1288,9 @@ int packet_get_outermost_tuple4(const struct packet *pkt, struct tuple4 *tuple)
|
||||
int packet_get_innermost_tuple6(const struct packet *pkt, struct tuple6 *tuple)
|
||||
{
|
||||
memset(tuple, 0, sizeof(struct tuple6));
|
||||
const struct layer *layer_l3 = NULL;
|
||||
const struct layer *layer_l4 = NULL;
|
||||
const struct layer *layer = NULL;
|
||||
const struct pkt_layer *layer_l3 = NULL;
|
||||
const struct pkt_layer *layer_l4 = NULL;
|
||||
const struct pkt_layer *layer = NULL;
|
||||
const struct metadata *meta = &pkt->meta;
|
||||
|
||||
for (int8_t i = pkt->layers_used - 1; i >= 0; i--)
|
||||
@@ -1329,9 +1329,9 @@ int packet_get_innermost_tuple6(const struct packet *pkt, struct tuple6 *tuple)
|
||||
int packet_get_outermost_tuple6(const struct packet *pkt, struct tuple6 *tuple)
|
||||
{
|
||||
memset(tuple, 0, sizeof(struct tuple6));
|
||||
const struct layer *layer_l3 = NULL;
|
||||
const struct layer *layer_l4 = NULL;
|
||||
const struct layer *layer = NULL;
|
||||
const struct pkt_layer *layer_l3 = NULL;
|
||||
const struct pkt_layer *layer_l4 = NULL;
|
||||
const struct pkt_layer *layer = NULL;
|
||||
const struct metadata *meta = &pkt->meta;
|
||||
|
||||
for (int8_t i = 0; i < pkt->layers_used; i++)
|
||||
@@ -1365,9 +1365,9 @@ int packet_get_outermost_tuple6(const struct packet *pkt, struct tuple6 *tuple)
|
||||
}
|
||||
}
|
||||
|
||||
const struct layer *packet_get_innermost_layer(const struct packet *pkt, enum layer_type type)
|
||||
const struct pkt_layer *packet_get_innermost_layer(const struct packet *pkt, enum layer_type type)
|
||||
{
|
||||
const struct layer *layer = NULL;
|
||||
const struct pkt_layer *layer = NULL;
|
||||
|
||||
for (int8_t i = pkt->layers_used - 1; i >= 0; i--)
|
||||
{
|
||||
@@ -1381,9 +1381,9 @@ const struct layer *packet_get_innermost_layer(const struct packet *pkt, enum la
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const struct layer *packet_get_outermost_layer(const struct packet *pkt, enum layer_type type)
|
||||
const struct pkt_layer *packet_get_outermost_layer(const struct packet *pkt, enum layer_type type)
|
||||
{
|
||||
const struct layer *layer = NULL;
|
||||
const struct pkt_layer *layer = NULL;
|
||||
|
||||
for (int8_t i = 0; i < pkt->layers_used; i++)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user