From 995b96515b7075fec77ab51dfe8be7788abd838d Mon Sep 17 00:00:00 2001
From: Paul Jakma <paul.jakma@sun.com>
Date: Thu, 11 May 2006 13:20:47 +0000
Subject: [ripngd] CID #72, remove unneeded NULL check
2006-05-11 Paul Jakma <paul.jakma@sun.com>
* ripng_interface.c: (ripng_interface_address_add) Remove
unneeded NULL check, Coverity CID #72.
---
ripngd/ChangeLog | 5 +++++
ripngd/ripng_interface.c | 20 +++++++++-----------
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/ripngd/ChangeLog b/ripngd/ChangeLog
index ff284f1f..1bafb84a 100644
--- a/ripngd/ChangeLog
+++ b/ripngd/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-11 Paul Jakma <paul.jakma@sun.com>
+
+ * ripng_interface.c: (ripng_interface_address_add) Remove
+ unneeded NULL check, Coverity CID #72.
+
2006-05-08 Paul Jakma <paul.jakma@sun.com>
* ripng_routemap.c: (route_set_ipv6_nexthop_local_compile) bug
diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c
index 52a1fe24..140e3bef 100644
--- a/ripngd/ripng_interface.c
+++ b/ripngd/ripng_interface.c
@@ -435,6 +435,8 @@ ripng_interface_address_add (int command, struct zclient *zclient,
if (p->family == AF_INET6)
{
+ struct ripng_interface *ri = c->ifp->info;
+
if (IS_RIPNG_DEBUG_ZEBRA)
zlog_debug ("RIPng connected address %s/%d add",
inet6_ntoa(p->u.prefix6),
@@ -444,19 +446,15 @@ ripng_interface_address_add (int command, struct zclient *zclient,
ripng_apply_address_add(c);
/* Let's try once again whether the interface could be activated */
- if (c->ifp) {
- struct ripng_interface *ri = c->ifp->info;
-
- if (!ri->running) {
- /* Check if this interface is RIP enabled or not.*/
- ripng_enable_apply (c->ifp);
+ if (!ri->running) {
+ /* Check if this interface is RIP enabled or not.*/
+ ripng_enable_apply (c->ifp);
- /* Apply distribute list to the interface. */
- ripng_distribute_update_interface (c->ifp);
+ /* Apply distribute list to the interface. */
+ ripng_distribute_update_interface (c->ifp);
- /* Check interface routemap. */
- ripng_if_rmap_update_interface (c->ifp);
- }
+ /* Check interface routemap. */
+ ripng_if_rmap_update_interface (c->ifp);
}
}
--
cgit v1.2.1