Merge commit 'd40c26594c22ad934a13061e11b373bdf81af8f9' into integrated

Conflicts:

	proto/static/static.c

diff --cc proto/static/static.c
index 7aa94f6c4530df00118791c6966b5a9ca901e785,d3a595d35fc0b7f5ebc656415a3dbceddcfb9e8f..c51b194ea248bfd1f5db718f6762d3888a84d042
--- 1/proto/static/static.c
--- 2/proto/static/static.c
+++ b/proto/static/static.c
@@@ -58,7 -58,11 +58,7 @@@ p_igp_table(struct proto *p
  static void
  static_install(struct proto *p, struct static_route *r, struct iface *ifa)
  {
-   if (r->installed)
 -  net *n;
 -  rta a, *aa;
 -  rte *e;
 -
+   if (r->installed > 0)
      return;
  
    DBG("Installing static route %I/%d, rtd=%d\n", r->net, r->masklen, r->dest);
@@@ -122,10 -123,10 +122,10 @@@ static_remove(struct proto *p, struct s
    if (!r->installed)
      return;
  
-   DBG("Removing static route %I/%d\n", r->net, r->masklen);
+   DBG("Removing static route %I/%d via %I\n", r->net, r->masklen, r->via);
 -  n = net_find(p->table, r->net, r->masklen);
 +
 +  // int pxlen = r->masklen + (ipa_is_ip4(r->net) ? 96 : 0);  // XXXX: Hack
 +  net *n = net_find(p->table, r->net, r->masklen);
    rte_update(p, n, NULL);
    r->installed = 0;
  }