Merge commit '0d0f6554a5c233bf2bf830ae319191c4b1808d49' into haugesund

diff --cc filter/f-inst.c
index 212ed346998333d462fd530d558042ac681ef998,e0bad833a82739bb6316b42f519c7537c5cf577e..852afc51199a52b055f622f5f8741760025cc16a
--- 1/filter/f-inst.c
--- 2/filter/f-inst.c
+++ b/filter/f-inst.c
@@@ -533,21 -533,21 +533,21 @@@
  
        switch (sa.sa_code)
        {
-       case SA_FROM:   RESULT(sa.f_type, ip, rta->from); break;
-       case SA_GW:     RESULT(sa.f_type, ip, rta->nh.gw); break;
-       case SA_NET:    RESULT(sa.f_type, net, fs->rte->net); break;
-       case SA_PROTO:  RESULT(sa.f_type, s, fs->rte->src->proto->name); break;
-       case SA_SOURCE: RESULT(sa.f_type, i, rta->source); break;
-       case SA_SCOPE:  RESULT(sa.f_type, i, rta->scope); break;
-       case SA_DEST:   RESULT(sa.f_type, i, rta->dest); break;
-       case SA_IFNAME: RESULT(sa.f_type, s, rta->nh.iface ? rta->nh.iface->name : ""); break;
-       case SA_IFINDEX:        RESULT(sa.f_type, i, rta->nh.iface ? rta->nh.iface->index : 0); break;
-       case SA_WEIGHT: RESULT(sa.f_type, i, rta->nh.weight + 1); break;
-       case SA_PREF:   RESULT(sa.f_type, i, rta->pref); break;
-       case SA_GW_MPLS:        RESULT(sa.f_type, i, rta->nh.labels ? rta->nh.label[0] : MPLS_NULL); break;
+       case SA_FROM:   RESULT(sa.type, ip, rta->from); break;
+       case SA_GW:     RESULT(sa.type, ip, rta->nh.gw); break;
 -      case SA_NET:    RESULT(sa.type, net, (*fs->rte)->net->n.addr); break;
 -      case SA_PROTO:  RESULT(sa.type, s, (*fs->rte)->src->proto->name); break;
++      case SA_NET:    RESULT(sa.type, net, fs->rte->net); break;
++      case SA_PROTO:  RESULT(sa.type, s, fs->rte->src->proto->name); break;
+       case SA_SOURCE: RESULT(sa.type, i, rta->source); break;
+       case SA_SCOPE:  RESULT(sa.type, i, rta->scope); break;
+       case SA_DEST:   RESULT(sa.type, i, rta->dest); break;
+       case SA_IFNAME: RESULT(sa.type, s, rta->nh.iface ? rta->nh.iface->name : ""); break;
+       case SA_IFINDEX:        RESULT(sa.type, i, rta->nh.iface ? rta->nh.iface->index : 0); break;
+       case SA_WEIGHT: RESULT(sa.type, i, rta->nh.weight + 1); break;
+       case SA_PREF:   RESULT(sa.type, i, rta->pref); break;
+       case SA_GW_MPLS:        RESULT(sa.type, i, rta->nh.labels ? rta->nh.label[0] : MPLS_NULL); break;
  
        default:
-       bug("Invalid static attribute access (%u/%u)", sa.f_type, sa.sa_code);
+       bug("Invalid static attribute access (%u/%u)", sa.type, sa.sa_code);
        }
      }
    }

diff --cc filter/filter.h
Simple merge

diff --cc nest/config.Y
Simple merge

diff --cc nest/route.h
Simple merge

diff --cc proto/babel/babel.c
Simple merge

diff --cc proto/bgp/attrs.c
Simple merge

diff --cc proto/bgp/bgp.h
Simple merge

diff --cc proto/ospf/rt.c
Simple merge

diff --cc proto/rip/rip.c
Simple merge

diff --cc sysdep/bsd/krt-sock.c
Simple merge

diff --cc sysdep/linux/netlink.c
Simple merge