proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 19:10:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospfd: Remove HAVE_OSPF_TE

Browse Source 
Remove from ospf the HAVE_OSPF_TE define and just always have
ospf traffic engineering.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Tested-by: NetDEF CI System <cisystem@netdef.org>
(cherry picked from commit 693da6096a28eef5eadeea699771265987b3ec0c)
This commit is contained in:
Donald Sharp 2015-12-16 14:22:11 -05:00 committed by Donald Sharp
parent cd66cd4ce1
commit 628426cd9d
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -270,8 +270,6 @@ AC_ARG_ENABLE(ospfapi,
AC_ARG_ENABLE(ospfclient, AC_ARG_ENABLE(ospfclient,
AS_HELP_STRING([--disable-ospfclient], [do not build OSPFAPI client for OSPFAPI, AS_HELP_STRING([--disable-ospfclient], [do not build OSPFAPI client for OSPFAPI,
(this is the default if --disable-ospfapi is set)])) (this is the default if --disable-ospfapi is set)]))
AC_ARG_ENABLE(ospf-te,
AS_HELP_STRING([--disable-ospf-te],[disable Traffic Engineering Extension to OSPF]))
AC_ARG_ENABLE(multipath, AC_ARG_ENABLE(multipath,
AS_HELP_STRING([--enable-multipath=ARG], [enable multipath function, ARG must be digit])) AS_HELP_STRING([--enable-multipath=ARG], [enable multipath function, ARG must be digit]))
AC_ARG_ENABLE(user, AC_ARG_ENABLE(user,
@ -381,10 +379,6 @@ if test "${enable_tcp_zebra}" = "yes"; then
AC_DEFINE(HAVE_TCP_ZEBRA,,Use TCP for zebra communication) AC_DEFINE(HAVE_TCP_ZEBRA,,Use TCP for zebra communication)
fi fi
if test "${enable_ospf_te}" != "no"; then
AC_DEFINE(HAVE_OSPF_TE,,OSPF TE)
fi
if test "${enable_linux24_tcp_md5}" = "yes"; then if test "${enable_linux24_tcp_md5}" = "yes"; then
AC_DEFINE(HAVE_TCP_MD5_LINUX24,,Old Linux 2.4 TCP MD5 Signature Patch) AC_DEFINE(HAVE_TCP_MD5_LINUX24,,Old Linux 2.4 TCP MD5 Signature Patch)
fi fi

6
ospfd/ospf_opaque.c
View File

@ -61,9 +61,7 @@
* Followings are initialize/terminate functions for Opaque-LSAs handling. * Followings are initialize/terminate functions for Opaque-LSAs handling.
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
#ifdef HAVE_OSPF_TE
#include "ospfd/ospf_te.h" #include "ospfd/ospf_te.h"
#endif /* HAVE_OSPF_TE */
#ifdef SUPPORT_OSPF_API #ifdef SUPPORT_OSPF_API
int ospf_apiserver_init (void); int ospf_apiserver_init (void);
@ -86,10 +84,8 @@ ospf_opaque_init (void)
ospf_opaque_register_vty (); ospf_opaque_register_vty ();
ospf_opaque_funclist_init (); ospf_opaque_funclist_init ();
#ifdef HAVE_OSPF_TE
if (ospf_mpls_te_init () != 0) if (ospf_mpls_te_init () != 0)
exit (1); exit (1);
#endif /* HAVE_OSPF_TE */
#ifdef SUPPORT_OSPF_API #ifdef SUPPORT_OSPF_API
if ((ospf_apiserver_enable) && (ospf_apiserver_init () != 0)) if ((ospf_apiserver_enable) && (ospf_apiserver_init () != 0))
@ -102,9 +98,7 @@ ospf_opaque_init (void)
void void
ospf_opaque_term (void) ospf_opaque_term (void)
{ {
#ifdef HAVE_OSPF_TE
ospf_mpls_te_term (); ospf_mpls_te_term ();
#endif /* HAVE_OSPF_TE */
#ifdef SUPPORT_OSPF_API #ifdef SUPPORT_OSPF_API
ospf_apiserver_term (); ospf_apiserver_term ();

4
ospfd/ospf_te.c
View File

@ -26,8 +26,6 @@
#include <zebra.h> #include <zebra.h>
#ifdef HAVE_OSPF_TE
#include "linklist.h" #include "linklist.h"
#include "prefix.h" #include "prefix.h"
#include "vrf.h" #include "vrf.h"
@ -1925,5 +1923,3 @@ ospf_mpls_te_register_vty (void)
return; return;
} }
#endif /* HAVE_OSPF_TE */