proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-05 13:19:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1943 from donaldsharp/update_pr_1942

Browse Source 
ripd: considering a interface with 2 or more IP
This commit is contained in:
Donald Sharp 2018-03-21 10:57:55 -04:00 committed by GitHub
commit 00e193da32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ripd/ripd.c
View File

@ -2186,6 +2186,7 @@ void rip_output_process(struct connected *ifc, struct sockaddr_in *to,
*/ */
int suppress = 0; int suppress = 0;
struct rip_info *tmp_rinfo = NULL; struct rip_info *tmp_rinfo = NULL;
struct connected *tmp_ifc = NULL;
for (ALL_LIST_ELEMENTS_RO(list, listnode, for (ALL_LIST_ELEMENTS_RO(list, listnode,
tmp_rinfo)) tmp_rinfo))
@ -2197,10 +2198,17 @@ void rip_output_process(struct connected *ifc, struct sockaddr_in *to,
} }
if (!suppress if (!suppress
&& rinfo->type == ZEBRA_ROUTE_CONNECT && rinfo->type == ZEBRA_ROUTE_CONNECT) {
&& prefix_match((struct prefix *)p, for (ALL_LIST_ELEMENTS_RO(
ifc->address)) ifc->ifp->connected,
suppress = 1; listnode, tmp_ifc))
if (prefix_match(
(struct prefix *)p,
tmp_ifc->address)) {
suppress = 1;
break;
}
}
if (suppress) if (suppress)
continue; continue;
@ -2311,19 +2319,29 @@ void rip_output_process(struct connected *ifc, struct sockaddr_in *to,
* configured on the same interface). * configured on the same interface).
*/ */
struct rip_info *tmp_rinfo = NULL; struct rip_info *tmp_rinfo = NULL;
struct connected *tmp_ifc = NULL;
for (ALL_LIST_ELEMENTS_RO(list, listnode, for (ALL_LIST_ELEMENTS_RO(list, listnode,
tmp_rinfo)) tmp_rinfo))
if (tmp_rinfo->type == ZEBRA_ROUTE_RIP if (tmp_rinfo->type == ZEBRA_ROUTE_RIP
&& tmp_rinfo->nh.ifindex && tmp_rinfo->nh.ifindex
== ifc->ifp->ifindex) == ifc->ifp->ifindex)
tmp_rinfo->metric_out = rinfo->metric_out =
RIP_METRIC_INFINITY; RIP_METRIC_INFINITY;
if (rinfo->type == ZEBRA_ROUTE_CONNECT if (rinfo->metric_out != RIP_METRIC_INFINITY
&& prefix_match((struct prefix *)p, && rinfo->type == ZEBRA_ROUTE_CONNECT) {
ifc->address)) for (ALL_LIST_ELEMENTS_RO(
rinfo->metric_out = RIP_METRIC_INFINITY; ifc->ifp->connected,
listnode, tmp_ifc))
if (prefix_match(
(struct prefix *)p,
tmp_ifc->address)) {
rinfo->metric_out =
RIP_METRIC_INFINITY;
break;
}
}
} }
/* Prepare preamble, auth headers, if needs be */ /* Prepare preamble, auth headers, if needs be */