Filters: don't rewrite gw explicitly set by filters

If the originating protocol sets hostentry, it should be
overridden by filters and not rewrite gw.

This fixes #156. Issue #154 may need a similar fix.

Thanks to Peter Hutchinson for reporting.

Signed-Off-By: Katerina Kubecova <katerina.kubecova@nic.cz>

diff --git a/filter/f-inst.c b/filter/f-inst.c
index b8ba0a801f03097d328d5ee271c272409065ec38..00d39c39bccbd8bd2a3dacfa70da936362a27737 100644 (file)
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -855,6 +855,9 @@
 
       a->originated = 1;
       a->fresh = 1;
+
+      if (a->id == ea_gen_nexthop.id)
+       ea_unset_attr(&fs->rte->attrs, 1, &ea_gen_hostentry);
     }
   }