Diff for /embedaddon/quagga/ospfd/ospf_te.c between versions 1.1 and 1.1.1.3

version 1.1, 2012/02/21 17:26:12 version 1.1.1.3, 2016/11/02 10:09:12
Line 26 Line 26
   
 #include <zebra.h>  #include <zebra.h>
   
 #ifdef HAVE_OSPF_TE  
 #ifndef HAVE_OPAQUE_LSA  
 #error "Wrong configure option"  
 #endif /* HAVE_OPAQUE_LSA */  
   
 #include "linklist.h"  #include "linklist.h"
 #include "prefix.h"  #include "prefix.h"
 #include "if.h"  #include "if.h"
Line 205  get_mpls_te_instance_value (void) Line 200  get_mpls_te_instance_value (void)
 {  {
   static u_int32_t seqno = 0;    static u_int32_t seqno = 0;
   
  if (LEGAL_TE_INSTANCE_RANGE (seqno + 1))  if (seqno < MAX_LEGAL_TE_INSTANCE_NUM )
     seqno += 1;      seqno += 1;
   else    else
     seqno  = 1; /* Avoid zero. */      seqno  = 1; /* Avoid zero. */
Line 556  ospf_mpls_te_new_if (struct interface *ifp) Line 551  ospf_mpls_te_new_if (struct interface *ifp)
   
   if (lookup_linkparams_by_ifp (ifp) != NULL)    if (lookup_linkparams_by_ifp (ifp) != NULL)
     {      {
      zlog_warn ("ospf_mpls_te_new_if: ifp(%p) already in use?", ifp);      zlog_warn ("ospf_mpls_te_new_if: ifp(%p) already in use?", (void *)ifp);
       rc = 0; /* Do nothing here. */        rc = 0; /* Do nothing here. */
       goto out;        goto out;
     }      }
Line 1036  ospf_mpls_te_lsa_refresh (struct ospf_lsa *lsa) Line 1031  ospf_mpls_te_lsa_refresh (struct ospf_lsa *lsa)
   /* If the lsa's age reached to MaxAge, start flushing procedure. */    /* If the lsa's age reached to MaxAge, start flushing procedure. */
   if (IS_LSA_MAXAGE (lsa))    if (IS_LSA_MAXAGE (lsa))
     {      {
      lp->flags &= ~LPFLG_LSA_ENGAGED;      if (lp)
         lp->flags &= ~LPFLG_LSA_ENGAGED;
       ospf_opaque_lsa_flush_schedule (lsa);        ospf_opaque_lsa_flush_schedule (lsa);
       goto out;        goto out;
     }      }
Line 1906  ospf_mpls_te_register_vty (void) Line 1902  ospf_mpls_te_register_vty (void)
   
   return;    return;
 }  }
   
 #endif /* HAVE_OSPF_TE */  

Removed from v.1.1  
changed lines
  Added in v.1.1.1.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>