]> git.puffer.fish Git - mirror/frr.git/commitdiff
ospf: unregister mpls-te inter-as only if mpls-te is enabled 3298/head
authorDmitrii Turlupov <dturlupov@factor-ts.ru>
Fri, 9 Nov 2018 10:44:42 +0000 (13:44 +0300)
committerDmitrii Turlupov <dturlupov@factor-ts.ru>
Fri, 9 Nov 2018 10:44:42 +0000 (13:44 +0300)
Signed-off-by: Dmitrii Turlupov <dturlupov@factor-ts.ru>
ospfd/ospf_te.c

index 02698d770a760725128098798eaf4ed139313991..16347f1c5bbfe730c98bf148f23d09bd869f5786 100644 (file)
@@ -2398,16 +2398,16 @@ DEFUN (no_ospf_mpls_te_inter_as,
                zlog_debug("MPLS-TE: Inter-AS support OFF");
 
        if ((OspfMplsTE.enabled) && (OspfMplsTE.inter_as != Off)) {
-               OspfMplsTE.inter_as = Off;
                /* Flush all Inter-AS LSA */
                for (ALL_LIST_ELEMENTS(OspfMplsTE.iflist, node, nnode, lp))
                        if (IS_INTER_AS(lp->type)
                            && CHECK_FLAG(lp->flags, LPFLG_LSA_ENGAGED))
                                ospf_mpls_te_lsa_schedule(lp, FLUSH_THIS_LSA);
-       }
 
-       /* Deregister the Callbacks for Inter-AS support */
-       ospf_mpls_te_unregister();
+               /* Deregister the Callbacks for Inter-AS support */
+               ospf_mpls_te_unregister();
+               OspfMplsTE.inter_as = Off;
+       }
 
        return CMD_SUCCESS;
 }