afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update frr.py to use pimd

Browse source
This commit is contained in:
apwiggins 2019-04-10 09:23:11 -03:00 • committed by GitHub
parent a3c3d0c18d
commit 840a27632d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
daemon/core/services/frr.py
View file

@ -171,7 +171,7 @@ bootdaemon()
flags="" flags=""
if [ "$1" = "xpimd" ] && \\ if [ "$1" = "pimd" ] && \\
grep -E -q '^[[:space:]]*router[[:space:]]+pim6[[:space:]]*$' $FRR_CONF; then grep -E -q '^[[:space:]]*router[[:space:]]+pim6[[:space:]]*$' $FRR_CONF; then
flags="$flags -6" flags="$flags -6"
fi fi
@ -210,7 +210,7 @@ bootfrr()
done done
if grep -E -q '^[[:space:]]*router[[:space:]]+pim6?[[:space:]]*$' $FRR_CONF; then if grep -E -q '^[[:space:]]*router[[:space:]]+pim6?[[:space:]]*$' $FRR_CONF; then
bootdaemon "xpimd" bootdaemon "pimd"
fi fi
$FRR_BIN_DIR/vtysh -b $FRR_BIN_DIR/vtysh -b
@ -608,14 +608,14 @@ class FRRBabel(FrrService):
return " babel wired\n babel split-horizon\n" return " babel wired\n babel split-horizon\n"
class FRRXpimd(FrrService): class FRRpimd(FrrService):
""" """
PIM multicast routing based on XORP. PIM multicast routing based on XORP.
""" """
name = 'FRRXpimd' name = 'FRRpimd'
startup = () startup = ()
shutdown = ('killall xpimd',) shutdown = ('killall pimd',)
validate = ('pidof xpimd',) validate = ('pidof pimd',)
ipv4_routing = True ipv4_routing = True
@classmethod @classmethod