rename security_zone to domain
This commit is contained in:
@@ -49,7 +49,7 @@ static inline const char *layer_type_tostring(enum layer_type type);
|
||||
|
||||
static inline void set_tuple2(const char *data, enum layer_type type, struct tuple2 *tuple);
|
||||
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 zone_id);
|
||||
static inline void set_tuple6(const char *data, enum layer_type type, struct tuple6 *tuple, uint64_t domain);
|
||||
|
||||
static inline struct layer_record *get_free_layer(struct packet *handler);
|
||||
|
||||
@@ -368,14 +368,14 @@ static inline void set_tuple4(const char *data, enum layer_type type, struct tup
|
||||
}
|
||||
}
|
||||
|
||||
static inline void set_tuple6(const char *data, enum layer_type type, struct tuple6 *tuple, uint64_t zone_id)
|
||||
static inline void set_tuple6(const char *data, enum layer_type type, struct tuple6 *tuple, uint64_t domain)
|
||||
{
|
||||
const struct ip *ipv4 = NULL;
|
||||
const struct ip6_hdr *ipv6 = NULL;
|
||||
const struct tcphdr *tcp = NULL;
|
||||
const struct udphdr *udp = NULL;
|
||||
|
||||
tuple->security_zone = zone_id;
|
||||
tuple->domain = domain;
|
||||
|
||||
switch (type)
|
||||
{
|
||||
@@ -1100,7 +1100,7 @@ const char *packet_parse(struct packet *handler, const char *data, uint16_t len)
|
||||
handler->layers_size = PACKET_MAX_LAYERS;
|
||||
handler->data_ptr = data;
|
||||
handler->data_len = len;
|
||||
handler->zone_id = 0;
|
||||
handler->domain = 0;
|
||||
handler->user_data = NULL;
|
||||
|
||||
// TESTED
|
||||
@@ -1273,8 +1273,8 @@ int packet_get_innermost_tuple6(const struct packet *handler, struct tuple6 *tup
|
||||
|
||||
if (layer_l3 && layer_l4)
|
||||
{
|
||||
set_tuple6((const char *)handler->data_ptr + layer_l3->hdr_offset, layer_l3->type, tuple, handler->zone_id);
|
||||
set_tuple6((const char *)handler->data_ptr + layer_l4->hdr_offset, layer_l4->type, tuple, handler->zone_id);
|
||||
set_tuple6((const char *)handler->data_ptr + layer_l3->hdr_offset, layer_l3->type, tuple, handler->domain);
|
||||
set_tuple6((const char *)handler->data_ptr + layer_l4->hdr_offset, layer_l4->type, tuple, handler->domain);
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
@@ -1312,8 +1312,8 @@ int packet_get_outermost_tuple6(const struct packet *handler, struct tuple6 *tup
|
||||
|
||||
if (layer_l3 && layer_l4)
|
||||
{
|
||||
set_tuple6((const char *)handler->data_ptr + layer_l3->hdr_offset, layer_l3->type, tuple, handler->zone_id);
|
||||
set_tuple6((const char *)handler->data_ptr + layer_l4->hdr_offset, layer_l4->type, tuple, handler->zone_id);
|
||||
set_tuple6((const char *)handler->data_ptr + layer_l3->hdr_offset, layer_l3->type, tuple, handler->domain);
|
||||
set_tuple6((const char *)handler->data_ptr + layer_l4->hdr_offset, layer_l4->type, tuple, handler->domain);
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user