From: Donald Sharp Date: Mon, 8 May 2017 18:44:25 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' into datacenter X-Git-Tag: reindent-master-before~193^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=dbb12b8da9761c6fed8f177b5c919622491d6da0;p=mirror_frr.git Merge remote-tracking branch 'origin/master' into datacenter --- dbb12b8da9761c6fed8f177b5c919622491d6da0 diff --cc Makefile.am index f287038fd,c0efa1925..d87b5943d --- a/Makefile.am +++ b/Makefile.am @@@ -2,13 -2,14 +2,13 @@@ SUBDIRS = lib qpb fpm @ZEBRA@ @LIBRFP@ @RFPTEST@ \ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @LDPD@ \ - @ISISD@ @PIMD@ @NHRPD@ \ + @ISISD@ @PIMD@ @NHRPD@ @EIGRPD@ \ @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \ - redhat @SOLARIS@ tests tools cumulus snapcraft + redhat @SOLARIS@ tests tools snapcraft DIST_SUBDIRS = lib qpb fpm zebra bgpd ripd ripngd ospfd ospf6d ldpd \ isisd watchfrr vtysh ospfclient doc m4 pkgsrc redhat tests \ - solaris pimd nhrpd @LIBRFP@ @RFPTEST@ tools snapcraft - solaris pimd nhrpd eigrpd @LIBRFP@ @RFPTEST@ tools cumulus \ - snapcraft ++ solaris pimd nhrpd eigrpd @LIBRFP@ @RFPTEST@ tools snapcraft EXTRA_DIST = aclocal.m4 SERVICES REPORTING-BUGS \ update-autotools \ diff --cc tools/etc/default/frr index ae960b9e1,000000000..693fa6339 mode 100644,000000..100644 --- a/tools/etc/default/frr +++ b/tools/etc/default/frr @@@ -1,9 -1,0 +1,10 @@@ +MAX_INSTANCES=5 +MAX_FDS=1024 +ZEBRA_OPTIONS="-s 16777216 -A 127.0.0.1" +BGPD_OPTIONS="-A 127.0.0.1" +OSPFD_OPTIONS="-A 127.0.0.1" +OSPF6D_OPTIONS="-A ::1" +RIPD_OPTIONS="-A 127.0.0.1" +RIPNGD_OPTIONS="-A ::1" +ISISD_OPTIONS="-A 127.0.0.1" ++EIGRP_OPTIONS="-A 127.0.0.1" diff --cc tools/etc/frr/daemons index cf58caeb4,000000000..eb7a5c9a9 mode 100644,000000..100644 --- a/tools/etc/frr/daemons +++ b/tools/etc/frr/daemons @@@ -1,33 -1,0 +1,34 @@@ +# This file tells the frr package which daemons to start. +# +# Entries are in the format: =(yes|no|priority) +# 0, "no" = disabled +# 1, "yes" = highest priority +# 2 .. 10 = lower priorities +# Read /usr/share/doc/frr/README.Debian for details. +# +# Sample configurations for these daemons can be found in +# /usr/share/doc/frr/examples/. +# +# ATTENTION: +# +# When activation a daemon at the first time, a config file, even if it is +# empty, has to be present *and* be owned by the user and group "frr", else +# the daemon will not be started by /etc/init.d/frr. The permissions should +# be u=rw,g=r,o=. +# When using "vtysh" such a config file is also needed. It should be owned by +# group "frrvty" and set to ug=rw,o= though. Check /etc/pam.d/frr, too. +# +# The watchfrr daemon is always started. Per default in monitoring-only but +# that can be changed via /etc/frr/daemons.conf. +# +zebra=no +bgpd=no +ospfd=no +ospf6d=no +ripd=no +ripngd=no +isisd=no +pimd=no +ldpd=no +nhrpd=no ++eigrpd=no diff --cc tools/etc/frr/daemons.conf index eed8379e8,000000000..21ae29d4c mode 100644,000000..100644 --- a/tools/etc/frr/daemons.conf +++ b/tools/etc/frr/daemons.conf @@@ -1,20 -1,0 +1,26 @@@ +# +# If this option is set the /etc/init.d/frr script automatically loads +# the config via "vtysh -b" when the servers are started. +# Check /etc/pam.d/frr if you intend to use "vtysh"! +# +vtysh_enable=yes +zebra_options=" -s 90000000 --daemon -A 127.0.0.1" +bgpd_options=" --daemon -A 127.0.0.1" +ospfd_options=" --daemon -A 127.0.0.1" +ospf6d_options=" --daemon -A ::1" +ripd_options=" --daemon -A 127.0.0.1" +ripngd_options=" --daemon -A ::1" +isisd_options=" --daemon -A 127.0.0.1" +pimd_options=" --daemon -A 127.0.0.1" +ldpd_options=" --daemon -A 127.0.0.1" +nhrpd_options=" --daemon -A 127.0.0.1" ++eigrpd_options=" --daemon -A 127.0.0.1" + +# The list of daemons to watch is automatically generated by the init script. +watchfrr_enable=yes +watchfrr_options=(-adz -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30) ++ ++# If valgrind_enable is 'yes' the frr daemons will be started via valgrind. ++# The use case for doing so is tracking down memory leaks, etc in frr. ++valgrind_enable=no ++valgrind=/usr/bin/valgrind