- dev - lists.frrouting.org

[cmaster-next] [PATCH] tools: teach xml2cli.pl the "[]" notation for optional arguments
by Renato Westphal 19 Dec '16

19 Dec '16

Requested by Daniel Walton. Signed-off-by: Renato Westphal <renato(a)opensourcerouting.org> --- tools/xml2cli.pl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/xml2cli.pl b/tools/xml2cli.pl index 1b45e7f..e098042 100755 --- a/tools/xml2cli.pl +++ b/tools/xml2cli.pl @@ -141,6 +141,8 @@ sub generate_arguments { # argument is the name of the node if ($node{'input'} or $node{'type'} eq "select") { $arg_value = "argv[" . $argc . "]->arg"; + } elsif ($node{'optional'}) { + $arg_value = "(argc > " . $argc . " ? argv[" . $argc. "]->arg : NULL)"; } else { $arg_value = '"' . $node{'name'} . '"'; } @@ -196,7 +198,11 @@ sub generate_code { $helpstr .= $::options{$options_name}{'help'}; } else { $funcname .= $node{'name'} . " "; - $cmdstr .= $node{'name'} . " "; + if ($node{'optional'}) { + $cmdstr .= "[" . $node{'name'} . "] "; + } else { + $cmdstr .= $node{'name'} . " "; + } $helpstr .= "\n \"" . $node{'help'} . "\\n\""; } @@ -279,6 +285,7 @@ sub parse_tree { $node{'help'} = $xml_node->findvalue('./@help'); $node{'function'} = $xml_node->findvalue('./@function'); $node{'ifdef'} = $xml_node->findvalue('./@ifdef'); + $node{'optional'} = $xml_node->findvalue('./@optional'); # push node to stack push (@nodes, \%node); -- 1.9.1

1 0

[cmaster-next] [PATCH] tools: teach xml2cli.pl the "{}" notation for optional arguments
by Renato Westphal 19 Dec '16

19 Dec '16

Requested by Daniel Walton. Signed-off-by: Renato Westphal <renato(a)opensourcerouting.org> --- tools/xml2cli.pl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/xml2cli.pl b/tools/xml2cli.pl index 1b45e7f..b84ab67 100755 --- a/tools/xml2cli.pl +++ b/tools/xml2cli.pl @@ -196,7 +196,11 @@ sub generate_code { $helpstr .= $::options{$options_name}{'help'}; } else { $funcname .= $node{'name'} . " "; - $cmdstr .= $node{'name'} . " "; + if ($node{'optional'}) { + $cmdstr .= "{" . $node{'name'} . "} "; + } else { + $cmdstr .= $node{'name'} . " "; + } $helpstr .= "\n \"" . $node{'help'} . "\\n\""; } @@ -279,6 +283,7 @@ sub parse_tree { $node{'help'} = $xml_node->findvalue('./@help'); $node{'function'} = $xml_node->findvalue('./@function'); $node{'ifdef'} = $xml_node->findvalue('./@ifdef'); + $node{'optional'} = $xml_node->findvalue('./@optional'); # push node to stack push (@nodes, \%node); -- 1.9.1

1 1

[cmaster-next] [PATCH] ospf6d: fix broken indentation in "show ipv6 ospf6 neighbor"
by Renato Westphal 19 Dec '16

19 Dec '16

In the State/IfState column, we were reserving only 6 characters to print the state of each neighbor, but this is not enough for cases like "Loading" (7 characters) and "ExChange" (8 characters). Increase the width of this field to 8 to fix the broken indendation. ospf6d's output before this patch: ubuntu# show ipv6 ospf6 neighbor Neighbor ID Pri DeadTime State/IfState Duration I/F[State] 2.2.2.2 1 00:00:35 ExChange/DR 00:01:15 rt1-eth0[BDR] 3.3.3.3 1 00:00:35 Loading/DR 00:01:15 rt1-eth1[BDR] 4.4.4.4 1 00:00:35 Full/DR 00:01:15 rt1-eth2[BDR] 5.5.5.5 1 00:00:35 None/DR 00:01:10 rt1-eth3[BDR] 6.6.6.6 1 00:00:35 Down/DR 00:01:15 rt1-eth4[BDR] 7.7.7.7 1 00:00:35 Attempt/DR 00:01:15 rt1-eth5[BDR] 8.8.8.8 1 00:00:35 Init/DR 00:01:10 rt1-eth6[BDR] 9.9.9.9 1 00:00:35 Twoway/DR 00:01:14 rt1-eth7[BDR] 10.10.10.10 1 00:00:35 ExStart/DR 00:01:10 rt1-eth8[BDR] ospf6d's output with this patch: ubuntu# show ipv6 ospf6 neighbor Neighbor ID Pri DeadTime State/IfState Duration I/F[State] 2.2.2.2 1 00:00:36 ExChange/DR 00:00:44 rt1-eth0[BDR] 3.3.3.3 1 00:00:36 Loading/DR 00:00:39 rt1-eth1[BDR] 4.4.4.4 1 00:00:35 Full/DR 00:00:39 rt1-eth2[BDR] 5.5.5.5 1 00:00:36 None/DR 00:00:44 rt1-eth3[BDR] 6.6.6.6 1 00:00:36 Down/DR 00:00:39 rt1-eth4[BDR] 7.7.7.7 1 00:00:36 Attempt/DR 00:00:39 rt1-eth5[BDR] 8.8.8.8 1 00:00:36 Init/DR 00:00:39 rt1-eth6[BDR] 9.9.9.9 1 00:00:35 Twoway/DR 00:00:40 rt1-eth7[BDR] 10.10.10.10 1 00:00:36 ExStart/DR 00:00:39 rt1-eth8[BDR] Signed-off-by: Renato Westphal <renato(a)opensourcerouting.org> --- ospf6d/ospf6_neighbor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c index f24ee84..e9bb249 100644 --- a/ospf6d/ospf6_neighbor.c +++ b/ospf6d/ospf6_neighbor.c @@ -682,7 +682,7 @@ ospf6_neighbor_show (struct vty *vty, struct ospf6_neighbor *on) "I/F", "State", VNL); */ - vty_out (vty, "%-15s %3d %11s %6s/%-12s %11s %s[%s]%s", + vty_out (vty, "%-15s %3d %11s %8s/%-12s %11s %s[%s]%s", router_id, on->priority, deadtime, ospf6_neighbor_state_str[on->state], nstate, duration, on->ospf6_if->interface->name, @@ -711,7 +711,7 @@ ospf6_neighbor_show_drchoice (struct vty *vty, struct ospf6_neighbor *on) timersub (&now, &on->last_changed, &res); timerstring (&res, duration, sizeof (duration)); - vty_out (vty, "%-15s %6s/%-11s %-15s %-15s %s[%s]%s", + vty_out (vty, "%-15s %8s/%-11s %-15s %-15s %s[%s]%s", router_id, ospf6_neighbor_state_str[on->state], duration, drouter, bdrouter, on->ospf6_if->interface->name, ospf6_interface_state_str[on->ospf6_if->state], @@ -856,11 +856,11 @@ DEFUN (show_ipv6_ospf6_neighbor, } if (showfunc == ospf6_neighbor_show) - vty_out (vty, "%-15s %3s %11s %6s/%-12s %11s %s[%s]%s", + vty_out (vty, "%-15s %3s %11s %8s/%-12s %11s %s[%s]%s", "Neighbor ID", "Pri", "DeadTime", "State", "IfState", "Duration", "I/F", "State", VNL); else if (showfunc == ospf6_neighbor_show_drchoice) - vty_out (vty, "%-15s %6s/%-11s %-15s %-15s %s[%s]%s", + vty_out (vty, "%-15s %8s/%-11s %-15s %-15s %s[%s]%s", "RouterID", "State", "Duration", "DR", "BDR", "I/F", "State", VNL); -- 1.9.1

1 0

[cmaster-next] [PATCH] ldpd: add missing privilege dropping on error path
by Renato Westphal 19 Dec '16

19 Dec '16

Signed-off-by: Renato Westphal <renato(a)opensourcerouting.org> --- ldpd/socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ldpd/socket.c b/ldpd/socket.c index 1bb0837..eaea997 100644 --- a/ldpd/socket.c +++ b/ldpd/socket.c @@ -85,6 +85,8 @@ ldp_create_socket(int af, enum socket_type type) if (ldpd_privs.change(ZPRIVS_RAISE)) log_warn("%s: could not raise privs", __func__); if (sock_set_reuse(fd, 1) == -1) { + if (ldpd_privs.change(ZPRIVS_LOWER)) + log_warn("%s: could not lower privs", __func__); close(fd); return (-1); } -- 1.9.1

1 0

[cmaster-next] Snapcraft_v2 branch ready for merge into stable/2.0
by Martin Winter 17 Dec '16

17 Dec '16

Got all the required changes from Renato and have now a branch with all the Snapcraft parts ready for merge. This includes code to modify the main Quagga and (in the snapcraft subdir) all the needed files to build a snap. Doc / Package files will need one more round to adjust mainly for the name (once we settle on something) Branch is snapcraft_v2 Main changes: - Snap packages are only allowed to write into their own mounted container and the filenames are not known until the package is installed. There are now new —vty_socket cli options to specify the location for the vty socket instead of using the compile-time path. (Plus —ctl_socket for the extra LDP socket and —config_dir for vtysh) - Snap packages can’t even read files outside their directories. Getting the homedir from the password file isn’t possible. Using now HOME env variable and only fall back to passed file if it doesn’t exits - Snap packages can’t SETUID or SETGID. They always run under root. There is now a check for UID and GID and the change only happens if it’s not already running under the requested User/Group - Martin

5 9

[cmaster-next] Quick update on what has been going on
by Donald Sharp 16 Dec '16

16 Dec '16

Since deciding on the name on Tuesday we have done this: Created a freerangerouting github org: https://github.com/freerangerouting/ -> If you want access to the organization, please let this list know. -> We've imported the code into this repo. Please submit pull requests against this rep. Created a slack channel for better communication: freerangerouting.slack.com thanks! donald

4 6

[cmaster-next] [PATCH 1/3] zebra: fix FIB route updates on *BSD
by Renato Westphal 16 Dec '16

16 Dec '16

On *BSD, we update a route in the FIB by removing the old one and then installing the new version. With that said, on kernel_route_rib() we need to provide a pointer to both the old version and the new version of the route. We were, however, passing a pointer to the new version to both the 'old' and 'new' parameters. This is not a problem on Linux, which uses NLM_F_REPLACE to update routes, but it breaks route updates on *BSD because the 'old' parameter points to a route that is not installed in the kernel. The kernel_route_rib() function then fails to uninstall the supposedly 'old' route and can fail to install the new version as well if the kernel doesn't support ECMP (e.g. FreeBSD with default configuration). Signed-off-by: Renato Westphal <renato(a)opensourcerouting.org> --- zebra/rib.h | 2 +- zebra/zebra_rib.c | 12 ++++++------ zebra/zebra_static.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/zebra/rib.h b/zebra/rib.h index 30929f1..a30c093 100644 --- a/zebra/rib.h +++ b/zebra/rib.h @@ -335,7 +335,7 @@ extern int zebra_check_addr (struct prefix *p); extern void rib_addnode (struct route_node *rn, struct rib *rib, int process); extern void rib_delnode (struct route_node *rn, struct rib *rib); -extern int rib_install_kernel (struct route_node *rn, struct rib *rib, int update); +extern int rib_install_kernel (struct route_node *rn, struct rib *rib, struct rib *old); extern int rib_uninstall_kernel (struct route_node *rn, struct rib *rib); /* NOTE: diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index c573f6b..a792bcc 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -1212,7 +1212,7 @@ nexthop_active_update (struct route_node *rn, struct rib *rib, int set) * is only used for IPv4. */ int -rib_install_kernel (struct route_node *rn, struct rib *rib, int update) +rib_install_kernel (struct route_node *rn, struct rib *rib, struct rib *old) { int ret = 0; struct nexthop *nexthop, *tnexthop; @@ -1231,7 +1231,7 @@ rib_install_kernel (struct route_node *rn, struct rib *rib, int update) * the kernel. */ zfpm_trigger_update (rn, "installing in kernel"); - ret = kernel_route_rib (&rn->p, update ? rib : NULL, rib); + ret = kernel_route_rib (&rn->p, old, rib); /* If install succeeds, update FIB flag for nexthops. */ if (!ret) @@ -1388,7 +1388,7 @@ rib_process_add_fib(struct zebra_vrf *zvrf, struct route_node *rn, if (!RIB_SYSTEM_ROUTE (new)) { - if (rib_install_kernel (rn, new, 0)) + if (rib_install_kernel (rn, new, NULL)) { inet_ntop (rn->p.family, &rn->p.u.prefix, buf, INET6_ADDRSTRLEN); zlog_warn ("%u:%s/%d: Route install failed", @@ -1470,7 +1470,7 @@ rib_process_update_fib (struct zebra_vrf *zvrf, struct route_node *rn, /* Non-system route should be installed. */ if (!RIB_SYSTEM_ROUTE (new)) { - if (rib_install_kernel (rn, new, 1)) + if (rib_install_kernel (rn, new, old)) { installed = 0; inet_ntop (rn->p.family, &rn->p.u.prefix, buf, INET6_ADDRSTRLEN); @@ -1542,7 +1542,7 @@ rib_process_update_fib (struct zebra_vrf *zvrf, struct route_node *rn, break; } if (!in_fib) - rib_install_kernel (rn, new, 0); + rib_install_kernel (rn, new, NULL); } } @@ -2779,7 +2779,7 @@ rib_delete (afi_t afi, safi_t safi, vrf_id_t vrf_id, int type, u_short instance, { /* This means someone else, other than Zebra, has deleted * a Zebra router from the kernel. We will add it back */ - rib_install_kernel(rn, fib, 0); + rib_install_kernel(rn, fib, NULL); } } else diff --git a/zebra/zebra_static.c b/zebra/zebra_static.c index e6ae9c7..7c37d6b 100644 --- a/zebra/zebra_static.c +++ b/zebra/zebra_static.c @@ -323,7 +323,7 @@ static_uninstall_route (afi_t afi, safi_t safi, struct prefix *p, struct static_ { /* Update route in kernel if it's in fib */ if (CHECK_FLAG(rib->status, RIB_ENTRY_SELECTED_FIB)) - rib_install_kernel (rn, rib, 1); + rib_install_kernel (rn, rib, rib); /* Update redistribution if it's selected */ if (CHECK_FLAG(rib->flags, ZEBRA_FLAG_SELECTED)) redistribute_update (&rn->p, rib, NULL); -- 1.9.1

1 2

[cmaster-next] [PATCH 00/10] Issue #12
by Renato Westphal 15 Dec '16

15 Dec '16

Hi all, This patchset makes ldpd display everything in order on CLI output (interfaces, label bindings, etc). This is important to keep consistent with the other routing daemons and to make automated testing easier (CLI output should be predictable and not dependant on the order that things were created). To do this, I converted several linked lists to red-black trees, which store elements in order. I could also use ordered lists, but they have worse time-complexities than red-black trees for basically everything. Fixes issue #12 and addresses a long standing request from Martin. Renato Westphal (10): ldpd: fix segfault when configuring multiple pseudowires ldpd: allow multiple link adjacencies with unnumbered interfaces ldpd: use red-black trees to store 'lde_map' elements ldpd: use red-black trees to store 'iface' elements ldpd: use red-black trees to store 'tnbr' elements ldpd: use red-black trees to store 'nbr_params' elements ldpd: use red-black trees to store 'l2vpn' elements ldpd: use red-black trees to store 'l2vpn_if' elements ldpd: use red-black trees to store 'l2vpn_pw' elements ldpd: use red-black trees to store 'adj' elements ldpd/adjacency.c | 116 +++++++++++++++++----------- ldpd/hello.c | 6 +- ldpd/interface.c | 45 ++++++----- ldpd/l2vpn.c | 108 ++++++++++++++------------ ldpd/lde.c | 49 +++++++----- ldpd/lde.h | 9 ++- ldpd/lde_lib.c | 18 ++--- ldpd/ldp_debug.c | 4 +- ldpd/ldp_vty_conf.c | 104 +++++++++++++------------- ldpd/ldpd.c | 212 ++++++++++++++++++++++++++-------------------------- ldpd/ldpd.h | 72 +++++++++++------- ldpd/ldpe.c | 56 +++++++------- ldpd/ldpe.h | 14 ++-- ldpd/neighbor.c | 29 ++++--- 14 files changed, 468 insertions(+), 374 deletions(-) -- 1.9.1

1 10

[cmaster-next] Name Survey Results (just for reference)
by Martin Winter 15 Dec '16

15 Dec '16

Just for everyones reference, here is the result from the survey as a spreadsheet https://docs.google.com/spreadsheets/d/1QlplLz0t7I4xbGuYa24WB-DwLLqYDCwXG6E… - Martin

1 0

[cmaster-next] Slack - upgrade to standard edition?
by Martin Winter 15 Dec '16

15 Dec '16

Donald, (and everyone else working on it) Thanks for setting up Slack. We (NetDEF) can get a free upgrade to the standard edition as part of bing a 501c3 non-profit. See https://freerangerouting.slack.com/pricing for difference between Free and Standard model. Happy to do this if this community thinks Slack is useful. Please be aware that it’s free “only” up to 250 users - and 85% discount above it. We can only do this for one Slack - so we may want to wait until everyone confirms the new selected name (i.e. no legal issues) - Martin

2 2