isisd: implement 'max-area-addresses-mismatch' notification

[mirror_frr.git] / zebra / zebra_mpls_netlink.c

diff --git a/zebra/zebra_mpls_netlink.c b/zebra/zebra_mpls_netlink.c
index 887c6854987533b5b682d9b113ff7d2d44a75e9f..c4ab316d0b9ce388655c2642b9937a1a0531f8bf 100644 (file)
--- a/zebra/zebra_mpls_netlink.c
+++ b/zebra/zebra_mpls_netlink.c
@@ -29,19 +29,22 @@
 /*
  * Install Label Forwarding entry into the kernel.
  */
-int kernel_add_lsp(zebra_lsp_t *lsp)
+enum zebra_dplane_result kernel_add_lsp(zebra_lsp_t *lsp)
 {
        int ret;
 
-       if (!lsp || !lsp->best_nhlfe) // unexpected
-               return -1;
+       if (!lsp || !lsp->best_nhlfe) { // unexpected
+               kernel_lsp_pass_fail(lsp, ZEBRA_DPLANE_INSTALL_FAILURE);
+               return ZEBRA_DPLANE_REQUEST_FAILURE;
+       }
 
-       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;
+       kernel_lsp_pass_fail(lsp,
+                            (!ret) ? ZEBRA_DPLANE_INSTALL_SUCCESS
+                                   : ZEBRA_DPLANE_INSTALL_FAILURE);
+
+       return ZEBRA_DPLANE_REQUEST_SUCCESS;
 }
 
 /*
@@ -55,53 +58,48 @@ int kernel_add_lsp(zebra_lsp_t *lsp)
  * 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)
+enum zebra_dplane_result kernel_upd_lsp(zebra_lsp_t *lsp)
 {
        int ret;
-       zebra_nhlfe_t *nhlfe;
-       struct nexthop *nexthop;
-
-       if (!lsp || !lsp->best_nhlfe) // unexpected
-               return -1;
-
-       UNSET_FLAG(lsp->flags, LSP_FLAG_CHANGED);
 
-       /* 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);
-               }
+       if (!lsp || !lsp->best_nhlfe) { // unexpected
+               kernel_lsp_pass_fail(lsp, ZEBRA_DPLANE_INSTALL_FAILURE);
+               return ZEBRA_DPLANE_REQUEST_FAILURE;
        }
 
        ret = netlink_mpls_multipath(RTM_NEWROUTE, lsp);
-       if (!ret)
-               SET_FLAG(lsp->flags, LSP_FLAG_INSTALLED);
 
-       return ret;
+       kernel_lsp_pass_fail(lsp,
+                            (!ret) ? ZEBRA_DPLANE_INSTALL_SUCCESS
+                                   : ZEBRA_DPLANE_INSTALL_FAILURE);
+
+       return ZEBRA_DPLANE_REQUEST_SUCCESS;
 }
 
 /*
  * Delete Label Forwarding entry from the kernel.
  */
-int kernel_del_lsp(zebra_lsp_t *lsp)
+enum zebra_dplane_result kernel_del_lsp(zebra_lsp_t *lsp)
 {
-       if (!lsp) // unexpected
-               return -1;
+       int ret;
 
-       if (CHECK_FLAG(lsp->flags, LSP_FLAG_INSTALLED)) {
-               netlink_mpls_multipath(RTM_DELROUTE, lsp);
-               UNSET_FLAG(lsp->flags, LSP_FLAG_INSTALLED);
+       if (!lsp) { // unexpected
+               kernel_lsp_pass_fail(lsp, ZEBRA_DPLANE_DELETE_FAILURE);
+               return ZEBRA_DPLANE_REQUEST_FAILURE;
        }
 
-       return 0;
+       if (!CHECK_FLAG(lsp->flags, LSP_FLAG_INSTALLED)) {
+               kernel_lsp_pass_fail(lsp, ZEBRA_DPLANE_DELETE_FAILURE);
+               return ZEBRA_DPLANE_REQUEST_FAILURE;
+       }
+
+       ret = netlink_mpls_multipath(RTM_DELROUTE, lsp);
+
+       kernel_lsp_pass_fail(lsp,
+                            (!ret) ? ZEBRA_DPLANE_DELETE_SUCCESS
+                                   : ZEBRA_DPLANE_DELETE_FAILURE);
+
+       return ZEBRA_DPLANE_REQUEST_SUCCESS;
 }
 
 int mpls_kernel_init(void)