Prepend and creation of empty path should work, but it has strange

syntax for now.

diff --git a/filter/config.Y b/filter/config.Y
index ebb2e4b1144a06cf78de48749e68ddc3193e96e2..a4c1392beedf3246392d6abd3f60bba803048ab9 100644 (file)
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -73,6 +73,7 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN,
        DEFINED,
        ADD, DELETE, CONTAINS, RESET,
        APPEND, MATCH,
+       EMPTY,
        FILTER, WHERE)
 
 %nonassoc THEN
@@ -418,6 +419,9 @@ term:
 /* Paths */
  | term '.' APPEND '(' term ')' { }
  | term '.' RESET { }
+
+ | EMPTY { $$ = f_new_inst(); $$->code = 'E'; $$->aux = T_PATH; }
+
 /* | term '.' LEN { $$->code = P('P','l'); } */
 
 /* function_call is inlined here */

diff --git a/filter/filter.c b/filter/filter.c
index cfb502fc47a809ac5d76eac9fa83ec860bbd292b..82fb30419c86066c7d103f09042b5d61d3cf7bd7 100644 (file)
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -453,6 +453,22 @@ interpret(struct f_inst *what)
       res.val.px.ip = ipa_and(mask, v1.val.px.ip);
     }
     break;
+
+  case 'E':    /* Create empty attribute */
+    res.type = what->aux;
+    res.val.ad = adata_empty(f_pool);
+    break;
+  case P('A','p'):     /* Path prepend */
+    TWOARGS;
+    if (v1.type != T_PATH)
+      runtime("Can't prepend to non-path");
+    if (v2.type != T_INT)
+      runtime("Can't prepend non-integer");
+
+    res.type = T_PATH;
+    res.val.ad = as_path_prepend(f_pool, v1.val.ad, v2.val.i);
+    break;
+
   default:
     bug( "Unknown instruction %d (%c)", what->code, what->code & 0xff);
   }
@@ -519,7 +535,7 @@ i_same(struct f_inst *f1, struct f_inst *f2)
     break;
   case 'p': ONEARG; break;
   case '?': TWOARGS; break;
-  case '0': break;
+  case '0': case 'E': break;
   case P('p',','): ONEARG; A2_SAME; break;
   case 'a': A2_SAME; break;
   case P('e','a'): A2_SAME; break;
@@ -535,6 +551,7 @@ i_same(struct f_inst *f1, struct f_inst *f2)
             break;
   case P('S','W'): ONEARG; if (!same_tree(f1->a2.p, f2->a2.p)) return 0; break;
   case P('i','M'): TWOARGS; break;
+  case P('A','p'): TWOARGS; break;
   default:
     bug( "Unknown instruction %d in same (%c)", f1->code, f1->code & 0xff);
   }