matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

2003-06-08 Paul Jakma <paul@dishone.st>

Browse source 
Compile and warning fixes for the ripd 'passive-interface default' patch.
This commit is contained in:
paul 2003-06-08 21:22:18 +00:00
parent 8708b74fd3
commit 01d0908a17
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ripd/rip_interface.c
View file

@ -1981,7 +1981,7 @@ config_write_rip_network (struct vty *vty, int config_mode)
/* RIP passive interface listing. */ /* RIP passive interface listing. */
if (config_mode) { if (config_mode) {
if (passive_default) if (passive_default)
vty_out (vty, " passive-interface default%s", ifname, VTY_NEWLINE); vty_out (vty, " passive-interface default%s", VTY_NEWLINE);
for (i = 0; i < vector_max (Vrip_passive_nondefault); i++) for (i = 0; i < vector_max (Vrip_passive_nondefault); i++)
if ((ifname = vector_slot (Vrip_passive_nondefault, i)) != NULL) if ((ifname = vector_slot (Vrip_passive_nondefault, i)) != NULL)
vty_out (vty, " %spassive-interface %s%s", vty_out (vty, " %spassive-interface %s%s",

10
ripd/ripd.c
View file

@ -1992,7 +1992,7 @@ rip_output_process (struct interface *ifp, struct prefix *ifaddr,
struct connected *c; struct connected *c;
int num; int num;
int rtemax; int rtemax;
int subnetted; int subnetted = 0;
/* Logging output event. */ /* Logging output event. */
if (IS_RIP_DEBUG_EVENT) if (IS_RIP_DEBUG_EVENT)
@ -2061,7 +2061,7 @@ rip_output_process (struct interface *ifp, struct prefix *ifaddr,
apply_classful_mask_ipv4 (&ifaddrclass); apply_classful_mask_ipv4 (&ifaddrclass);
subnetted = 0; subnetted = 0;
if (ifaddr->prefixlen > ifaddrclass.prefixlen) if (ifaddr->prefixlen > ifaddrclass.prefixlen)
subnetted = 1; subnetted = 1;
} }
for (rp = route_top (rip->table); rp; rp = route_next (rp)) for (rp = route_top (rip->table); rp; rp = route_next (rp))
@ -2260,7 +2260,7 @@ rip_update_interface (struct interface *ifp, u_char version, int route_type)
if (IS_RIP_DEBUG_EVENT) if (IS_RIP_DEBUG_EVENT)
zlog_info ("multicast announce on %s ", ifp->name); zlog_info ("multicast announce on %s ", ifp->name);
rip_output_process (ifp, NULL, NULL, route_type, version); rip_output_process (ifp, NULL, NULL, route_type, rip->version_send);
return; return;
} }
@ -2288,7 +2288,7 @@ rip_update_interface (struct interface *ifp, u_char version, int route_type)
inet_ntoa (to.sin_addr), ifp->name); inet_ntoa (to.sin_addr), ifp->name);
rip_output_process (ifp, connected->address, &to, route_type, rip_output_process (ifp, connected->address, &to, route_type,
version_send); rip->version_send);
} }
} }
} }
@ -2369,7 +2369,7 @@ rip_update_process (int route_type)
to.sin_port = htons (RIP_PORT_DEFAULT); to.sin_port = htons (RIP_PORT_DEFAULT);
/* RIP version is rip's configuration. */ /* RIP version is rip's configuration. */
rip_output_process (ifp, NULL, &to, route_type, rip->version); rip_output_process (ifp, NULL, &to, route_type, rip->version_send);
} }
} }