Filters: fix rta access to use ->aux field.

diff --git a/filter/config.Y b/filter/config.Y
index 3a176df2fab350501d5ab59e5f304b2f2974333f..7b61baaa6ece8b1ae88f4c96e71a30115cdaf9db 100644 (file)
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -276,11 +276,11 @@ term:
      }
    }
 
- | RTA '.' FROM    { $$ = f_new_inst(); $$->code = 'a'; $$->a1.i = T_IP; $$->a2.i = OFFSETOF(struct rta, from); }
+ | RTA '.' FROM    { $$ = f_new_inst(); $$->code = 'a'; $$->aux = T_IP; $$->a2.i = OFFSETOF(struct rta, from); }
 
- | RTA '.' GW      { $$ = f_new_inst(); $$->code = 'a'; $$->a1.i = T_IP; $$->a2.i = OFFSETOF(struct rta, gw); }
- | RTA '.' NET     { $$ = f_new_inst(); $$->code = 'a'; $$->a1.i = T_PREFIX; $$->a2.i = 0x12345678; }
- | RTA '.' SOURCE  { $$ = f_new_inst(); $$->code = 'a'; $$->a1.i = T_ENUM_RTS; $$->a2.i = OFFSETOF(struct rta, gw); }
+ | RTA '.' GW      { $$ = f_new_inst(); $$->code = 'a'; $$->aux = T_IP; $$->a2.i = OFFSETOF(struct rta, gw); }
+ | RTA '.' NET     { $$ = f_new_inst(); $$->code = 'a'; $$->aux = T_PREFIX; $$->a2.i = 0x12345678; }
+ | RTA '.' SOURCE  { $$ = f_new_inst(); $$->code = 'a'; $$->aux = T_ENUM_RTS; $$->a2.i = OFFSETOF(struct rta, gw); }
 
  | RTA '.' any_dynamic { $$ = $3; $$->code = 'ea'; }
 

diff --git a/filter/filter.c b/filter/filter.c
index 335874156e430e010acb3624954b10c5774dde85..9c2bfe8b1db1ed8e35b7146e27268ce537f6d50e 100644 (file)
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -313,7 +313,7 @@ interpret(struct f_inst *what)
          break;
        }
       default:
-       bug( "Invalid type for rta access" );
+       bug( "Invalid type for rta access (%x)\n" );
       }
     }
     break;