- dev - lists.frrouting.org

[cmaster-next] [PATCH] vtysh: Fix static compilation
by Donald Sharp 08 Dec '16

08 Dec '16

When compiling vtysh with --enable-static and --disasble-shared we get linker errors with duplicate function names. This commit addresses this issue. Signed-off-by: Donald Sharp <sharpd(a)cumulusnetworks.com> --- vtysh/vtysh.c | 14 +++++++------- vtysh/vtysh_user.c | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 6c00058..a90915e 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -1457,8 +1457,8 @@ DEFUNSH (VTYSH_ISISD, } DEFUNSH (VTYSH_RMAP, - route_map, - route_map_cmd, + vtysh_route_map, + vtysh_route_map_cmd, "route-map WORD (deny|permit) <1-65535>", "Create route-map or enter route-map command mode\n" "Route map tag\n" @@ -1867,13 +1867,13 @@ ALIAS (vtysh_exit_vrf, /* TODO Implement interface description commands in ripngd, ospf6d * and isisd. */ DEFSH (VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_OSPFD|VTYSH_LDPD, - interface_desc_cmd, + vtysh_interface_desc_cmd, "description .LINE", "Interface specific description\n" "Characters describing this interface\n") DEFSH (VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_OSPFD, - no_interface_desc_cmd, + vtysh_no_interface_desc_cmd, "no description", NO_STR "Interface specific description\n") @@ -3295,8 +3295,8 @@ vtysh_init_vty (void) install_element (RMAP_NODE, &vtysh_end_all_cmd); install_element (VTY_NODE, &vtysh_end_all_cmd); - install_element (INTERFACE_NODE, &interface_desc_cmd); - install_element (INTERFACE_NODE, &no_interface_desc_cmd); + install_element (INTERFACE_NODE, &vtysh_interface_desc_cmd); + install_element (INTERFACE_NODE, &vtysh_no_interface_desc_cmd); install_element (INTERFACE_NODE, &vtysh_end_all_cmd); install_element (INTERFACE_NODE, &vtysh_exit_interface_cmd); install_element (LINK_PARAMS_NODE, &exit_link_params_cmd); @@ -3361,7 +3361,7 @@ vtysh_init_vty (void) install_element (BGP_VNC_L2_GROUP_NODE, &exit_vnc_config_cmd); install_element (CONFIG_NODE, &key_chain_cmd); - install_element (CONFIG_NODE, &route_map_cmd); + install_element (CONFIG_NODE, &vtysh_route_map_cmd); install_element (CONFIG_NODE, &vtysh_line_vty_cmd); install_element (KEYCHAIN_NODE, &key_cmd); install_element (KEYCHAIN_NODE, &key_chain_cmd); diff --git a/vtysh/vtysh_user.c b/vtysh/vtysh_user.c index 1886ba3..da2ed15 100644 --- a/vtysh/vtysh_user.c +++ b/vtysh/vtysh_user.c @@ -165,8 +165,8 @@ user_get (const char *name) return user; } -DEFUN (banner_motd_file, - banner_motd_file_cmd, +DEFUN (vtysh_banner_motd_file, + vtysh_banner_motd_file_cmd, "banner motd file FILE", "Set banner\n" "Banner for motd\n" @@ -229,5 +229,5 @@ vtysh_user_init (void) { userlist = list_new (); install_element (CONFIG_NODE, &username_nopassword_cmd); - install_element (CONFIG_NODE, &banner_motd_file_cmd); + install_element (CONFIG_NODE, &vtysh_banner_motd_file_cmd); } -- 2.5.5

2 1

[cmaster-next] stable/2.0 close-down
by David Lamparter 08 Dec '16

08 Dec '16

Hi everyone, I've just merged Renato's RIP & BGP cleanups, which came with a zebra namespace rework/cleanup. This was pretty much exactly at the limit of what I think was still acceptable for a "stable/" branch, but I'd like to progress clamping down on the "allowed impact" of changes. Donald & I are in agreement that, for "stable/2.0", there should be: - no new features - no reworks (Please voice your disagreement if you have any!) On the other hand, please *do* send: - bugfixes in general - bugfixes for regressions - build system fixes - documentation updates However, even bugfixes should hopefully get smaller and smaller now. We need to make sure the limes converges towards a release :) Cheers, -David

5 8

[cmaster-next] [PATCH 2/2] quagga: Remove description of deprecated interfaces
by Donald Sharp 07 Dec '16

07 Dec '16

The deprecated interface section is no longer being used. Let's remove it from the document. Signed-off-by: Donald Sharp <sharpd(a)cumulusnetworks.com> --- COMMUNITY.md | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/COMMUNITY.md b/COMMUNITY.md index cb72ae0..7d08ed5 100644 --- a/COMMUNITY.md +++ b/COMMUNITY.md @@ -261,40 +261,6 @@ Please don’t reformat existing files (or only sections modified by your changes), even if they don’t follow the standard. This makes it very hard to highlight the changes -### Changing / Deprecate an existing exported interface - -If changing an exported interface, please try to deprecate the interface in an -orderly manner. If at all possible, try to retain the old deprecated interface -as is, or functionally equivalent. Make a note of when the interface was -deprecated and guard the deprecated interface definitions in the header file, -i.e.: - -``` -/* Deprecated: 20050406 */ -#if !defined(QUAGGA_NO_DEPRECATED_INTERFACES) -#warning "Using deprecated <libname> (interface(s)|function(s))" -... -#endif /* QUAGGA_NO_DEPRECATED_INTERFACES */ -``` - -This is to ensure that the core Quagga sources do not use the deprecated -interfaces (you should update Quagga sources to use new interfaces, if -applicable), while allowing external sources to continue to build. Deprecated -interfaces should be excised in the next unstable cycle. - -Note: If you wish, you can test for GCC and use a function marked with the -`deprecated` attribute. However, you must provide the warning for other -compilers. If changing or removing a command definition, ensure that you -properly deprecate it - use the `_DEPRECATED` form of the appropriate `DEFUN` -macro. This is critical. Even if the command can no longer function, you MUST -still implement it as a do-nothing stub. - -Failure to follow this causes grief for systems administrators, as an upgrade -may cause daemons to fail to start because of unrecognised commands. Deprecated -commands should be excised in the next unstable cycle. A list of deprecated -commands should be collated for each release. - - ### Compile-Time conditional code Many users access PROJECT via binary packages from 3rd party sources; -- 2.5.5

1 0

[cmaster-next] [PATCH 1/2] quagga: Add Debug Guard section in COMMUNITY.md
by Donald Sharp 07 Dec '16

07 Dec '16

Add verbiage to loosely describe how developers MUST guard debugs put into their code. Signed-off-by: Donald Sharp <sharpd(a)cumulusnetworks.com> --- COMMUNITY.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/COMMUNITY.md b/COMMUNITY.md index 0cc8e8d..cb72ae0 100644 --- a/COMMUNITY.md +++ b/COMMUNITY.md @@ -324,3 +324,14 @@ frobnicate (); Note that the former approach requires ensuring that `SOME_SYMBOL` will be defined (watch your `AC_DEFINE`s). + +### Debug-Guards in code + +Debugs are an important methodology to allow developers to fix issues +found in the code after it has been released. The caveat here is +that the developer must remember that people will be using the code +at scale and in ways that can be unexpected for the original implementor. +As such debugs MUST be guarded in such a way that they can be turned off. +This PROJECT has the ability to turn on/off debugs from the CLI and it is +expected that the developer will use this convention to allow control +of their debugs. \ No newline at end of file -- 2.5.5

1 0

[cmaster-next] Technical Meeting Agenda
by Donald Sharp 07 Dec '16

07 Dec '16

1) Status 2) Branching Discussion 3) CAP-N-PROTO email 3) RD/RT 4) EVPN Is there anything else that people would like to discuss? donald

3 3

[cmaster-next] [PATCH] bgpd: Fix crashes when no default bgp instance is configured.
by Donald Sharp 07 Dec '16

07 Dec '16

The vnc code assumes that bgp must have a default instance. This code change checks to make sure that we do before proceeding. It makes no assurances that vnc will behave correctly without a default instance. Signed-off-by: Donald Sharp <sharpd(a)cumulusnetworks.com> --- bgpd/rfapi/rfapi_import.c | 3 ++- bgpd/rfapi/vnc_import_bgp.c | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/bgpd/rfapi/rfapi_import.c b/bgpd/rfapi/rfapi_import.c index 8783024..77da4f9 100644 --- a/bgpd/rfapi/rfapi_import.c +++ b/bgpd/rfapi/rfapi_import.c @@ -4414,7 +4414,8 @@ rfapiProcessPeerDown (struct peer *peer) */ bgp = bgp_get_default (); /* assume 1 instance for now */ - assert (bgp); + if (!bgp) + return; h = bgp->rfapi; assert (h); diff --git a/bgpd/rfapi/vnc_import_bgp.c b/bgpd/rfapi/vnc_import_bgp.c index 4215ce2..dc2640a 100644 --- a/bgpd/rfapi/vnc_import_bgp.c +++ b/bgpd/rfapi/vnc_import_bgp.c @@ -208,12 +208,17 @@ prefix_bag_free (void *pb) static void print_rhn_list (const char *tag1, const char *tag2) { - struct bgp *bgp = bgp_get_default (); - struct skiplist *sl = bgp->rfapi->resolve_nve_nexthop; + struct bgp *bgp; + struct skiplist *sl; struct skiplistnode *p; struct prefix_bag *pb; int count = 0; + bgp = bgp_get_default (); + if (!bgp) + return; + + sl = bgp->frapi->resolve_nve_nexthop; if (!sl) { zlog_debug ("%s: %s: RHN List is empty", (tag1 ? tag1 : ""), @@ -251,6 +256,8 @@ vnc_rhnck (char *tag) struct skiplistnode *p; bgp = bgp_get_default (); + if (!bgp) + return; sl = bgp->rfapi->resolve_nve_nexthop; if (!sl) @@ -1798,6 +1805,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 +2002,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.7.4

5 11

[cmaster-next] [PATCH] bgpd: Remove unguarded debugs
by Donald Sharp 06 Dec '16

06 Dec '16

Remove allot of unguarded debugs in bgp that are causing the log file to be filed up. Signed-off-by: Donald Sharp <sharpd(a)cumulusnetworks.com> --- bgpd/bgp_routemap.c | 2 -- bgpd/rfapi/bgp_rfapi_cfg.c | 7 ------- bgpd/rfapi/rfapi_import.c | 24 ----------------------- bgpd/rfapi/rfapi_monitor.c | 4 ---- bgpd/rfapi/rfapi_rib.c | 10 ---------- bgpd/rfapi/rfapi_vty.c | 46 --------------------------------------------- bgpd/rfapi/vnc_export_bgp.c | 14 -------------- bgpd/rfapi/vnc_import_bgp.c | 2 -- bgpd/rfapi/vnc_zebra.c | 11 ----------- 9 files changed, 120 deletions(-) diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c index ea42cb5..88a169a 100644 --- a/bgpd/bgp_routemap.c +++ b/bgpd/bgp_routemap.c @@ -2853,7 +2853,6 @@ bgp_route_map_process_update_cb (char *rmap_name) bgp_route_map_process_update(bgp, rmap_name, 1); #if ENABLE_BGP_VNC - zlog_debug("%s: calling vnc_routemap_update", __func__); vnc_routemap_update(bgp, __func__); #endif return 0; @@ -2893,7 +2892,6 @@ bgp_route_map_mark_update (const char *rmap_name) for (ALL_LIST_ELEMENTS (bm->bgp, node, nnode, bgp)) bgp_route_map_process_update(bgp, rmap_name, 0); #if ENABLE_BGP_VNC - zlog_debug("%s: calling vnc_routemap_update", __func__); vnc_routemap_update(bgp, __func__); #endif } diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c index d064c50..a0d80d6 100644 --- a/bgpd/rfapi/bgp_rfapi_cfg.c +++ b/bgpd/rfapi/bgp_rfapi_cfg.c @@ -774,7 +774,6 @@ vnc_redistribute_prechange (struct bgp *bgp) afi_t afi; int type; - zlog_debug ("%s: entry", __func__); memset (redist_was_enabled, 0, sizeof (redist_was_enabled)); /* @@ -794,7 +793,6 @@ vnc_redistribute_prechange (struct bgp *bgp) } } } - zlog_debug ("%s: return", __func__); } static void @@ -803,7 +801,6 @@ vnc_redistribute_postchange (struct bgp *bgp) afi_t afi; int type; - zlog_debug ("%s: entry", __func__); /* * If we turned off redistribution above, turn it back on. Doing so * will tell zebra to resend the routes to us @@ -818,7 +815,6 @@ vnc_redistribute_postchange (struct bgp *bgp) } } } - zlog_debug ("%s: return", __func__); } DEFUN (vnc_redistribute_rh_roo_localadmin, @@ -2498,8 +2494,6 @@ vnc_routemap_update (struct bgp *bgp, const char *unused) struct rfapi_cfg *hc; int i; - zlog_debug ("%s(arg=%s)", __func__, unused); - if (!bgp) { zlog_debug ("%s: No BGP process is configured", __func__); @@ -2573,7 +2567,6 @@ vnc_routemap_update (struct bgp *bgp, const char *unused) vnc_redistribute_prechange (bgp); vnc_redistribute_postchange (bgp); - zlog_debug ("%s done", __func__); } static void diff --git a/bgpd/rfapi/rfapi_import.c b/bgpd/rfapi/rfapi_import.c index 77da4f9..54643ee 100644 --- a/bgpd/rfapi/rfapi_import.c +++ b/bgpd/rfapi/rfapi_import.c @@ -1349,10 +1349,6 @@ rfapiRouteInfo2NextHopEntry ( struct rfapi_next_hop_entry *new; int have_vnc_tunnel_un = 0; -#if DEBUG_ENCAP_MONITOR - zlog_debug ("%s: entry, bi %p, rn %p", __func__, bi, rn); -#endif - new = XCALLOC (MTYPE_RFAPI_NEXTHOP, sizeof (struct rfapi_next_hop_entry)); assert (new); @@ -1500,11 +1496,6 @@ rfapiRouteInfo2NextHopEntry ( new->un_options = rfapi_encap_tlv_to_un_option (bi->attr); -#if DEBUG_ENCAP_MONITOR - zlog_debug ("%s: line %d: have_vnc_tunnel_un=%d", - __func__, __LINE__, have_vnc_tunnel_un); -#endif - if (!have_vnc_tunnel_un && bi && bi->extra) { /* @@ -1960,7 +1951,6 @@ rfapiRouteTable2NextHopList ( } } - zlog_debug ("%s: returning %d routes", __func__, count); return biglist; } @@ -2055,7 +2045,6 @@ rfapiEthRouteTable2NextHopList ( } } - zlog_debug ("%s: returning %d routes", __func__, count); return biglist; } @@ -3117,10 +3106,6 @@ rfapiBgpInfoFilteredImportEncap ( break; } - zlog_debug ("%s: entry: %s: prefix %s/%d", __func__, - action_str, - inet_ntop (p->family, &p->u.prefix, buf, BUFSIZ), p->prefixlen); - memset (&p_firstbi_old, 0, sizeof (p_firstbi_old)); memset (&p_firstbi_new, 0, sizeof (p_firstbi_new)); @@ -3598,12 +3583,6 @@ rfapiBgpInfoFilteredImportVPN ( if (import_table == bgp->rfapi->it_ce) is_it_ce = 1; - zlog_debug ("%s: entry: %s%s: prefix %s/%d: it %p, afi %s", __func__, - (is_it_ce ? "CE-IT " : ""), - action_str, - rfapi_ntop (p->family, &p->u.prefix, buf, BUFSIZ), - p->prefixlen, import_table, afi2str (afi)); - VNC_ITRCCK; /* @@ -4695,9 +4674,6 @@ rfapiDeleteRemotePrefixesIt ( buf_pfx[0] = '*'; buf_pfx[1] = 0; } - - zlog_debug ("%s: entry, p=%s, delete_active=%d, delete_holddown=%d", - __func__, buf_pfx, delete_active, delete_holddown); } #endif diff --git a/bgpd/rfapi/rfapi_monitor.c b/bgpd/rfapi/rfapi_monitor.c index 216b45e..8e33530 100644 --- a/bgpd/rfapi/rfapi_monitor.c +++ b/bgpd/rfapi/rfapi_monitor.c @@ -707,8 +707,6 @@ rfapiMonitorDelHd (struct rfapi_descriptor *rfd) struct bgp *bgp; int count = 0; - zlog_debug ("%s: entry rfd=%p", __func__, rfd); - bgp = bgp_get_default (); if (rfd->mon) @@ -1511,8 +1509,6 @@ rfapiMonitorEthDel ( struct rfapi_monitor_eth mon_buf; int rc; - zlog_debug ("%s: entry rfd=%p", __func__, rfd); - assert (rfd->mon_eth); memset ((void *) &mon_buf, 0, sizeof (mon_buf)); diff --git a/bgpd/rfapi/rfapi_rib.c b/bgpd/rfapi/rfapi_rib.c index 896b5f5..40d00ca 100644 --- a/bgpd/rfapi/rfapi_rib.c +++ b/bgpd/rfapi/rfapi_rib.c @@ -1602,8 +1602,6 @@ rfapiRibUpdatePendingNode ( int count = 0; char buf[BUFSIZ]; - zlog_debug ("%s: entry", __func__); - if (CHECK_FLAG (bgp->rfapi_cfg->flags, BGP_VNC_CONFIG_CALLBACK_DISABLE)) return; @@ -1619,9 +1617,6 @@ rfapiRibUpdatePendingNode ( pn = route_node_get (rfd->rib_pending[afi], prefix); assert (pn); - zlog_debug ("%s: pn->info=%p, pn->aggregate=%p", __func__, pn->info, - pn->aggregate); - if (pn->aggregate) { /* @@ -2155,8 +2150,6 @@ rfapiRibPendingDeleteRoute ( char buf[BUFSIZ]; prefix2str (&it_node->p, buf, BUFSIZ); - zlog_debug ("%s: entry, it=%p, afi=%d, it_node=%p, pfx=%s", - __func__, it, afi, it_node, buf); if (AFI_ETHER == afi) { @@ -2175,9 +2168,6 @@ rfapiRibPendingDeleteRoute ( */ if ((sl = RFAPI_MONITOR_ETH (it_node))) { - - zlog_debug ("%s: route-specific skiplist: %p", __func__, sl); - for (cursor = NULL, rc = skiplist_next (sl, NULL, (void **) &m, (void **) &cursor); !rc; rc = skiplist_next (sl, NULL, (void **) &m, (void **) &cursor)) diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c index c198564..1f25c72 100644 --- a/bgpd/rfapi/rfapi_vty.c +++ b/bgpd/rfapi/rfapi_vty.c @@ -3283,10 +3283,6 @@ rfapiDeleteLocalPrefixes (struct rfapi_local_reg_delete_arg *cda) struct rfapi_next_hop_entry *tail = NULL; struct rfapi_cfg *rfapi_cfg; -#if DEBUG_L2_EXTRA - zlog_debug ("%s: entry", __func__); -#endif - if (!bgp_default) return ENXIO; @@ -3305,10 +3301,6 @@ rfapiDeleteLocalPrefixes (struct rfapi_local_reg_delete_arg *cda) rfapiQprefix2Rprefix (pPrefix, &rprefix); } -#if DEBUG_L2_EXTRA - zlog_debug ("%s: starting descriptor loop", __func__); -#endif - for (ALL_LIST_ELEMENTS_RO (&h->descriptors, node, rfd)) { struct rfapi_adb *adb; @@ -3317,10 +3309,6 @@ rfapiDeleteLocalPrefixes (struct rfapi_local_reg_delete_arg *cda) struct nve_addr ha; struct nve_addr *hap; -#if DEBUG_L2_EXTRA - zlog_debug ("%s: rfd=%p", __func__, rfd); -#endif - /* * match un, vn addresses of NVEs */ @@ -3329,10 +3317,6 @@ rfapiDeleteLocalPrefixes (struct rfapi_local_reg_delete_arg *cda) if (pVn && (rfapi_ip_addr_cmp (pVn, &rfd->vn_addr))) continue; -#if DEBUG_L2_EXTRA - zlog_debug ("%s: un, vn match", __func__); -#endif - /* * match prefix */ @@ -3372,10 +3356,6 @@ rfapiDeleteLocalPrefixes (struct rfapi_local_reg_delete_arg *cda) { if (!prefix_same (pPrefix, &adb->prefix_ip)) { -#if DEBUG_L2_EXTRA - zlog_debug ("%s: adb=%p, prefix doesn't match, skipping", - __func__, adb); -#endif continue; } } @@ -3385,10 +3365,6 @@ rfapiDeleteLocalPrefixes (struct rfapi_local_reg_delete_arg *cda) (cda->l2o.o.macaddr.octet, adb->prefix_eth.u.prefix_eth.octet, ETHER_ADDR_LEN)) { -#if DEBUG_L2_EXTRA - zlog_debug ("%s: adb=%p, macaddr doesn't match, skipping", - __func__, adb); -#endif continue; } } @@ -3397,19 +3373,10 @@ rfapiDeleteLocalPrefixes (struct rfapi_local_reg_delete_arg *cda) { if (cda->l2o.o.logical_net_id != adb->l2o.logical_net_id) { -#if DEBUG_L2_EXTRA - zlog_debug ("%s: adb=%p, LNI doesn't match, skipping", - __func__, adb); -#endif continue; } } -#if DEBUG_L2_EXTRA - zlog_debug ("%s: ipN adding adb %p to delete list", __func__, - adb); -#endif - listnode_add (adb_delete_list, adb); } @@ -3454,10 +3421,6 @@ rfapiDeleteLocalPrefixes (struct rfapi_local_reg_delete_arg *cda) pVn = NULL; } -#if DEBUG_L2_EXTRA - zlog_debug ("%s: ipN killing reg from adb %p ", __func__, adb); -#endif - rc = rfapi_register (rfd, &rp, 0, NULL, pVn, RFAPI_REGISTER_KILL); if (!rc) { @@ -3508,10 +3471,6 @@ rfapiDeleteLocalPrefixes (struct rfapi_local_reg_delete_arg *cda) continue; } } -#if DEBUG_L2_EXTRA - zlog_debug ("%s: ip0 adding adb %p to delete list", - __func__, adb); -#endif listnode_add (adb_delete_list, adb); } @@ -3527,11 +3486,6 @@ rfapiDeleteLocalPrefixes (struct rfapi_local_reg_delete_arg *cda) vn.type = RFAPI_VN_OPTION_TYPE_L2ADDR; vn.v.l2addr = adb->l2o; -#if DEBUG_L2_EXTRA - zlog_debug ("%s: ip0 killing reg from adb %p ", - __func__, adb); -#endif - rc = rfapi_register (rfd, &rp, 0, NULL, &vn, RFAPI_REGISTER_KILL); if (!rc) diff --git a/bgpd/rfapi/vnc_export_bgp.c b/bgpd/rfapi/vnc_export_bgp.c index 6434c37..f1a9ecb 100644 --- a/bgpd/rfapi/vnc_export_bgp.c +++ b/bgpd/rfapi/vnc_export_bgp.c @@ -437,8 +437,6 @@ vnc_direct_bgp_vpn_enable_ce (struct bgp *bgp, afi_t afi) struct route_node *rn; struct bgp_info *ri; - zlog_debug ("%s: entry, afi=%d", __func__, afi); - if (!bgp) return; @@ -499,8 +497,6 @@ vnc_direct_bgp_vpn_disable_ce (struct bgp *bgp, afi_t afi) { struct bgp_node *rn; - zlog_debug ("%s: entry, afi=%d", __func__, afi); - if (!bgp) return; @@ -1276,8 +1272,6 @@ vnc_direct_bgp_add_group_afi ( struct attr attr = { 0 }; struct rfapi_import_table *import_table; - zlog_debug ("%s: entry", __func__); - import_table = rfg->rfapi_import_table; if (!import_table) { @@ -1417,8 +1411,6 @@ vnc_direct_bgp_del_group_afi ( struct route_node *rn; struct rfapi_import_table *import_table; - zlog_debug ("%s: entry", __func__); - import_table = rfg->rfapi_import_table; if (!import_table) { @@ -1626,8 +1618,6 @@ vnc_direct_bgp_vpn_disable (struct bgp *bgp, afi_t afi) struct rfapi_import_table *it; uint8_t family = afi2family (afi); - zlog_debug ("%s: entry, afi=%d", __func__, afi); - if (!bgp) return; @@ -1873,8 +1863,6 @@ vnc_direct_bgp_rh_vpn_enable (struct bgp *bgp, afi_t afi) struct bgp_node *prn; struct rfapi_cfg *hc; - zlog_debug ("%s: entry, afi=%d", __func__, afi); - if (!bgp) return; @@ -2034,8 +2022,6 @@ vnc_direct_bgp_rh_vpn_disable (struct bgp *bgp, afi_t afi) { struct bgp_node *rn; - zlog_debug ("%s: entry, afi=%d", __func__, afi); - if (!bgp) return; diff --git a/bgpd/rfapi/vnc_import_bgp.c b/bgpd/rfapi/vnc_import_bgp.c index dc2640a..0ba927d 100644 --- a/bgpd/rfapi/vnc_import_bgp.c +++ b/bgpd/rfapi/vnc_import_bgp.c @@ -3097,7 +3097,6 @@ vnc_import_bgp_redist_disable (struct bgp *bgp, afi_t afi) } bgp->rfapi_cfg->redist[afi][ZEBRA_ROUTE_BGP_DIRECT] = 0; - zlog_debug ("%s: return", __func__); } @@ -3145,5 +3144,4 @@ vnc_import_bgp_exterior_redist_disable (struct bgp *bgp, afi_t afi) } bgp->rfapi_cfg->redist[afi][ZEBRA_ROUTE_BGP_DIRECT_EXT] = 0; - zlog_debug ("%s: return", __func__); } diff --git a/bgpd/rfapi/vnc_zebra.c b/bgpd/rfapi/vnc_zebra.c index e357ef6..bc77ca4 100644 --- a/bgpd/rfapi/vnc_zebra.c +++ b/bgpd/rfapi/vnc_zebra.c @@ -284,8 +284,6 @@ vnc_redistribute_withdraw (struct bgp *bgp, afi_t afi, uint8_t type) struct bgp_node *prn; struct bgp_node *rn; - zlog_debug ("%s: entry", __func__); - if (!bgp) return; if (!bgp->rfapi_cfg) @@ -331,7 +329,6 @@ vnc_redistribute_withdraw (struct bgp *bgp, afi_t afi, uint8_t type) } } } - zlog_debug ("%s: return", __func__); } /* @@ -729,8 +726,6 @@ vnc_zebra_add_del_prefix ( void *nh_ary = NULL; void *nhp_ary = NULL; - zlog_debug ("%s: entry, add=%d", __func__, add); - if (zclient_vnc->sock < 0) return; @@ -808,8 +803,6 @@ vnc_zebra_add_del_nve ( // struct prefix *nhpp; void *pAddr; - zlog_debug ("%s: entry, add=%d", __func__, add); - if (zclient_vnc->sock < 0) return; @@ -909,7 +902,6 @@ vnc_zebra_add_del_group_afi ( void *nh_ary = NULL; void *nhp_ary = NULL; - zlog_debug ("%s: entry", __func__); import_table = rfg->rfapi_import_table; if (!import_table) { @@ -982,7 +974,6 @@ vnc_zebra_add_group (struct bgp *bgp, struct rfapi_nve_group_cfg *rfg) void vnc_zebra_del_group (struct bgp *bgp, struct rfapi_nve_group_cfg *rfg) { - zlog_debug ("%s: entry", __func__); vnc_zebra_add_del_group_afi (bgp, rfg, AFI_IP, 0); vnc_zebra_add_del_group_afi (bgp, rfg, AFI_IP6, 0); } @@ -1083,8 +1074,6 @@ vnc_redistribute_unset (struct bgp *bgp, afi_t afi, int type) /* Withdraw redistributed routes from current BGP's routing table. */ vnc_redistribute_withdraw (bgp, afi, type); - zlog_debug ("%s: return", __func__); - return CMD_SUCCESS; } -- 2.7.4

4 13

[cmaster-next] AFI/SAFI discussion
by Donald Sharp 06 Dec '16

06 Dec '16

David and I just had a quick discussion on AFI/SAFI handling in Quagga. Capturing result of conversation here: 1) Change #defines in zebra.h of SAFI_XXX to an enum as well as modifying them to SAFI_INT_XXX -> the _INT_ is to tell the world that these are internal values only. 2) lib/prefix.[ch] has code to map internal/external AFI/SAFI values. I am going to submit patches for #1 and #2 hopefully in the next few days. This mapping between internal and IETF AFI/SAFI values is there to allow bgp to not have a sparse array for peer information. I think that there is desire to move away from this solution. We do not have anything designed at this point beyond vague hand waving :) donald

2 1

[cmaster-next] [PATCH] zebra: fix segfault on "show mpls table"
by Renato Westphal 06 Dec '16

06 Dec '16

Signed-off-by: Renato Westphal <renato(a)opensourcerouting.org> --- zebra/zebra_mpls_vty.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zebra/zebra_mpls_vty.c b/zebra/zebra_mpls_vty.c index ff84c59..ca59764 100644 --- a/zebra/zebra_mpls_vty.c +++ b/zebra/zebra_mpls_vty.c @@ -789,10 +789,10 @@ DEFUN (show_mpls_table, "JavaScript Object Notation\n") { struct zebra_vrf *zvrf; - u_char use_json = (argv[3]->arg != NULL); + u_char uj = use_json (argc, argv); zvrf = vrf_info_lookup(VRF_DEFAULT); - zebra_mpls_print_lsp_table(vty, zvrf, use_json); + zebra_mpls_print_lsp_table(vty, zvrf, uj); return CMD_SUCCESS; } @@ -807,11 +807,11 @@ DEFUN (show_mpls_table_lsp, { u_int32_t label; struct zebra_vrf *zvrf; - u_char use_json = (argv[4]->arg != NULL); + u_char uj = use_json (argc, argv); zvrf = vrf_info_lookup(VRF_DEFAULT); label = atoi(argv[3]->arg); - zebra_mpls_print_lsp (vty, zvrf, label, use_json); + zebra_mpls_print_lsp (vty, zvrf, label, uj); return CMD_SUCCESS; } -- 1.9.1

1 0

[cmaster-next] [PATCH] *: fix up DEFUNs without install_element calls
by David Lamparter 06 Dec '16

06 Dec '16

These now generate warnings which will break the build with -Werror. Note this may have enabled commands that should be disabled, or the other way around... Signed-off-by: David Lamparter <equinox(a)opensourcerouting.org> --- "logical-router ..." needs more checking. Also, not sure wtf is up with all the "ospf distance" commands. Either way, this fixes all the compile warnings about unused DEFUNs... please send patches if some bits are wrong... -David --- bgpd/bgp_vty.c | 1 + lib/command.c | 15 --------------- lib/if.c | 2 ++ ospf6d/ospf6_neighbor.c | 1 + ospf6d/ospf6_top.c | 4 ++++ ospfd/ospf_ri.c | 1 + ospfd/ospf_vty.c | 2 ++ ripngd/ripngd.c | 2 ++ vtysh/vtysh.c | 24 +++++------------------- zebra/interface.c | 1 + 10 files changed, 19 insertions(+), 34 deletions(-) diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 41f09e3..4532e24 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -11379,6 +11379,7 @@ community_list_vty (void) /* Community-list. */ install_element (CONFIG_NODE, &ip_community_list_standard_cmd); + install_element (CONFIG_NODE, &ip_community_list_expanded_all_cmd); install_element (CONFIG_NODE, &no_ip_community_list_standard_all_cmd); install_element (CONFIG_NODE, &no_ip_community_list_expanded_all_cmd); install_element (VIEW_NODE, &show_ip_community_list_cmd); diff --git a/lib/command.c b/lib/command.c index e51ff83..092037b 100644 --- a/lib/command.c +++ b/lib/command.c @@ -2069,21 +2069,6 @@ DEFUN (config_log_syslog, } } -DEFUN_DEPRECATED (config_log_syslog_facility, - config_log_syslog_facility_cmd, - "log syslog facility (kern|user|mail|daemon|auth|syslog|lpr|news|uucp|cron|local0|local1|local2|local3|local4|local5|local6|local7)", - "Logging control\n" - "Logging goes to syslog\n" - "(Deprecated) Facility parameter for syslog messages\n" - LOG_FACILITY_DESC) -{ - int facility = facility_match(argv[3]->arg); - - zlog_set_level (NULL, ZLOG_DEST_SYSLOG, zlog_default->default_lvl); - zlog_default->facility = facility; - return CMD_SUCCESS; -} - DEFUN (no_config_log_syslog, no_config_log_syslog_cmd, "no log syslog [<kern|user|mail|daemon|auth|syslog|lpr|news|uucp|cron|local0|local1|local2|local3|local4|local5|local6|local7>] [<emergencies|alerts|critical|errors|warnings|notifications|informational|debugging>]", diff --git a/lib/if.c b/lib/if.c index 128fc67..a1bac2c 100644 --- a/lib/if.c +++ b/lib/if.c @@ -838,6 +838,7 @@ if_cmd_init (void) install_element (INTERFACE_NODE, &no_interface_desc_cmd); } +#if 0 /* For debug purpose. */ DEFUN (show_address, show_address_cmd, @@ -907,6 +908,7 @@ DEFUN (show_address_vrf_all, } return CMD_SUCCESS; } +#endif /* Allocate connected structure. */ struct connected * diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c index 385232f..f24ee84 100644 --- a/ospf6d/ospf6_neighbor.c +++ b/ospf6d/ospf6_neighbor.c @@ -913,6 +913,7 @@ void ospf6_neighbor_init (void) { install_element (VIEW_NODE, &show_ipv6_ospf6_neighbor_cmd); + install_element (VIEW_NODE, &show_ipv6_ospf6_neighbor_one_cmd); } DEFUN (debug_ospf6_neighbor, diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index 4c50828..65ded28 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -622,6 +622,7 @@ DEFUN (no_ospf6_distance_ospf6, return CMD_SUCCESS; } +#if 0 DEFUN (ospf6_distance_source, ospf6_distance_source_cmd, "distance (1-255) X:X::X:X/M [WORD]", @@ -652,6 +653,7 @@ DEFUN (no_ospf6_distance_source, return CMD_SUCCESS; } +#endif DEFUN (ospf6_interface_area, ospf6_interface_area_cmd, @@ -833,6 +835,7 @@ DEFUN (no_ospf6_stub_router_admin, return CMD_SUCCESS; } +#if 0 DEFUN (ospf6_stub_router_startup, ospf6_stub_router_startup_cmd, "stub-router on-startup (5-86400)", @@ -878,6 +881,7 @@ DEFUN (no_ospf6_stub_router_shutdown, { return CMD_SUCCESS; } +#endif static void ospf6_show (struct vty *vty, struct ospf6 *o) diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c index 28957e0..883ea7c 100644 --- a/ospfd/ospf_ri.c +++ b/ospfd/ospf_ri.c @@ -1662,6 +1662,7 @@ ospf_router_info_register_vty (void) install_element (OSPF_NODE, &pce_neighbor_cmd); install_element (OSPF_NODE, &no_pce_neighbor_cmd); install_element (OSPF_NODE, &pce_cap_flag_cmd); + install_element (OSPF_NODE, &no_pce_cap_flag_cmd); return; } diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 776b1a0..12ae942 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -7800,6 +7800,7 @@ DEFUN (ospf_distance_ospf, return CMD_SUCCESS; } +#if 0 DEFUN (ospf_distance_source, ospf_distance_source_cmd, "distance (1-255) A.B.C.D/M", @@ -7881,6 +7882,7 @@ DEFUN (no_ospf_distance_source_access_list, return CMD_SUCCESS; } +#endif DEFUN (ip_ospf_mtu_ignore, ip_ospf_mtu_ignore_addr_cmd, diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c index ca8850e..fefb1fd 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -2575,6 +2575,7 @@ DEFUN (no_ripng_timers, return CMD_SUCCESS; } +#if 0 DEFUN (show_ipv6_protocols, show_ipv6_protocols_cmd, "show ipv6 protocols", @@ -2601,6 +2602,7 @@ DEFUN (show_ipv6_protocols, return CMD_SUCCESS; } +#endif /* Please be carefull to use this command. */ DEFUN (ripng_default_information_originate, diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 0a83b56..9bcbe73 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -1560,24 +1560,6 @@ DEFUNSH (VTYSH_BGPD, return CMD_SUCCESS; } -DEFUNSH (VTYSH_ZEBRA, - vtysh_exit_zebra, - vtysh_exit_zebra_cmd, - "exit", - "Exit current mode and down to previous mode\n") -{ - return vtysh_exit (vty); -} - -DEFUNSH (VTYSH_ZEBRA, - vtysh_quit_zebra, - vtysh_quit_zebra_cmd, - "quit", - "Exit current mode and down to previous mode\n") -{ - return vtysh_exit_zebra (self, vty, argc, argv); -} - DEFUNSH (VTYSH_RIPD, vtysh_exit_ripd, vtysh_exit_ripd_cmd, @@ -3122,7 +3104,8 @@ vtysh_init_vty (void) /* "exit" command. */ install_element (VIEW_NODE, &vtysh_exit_all_cmd); install_element (CONFIG_NODE, &vtysh_exit_all_cmd); - /* install_element (CONFIG_NODE, &vtysh_quit_all_cmd); */ + install_element (VIEW_NODE, &vtysh_quit_all_cmd); + install_element (CONFIG_NODE, &vtysh_quit_all_cmd); install_element (RIP_NODE, &vtysh_exit_ripd_cmd); install_element (RIP_NODE, &vtysh_quit_ripd_cmd); install_element (RIPNG_NODE, &vtysh_exit_ripngd_cmd); @@ -3226,6 +3209,8 @@ vtysh_init_vty (void) install_element (INTERFACE_NODE, &vtysh_quit_interface_cmd); install_element (NS_NODE, &vtysh_end_all_cmd); + + install_element (CONFIG_NODE, &vtysh_ns_cmd); install_element (NS_NODE, &vtysh_exit_ns_cmd); install_element (NS_NODE, &vtysh_quit_ns_cmd); @@ -3255,6 +3240,7 @@ vtysh_init_vty (void) #if defined(ENABLE_BGP_VNC) install_element (BGP_NODE, &vnc_defaults_cmd); install_element (BGP_NODE, &vnc_nve_group_cmd); + install_element (BGP_NODE, &vnc_l2_group_cmd); #endif install_element (BGP_NODE, &address_family_ipv4_unicast_cmd); install_element (BGP_NODE, &address_family_ipv4_multicast_cmd); diff --git a/zebra/interface.c b/zebra/interface.c index 93a059a..8eddd30 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -2909,6 +2909,7 @@ zebra_if_init (void) install_element(LINK_PARAMS_NODE, &link_params_enable_cmd); install_element(LINK_PARAMS_NODE, &no_link_params_enable_cmd); install_element(LINK_PARAMS_NODE, &link_params_metric_cmd); + install_element(LINK_PARAMS_NODE, &no_link_params_metric_cmd); install_element(LINK_PARAMS_NODE, &link_params_maxbw_cmd); install_element(LINK_PARAMS_NODE, &link_params_max_rsv_bw_cmd); install_element(LINK_PARAMS_NODE, &link_params_unrsv_bw_cmd); -- 2.7.3

1 0