1 files changed, 102 insertions, 115 deletions

diff --git a/ripngd/ripng_route.c b/ripngd/ripng_route.c
index 8538b07a98..15db7b2939 100644
--- a/ripngd/ripng_route.c
+++ b/ripngd/ripng_route.c
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with GNU Zebra; see the file COPYING.  If not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * 02111-1307, USA.
  */
 
 #include <zebra.h>
@@ -31,151 +31,138 @@
 #include "ripngd/ripngd.h"
 #include "ripngd/ripng_route.h"
 
-static struct ripng_aggregate *
-ripng_aggregate_new (void)
+static struct ripng_aggregate *ripng_aggregate_new(void)
 {
-  struct ripng_aggregate *new;
+	struct ripng_aggregate *new;
 
-  new = XCALLOC (MTYPE_RIPNG_AGGREGATE, sizeof (struct ripng_aggregate));
-  return new;
+	new = XCALLOC(MTYPE_RIPNG_AGGREGATE, sizeof(struct ripng_aggregate));
+	return new;
 }
 
-void
-ripng_aggregate_free (struct ripng_aggregate *aggregate)
+void ripng_aggregate_free(struct ripng_aggregate *aggregate)
 {
-  XFREE (MTYPE_RIPNG_AGGREGATE, aggregate);
+	XFREE(MTYPE_RIPNG_AGGREGATE, aggregate);
 }
 
 /* Aggregate count increment check. */
-void
-ripng_aggregate_increment (struct route_node *child, struct ripng_info *rinfo)
+void ripng_aggregate_increment(struct route_node *child,
+			       struct ripng_info *rinfo)
 {
-  struct route_node *np;
-  struct ripng_aggregate *aggregate;
-
-  for (np = child; np; np = np->parent)
-    if ((aggregate = np->aggregate) != NULL)
-      {
-	aggregate->count++;
-	rinfo->suppress++;
-      }
+	struct route_node *np;
+	struct ripng_aggregate *aggregate;
+
+	for (np = child; np; np = np->parent)
+		if ((aggregate = np->aggregate) != NULL) {
+			aggregate->count++;
+			rinfo->suppress++;
+		}
 }
 
 /* Aggregate count decrement check. */
-void
-ripng_aggregate_decrement (struct route_node *child, struct ripng_info *rinfo)
+void ripng_aggregate_decrement(struct route_node *child,
+			       struct ripng_info *rinfo)
 {
-  struct route_node *np;
-  struct ripng_aggregate *aggregate;
-
-  for (np = child; np; np = np->parent)
-    if ((aggregate = np->aggregate) != NULL)
-      {
-	aggregate->count--;
-	rinfo->suppress--;
-      }
+	struct route_node *np;
+	struct ripng_aggregate *aggregate;
+
+	for (np = child; np; np = np->parent)
+		if ((aggregate = np->aggregate) != NULL) {
+			aggregate->count--;
+			rinfo->suppress--;
+		}
 }
 
 /* Aggregate count decrement check for a list. */
-void
-ripng_aggregate_decrement_list (struct route_node *child, struct list *list)
+void ripng_aggregate_decrement_list(struct route_node *child, struct list *list)
 {
-  struct route_node *np;
-  struct ripng_aggregate *aggregate;
-  struct ripng_info *rinfo = NULL;
-  struct listnode *node = NULL;
+	struct route_node *np;
+	struct ripng_aggregate *aggregate;
+	struct ripng_info *rinfo = NULL;
+	struct listnode *node = NULL;
 
-  for (np = child; np; np = np->parent)
-    if ((aggregate = np->aggregate) != NULL)
-      aggregate->count -= listcount (list);
+	for (np = child; np; np = np->parent)
+		if ((aggregate = np->aggregate) != NULL)
+			aggregate->count -= listcount(list);
 
-  for (ALL_LIST_ELEMENTS_RO (list, node, rinfo))
-    rinfo->suppress--;
+	for (ALL_LIST_ELEMENTS_RO(list, node, rinfo))
+		rinfo->suppress--;
 }
 
 /* RIPng routes treatment. */
-int
-ripng_aggregate_add (struct prefix *p)
+int ripng_aggregate_add(struct prefix *p)
 {
-  struct route_node *top;
-  struct route_node *rp;
-  struct ripng_info *rinfo;
-  struct ripng_aggregate *aggregate;
-  struct ripng_aggregate *sub;
-  struct list *list = NULL;
-  struct listnode *node = NULL;
-
-  /* Get top node for aggregation. */
-  top = route_node_get (ripng->table, p);
-
-  /* Allocate new aggregate. */
-  aggregate = ripng_aggregate_new ();
-  aggregate->metric = 1;
-
-  top->aggregate = aggregate;
-
-  /* Suppress routes match to the aggregate. */
-  for (rp = route_lock_node (top); rp; rp = route_next_until (rp, top))
-    {
-      /* Suppress normal route. */
-      if ((list = rp->info) != NULL)
-        for (ALL_LIST_ELEMENTS_RO (list, node, rinfo))
-          {
-            aggregate->count++;
-            rinfo->suppress++;
-          }
-      /* Suppress aggregate route.  This may not need. */
-      if (rp != top && (sub = rp->aggregate) != NULL)
-	{
-	  aggregate->count++;
-	  sub->suppress++;
+	struct route_node *top;
+	struct route_node *rp;
+	struct ripng_info *rinfo;
+	struct ripng_aggregate *aggregate;
+	struct ripng_aggregate *sub;
+	struct list *list = NULL;
+	struct listnode *node = NULL;
+
+	/* Get top node for aggregation. */
+	top = route_node_get(ripng->table, p);
+
+	/* Allocate new aggregate. */
+	aggregate = ripng_aggregate_new();
+	aggregate->metric = 1;
+
+	top->aggregate = aggregate;
+
+	/* Suppress routes match to the aggregate. */
+	for (rp = route_lock_node(top); rp; rp = route_next_until(rp, top)) {
+		/* Suppress normal route. */
+		if ((list = rp->info) != NULL)
+			for (ALL_LIST_ELEMENTS_RO(list, node, rinfo)) {
+				aggregate->count++;
+				rinfo->suppress++;
+			}
+		/* Suppress aggregate route.  This may not need. */
+		if (rp != top && (sub = rp->aggregate) != NULL) {
+			aggregate->count++;
+			sub->suppress++;
+		}
 	}
-    }
 
-  return 0;
+	return 0;
 }
 
 /* Delete RIPng static route. */
-int
-ripng_aggregate_delete (struct prefix *p)
+int ripng_aggregate_delete(struct prefix *p)
 {
-  struct route_node *top;
-  struct route_node *rp;
-  struct ripng_info *rinfo;
-  struct ripng_aggregate *aggregate;
-  struct ripng_aggregate *sub;
-  struct list *list = NULL;
-  struct listnode *node = NULL;
-
-  /* Get top node for aggregation. */
-  top = route_node_get (ripng->table, p);
-
-  /* Allocate new aggregate. */
-  aggregate = top->aggregate;
-
-  /* Suppress routes match to the aggregate. */
-  for (rp = route_lock_node (top); rp; rp = route_next_until (rp, top))
-    {
-      /* Suppress normal route. */
-      if ((list = rp->info) != NULL)
-        for (ALL_LIST_ELEMENTS_RO (list, node, rinfo))
-          {
-            aggregate->count--;
-            rinfo->suppress--;
-          }
-
-      if (rp != top && (sub = rp->aggregate) != NULL)
-	{
-	  aggregate->count--;
-	  sub->suppress--;
+	struct route_node *top;
+	struct route_node *rp;
+	struct ripng_info *rinfo;
+	struct ripng_aggregate *aggregate;
+	struct ripng_aggregate *sub;
+	struct list *list = NULL;
+	struct listnode *node = NULL;
+
+	/* Get top node for aggregation. */
+	top = route_node_get(ripng->table, p);
+
+	/* Allocate new aggregate. */
+	aggregate = top->aggregate;
+
+	/* Suppress routes match to the aggregate. */
+	for (rp = route_lock_node(top); rp; rp = route_next_until(rp, top)) {
+		/* Suppress normal route. */
+		if ((list = rp->info) != NULL)
+			for (ALL_LIST_ELEMENTS_RO(list, node, rinfo)) {
+				aggregate->count--;
+				rinfo->suppress--;
+			}
+
+		if (rp != top && (sub = rp->aggregate) != NULL) {
+			aggregate->count--;
+			sub->suppress--;
+		}
 	}
-    }
 
-  top->aggregate = NULL;
-  ripng_aggregate_free (aggregate);
+	top->aggregate = NULL;
+	ripng_aggregate_free(aggregate);
 
-  route_unlock_node (top);
-  route_unlock_node (top);
+	route_unlock_node(top);
+	route_unlock_node(top);
 
-  return 0;
+	return 0;
 }