From: Maria Matejka <mq@ucw.cz>
Date: Mon, 30 May 2022 13:43:13 +0000 (+0200)
Subject: Merge commit '0d0f6554a5c233bf2bf830ae319191c4b1808d49' into haugesund
X-Git-Tag: v3.0-alpha1~171^2~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54344f15f8a6a6f5f0388097a1825a9c08c17482;p=thirdparty%2Fbird.git

Merge commit '0d0f6554a5c233bf2bf830ae319191c4b1808d49' into haugesund
---

54344f15f8a6a6f5f0388097a1825a9c08c17482
diff --cc filter/f-inst.c
index 212ed3469,e0bad833a..852afc511
--- a/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);
        }
      }
    }