proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 18:04:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster

Browse Source
This commit is contained in:
Donald Sharp 2016-02-03 09:01:59 -05:00
commit 14a4730101
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bgpd/bgp_attr.h
View File

@ -60,10 +60,8 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
struct attr_extra struct attr_extra
{ {
/* Multi-Protocol Nexthop, AFI IPv6 */ /* Multi-Protocol Nexthop, AFI IPv6 */
#ifdef HAVE_IPV6
struct in6_addr mp_nexthop_global; struct in6_addr mp_nexthop_global;
struct in6_addr mp_nexthop_local; struct in6_addr mp_nexthop_local;
#endif /* HAVE_IPV6 */
/* Extended Communities attribute. */ /* Extended Communities attribute. */
struct ecommunity *ecommunity; struct ecommunity *ecommunity;
@ -75,7 +73,6 @@ struct attr_extra
struct transit *transit; struct transit *transit;
struct in_addr mp_nexthop_global_in; struct in_addr mp_nexthop_global_in;
struct in_addr mp_nexthop_local_in;
/* Aggregator Router ID attribute */ /* Aggregator Router ID attribute */
struct in_addr aggregator_addr; struct in_addr aggregator_addr;

9
configure.ac
View File

@ -815,15 +815,6 @@ AC_CHECK_FUNCS([dup2 ftruncate getcwd gethostbyname getpagesize gettimeofday \
if_nametoindex if_indextoname getifaddrs \ if_nametoindex if_indextoname getifaddrs \
uname fcntl]) uname fcntl])
AC_CHECK_FUNCS(setproctitle, ,
[AC_CHECK_LIB(util, setproctitle,
[LIBS="$LIBS -lutil"
AC_DEFINE(HAVE_SETPROCTITLE,, Have setproctitle)
]
)
]
)
dnl ------------------------------------ dnl ------------------------------------
dnl Determine routing get and set method dnl Determine routing get and set method
dnl ------------------------------------ dnl ------------------------------------