diff options
| author | Chris Hall (GMCH) <chris.hall@highwayman.com> | 2009-12-10 21:42:20 +0000 |
|---|---|---|
| committer | Chris Hall (GMCH) <chris.hall@highwayman.com> | 2009-12-10 21:42:20 +0000 |
| commit | 302c8d2456ca0a09ac1ff8c07dbd9ba569d85c80 (patch) | |
| tree | 6165c4e3f986812545bcbf12952840a314a6d4ac /ripd/rip_interface.c | |
| parent | 224a85d77aea7077ce7aec038d7abe3bb3b049ea (diff) | |
| parent | 122e52d3c6f844aceddf1b3b35885d0feae6650a (diff) | |
| download | quagga-302c8d2456ca0a09ac1ff8c07dbd9ba569d85c80.tar.bz2 quagga-302c8d2456ca0a09ac1ff8c07dbd9ba569d85c80.tar.xz | |
Merge branch 'master' of /git/quagga.euro-ix into pthreads
Diffstat (limited to 'ripd/rip_interface.c')
| -rw-r--r-- | ripd/rip_interface.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index 4f80bf42..d3b55fc0 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -239,6 +239,7 @@ rip_request_interface (struct interface *ifp) } } +#if 0 /* Send RIP request to the neighbor. */ static void rip_request_neighbor (struct in_addr addr) @@ -269,6 +270,7 @@ rip_request_neighbor_all (void) if (rp->info) rip_request_neighbor (rp->p.u.prefix4); } +#endif /* Multicast packet receive socket. */ static int @@ -423,8 +425,9 @@ rip_interface_up (int command, struct zclient *zclient, zebra_size_t length) return 0; if (IS_RIP_DEBUG_ZEBRA) - zlog_debug ("interface %s index %d flags %lld metric %d mtu %d is up", - ifp->name, ifp->ifindex, ifp->flags, ifp->metric, ifp->mtu); + zlog_debug ("interface %s index %d flags %#llx metric %d mtu %d is up", + ifp->name, ifp->ifindex, (unsigned long long) ifp->flags, + ifp->metric, ifp->mtu); /* Check if this interface is RIP enabled or not.*/ rip_enable_apply (ifp); @@ -447,8 +450,9 @@ rip_interface_add (int command, struct zclient *zclient, zebra_size_t length) ifp = zebra_interface_add_read (zclient->ibuf); if (IS_RIP_DEBUG_ZEBRA) - zlog_debug ("interface add %s index %d flags %lld metric %d mtu %d", - ifp->name, ifp->ifindex, ifp->flags, ifp->metric, ifp->mtu); + zlog_debug ("interface add %s index %d flags %#llx metric %d mtu %d", + ifp->name, ifp->ifindex, (unsigned long long) ifp->flags, + ifp->metric, ifp->mtu); /* Check if this interface is RIP enabled or not.*/ rip_enable_apply (ifp); @@ -486,8 +490,9 @@ rip_interface_delete (int command, struct zclient *zclient, rip_if_down(ifp); } - zlog_info("interface delete %s index %d flags %lld metric %d mtu %d", - ifp->name, ifp->ifindex, ifp->flags, ifp->metric, ifp->mtu); + zlog_info("interface delete %s index %d flags %#llx metric %d mtu %d", + ifp->name, ifp->ifindex, (unsigned long long) ifp->flags, + ifp->metric, ifp->mtu); /* To support pseudo interface do not free interface structure. */ /* if_delete(ifp); */ @@ -947,8 +952,6 @@ rip_interface_wakeup (struct thread *t) return 0; } -int rip_redistribute_check (int); - static void rip_connect_set (struct interface *ifp, int set) { |