Allows to define constants of all filter types.

1 files changed, 16 insertions, 31 deletions

diff --git a/filter/config.Y b/filter/config.Y
index 0eeb2ce1..2ca03463 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -193,7 +193,14 @@ f_generate_ec(u16 kind, struct f_inst *tk, struct f_inst *tv)
   else if (tk->code == 'C') {
     c1 = 1;
     struct f_val *val = tk->a1.p;
-    if (val->type == T_IP) {
+
+    if (val->type == T_INT) {
+      ipv4_used = 0; key = val->val.i;
+    }
+    else if (val->type == T_QUAD) {
+      ipv4_used = 1; key = val->val.i;
+    }
+    else if (val->type == T_IP) {
       ipv4_used = 1; key = ipa_to_u32(val->val.px.ip);
     }
     else
@@ -661,37 +668,15 @@ function_call:
 symbol:
    SYM {
      $$ = f_new_inst();
-     switch ($1->class) {
-       case SYM_NUMBER:
-	$$ = f_new_inst();
-	$$->code = 'c'; 
-	$$->aux = T_INT; 
-	$$->a2.i = $1->aux;
-	break;
-       case SYM_IPA:
-	{ NEW_F_VAL; $$ = f_new_inst(); $$->code = 'C'; $$->a1.p = val; val->type = T_IP; val->val.px.ip = * (ip_addr *) ($1->def); }
-	break;
-       case SYM_VARIABLE | T_BOOL:
-       case SYM_VARIABLE | T_INT:
-       case SYM_VARIABLE | T_PAIR:
-       case SYM_VARIABLE | T_QUAD:
-       case SYM_VARIABLE | T_EC:
-       case SYM_VARIABLE | T_STRING:
-       case SYM_VARIABLE | T_IP:
-       case SYM_VARIABLE | T_PREFIX:
-       case SYM_VARIABLE | T_PREFIX_SET:
-       case SYM_VARIABLE | T_SET:
-       case SYM_VARIABLE | T_PATH:
-       case SYM_VARIABLE | T_PATH_MASK:
-       case SYM_VARIABLE | T_CLIST:
-       case SYM_VARIABLE | T_ECLIST:
-	 $$->code = 'V';
-	 $$->a1.p = $1->def;
-	 $$->a2.p = $1->name;
-	 break;
-       default:
-	 cf_error("%s: variable expected.", $1->name );
+
+     switch ($1->class & 0xff00) {
+       case SYM_CONSTANT: $$->code = 'C'; break;
+       case SYM_VARIABLE: $$->code = 'V'; break;
+       default: cf_error("%s: variable expected.", $1->name);
      }
+
+     $$->a1.p = $1->def;
+     $$->a2.p = $1->name;
    }
 
 static_attr: