proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 08:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2004-03-19 Jean-Yves Simon <lethalwp@tiscali.be>

Browse Source 
* ripd.c: make ripd also check on administrative distance of his
          own links to update routes.
This commit is contained in:
paul 2004-05-01 20:45:38 +00:00
parent 35be31b6b2
commit b94f9dbd26
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ripd/ChangeLog
View File

@ -1,3 +1,8 @@
2004-03-19 Jean-Yves Simon <lethalwp@tiscali.be>
* ripd.c: make ripd also check on administrative distance of his
own links to update routes.
2004-03-18 sowmini.varadhan@sun.com 2004-03-18 sowmini.varadhan@sun.com
* ripd.c: rip_send_packet can get null connected address when * ripd.c: rip_send_packet can get null connected address when

24
ripd/ripd.c
View File

@ -387,7 +387,7 @@ rip_rte_process (struct rte *rte, struct sockaddr_in *from,
int ret; int ret;
struct prefix_ipv4 p; struct prefix_ipv4 p;
struct route_node *rp; struct route_node *rp;
struct rip_info *rinfo; struct rip_info *rinfo, rinfotmp;
struct rip_interface *ri; struct rip_interface *ri;
struct in_addr *nexthop; struct in_addr *nexthop;
u_char oldmetric; u_char oldmetric;
@ -560,13 +560,27 @@ rip_rte_process (struct rte *rte, struct sockaddr_in *from,
if (same) if (same)
rip_timeout_update (rinfo); rip_timeout_update (rinfo);
/* Fill in a minimaly temporary rip_info structure, for a future
rip_distance_apply() use) */
memset (&rinfo,0,sizeof(rinfotmp));
IPV4_ADDR_COPY (&rinfotmp.from, &from->sin_addr);
rinfotmp.rp=rinfo->rp;
/* Next, compare the metrics. If the datagram is from the same /* Next, compare the metrics. If the datagram is from the same
router as the existing route, and the new metric is different router as the existing route, and the new metric is different
than the old one; or, if the new metric is lower than the old than the old one; or, if the new metric is lower than the old
one, or if the tag has been changed; do the following actions: */ one, or if the tag has been changed; or if there is a route
if ((same && rinfo->metric != rte->metric) || with a lower administrave distance; or an update of the
(rte->metric < rinfo->metric) || distance on the actual route; do the following actions: */
(same && (rinfo->metric == rte->metric) && ntohs(rte->tag) != rinfo->tag)) if (( same && rinfo->metric != rte->metric )
|| ( rte->metric < rinfo->metric )
|| ( (same)
&& (rinfo->metric == rte->metric)
&& ntohs(rte->tag) != rinfo->tag )
|| ( rinfo->distance > rip_distance_apply (&rinfotmp) )
|| ( (rinfo->distance != rip_distance_apply (rinfo)) && same ))
{ {
/* - Adopt the route from the datagram. That is, put the /* - Adopt the route from the datagram. That is, put the
new metric in, and adjust the next hop address (if new metric in, and adjust the next hop address (if