mirror/labs-bird
1
0
Fork 0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00
Code Releases Activity

Merge commit 'de86040b2cf4ec9bfbb64f0e208a19d4d7e51adc' into haugesund

Browse Source
This commit is contained in:
Maria Matejka
2022-05-30 16:21:48 +02:00
parent 86ac1045d7 de86040b2c
commit 0097f24e2e
10 changed files with 113 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
filter/data.h
View File

@@ -16,20 +16,7 @@
/* Filter value; size of this affects filter memory consumption */
struct f_val {
btype type; /* T_* */
union {
union bval bval;
BVAL_ITEMS;
u64 ec;
lcomm lc;
ip_addr ip;
const net_addr *net;
const char *s;
const struct f_tree *t;
const struct f_trie *ti;
const struct f_path_mask *path_mask;
struct f_path_mask_item pmi;
} val;
union bval_long val;
};
#define fputip(a) ({ ip_addr *ax = falloc(sizeof(*ax)); *ax = (a); ax; })

8
filter/f-inst.c
View File

@@ -717,12 +717,8 @@
runtime( "Setting opaque attribute is not allowed" );
break;
case T_IP:;
int len = sizeof(ip_addr);
struct adata *ad = lp_alloc(fs->pool, sizeof(struct adata) + len);
ad->length = len;
(* (ip_addr *) ad->data) = v1.val.ip;
l->attrs[0].u.ptr = ad;
case T_IP:
l->attrs[0].u.ptr = lp_store_adata(fs->pool, &v1.val.ip, sizeof(ip_addr));
break;
default: