- dev - lists.frrouting.org

[cmaster-next] link-params sub mode
by Donald Sharp 01 Dec '16

01 Dec '16

Olivier - We've noticed that link-params creates allot of config lines when you configure any part of it. Would you mind if I change the behavior to this: When link-params is configured it auto starts displaying 6000-02# conf t dell-s6000-02(config)# int swp1 dell-s6000-02(config-if)# link-params dell-s6000-02(config-link-params)# admin-grp 0x12345678 dell-s6000-02(config-link-params)# end dell-s6000-02# show run interface swp1 link-params enable metric 0 <----Remove the metric and bw lines max-bw 1.25e+06 max-rsv-bw 1.25e+06 unrsv-bw 0 1.25e+06 unrsv-bw 1 1.25e+06 unrsv-bw 2 1.25e+06 unrsv-bw 3 1.25e+06 unrsv-bw 4 1.25e+06 unrsv-bw 5 1.25e+06 unrsv-bw 6 1.25e+06 unrsv-bw 7 1.25e+06 admin-grp 305419896 exit-link-params ! I'd like to reduce this to: interface swp1 link-params enable admin-grp 0x12345678 <----- Fix this to be what we entered exit-link-params ! Finally do we need to display the enable line as well? donald

3 8

[cmaster-next] Topology Tests added to CI - and new BGPd crash discovered
by Martin Winter 01 Dec '16

01 Dec '16

(Testing the new mailing list as well) First of all: I finally got around and added some framework for Topology Tests based on Mininet to the CI testbed. As Mininet is all based on Python, the whole framework is based on pytest. At this time, there are 2 tests in it: - OSPFv3 simple topology - BGP Multiview topology The git for this setup is here: https://git.netdef.org/scm/netdef/topotests.git There is no proprietary code in it - all can be easy replicated on a Ubuntu 16.04 (I have not tested any other Distros and Mininet requires Linux). Just follow the directions in the README inside the git and you should be able to replicate the setup. The idea is to have some test setup which can be shared and anyone can add tests (The CI system runs all the tests in this git) Happy to hear any feedback on this setup… As a side note, the BGP Multiview test crashes BGPd on startup. Because of this, I have NOT YET enabled the test results parsing in the CI system (or all builds would fail at this time) If you look at the the latest build on our CI system, you’ll see a crash in BGPd See https://ci1.netdef.org/browse/QUAGGA-CMASTERNEXT-TOPOU1604-106 Seems to be a crash in the VNC code. (cc’ing Lou to make sure he see this…) Again, please provide feedback. The idea is to add many more topologies to the CI system, but would like to hear some feedback on the setup. - Martin

3 2

[cmaster-next] [PATCH] bgpd: Fix multiple bgp view vnc crash
by Donald Sharp 01 Dec '16

01 Dec '16

When configuring multiple bgp views without a default bgp session, the code will crash. This code change only fixes the crash from happening. I'm not entirely sure that the code will not misbehave with multiple bgp views and configuring vnc in this case. Signed-off-by: Donald Sharp <sharpd(a)cumulusnetworks.com> --- bgpd/rfapi/vnc_import_bgp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bgpd/rfapi/vnc_import_bgp.c b/bgpd/rfapi/vnc_import_bgp.c index 4215ce2..441bdee 100644 --- a/bgpd/rfapi/vnc_import_bgp.c +++ b/bgpd/rfapi/vnc_import_bgp.c @@ -1798,6 +1798,9 @@ vnc_import_bgp_exterior_add_route_it ( struct bgp *bgp_default = bgp_get_default (); afi_t afi = family2afi (prefix->family); + if (!bgp_default) + return; + h = bgp_default->rfapi; hc = bgp_default->rfapi_cfg; @@ -1992,6 +1995,9 @@ vnc_import_bgp_exterior_del_route ( afi_t afi = family2afi (prefix->family); struct bgp *bgp_default = bgp_get_default (); + if (!bgp_default) + return; + memset (&pfx_orig_nexthop, 0, sizeof (struct prefix)); /* keep valgrind happy */ h = bgp_default->rfapi; -- 2.5.5

3 4

[cmaster-next] [PATCH 2/2] pimd: Fix large integer display of drpriority
by Donald Sharp 30 Nov '16

30 Nov '16

When displaying drpriority you can enter unsigned integer values from 1-2^32. The display was turning the unsigned value into a signed value and thus we were displaying the wrong value. Ticket: CM-13787 Signed-off-by: Donald Sharp <sharpd(a)cumulusnetworks.com> Reviewed-by: David Ahern <dsa(a)cumulusnetworks.com> (cherry picked from commit db17265f1025e3ec578998ad537c33b49ed33cde) --- pimd/pim_vty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c index f1c8930..037a00c 100644 --- a/pimd/pim_vty.c +++ b/pimd/pim_vty.c @@ -148,7 +148,7 @@ int pim_interface_config_write(struct vty *vty) /* IF ip pim drpriority */ if (pim_ifp->pim_dr_priority != PIM_DEFAULT_DR_PRIORITY) { - vty_out(vty, " ip pim drpriority %d%s", pim_ifp->pim_dr_priority, + vty_out(vty, " ip pim drpriority %u%s", pim_ifp->pim_dr_priority, VTY_NEWLINE); ++writes; } -- 2.5.5

1 0

[cmaster-next] [PATCH 1/2] ospfd: Fix memory leak when not using json
by Donald Sharp 30 Nov '16

30 Nov '16

When doing a show command under ospf, if not using json we would have a small memory leak in show_ip_ospf_common. Signed-off-by: Donald Sharp <sharpd(a)cumulusnetworks.com> (cherry picked from commit 50750712b1ac8364e290c67782eaf371025dc59e) --- ospfd/ospf_vty.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index b094660..43a4434 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -3299,8 +3299,10 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json) json_object *json_areas = NULL; if (use_json) - json = json_object_new_object(); - json_areas = json_object_new_object(); + { + json = json_object_new_object(); + json_areas = json_object_new_object(); + } if (ospf->instance) { -- 2.5.5

1 0

[cmaster-next] Technical Meetings Notes
by Donald Sharp 30 Nov '16

30 Nov '16

Branch Stuff: master -> Current development branch, holds cmaster-next + vtysh-grammar stable/2.0 -> Current Release Candidate, started from cmaster-next <see David's email sent earlier today> Moving Forward: Please send pull requests with an issue for it under github or send the commits to this alias, indicate what branch they should go against in cover letter subject, else master will be assumed. Move Meeting to every 2 weeks? General consensus is to not do this yet. Revisit after Xmas RD/RT finish up: -> General consensus was option #6 was the go to. I am going to send an separate email with an outline of what we discussed today to continue discussion here. EVPN Discussion: -> Vivek sent an email last night with the Cumulus Implementation currently. Vivek went over this email in today's meeting. More discussion next week. donald

1 0

[cmaster-next] [PATCH 2/2] bgpd: fix "show ip bgp" column alignment
by Donald Sharp 30 Nov '16

30 Nov '16

From: Daniel Walton <dwalton(a)cumulusnetworks.com> The "Weight" column is off: BGP table version is 0, local router ID is 10.1.1.1 Status codes: s suppressed, d damped, h history, * valid, > best, = multipath, i internal, r RIB-failure, S Stale, R Removed Origin codes: i - IGP, e - EGP, ? - incomplete Network Next Hop Metric LocPrf Weight Path *> 4.1.1.2/32 9.9.9.2 0 32768 ? *> 4.1.1.4/32 9.9.9.2 0 32768 ? Displayed 2 out of 2 total prefixes Signed-off-by: Daniel Walton <dwalton(a)cumulusnetworks.com> Reviewed-by: Donald Sharp <sharpd(a)cumulusnetworks.com> (cherry picked from commit 65c7395b07e8c592c847d4a1e22fc89ddf448341) --- bgpd/bgp_route.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 8520466..23ecefa 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -6254,7 +6254,7 @@ route_vty_out (struct vty *vty, struct prefix *p, if (json_paths) json_object_int_add(json_path, "med", attr->med); else - vty_out (vty, "%10u ", attr->med); + vty_out (vty, "%10u", attr->med); else if (!json_paths) vty_out (vty, " "); @@ -6264,7 +6264,7 @@ route_vty_out (struct vty *vty, struct prefix *p, if (json_paths) json_object_int_add(json_path, "localpref", attr->local_pref); else - vty_out (vty, "%7u ", attr->local_pref); + vty_out (vty, "%7u", attr->local_pref); else if (!json_paths) vty_out (vty, " "); @@ -6437,12 +6437,12 @@ route_vty_out_tmp (struct vty *vty, struct prefix *p, struct attr *attr, safi_t } #endif /* HAVE_IPV6 */ if (attr->flag & ATTR_FLAG_BIT (BGP_ATTR_MULTI_EXIT_DISC)) - vty_out (vty, "%10u ", attr->med); + vty_out (vty, "%10u", attr->med); else vty_out (vty, " "); if (attr->flag & ATTR_FLAG_BIT (BGP_ATTR_LOCAL_PREF)) - vty_out (vty, "%7u ", attr->local_pref); + vty_out (vty, "%7u", attr->local_pref); else vty_out (vty, " "); -- 2.5.5

1 0

[cmaster-next] [PATCH 1/2] ospfd: "ip ospf bfd" removes the "ip ospf bfd 3 250 250" command
by Donald Sharp 30 Nov '16

30 Nov '16

From: Daniel Walton <dwalton(a)cumulusnetworks.com> Signed-off-by: Daniel Walton <dwalton(a)cumulusnetworks.com> Reviewed-by: Donald Sharp <sharpd(a)cumulusnetworks.com> Ticket: CM-13712 (cherry picked from commit 367b138748e894bbfaae36d1cf7c90eafebfebc9) --- ospfd/ospf_bfd.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ospfd/ospf_bfd.c b/ospfd/ospf_bfd.c index c87bcb0..9ad8508 100644 --- a/ospfd/ospf_bfd.c +++ b/ospfd/ospf_bfd.c @@ -369,10 +369,16 @@ DEFUN (ip_ospf_bfd, "Enables BFD support\n") { struct interface *ifp = (struct interface *) vty->index; + struct ospf_if_params *params; + struct bfd_info *bfd_info; assert (ifp); - ospf_bfd_if_param_set (ifp, BFD_DEF_MIN_RX, BFD_DEF_MIN_TX, - BFD_DEF_DETECT_MULT, 1); + params = IF_DEF_PARAMS (ifp); + bfd_info = params->bfd_info; + + if (!bfd_info || ! CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG)) + ospf_bfd_if_param_set (ifp, BFD_DEF_MIN_RX, BFD_DEF_MIN_TX, + BFD_DEF_DETECT_MULT, 1); return CMD_SUCCESS; } -- 2.5.5

1 0

[cmaster-next] [PATCH 0/2] Minor stable/2.0 patches
by Donald Sharp 30 Nov '16

30 Nov '16

These two patches fix issues #3 and #4 as filed in the git hub issue system. They run successfully against the fullness of our regression system. Daniel Walton (2): ospfd: "ip ospf bfd" removes the "ip ospf bfd 3 250 250" command bgpd: fix "show ip bgp" column alignment bgpd/bgp_route.c | 8 ++++---- ospfd/ospf_bfd.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) -- 2.5.5

1 0

[cmaster-next] branches renamed/reorganised
by David Lamparter 29 Nov '16

29 Nov '16

Hi everyone, after having a quick chat with Donald yesterday, I went ahead and reorganised the branches on OSR's github: - "master" (Quagga upstream) is now "quagga-master" - "cmaster-next" is now "master" - this branch has the "vtysh-grammar" work from Cumulus merged. this means a lot of new features to make the CLI easier and way less annoying to deal with! - the branch currently fails in dejagnu unittests due to some open issues - I have pushed some fixes to get this working, but the branch should now transfer into control as it is intended for the fork. - "stable/2.0" is up - this is cmaster-next *without* vtysh-grammar, and will be the first release for the fork at some point. - Nothing is tagged yet as release candidate or so. - This is also intended to be under the rules for the new fork; at the same time I've taken responsibility and blame for pushing this forward :) - only bugfixes are now accepted for this branch as intended in the community document. The intention is that this is also the future branch structure. Cheers and hope to see everyone in a few minutes on the call, -David

1 0