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

Merge pull request #652 from donaldsharp/miscapotamus

Browse Source 
Miscapotamus
This commit is contained in:
Renato Westphal 2017-06-02 22:40:56 -03:00 committed by GitHub
commit 2cfaf92bc8
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/Building_FRR_on_Ubuntu1204.md
View File

@ -13,7 +13,7 @@ Add packages:
apt-get install git autoconf automake libtool make gawk libreadline-dev \ apt-get install git autoconf automake libtool make gawk libreadline-dev \
texinfo libpam0g-dev dejagnu libjson0-dev pkg-config libpam0g-dev \ texinfo libpam0g-dev dejagnu libjson0-dev pkg-config libpam0g-dev \
libjson0-dev flex python-pip libc-ares-dev python3-dev libjson0-dev flex python-pip libc-ares-dev python3-dev libxml2 libxml2-dev
Install newer bison from 14.04 package source (Ubuntu 12.04 package source Install newer bison from 14.04 package source (Ubuntu 12.04 package source
is too old) is too old)
@ -51,6 +51,11 @@ Install newer version of autoconf and automake:
sudo make install sudo make install
cd .. cd ..
Install XML::LibXML
sudo cpan
install XML::LibXML
Install pytest: Install pytest:
pip install pytest pip install pytest

2
nhrpd/vici.c
View File

@ -421,7 +421,7 @@ static int vici_reconnect(struct thread *t)
fd = sock_open_unix("/var/run/charon.vici"); fd = sock_open_unix("/var/run/charon.vici");
if (fd < 0) { if (fd < 0) {
zlog_warn("%s: failure connecting VICI socket: %s", debugf(NHRP_DEBUG_VICI, "%s: failure connecting VICI socket: %s",
__PRETTY_FUNCTION__, strerror(errno)); __PRETTY_FUNCTION__, strerror(errno));
thread_add_timer(master, vici_reconnect, vici, 2, thread_add_timer(master, vici_reconnect, vici, 2,
&vici->t_reconnect); &vici->t_reconnect);

8
pimd/pim_bfd.c
View File

@ -44,15 +44,10 @@ pim_bfd_write_config (struct vty *vty, struct interface *ifp)
struct pim_interface *pim_ifp = ifp->info; struct pim_interface *pim_ifp = ifp->info;
struct bfd_info *bfd_info = NULL; struct bfd_info *bfd_info = NULL;
if (!pim_ifp)
return;
bfd_info = (struct bfd_info *) pim_ifp->bfd_info; bfd_info = (struct bfd_info *) pim_ifp->bfd_info;
if (!bfd_info) if (!bfd_info)
{
zlog_debug ("%s: interface %s bfd_info is NULL ", __PRETTY_FUNCTION__,
ifp->name);
return; return;
}
if (CHECK_FLAG (bfd_info->flags, BFD_FLAG_PARAM_CFG)) if (CHECK_FLAG (bfd_info->flags, BFD_FLAG_PARAM_CFG))
vty_out (vty, " ip pim bfd %d %d %d%s", vty_out (vty, " ip pim bfd %d %d %d%s",
bfd_info->detect_mult, bfd_info->required_min_rx, bfd_info->detect_mult, bfd_info->required_min_rx,
@ -94,7 +89,6 @@ pim_bfd_info_nbr_create (struct pim_interface *pim_ifp,
if (!neigh->bfd_info) if (!neigh->bfd_info)
return; return;
zlog_debug ("%s: bfd_info ", __PRETTY_FUNCTION__);
nbr_bfd_info = (struct bfd_info *) neigh->bfd_info; nbr_bfd_info = (struct bfd_info *) neigh->bfd_info;
nbr_bfd_info->detect_mult = pim_ifp->bfd_info->detect_mult; nbr_bfd_info->detect_mult = pim_ifp->bfd_info->detect_mult;

4
zebra/rtadv.c
View File

@ -1403,8 +1403,8 @@ DEFUN (ipv6_nd_router_preference,
"Neighbor discovery\n" "Neighbor discovery\n"
"Default router preference\n" "Default router preference\n"
"High default router preference\n" "High default router preference\n"
"Low default router preference\n" "Medium default router preference (default)\n"
"Medium default router preference (default)\n") "Low default router preference\n")
{ {
int idx_high_medium_low = 3; int idx_high_medium_low = 3;
VTY_DECLVAR_CONTEXT (interface, ifp); VTY_DECLVAR_CONTEXT (interface, ifp);