Bugfix in interpret

Missing cases in filter code interpret leads to crash
when  bgp_next_hop attr was queried.
This commit is contained in:
Ondrej Zajicek 2008-12-25 17:49:57 +01:00
parent 083c43e22e
commit 330aecead8

View file

@ -560,6 +560,15 @@ interpret(struct f_inst *what)
res.type = T_INT; res.type = T_INT;
res.val.i = e->u.data; res.val.i = e->u.data;
break; 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: case EAF_TYPE_AS_PATH:
if (!e) { if (!e) {
res.type = T_VOID; res.type = T_VOID;
@ -599,6 +608,14 @@ interpret(struct f_inst *what)
runtime( "Setting int attribute to non-int value" ); runtime( "Setting int attribute to non-int value" );
l->attrs[0].u.data = v1.val.i; l->attrs[0].u.data = v1.val.i;
break; break;
case EAF_TYPE_IP_ADDRESS:
if (v1.type != T_IP)
runtime( "Setting ip attribute to non-ip value" );
int len = sizeof(ip_addr);
struct adata *ad = lp_alloc(f_pool, sizeof(struct adata) + len);
ad->length = len;
(* (ip_addr *) ad->data) = v1.val.px.ip;
break;
case EAF_TYPE_AS_PATH: case EAF_TYPE_AS_PATH:
if (v1.type != T_PATH) if (v1.type != T_PATH)
runtime( "Setting path attribute to non-path value" ); runtime( "Setting path attribute to non-path value" );