summaryrefslogtreecommitdiff
path: root/ripd
diff options
context:
space:
mode:
Diffstat (limited to 'ripd')
-rw-r--r--ripd/rip_interface.c2
-rw-r--r--ripd/rip_snmp.c14
2 files changed, 10 insertions, 6 deletions
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index b6d9240f..7c5577b4 100644
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -591,7 +591,7 @@ rip_if_down(struct interface *ifp)
{
rip_zebra_ipv4_delete ((struct prefix_ipv4 *) &rp->p,
&rinfo->nexthop,
- rinfo->ifindex);
+ rinfo->metric);
rip_redistribute_delete (rinfo->type,rinfo->sub_type,
(struct prefix_ipv4 *)&rp->p,
diff --git a/ripd/rip_snmp.c b/ripd/rip_snmp.c
index d02c7610..61c47c71 100644
--- a/ripd/rip_snmp.c
+++ b/ripd/rip_snmp.c
@@ -93,10 +93,14 @@ oid rip_oid [] = { RIPV2MIB };
struct route_table *rip_ifaddr_table;
/* Hook functions. */
-static u_char *rip2Globals ();
-static u_char *rip2IfStatEntry ();
-static u_char *rip2IfConfAddress ();
-static u_char *rip2PeerTable ();
+static u_char *rip2Globals (struct variable *, oid [], size_t *,
+ int, size_t *, WriteMethod **);
+static u_char *rip2IfStatEntry (struct variable *, oid [], size_t *,
+ int, size_t *, WriteMethod **);
+static u_char *rip2IfConfAddress (struct variable *, oid [], size_t *,
+ int, size_t *, WriteMethod **);
+static u_char *rip2PeerTable (struct variable *, oid [], size_t *,
+ int, size_t *, WriteMethod **);
struct variable rip_variables[] =
{
@@ -215,7 +219,7 @@ rip_ifaddr_delete (struct interface *ifp, struct connected *ifc)
}
}
-struct interface *
+static struct interface *
rip_ifaddr_lookup_next (struct in_addr *addr)
{
struct prefix_ipv4 p;