mirror/labs-bird
1
0
Fork 0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00
Code Releases Activity

Merge tag 'v1.6.2' into int-new

Browse Source
This commit is contained in:
Ondrej Zajicek (work)
2016-11-08 17:03:31 +01:00
parent 5de0e848de f51b1f5565
commit cc5b93f72d
40 changed files with 988 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
proto/rip/rip.c
View File

@@ -162,7 +162,6 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
{
/* ECMP route */
struct mpnh *nhs = NULL;
struct mpnh **nhp = &nhs;
int num = 0;
for (rt = en->routes; rt && (num < p->ecmp); rt = rt->next)
@@ -174,9 +173,7 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
nh->gw = rt->next_hop;
nh->iface = rt->from->nbr->iface;
nh->weight = rt->from->ifa->cf->ecmp_weight;
nh->next = NULL;
*nhp = nh;
nhp = &(nh->next);
mpnh_insert(&nhs, nh);
num++;
if (rt->tag != rt_tag)