diff options
| -rw-r--r-- | filter/filter.c | 5 | ||||
| -rw-r--r-- | filter/filter.h | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/filter/filter.c b/filter/filter.c index 7fe902e9..267fa166 100644 --- a/filter/filter.c +++ b/filter/filter.c @@ -20,6 +20,7 @@ #include "nest/route.h" #include "nest/protocol.h" #include "nest/iface.h" +#include "nest/attrs.h" #include "conf/conf.h" #include "filter/filter.h" @@ -138,6 +139,7 @@ val_print(struct f_val v) case T_SET: tree_print( v.val.t ); PRINTF( "\n" ); break; case T_ENUM: PRINTF( "(enum %x)%d", v.type, v.val.i ); break; case T_PATH: as_path_format(v.val.ad, buf2, 1020); PRINTF( "(path %s)", buf2 ); break; + case T_CLIST: int_set_format(v.val.ad, buf2, 1020); PRINTF( "(clist %s)", buf2 ); break; case T_PATH_MASK: debug( "(pathmask " ); { struct f_path_mask *p = v.val.s; while (p) { debug("%d ", p->val); p=p->next; } debug(")" ); } break; default: PRINTF( "[unknown type %x]", v.type ); #undef PRINTF @@ -616,9 +618,6 @@ filter_same(struct filter *new, struct filter *old) } /* This should end up far away from here! - * - * FIXME: It should take struct adata *, not u8 * + length; but that makes it a little more difficult to test. - * Or maybe both versions are usefull? */ struct adata * comlist_add(struct linpool *pool, struct adata *list, u32 val) diff --git a/filter/filter.h b/filter/filter.h index e45b5f3c..4af93175 100644 --- a/filter/filter.h +++ b/filter/filter.h @@ -11,6 +11,7 @@ #include "lib/resource.h" #include "lib/ip.h" +#include "nest/attrs.h" struct f_inst { /* Instruction */ struct f_inst *next; /* Structure is 16 bytes, anyway */ @@ -39,12 +40,6 @@ struct prefix { /* If range then prefix must be in range (len >> 16 & 0xff, len >> 8 & 0xff) */ }; -struct f_path_mask { - struct f_path_mask *next; - int val; -}; -#define PM_ANY -1 - struct f_val { int type; union { |