December 2016 - dev - lists.frrouting.org

[cmaster-next] [PATCH 2/9] lib: Remove deprecated interface
by Donald Sharp 14 Dec '16

14 Dec '16

Remove Deprecated interface that is not used. Signed-off-by: Donald Sharp <sharpd(a)cumulusnetworks.com> --- configure.ac | 8 -------- lib/linklist.h | 11 ----------- 2 files changed, 19 deletions(-) diff --git a/configure.ac b/configure.ac index 7e751cd..78cc975 100755 --- a/configure.ac +++ b/configure.ac @@ -1579,14 +1579,6 @@ for I in 1 2 3 4 5 6 7 8 9 10; do done AC_DEFINE_UNQUOTED(VTYSH_BIN_PATH, "$vtysh_bin",path to vtysh binary) -dnl ------------------------------- -dnl Quagga sources should always be -dnl current wrt interfaces. Dont -dnl allow deprecated interfaces to -dnl be exposed. -dnl ------------------------------- -AC_DEFINE(QUAGGA_NO_DEPRECATED_INTERFACES, 1, Hide deprecated interfaces) - dnl --------------------------- dnl Check htonl works correctly dnl --------------------------- diff --git a/lib/linklist.h b/lib/linklist.h index e99e50f..cd6e2f1 100644 --- a/lib/linklist.h +++ b/lib/linklist.h @@ -135,15 +135,4 @@ extern void list_add_list (struct list *, struct list *); (L)->count--; \ } while (0) -/* Deprecated: 20050406 */ -#if !defined(QUAGGA_NO_DEPRECATED_INTERFACES) -#warning "Using deprecated libzebra interfaces" -#define LISTNODE_ADD(L,N) LISTNODE_ATTACH(L,N) -#define LISTNODE_DELETE(L,N) LISTNODE_DETACH(L,N) -#define nextnode(X) ((X) = (X)->next) -#define getdata(X) listgetdata(X) -#define LIST_LOOP(L,V,N) \ - for (ALL_LIST_ELEMENTS_RO (L,N,V)) -#endif /* QUAGGA_NO_DEPRECATED_INTERFACES */ - #endif /* _ZEBRA_LINKLIST_H */ -- 2.5.5

1 0

[cmaster-next] [PATCH 1/9] lib: Setup prefix.h to allow it to store (s, g)
by Donald Sharp 14 Dec '16

14 Dec '16

We need the ability to store the (s,g) in a struct prefix. This will allow us to consolidate some duplicated code in pimd as well as set us up to switch from a link list to a table to store (s,g) state. Signed-off-by: Donald Sharp <sharpd(a)cumulusnetworks.com> (cherry picked from commit c8fad6b8d700353d1a6d6eb7f3807f1c00dda097) --- lib/prefix.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/prefix.h b/lib/prefix.h index 85488cc..4878fcf 100644 --- a/lib/prefix.h +++ b/lib/prefix.h @@ -83,6 +83,11 @@ struct prefix struct in_addr adv_router; } lp; struct ethaddr prefix_eth; /* AF_ETHERNET */ + struct + { + struct in_addr src; + struct in_addr grp; + } sg; u_char val[8]; uintptr_t ptr; } u __attribute__ ((aligned (8))); -- 2.5.5

1 0

[cmaster-next] [PATCH 0/9] master - Some lib changes in Prep for PIM-SM
by Donald Sharp 14 Dec '16

14 Dec '16

Just some basic lib code changes needed for changes in pimd. Donald Sharp (9): lib: Setup prefix.h to allow it to store (s,g) lib: Remove deprecated interface lib: Add Timer Wheel functionality lib: Turn off automatic debugging of Wheel code. lib: Slight Optimization of thread handling. lib: Fix 'show thread cpu' to display active threads lib: Fix thread_execute_crash lib: Fix clang SA warnings. lib: Allow json to work across different versions. configure.ac | 8 --- lib/Makefile.am | 4 +- lib/imsg.c | 3 +- lib/json.c | 15 ++++++ lib/json.h | 4 ++ lib/linklist.h | 11 ---- lib/prefix.h | 5 ++ lib/thread.c | 64 ++++++++++++---------- lib/thread.h | 1 + lib/wheel.c | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/wheel.h | 70 ++++++++++++++++++++++++ 11 files changed, 298 insertions(+), 51 deletions(-) create mode 100644 lib/wheel.c create mode 100644 lib/wheel.h -- 2.5.5

1 0

[cmaster-next] [PATCH] zebra: fix segfault on exit when RIB debugging is enabled
by Renato Westphal 14 Dec '16

14 Dec '16

Fixes the following crash on exit: (gdb) bt 0 _rnode_zlog (...) at zebra_rib.c:104 1 0x0000000000417726 in rib_unlink (...) at zebra_rib.c:2370 2 0x000000000042db80 in zebra_rtable_node_destroy (...) at zebra_vrf.c:336 3 0x00007ffff7b6ce2e in route_node_free (...) at table.c:81 4 0x00007ffff7b6ced7 in route_table_free (...) at table.c:118 5 0x00007ffff7b6cd88 in route_table_finish (...) at table.c:53 6 0x000000000042defa in zebra_vrf_delete (...) at zebra_vrf.c:278 7 0x00007ffff7b9e044 in vrf_delete (...) at vrf.c:162 8 0x00007ffff7b9e89f in vrf_terminate () at vrf.c:458 9 0x000000000041027c in sigint () at main.c:205 10 0x00007ffff7b953f2 in quagga_sigevent_process () at sigevent.c:111 11 0x00007ffff7b681dd in thread_fetch (...) at thread.c:1297 12 0x000000000040c7ed in main (...) at main.c:471 To fix the problem, free the table->info pointer only after route_table_finish() is called for the table. Signed-off-by: Renato Westphal <renato(a)opensourcerouting.org> --- zebra/zebra_vrf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/zebra/zebra_vrf.c b/zebra/zebra_vrf.c index bf42792..9297438 100644 --- a/zebra/zebra_vrf.c +++ b/zebra/zebra_vrf.c @@ -271,11 +271,14 @@ zebra_vrf_delete (struct vrf *vrf) /* release allocated memory */ for (afi = AFI_IP; afi <= AFI_IP6; afi++) { + void *table_info; + for (safi = SAFI_UNICAST; safi <= SAFI_MULTICAST; safi++) { table = zvrf->table[afi][safi]; - XFREE (MTYPE_RIB_TABLE_INFO, table->info); + table_info = table->info; route_table_finish (table); + XFREE (MTYPE_RIB_TABLE_INFO, table_info); table = zvrf->stable[afi][safi]; route_table_finish (table); @@ -285,8 +288,9 @@ zebra_vrf_delete (struct vrf *vrf) if (zvrf->other_table[afi][table_id]) { table = zvrf->other_table[afi][table_id]; - XFREE (MTYPE_RIB_TABLE_INFO, table->info); + table_info = table->info; route_table_finish (table); + XFREE (MTYPE_RIB_TABLE_INFO, table_info); } route_table_finish (zvrf->rnh_table[afi]); -- 1.9.1

2 1

[cmaster-next] [PATCH] zebra-mpls: fix regression caused by wrong conflict resolution
by Renato Westphal 14 Dec '16

14 Dec '16

Signed-off-by: Renato Westphal <renato(a)opensourcerouting.org> --- zebra/zebra_vty.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index f32b51f..bde9431 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -918,6 +918,15 @@ vty_show_ip_route_detail (struct vty *vty, struct route_node *rn, int mcast) default: break; } + + /* Label information */ + if (nexthop->nh_label && nexthop->nh_label->num_labels) + { + vty_out (vty, " label %s", + mpls_label2str (nexthop->nh_label->num_labels, + nexthop->nh_label->label, buf, BUFSIZ)); + } + vty_out (vty, "%s", VTY_NEWLINE); } vty_out (vty, "%s", VTY_NEWLINE); @@ -1158,6 +1167,14 @@ vty_show_ip_route (struct vty *vty, struct route_node *rn, struct rib *rib, break; } + /* Label information */ + if (nexthop->nh_label && nexthop->nh_label->num_labels) + { + vty_out (vty, " label %s", + mpls_label2str (nexthop->nh_label->num_labels, + nexthop->nh_label->label, buf, BUFSIZ)); + } + if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_BLACKHOLE)) vty_out (vty, ", bh"); if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_REJECT)) -- 1.9.1

3 4

[cmaster-next] [PATCH 1/3] ldpd: add missing check on disc_find_iface()
by Renato Westphal 14 Dec '16

14 Dec '16

When we find an interface on disc_find_iface(), we need to check if it's enabled for the address-family (IPv4 or IPv6) of the received packet. We were doing that only for targeted hellos, do it for link hellos as well. Signed-off-by: Renato Westphal <renato(a)opensourcerouting.org> --- ldpd/packet.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ldpd/packet.c b/ldpd/packet.c index 9b3151d..ad78181 100644 --- a/ldpd/packet.c +++ b/ldpd/packet.c @@ -292,16 +292,16 @@ disc_find_iface(unsigned int ifindex, int af, union ldpd_addr *src, if (iface == NULL) return (NULL); + ia = iface_af_get(iface, af); + if (!ia->enabled) + return (NULL); + /* * For unicast packets, we just need to make sure that the interface * is enabled for the given address-family. */ - if (!multicast) { - ia = iface_af_get(iface, af); - if (ia->enabled) - return (iface); - return (NULL); - } + if (!multicast) + return (iface); switch (af) { case AF_INET: -- 1.9.1

2 3

[cmaster-next] [PATCH] bgp: Modify output to be a bit clearer
by Donald Sharp 14 Dec '16

14 Dec '16

Modify the 'show ip bgp ...' output to be a bit clearer on what work it did. Modify: root@dell-s6000-02 ~/quagga# vtysh -c "show ip bgp" BGP table version is 7, local router ID is 6.0.0.9 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 *> 6.0.0.5/32 169.254.0.1 0 0 65101 ? *> 6.0.0.6/32 169.254.0.17 0 0 65101 ? *> 6.0.0.7/32 169.254.0.33 0 0 65104 ? *> 6.0.0.8/32 169.254.0.49 0 0 65104 ? *> 6.0.0.9/32 0.0.0.0 0 32768 ? *= 6.0.0.10/32 169.254.0.49 0 65104 65200 ? *= 169.254.0.33 0 65104 65200 ? *= 169.254.0.17 0 65101 65200 ? *> 169.254.0.1 0 65101 65200 ? Displayed 6 out of 9 total prefixes To ..... Displayed 6 routes and 9 total paths Issue #11 Signed-off-by: Donald Sharp <sharpd(a)cumulusnetworks.com> --- bgpd/bgp_encap.c | 2 +- bgpd/bgp_mplsvpn.c | 2 +- bgpd/bgp_route.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bgpd/bgp_encap.c b/bgpd/bgp_encap.c index 533a306..69f6c61 100644 --- a/bgpd/bgp_encap.c +++ b/bgpd/bgp_encap.c @@ -461,7 +461,7 @@ bgp_show_encap ( vty_out (vty, "No prefixes displayed, %ld exist%s", total_count, VTY_NEWLINE); } else - vty_out (vty, "%sDisplayed %ld out of %ld total prefixes%s", + vty_out (vty, "%sDisplayed %ld routes and %ld total paths%s", VTY_NEWLINE, output_count, total_count, VTY_NEWLINE); return CMD_SUCCESS; diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 39cb41d..d55acdd 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -878,7 +878,7 @@ bgp_show_mpls_vpn (struct vty *vty, afi_t afi, struct prefix_rd *prd, if (output_count == 0) vty_out (vty, "No prefixes displayed, %ld exist%s", total_count, VTY_NEWLINE); else - vty_out (vty, "%sDisplayed %ld out of %ld total prefixes%s", + vty_out (vty, "%sDisplayed %ld routes and %ld total paths%s", VTY_NEWLINE, output_count, total_count, VTY_NEWLINE); } diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 090d633..a618994 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -7792,7 +7792,7 @@ bgp_show_table (struct vty *vty, struct bgp *bgp, struct bgp_table *table, vty_out (vty, "No BGP prefixes displayed, %ld exist%s", total_count, VTY_NEWLINE); } else - vty_out (vty, "%sDisplayed %ld out of %ld total prefixes%s", + vty_out (vty, "%sDisplayed %ld routes and %ld total paths%s", VTY_NEWLINE, output_count, total_count, VTY_NEWLINE); } -- 2.5.5

2 1

[cmaster-next] Today's Agenda
by Donald Sharp 14 Dec '16

14 Dec '16

RC2.0 - Where we are Branching RD/RT EVPN. Anything else we need to add to the agenda? doanld

2 2

[cmaster-next] Github Mirror between cmaster-next from Cumulus and OpenSourceRouting turned off
by Martin Winter 13 Dec '16

13 Dec '16

Per David’s request’ I’ve turned off the mirroring between the Github CumulusNetworks/private_quagga and Github opensourcerouting/cumulus-private_quagga Based on David, this is no longer needed. If anyone disagrees, then please speak up. - Martin

4 5

[cmaster-next] stable/2.0 open issues & patches
by David Lamparter 13 Dec '16

13 Dec '16

Hi everyone, since there is no patchwork tracker yet, please make sure all patches or open issues for stable/2.0 are listed on https://github.com/opensourcerouting/cumulus-private_quagga/issues with a "2.0-rc1" milestone tag. I may have missed some patches, and I also will be disappearing over christmas so other people might be interested in working on stable/2.0, but that only works if there's a public list of TODO items :) Thanks, -David

1 0