- dev - lists.frrouting.org

[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 29 Nov '16

29 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 29 Nov '16

29 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 29 Nov '16

29 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 29 Nov '16

29 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

[cmaster-next] [PATCH 1/2] isisd: use a smaller #ifdef for isis_receive()
by Renato Westphal 28 Nov '16

28 Nov '16

There's no need to provide two definitions of the isis_receive() function (one for GNU_LINUX and the other for !GNU_LINUX). Both differ only slightly so it makes more sense to define isis_receive() just once and use a smaller #ifdef to account for these differences. This improves code readability. Signed-off-by: Renato Westphal <renato(a)opensourcerouting.org> --- isisd/isis_pdu.c | 40 ++++------------------------------------ 1 file changed, 4 insertions(+), 36 deletions(-) diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c index 1dfb462..39d2df7 100644 --- a/isisd/isis_pdu.c +++ b/isisd/isis_pdu.c @@ -2139,7 +2139,6 @@ isis_handle_pdu (struct isis_circuit *circuit, u_char * ssnpa) return retval; } -#ifdef GNU_LINUX int isis_receive (struct thread *thread) { @@ -2153,10 +2152,11 @@ isis_receive (struct thread *thread) circuit = THREAD_ARG (thread); assert (circuit); + circuit->t_read = NULL; + isis_circuit_stream(circuit, &circuit->rcv_stream); retval = circuit->rx (circuit, ssnpa); - circuit->t_read = NULL; if (retval == ISIS_OK) retval = isis_handle_pdu (circuit, ssnpa); @@ -2166,52 +2166,20 @@ isis_receive (struct thread *thread) */ if (!circuit->is_passive) { +#ifdef GNU_LINUX THREAD_READ_ON (master, circuit->t_read, isis_receive, circuit, circuit->fd); - } - - return retval; -} - #else -int -isis_receive (struct thread *thread) -{ - struct isis_circuit *circuit; - u_char ssnpa[ETH_ALEN]; - int retval; - - /* - * Get the circuit - */ - circuit = THREAD_ARG (thread); - assert (circuit); - - circuit->t_read = NULL; - - isis_circuit_stream(circuit, &circuit->rcv_stream); - - retval = circuit->rx (circuit, ssnpa); - - if (retval == ISIS_OK) - retval = isis_handle_pdu (circuit, ssnpa); - - /* - * prepare for next packet. - */ - if (!circuit->is_passive) - { circuit->t_read = thread_add_timer_msec (master, isis_receive, circuit, listcount (circuit->area->circuit_list) * 100); +#endif } return retval; } -#endif - /* filling of the fixed isis header */ void fill_fixed_hdr (struct isis_fixed_hdr *hdr, u_char pdu_type) -- 1.9.1

1 1

[cmaster-next] please check your spam folders for list mails
by David Lamparter 28 Nov '16

28 Nov '16

Hi everyone, we've just noticed that some mails on this mailing list have gotten flagged down as spam. This is a widespread problem with mailing lists in regard to DKIM, DMARC and SPF anti-spam measures, i.e. in this case the SPF record for cumulusnetworks.com prohibits the mailing list from forwarding the mail, and in combination with DMARC that's sufficient for Google to put it into spam. There is no "good" workaround for this, and since this list is temporary and will hopefully be moved soon, there won't really be a fix. If you use Google Mail, please go to your spam folder and look for any mail that has "[cmaster-next]" in the Subject: line. I would hope the spam detection will remember the "this is not spam" click for future mails. There should have been 2 mails from Donald on the list, one Nov 25th, one today. These were the only ones I found in my spam folder, I hope I didn't miss anything else. Cheers, -David P.S.: I checked other subscriber domains on the list: - 6wind.com: no SPF - OK - opensourcerouting.org: no SPF - OK - labn.net: neutral SPF, but no DMARC - OK - us.ibm.com: soft SPF, but no DMARC - should be OK - orange.com: soft SPF, but no DMARC - should be OK - atcorp.com: hard SPF, but no DMARC - should be OK - cumulusnetworks.com: hard SPF + DMARC - PROBLEM :( I can write a script to auto-check this later for subscribers on the list, so at least they get a notification/warning.

1 0