summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2010-03-15 00:34:44 +0100
committerOndrej Zajicek <santiago@crfreenet.org>2010-03-15 00:34:44 +0100
commite8da1bd0b5f83991d37bc7e8364101c3faa78b3b (patch)
tree409c723a082e99856035c4282b90ef1bfbe05a1f
parentafa9f66c27e2f96b92059131def53cc7b2497705 (diff)
downloadbird-e8da1bd0b5f83991d37bc7e8364101c3faa78b3b.tar
bird-e8da1bd0b5f83991d37bc7e8364101c3faa78b3b.zip
Fixes missing cases in filters.
-rw-r--r--filter/filter.c43
1 files changed, 25 insertions, 18 deletions
diff --git a/filter/filter.c b/filter/filter.c
index ec155ee..81bfd4e 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -605,42 +605,45 @@ interpret(struct f_inst *what)
e = ea_find( (*f_tmp_attrs), what->a2.i );
if ((!e) && (f_flags & FF_FORCE_TMPATTR))
e = ea_find( (*f_rte)->attrs->eattrs, what->a2.i );
-
- switch (what->aux & EAF_TYPE_MASK) {
- case EAF_TYPE_INT:
- if (!e) {
- res.type = T_VOID;
+
+ if (!e) {
+ /* A special case: undefined int_set looks like empty int_set */
+ if ((what->aux & EAF_TYPE_MASK) == EAF_TYPE_INT_SET) {
+ res.type = T_CLIST;
+ res.val.ad = adata_empty(f_pool);
break;
}
+ /* Undefined value */
+ res.type = T_VOID;
+ break;
+ }
+
+ switch (what->aux & EAF_TYPE_MASK) {
+ case EAF_TYPE_INT:
+ case EAF_TYPE_ROUTER_ID:
res.type = T_INT;
res.val.i = e->u.data;
break;
+ case EAF_TYPE_OPAQUE:
+ res.type = T_ENUM_EMPTY;
+ res.val.i = 0;
+ break;
case EAF_TYPE_IP_ADDRESS:
- if (!e) {
- res.type = T_VOID;
- break;
- }
res.type = T_IP;
struct adata * ad = e->u.ptr;
res.val.px.ip = * (ip_addr *) ad->data;
break;
case EAF_TYPE_AS_PATH:
- if (!e) {
- res.type = T_VOID;
- break;
- }
res.type = T_PATH;
res.val.ad = e->u.ptr;
break;
case EAF_TYPE_INT_SET:
- if (!e) {
- res.type = T_CLIST;
- res.val.ad = adata_empty(f_pool);
- break;
- }
res.type = T_CLIST;
res.val.ad = e->u.ptr;
break;
+ case EAF_TYPE_UNDEF:
+ res.type = T_VOID;
+ break;
default:
bug("Unknown type in e,a");
}
@@ -659,10 +662,14 @@ interpret(struct f_inst *what)
l->attrs[0].type = what->aux | EAF_ORIGINATED;
switch (what->aux & EAF_TYPE_MASK) {
case EAF_TYPE_INT:
+ case EAF_TYPE_ROUTER_ID:
if (v1.type != T_INT)
runtime( "Setting int attribute to non-int value" );
l->attrs[0].u.data = v1.val.i;
break;
+ case EAF_TYPE_OPAQUE:
+ runtime( "Setting opaque attribute is not allowed" );
+ break;
case EAF_TYPE_IP_ADDRESS:
if (v1.type != T_IP)
runtime( "Setting ip attribute to non-ip value" );