From 2e3b2e474ed5ba04744b167132a84f9954485af4 Mon Sep 17 00:00:00 2001
From: paul <paul>
Date: Fri, 13 Dec 2002 21:03:13 +0000
Subject: zebra link state detection support

---
 ripd/rip_interface.c | 8 ++++----
 ripd/ripd.c          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'ripd')

diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index 06d4416b..bdfca575 100644
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -248,7 +248,7 @@ rip_request_interface (struct interface *ifp)
     return;
 
   /* If interface is down, don't send RIP packet. */
-  if (! if_is_up (ifp))
+  if (! if_is_operative (ifp))
     return;
 
   /* Fetch RIP interface information. */
@@ -311,7 +311,7 @@ rip_multicast_join (struct interface *ifp, int sock)
 {
   listnode cnode;
 
-  if (if_is_up (ifp) && if_is_multicast (ifp))
+  if (if_is_operative (ifp) && if_is_multicast (ifp))
     {
       if (IS_RIP_DEBUG_EVENT)
 	zlog_info ("multicast join at %s", ifp->name);
@@ -705,7 +705,7 @@ rip_if_down(struct interface *ifp)
 	      {
 		/* All redistributed routes but static and system */
 		if ((rinfo->ifindex == ifp->ifindex) &&
-		    (rinfo->type != ZEBRA_ROUTE_STATIC) &&
+		    /* (rinfo->type != ZEBRA_ROUTE_STATIC) && */
 		    (rinfo->type != ZEBRA_ROUTE_SYSTEM))
 		  rip_redistribute_delete (rinfo->type,rinfo->sub_type,
 					   (struct prefix_ipv4 *)&rp->p,
@@ -1008,7 +1008,7 @@ rip_enable_apply (struct interface *ifp)
   if (if_is_loopback (ifp))
     return;
 
-  if (! if_is_up (ifp))
+  if (! if_is_operative (ifp))
     return;
 
   ri = ifp->info;
diff --git a/ripd/ripd.c b/ripd/ripd.c
index 3c55479d..c63bf104 100644
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -2231,7 +2231,7 @@ rip_update_process (int route_type)
       if (if_is_loopback (ifp))
 	continue;
 
-      if (! if_is_up (ifp))
+      if (! if_is_operative (ifp))
 	continue;
 
       /* Fetch RIP interface information. */
-- 
cgit v1.2.1