diff options
| author | paul <paul> | 2003-06-08 21:22:18 +0000 |
|---|---|---|
| committer | paul <paul> | 2003-06-08 21:22:18 +0000 |
| commit | 01d0908a17fcaefa9cf4e8379765ed79dba07db5 (patch) | |
| tree | 6762136870bc297dc7486448c5ab6000a3dddaf4 /ripd | |
| parent | 8708b74fd3bb887e81af4eea8beb0e16dd12ad32 (diff) | |
2003-06-08 Paul Jakma <paul@dishone.st>
Compile and warning fixes for the ripd 'passive-interface default' patch.
Diffstat (limited to 'ripd')
| -rw-r--r-- | ripd/rip_interface.c | 2 | ||||
| -rw-r--r-- | ripd/ripd.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index 1aec0f09..e187d8bf 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -1981,7 +1981,7 @@ config_write_rip_network (struct vty *vty, int config_mode) /* RIP passive interface listing. */ if (config_mode) { 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++) if ((ifname = vector_slot (Vrip_passive_nondefault, i)) != NULL) vty_out (vty, " %spassive-interface %s%s", diff --git a/ripd/ripd.c b/ripd/ripd.c index c9289e7a..d2a6b4d4 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -1992,7 +1992,7 @@ rip_output_process (struct interface *ifp, struct prefix *ifaddr, struct connected *c; int num; int rtemax; - int subnetted; + int subnetted = 0; /* Logging output event. */ if (IS_RIP_DEBUG_EVENT) @@ -2061,7 +2061,7 @@ rip_output_process (struct interface *ifp, struct prefix *ifaddr, apply_classful_mask_ipv4 (&ifaddrclass); subnetted = 0; if (ifaddr->prefixlen > ifaddrclass.prefixlen) - subnetted = 1; + subnetted = 1; } 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) 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; } @@ -2288,7 +2288,7 @@ rip_update_interface (struct interface *ifp, u_char version, int route_type) inet_ntoa (to.sin_addr), ifp->name); 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); /* 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); } } |