From 95c7c2dd3de348f4de93d6772967cddee83a0bb7 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 1 Jun 2017 20:05:15 -0400 Subject: [PATCH 1/4] doc: Fix up some missed stuff for Ubuntu 12.04 build doc Signed-off-by: Donald Sharp --- doc/Building_FRR_on_Ubuntu1204.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/Building_FRR_on_Ubuntu1204.md b/doc/Building_FRR_on_Ubuntu1204.md index 033e05bcdb..e79614a57e 100644 --- a/doc/Building_FRR_on_Ubuntu1204.md +++ b/doc/Building_FRR_on_Ubuntu1204.md @@ -13,7 +13,7 @@ Add packages: apt-get install git autoconf automake libtool make gawk libreadline-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 is too old) @@ -51,6 +51,11 @@ Install newer version of autoconf and automake: sudo make install cd .. +Install XML::LibXML + + sudo cpan + install XML::LibXML + Install pytest: pip install pytest From 4b872c22a3a4d7a3a96adf2b9313afa79324de02 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 1 Jun 2017 20:09:06 -0400 Subject: [PATCH 2/4] nhrpd: Guard a debug that was constantly spewing information This debug when nhrpd was just running but not configured was constantly being sent to the log file. Filling it with useless information Signed-off-by: Donald Sharp --- nhrpd/vici.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nhrpd/vici.c b/nhrpd/vici.c index 244562d547..18faca2d5a 100644 --- a/nhrpd/vici.c +++ b/nhrpd/vici.c @@ -421,7 +421,7 @@ static int vici_reconnect(struct thread *t) fd = sock_open_unix("/var/run/charon.vici"); 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)); thread_add_timer(master, vici_reconnect, vici, 2, &vici->t_reconnect); From bade23d3b02d5e7c71a2d9fbdad2456a9668b174 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 1 Jun 2017 20:11:19 -0400 Subject: [PATCH 3/4] pimd: Remove some unneeded debugs from pim Signed-off-by: Donald Sharp --- pimd/pim_bfd.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pimd/pim_bfd.c b/pimd/pim_bfd.c index 5c10df32e1..b0915fa628 100644 --- a/pimd/pim_bfd.c +++ b/pimd/pim_bfd.c @@ -44,15 +44,10 @@ pim_bfd_write_config (struct vty *vty, struct interface *ifp) struct pim_interface *pim_ifp = ifp->info; struct bfd_info *bfd_info = NULL; - if (!pim_ifp) - return; bfd_info = (struct bfd_info *) pim_ifp->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)) vty_out (vty, " ip pim bfd %d %d %d%s", 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) return; - zlog_debug ("%s: bfd_info ", __PRETTY_FUNCTION__); nbr_bfd_info = (struct bfd_info *) neigh->bfd_info; nbr_bfd_info->detect_mult = pim_ifp->bfd_info->detect_mult; From 58f1b7ccbdaf8054e6b2ece1bf3840663aea6214 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 2 Jun 2017 07:35:38 -0400 Subject: [PATCH 4/4] zebra: Fix help string ordering Signed-off-by: Donald Sharp --- zebra/rtadv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zebra/rtadv.c b/zebra/rtadv.c index 7f46066a63..5b0b44572f 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -1403,8 +1403,8 @@ DEFUN (ipv6_nd_router_preference, "Neighbor discovery\n" "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; VTY_DECLVAR_CONTEXT (interface, ifp);