commit f85592e05ae6463727433893e61afd1081fcf7e0
author Timo Teräs <timo.teras@iki.fi> Fri May 22 13:41:00 2015 +0300
committer David Lamparter <equinox@opensourcerouting.org> Fri May 29 07:31:01 2015 +0200
tree 2a87863a6f00342334d260a25d02ccda99128a89
parent 483abc037b0ac4b3ed168c4810bb14ea338fa80c

zebra: simplify redistribution code

Merge the conditionals as one to avoid code duplication.

Signed-off-by: Timo Teräs <timo.teras@iki.fi>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

zebra/redistribute.c

diff --git a/zebra/redistribute.c b/zebra/redistribute.c
index 078c2ad..8d5b4ca 100644
--- a/zebra/redistribute.c
+++ b/zebra/redistribute.c
@@ -176,19 +176,8 @@
 
   for (ALL_LIST_ELEMENTS (zebrad.client_list, node, nnode, client))
     {
-      if (is_default (p))
-        {
-          if (client->redist_default || client->redist[rib->type])
-            {
-              if (p->family == AF_INET)
-                zsend_route_multipath (ZEBRA_IPV4_ROUTE_ADD, client, p, rib);
-#ifdef HAVE_IPV6
-              if (p->family == AF_INET6)
-                zsend_route_multipath (ZEBRA_IPV6_ROUTE_ADD, client, p, rib);
-#endif /* HAVE_IPV6 */	  
-	    }
-        }
-      else if (client->redist[rib->type])
+      if ((is_default (p) && client->redist_default)
+          || client->redist[rib->type])
         {
           if (p->family == AF_INET)
             zsend_route_multipath (ZEBRA_IPV4_ROUTE_ADD, client, p, rib);
@@ -212,21 +201,8 @@
 
   for (ALL_LIST_ELEMENTS (zebrad.client_list, node, nnode, client))
     {
-      if (is_default (p))
-	{
-	  if (client->redist_default || client->redist[rib->type])
-	    {
-	      if (p->family == AF_INET)
-		zsend_route_multipath (ZEBRA_IPV4_ROUTE_DELETE, client, p,
-				       rib);
-#ifdef HAVE_IPV6
-	      if (p->family == AF_INET6)
-		zsend_route_multipath (ZEBRA_IPV6_ROUTE_DELETE, client, p,
-				       rib);
-#endif /* HAVE_IPV6 */
-	    }
-	}
-      else if (client->redist[rib->type])
+      if ((is_default (p) && client->redist_default)
+          || client->redist[rib->type])
 	{
 	  if (p->family == AF_INET)
 	    zsend_route_multipath (ZEBRA_IPV4_ROUTE_DELETE, client, p, rib);