Merge pull request #4765 from opensourcerouting/defaults-v2

[mirror_frr.git] / pbrd / pbr_zebra.c

diff --git a/pbrd/pbr_zebra.c b/pbrd/pbr_zebra.c
index 39e92467ab66296459ccdc94825f38256117573d..06ad0f40a47a4fe71e00f028e56e5926f346dcb8 100644 (file)
--- a/pbrd/pbr_zebra.c
+++ b/pbrd/pbr_zebra.c
@@ -39,6 +39,7 @@
 #include "pbr_memory.h"
 #include "pbr_zebra.h"
 #include "pbr_debug.h"
+#include "pbr_vrf.h"
 
 DEFINE_MTYPE_STATIC(PBRD, PBR_INTERFACE, "PBR Interface")
 
@@ -67,8 +68,11 @@ int pbr_ifp_create(struct interface *ifp)
        if (!ifp->info)
                pbr_if_new(ifp);
 
+       /* Update nexthops tracked from a `set nexthop` command */
        pbr_nht_nexthop_interface_update(ifp);
 
+       pbr_map_policy_interface_update(ifp, true);
+
        return 0;
 }
 
@@ -77,6 +81,8 @@ int pbr_ifp_destroy(struct interface *ifp)
        DEBUGD(&pbr_dbg_zebra,
               "%s: %s", __PRETTY_FUNCTION__, ifp->name);
 
+       pbr_map_policy_interface_update(ifp, false);
+
        return 0;
 }
 
@@ -109,7 +115,7 @@ static int interface_address_delete(ZAPI_CALLBACK_ARGS)
               "%s: %s deleted %s", __PRETTY_FUNCTION__, c->ifp->name,
               prefix2str(c->address, buf, sizeof(buf)));
 
-       connected_free(c);
+       connected_free(&c);
        return 0;
 }
 
@@ -133,6 +139,29 @@ int pbr_ifp_down(struct interface *ifp)
        return 0;
 }
 
+static int interface_vrf_update(ZAPI_CALLBACK_ARGS)
+{
+       struct interface *ifp;
+       vrf_id_t new_vrf_id;
+
+       ifp = zebra_interface_vrf_update_read(zclient->ibuf, vrf_id,
+                                             &new_vrf_id);
+
+       if (!ifp) {
+               DEBUGD(&pbr_dbg_zebra, "%s: VRF change interface not found",
+                      __func__);
+
+               return 0;
+       }
+
+       DEBUGD(&pbr_dbg_zebra, "%s: %s VRF change %u -> %u", __func__,
+              ifp->name, vrf_id, new_vrf_id);
+
+       if_update_to_new_vrf(ifp, new_vrf_id);
+
+       return 0;
+}
+
 static int route_notify_owner(ZAPI_CALLBACK_ARGS)
 {
        struct prefix p;
@@ -205,23 +234,21 @@ static int rule_notify_owner(ZAPI_CALLBACK_ARGS)
        switch (note) {
        case ZAPI_RULE_FAIL_INSTALL:
                pbrms->installed &= ~installed;
-               DEBUGD(&pbr_dbg_zebra,
-                      "%s: Received RULE_FAIL_INSTALL: %" PRIu64,
-                      __PRETTY_FUNCTION__, pbrms->installed);
                break;
        case ZAPI_RULE_INSTALLED:
                pbrms->installed |= installed;
-               DEBUGD(&pbr_dbg_zebra, "%s: Received RULE_INSTALLED: %" PRIu64,
-                      __PRETTY_FUNCTION__, pbrms->installed);
                break;
        case ZAPI_RULE_FAIL_REMOVE:
+               /* Don't change state on rule removal failure */
+               break;
        case ZAPI_RULE_REMOVED:
                pbrms->installed &= ~installed;
-               DEBUGD(&pbr_dbg_zebra, "%s: Received RULE REMOVED: %" PRIu64,
-                      __PRETTY_FUNCTION__, pbrms->installed);
                break;
        }
 
+       DEBUGD(&pbr_dbg_zebra, "%s: Received %s: %" PRIu64, __func__,
+              zapi_rule_notify_owner2str(note), pbrms->installed);
+
        pbr_map_final_interface_deletion(pbrms->parent, pmi);
 
        return 0;
@@ -421,6 +448,7 @@ void pbr_zebra_init(void)
        zclient->zebra_connected = zebra_connected;
        zclient->interface_address_add = interface_address_add;
        zclient->interface_address_delete = interface_address_delete;
+       zclient->interface_vrf_update = interface_vrf_update;
        zclient->route_notify_owner = route_notify_owner;
        zclient->rule_notify_owner = rule_notify_owner;
        zclient->nexthop_update = pbr_zebra_nexthop_update;
@@ -483,6 +511,26 @@ static void pbr_encode_pbr_map_sequence_prefix(struct stream *s,
        stream_put(s, &p->u.prefix, prefix_blen(p));
 }
 
+static void
+pbr_encode_pbr_map_sequence_vrf(struct stream *s,
+                               const struct pbr_map_sequence *pbrms,
+                               const struct interface *ifp)
+{
+       struct pbr_vrf *pbr_vrf;
+
+       if (pbrms->vrf_unchanged)
+               pbr_vrf = pbr_vrf_lookup_by_id(ifp->vrf_id);
+       else
+               pbr_vrf = pbr_vrf_lookup_by_name(pbrms->vrf_name);
+
+       if (!pbr_vrf) {
+               DEBUGD(&pbr_dbg_zebra, "%s: VRF not found", __func__);
+               return;
+       }
+
+       stream_putl(s, pbr_vrf->vrf->data.l.table_id);
+}
+
 static void pbr_encode_pbr_map_sequence(struct stream *s,
                                        struct pbr_map_sequence *pbrms,
                                        struct interface *ifp)
@@ -501,7 +549,10 @@ static void pbr_encode_pbr_map_sequence(struct stream *s,
        pbr_encode_pbr_map_sequence_prefix(s, pbrms->dst, family);
        stream_putw(s, 0);  /* dst port */
        stream_putl(s, pbrms->mark);
-       if (pbrms->nhgrp_name)
+
+       if (pbrms->vrf_unchanged || pbrms->vrf_lookup)
+               pbr_encode_pbr_map_sequence_vrf(s, pbrms, ifp);
+       else if (pbrms->nhgrp_name)
                stream_putl(s, pbr_nht_get_table(pbrms->nhgrp_name));
        else if (pbrms->nhg)
                stream_putl(s, pbr_nht_get_table(pbrms->internal_nhg_name));