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

ripd: ripd-warnings.patch

Browse Source 
Remove compile warnings for the ripd directory
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by:
This commit is contained in:
Donald Sharp 2015-05-19 18:29:14 -07:00
parent e90bde9cb0
commit e5f745ca93
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ripd/rip_interface.c
View File

@ -832,7 +832,7 @@ rip_enable_network_add (struct prefix *p)
return -1; return -1;
} }
else else
node->info = (char *) "enabled"; node->info = (void *)1;
/* XXX: One should find a better solution than a generic one */ /* XXX: One should find a better solution than a generic one */
rip_enable_apply_all(); rip_enable_apply_all();

15
ripd/ripd.c
View File

@ -1684,16 +1684,6 @@ rip_request_process (struct rip_packet *packet, int size,
ntohs (rte->family) == 0 && ntohs (rte->family) == 0 &&
ntohl (rte->metric) == RIP_METRIC_INFINITY) ntohl (rte->metric) == RIP_METRIC_INFINITY)
{ {
struct prefix_ipv4 saddr;
/* saddr will be used for determining which routes to split-horizon.
Since the source address we'll pick will be on the same subnet as the
destination, for the purpose of split-horizoning, we'll
pretend that "from" is our source address. */
saddr.family = AF_INET;
saddr.prefixlen = IPV4_MAX_BITLEN;
saddr.prefix = from->sin_addr;
/* All route with split horizon */ /* All route with split horizon */
rip_output_process (ifc, from, rip_all_route, packet->version); rip_output_process (ifc, from, rip_all_route, packet->version);
} }
@ -2934,7 +2924,7 @@ DEFUN (rip_route,
return CMD_WARNING; return CMD_WARNING;
} }
node->info = (char *)"static"; node->info = (void *)1;
rip_redistribute_add (ZEBRA_ROUTE_RIP, RIP_ROUTE_STATIC, &p, 0, NULL, 0, 0); rip_redistribute_add (ZEBRA_ROUTE_RIP, RIP_ROUTE_STATIC, &p, 0, NULL, 0, 0);
@ -3181,7 +3171,6 @@ rip_distance_unset (struct vty *vty, const char *distance_str,
{ {
int ret; int ret;
struct prefix_ipv4 p; struct prefix_ipv4 p;
u_char distance;
struct route_node *rn; struct route_node *rn;
struct rip_distance *rdistance; struct rip_distance *rdistance;
@ -3192,8 +3181,6 @@ rip_distance_unset (struct vty *vty, const char *distance_str,
return CMD_WARNING; return CMD_WARNING;
} }
distance = atoi (distance_str);
rn = route_node_lookup (rip_distance_table, (struct prefix *)&p); rn = route_node_lookup (rip_distance_table, (struct prefix *)&p);
if (! rn) if (! rn)
{ {