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 '1e8721e2aeccfbc3f533e8b8abc07582cee77e9a' into int-new

Browse Source
This commit is contained in:
Ondrej Zajicek (work)
2017-12-07 21:54:47 +01:00
parent 46434a3cad 1e8721e2ae
commit 830ba75e6d
15 changed files with 676 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
filter/filter.c
View File

@@ -1089,7 +1089,8 @@ interpret(struct f_inst *what)
switch (what->aux & EAF_TYPE_MASK) {
case EAF_TYPE_INT:
if (v1.type != T_INT)
// Enums are also ints, so allow them in.
if (v1.type != T_INT && (v1.type < T_ENUM_LO || v1.type > T_ENUM_HI))
runtime( "Setting int attribute to non-int value" );
l->attrs[0].u.data = v1.val.i;
break;

1
filter/filter.h
View File

@@ -147,6 +147,7 @@ void val_format(struct f_val v, buffer *buf);
#define T_ENUM_RTD 0x34
#define T_ENUM_ROA 0x35
#define T_ENUM_NETTYPE 0x36
#define T_ENUM_RA_PREFERENCE 0x37
/* new enums go here */
#define T_ENUM_EMPTY 0x3f /* Special hack for atomic_aggr */