Merge pull request #5793 from ton31337/fix/formatting_show_bgp_summary_failed

[mirror_frr.git] / zebra / zebra_mpls_netlink.c

diff --git a/zebra/zebra_mpls_netlink.c b/zebra/zebra_mpls_netlink.c
index 887c6854987533b5b682d9b113ff7d2d44a75e9f..a9233530dc9c16968bffa25f07f6fda3381d4cc4 100644 (file)
--- a/zebra/zebra_mpls_netlink.c
+++ b/zebra/zebra_mpls_netlink.c
@@ -22,86 +22,53 @@
 
 #ifdef HAVE_NETLINK
 
+#include "zebra/debug.h"
 #include "zebra/rt.h"
 #include "zebra/rt_netlink.h"
 #include "zebra/zebra_mpls.h"
 
 /*
- * Install Label Forwarding entry into the kernel.
+ * LSP forwarding update using dataplane context information.
  */
-int kernel_add_lsp(zebra_lsp_t *lsp)
+enum zebra_dplane_result kernel_lsp_update(struct zebra_dplane_ctx *ctx)
 {
-       int ret;
-
-       if (!lsp || !lsp->best_nhlfe) // unexpected
-               return -1;
-
-       UNSET_FLAG(lsp->flags, LSP_FLAG_CHANGED);
-       ret = netlink_mpls_multipath(RTM_NEWROUTE, lsp);
-       if (!ret)
-               SET_FLAG(lsp->flags, LSP_FLAG_INSTALLED);
-
-       return ret;
-}
-
-/*
- * Update Label Forwarding entry in the kernel. This means that the Label
- * forwarding entry is already installed and needs an update - either a new
- * path is to be added, an installed path has changed (e.g., outgoing label)
- * or an installed path (but not all paths) has to be removed.
- * TODO: Performs a DEL followed by ADD now, need to change to REPLACE. Note
- * that REPLACE was originally implemented for IPv4 nexthops but removed as
- * it was not functioning when moving from swap to PHP as that was signaled
- * through the metric field (before kernel-MPLS). This shouldn't be an issue
- * any longer, so REPLACE can be reintroduced.
- */
-int kernel_upd_lsp(zebra_lsp_t *lsp)
-{
-       int ret;
-       zebra_nhlfe_t *nhlfe;
-       struct nexthop *nexthop;
-
-       if (!lsp || !lsp->best_nhlfe) // unexpected
-               return -1;
+       int cmd, ret = -1;
+
+       /* Call to netlink layer based on type of update */
+       if (dplane_ctx_get_op(ctx) == DPLANE_OP_LSP_DELETE) {
+               cmd = RTM_DELROUTE;
+       } else if (dplane_ctx_get_op(ctx) == DPLANE_OP_LSP_INSTALL ||
+                  dplane_ctx_get_op(ctx) == DPLANE_OP_LSP_UPDATE) {
+
+               /* Validate */
+               if (dplane_ctx_get_best_nhlfe(ctx) == NULL) {
+                       if (IS_ZEBRA_DEBUG_KERNEL || IS_ZEBRA_DEBUG_MPLS)
+                               zlog_debug("LSP in-label %u: update fails, no best NHLFE",
+                                          dplane_ctx_get_in_label(ctx));
+                       goto done;
+               }
 
-       UNSET_FLAG(lsp->flags, LSP_FLAG_CHANGED);
+               cmd = RTM_NEWROUTE;
+       } else
+               /* Invalid op? */
+               goto done;
 
-       /* Any NHLFE that was installed but is not selected now needs to
-        * have its flags updated.
-        */
-       for (nhlfe = lsp->nhlfe_list; nhlfe; nhlfe = nhlfe->next) {
-               nexthop = nhlfe->nexthop;
-               if (!nexthop)
-                       continue;
-
-               if (CHECK_FLAG(nhlfe->flags, NHLFE_FLAG_INSTALLED) &&
-                   !CHECK_FLAG(nhlfe->flags, NHLFE_FLAG_SELECTED)) {
-                       UNSET_FLAG(nhlfe->flags, NHLFE_FLAG_INSTALLED);
-                       UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB);
-               }
-       }
+       ret = netlink_mpls_multipath(cmd, ctx);
 
-       ret = netlink_mpls_multipath(RTM_NEWROUTE, lsp);
-       if (!ret)
-               SET_FLAG(lsp->flags, LSP_FLAG_INSTALLED);
+done:
 
-       return ret;
+       return (ret == 0 ?
+               ZEBRA_DPLANE_REQUEST_SUCCESS : ZEBRA_DPLANE_REQUEST_FAILURE);
 }
 
 /*
- * Delete Label Forwarding entry from the kernel.
+ * Pseudowire update api - not supported by netlink as of 12/18,
+ * but note that the default has been to report 'success' for pw updates
+ * on unsupported platforms.
  */
-int kernel_del_lsp(zebra_lsp_t *lsp)
+enum zebra_dplane_result kernel_pw_update(struct zebra_dplane_ctx *ctx)
 {
-       if (!lsp) // unexpected
-               return -1;
-
-       if (CHECK_FLAG(lsp->flags, LSP_FLAG_INSTALLED)) {
-               netlink_mpls_multipath(RTM_DELROUTE, lsp);
-               UNSET_FLAG(lsp->flags, LSP_FLAG_INSTALLED);
-       }
-
-       return 0;
+       return ZEBRA_DPLANE_REQUEST_SUCCESS;
 }
 
 int mpls_kernel_init(void)