*: reindentreindent-3.0-after

indent.py `git ls-files | pcregrep '\.[ch]$' | pcregrep -v '^(ldpd|babeld|nhrpd)/'`

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

1 files changed, 379 insertions, 384 deletions

diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c
index 964af81d1..93c30f8d3 100644
--- a/ripngd/ripng_zebra.c
+++ b/ripngd/ripng_zebra.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>
@@ -38,270 +38,261 @@
 struct zclient *zclient = NULL;
 
 /* Send ECMP routes to zebra. */
-static void
-ripng_zebra_ipv6_send (struct route_node *rp, u_char cmd)
+static void ripng_zebra_ipv6_send(struct route_node *rp, u_char cmd)
 {
-  static struct in6_addr **nexthops = NULL;
-  static ifindex_t *ifindexes = NULL;
-  static unsigned int nexthops_len = 0;
-
-  struct list *list = (struct list *)rp->info;
-  struct zapi_ipv6 api;
-  struct listnode *listnode = NULL;
-  struct ripng_info *rinfo = NULL;
-  int count = 0;
-
-  if (vrf_bitmap_check (zclient->redist[AFI_IP6][ZEBRA_ROUTE_RIPNG], VRF_DEFAULT))
-    {
-      api.vrf_id = VRF_DEFAULT;
-      api.type = ZEBRA_ROUTE_RIPNG;
-      api.instance = 0;
-      api.flags = 0;
-      api.message = 0;
-      api.safi = SAFI_UNICAST;
-
-      if (nexthops_len < listcount (list))
-        {
-          nexthops_len = listcount (list);
-          nexthops = XREALLOC (MTYPE_TMP, nexthops,
-                               nexthops_len * sizeof (struct in6_addr *));
-          ifindexes = XREALLOC (MTYPE_TMP, ifindexes,
-                                nexthops_len * sizeof (unsigned int));
-        }
-
-      SET_FLAG (api.message, ZAPI_MESSAGE_NEXTHOP);
-      SET_FLAG (api.message, ZAPI_MESSAGE_IFINDEX);
-      for (ALL_LIST_ELEMENTS_RO (list, listnode, rinfo))
-        {
-          nexthops[count] = &rinfo->nexthop;
-          ifindexes[count] = rinfo->ifindex;
-          count++;
-          if (cmd == ZEBRA_IPV6_ROUTE_ADD)
-            SET_FLAG (rinfo->flags, RIPNG_RTF_FIB);
-          else
-            UNSET_FLAG (rinfo->flags, RIPNG_RTF_FIB);
-        }
-
-      api.nexthop = nexthops;
-      api.nexthop_num = count;
-      api.ifindex = ifindexes;
-      api.ifindex_num = count;
-
-      rinfo = listgetdata (listhead (list));
-
-      SET_FLAG (api.message, ZAPI_MESSAGE_METRIC);
-      api.metric = rinfo->metric;
-
-      if (rinfo->tag)
-        {
-          SET_FLAG (api.message, ZAPI_MESSAGE_TAG);
-          api.tag = rinfo->tag;
-        }
-
-      zapi_ipv6_route (cmd, zclient,
-                       (struct prefix_ipv6 *)&rp->p, NULL, &api);
-
-      if (IS_RIPNG_DEBUG_ZEBRA)
-        {
-          if (ripng->ecmp)
-            zlog_debug ("%s: %s/%d nexthops %d",
-                        (cmd == ZEBRA_IPV6_ROUTE_ADD) ? \
-                            "Install into zebra" : "Delete from zebra",
-                        inet6_ntoa (rp->p.u.prefix6), rp->p.prefixlen, count);
-          else
-            zlog_debug ("%s: %s/%d",
-                        (cmd == ZEBRA_IPV6_ROUTE_ADD) ? \
-                            "Install into zebra" : "Delete from zebra",
-                        inet6_ntoa (rp->p.u.prefix6), rp->p.prefixlen);
-        }
-    }
+	static struct in6_addr **nexthops = NULL;
+	static ifindex_t *ifindexes = NULL;
+	static unsigned int nexthops_len = 0;
+
+	struct list *list = (struct list *)rp->info;
+	struct zapi_ipv6 api;
+	struct listnode *listnode = NULL;
+	struct ripng_info *rinfo = NULL;
+	int count = 0;
+
+	if (vrf_bitmap_check(zclient->redist[AFI_IP6][ZEBRA_ROUTE_RIPNG],
+			     VRF_DEFAULT)) {
+		api.vrf_id = VRF_DEFAULT;
+		api.type = ZEBRA_ROUTE_RIPNG;
+		api.instance = 0;
+		api.flags = 0;
+		api.message = 0;
+		api.safi = SAFI_UNICAST;
+
+		if (nexthops_len < listcount(list)) {
+			nexthops_len = listcount(list);
+			nexthops = XREALLOC(
+				MTYPE_TMP, nexthops,
+				nexthops_len * sizeof(struct in6_addr *));
+			ifindexes =
+				XREALLOC(MTYPE_TMP, ifindexes,
+					 nexthops_len * sizeof(unsigned int));
+		}
+
+		SET_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP);
+		SET_FLAG(api.message, ZAPI_MESSAGE_IFINDEX);
+		for (ALL_LIST_ELEMENTS_RO(list, listnode, rinfo)) {
+			nexthops[count] = &rinfo->nexthop;
+			ifindexes[count] = rinfo->ifindex;
+			count++;
+			if (cmd == ZEBRA_IPV6_ROUTE_ADD)
+				SET_FLAG(rinfo->flags, RIPNG_RTF_FIB);
+			else
+				UNSET_FLAG(rinfo->flags, RIPNG_RTF_FIB);
+		}
+
+		api.nexthop = nexthops;
+		api.nexthop_num = count;
+		api.ifindex = ifindexes;
+		api.ifindex_num = count;
+
+		rinfo = listgetdata(listhead(list));
+
+		SET_FLAG(api.message, ZAPI_MESSAGE_METRIC);
+		api.metric = rinfo->metric;
+
+		if (rinfo->tag) {
+			SET_FLAG(api.message, ZAPI_MESSAGE_TAG);
+			api.tag = rinfo->tag;
+		}
+
+		zapi_ipv6_route(cmd, zclient, (struct prefix_ipv6 *)&rp->p,
+				NULL, &api);
+
+		if (IS_RIPNG_DEBUG_ZEBRA) {
+			if (ripng->ecmp)
+				zlog_debug("%s: %s/%d nexthops %d",
+					   (cmd == ZEBRA_IPV6_ROUTE_ADD)
+						   ? "Install into zebra"
+						   : "Delete from zebra",
+					   inet6_ntoa(rp->p.u.prefix6),
+					   rp->p.prefixlen, count);
+			else
+				zlog_debug("%s: %s/%d",
+					   (cmd == ZEBRA_IPV6_ROUTE_ADD)
+						   ? "Install into zebra"
+						   : "Delete from zebra",
+					   inet6_ntoa(rp->p.u.prefix6),
+					   rp->p.prefixlen);
+		}
+	}
 }
 
 /* Add/update ECMP routes to zebra. */
-void
-ripng_zebra_ipv6_add (struct route_node *rp)
+void ripng_zebra_ipv6_add(struct route_node *rp)
 {
-  ripng_zebra_ipv6_send (rp, ZEBRA_IPV6_ROUTE_ADD);
+	ripng_zebra_ipv6_send(rp, ZEBRA_IPV6_ROUTE_ADD);
 }
 
 /* Delete ECMP routes from zebra. */
-void
-ripng_zebra_ipv6_delete (struct route_node *rp)
+void ripng_zebra_ipv6_delete(struct route_node *rp)
 {
-  ripng_zebra_ipv6_send (rp, ZEBRA_IPV6_ROUTE_DELETE);
+	ripng_zebra_ipv6_send(rp, ZEBRA_IPV6_ROUTE_DELETE);
 }
 
 /* Zebra route add and delete treatment. */
-static int
-ripng_zebra_read_ipv6 (int command, struct zclient *zclient,
-		       zebra_size_t length, vrf_id_t vrf_id)
+static int ripng_zebra_read_ipv6(int command, struct zclient *zclient,
+				 zebra_size_t length, vrf_id_t vrf_id)
 {
-  struct stream *s;
-  struct zapi_ipv6 api;
-  unsigned long ifindex;
-  struct in6_addr nexthop;
-  struct prefix_ipv6 p, src_p;
-
-  s = zclient->ibuf;
-  ifindex = 0;
-  memset (&nexthop, 0, sizeof (struct in6_addr));
-
-  /* Type, flags, message. */
-  api.type = stream_getc (s);
-  api.instance = stream_getw (s);
-  api.flags = stream_getl (s);
-  api.message = stream_getc (s);
-
-  /* IPv6 prefix. */
-  memset (&p, 0, sizeof (struct prefix_ipv6));
-  p.family = AF_INET6;
-  p.prefixlen = MIN(IPV6_MAX_PREFIXLEN, stream_getc (s));
-  stream_get (&p.prefix, s, PSIZE (p.prefixlen));
-
-  memset (&src_p, 0, sizeof (struct prefix_ipv6));
-  src_p.family = AF_INET6;
-  if (CHECK_FLAG (api.message, ZAPI_MESSAGE_SRCPFX))
-    {
-      src_p.prefixlen = stream_getc (s);
-      stream_get (&src_p.prefix, s, PSIZE (src_p.prefixlen));
-    }
-
-  if (src_p.prefixlen)
-    /* we completely ignore srcdest routes for now. */
-    return 0;
-
-  /* Nexthop, ifindex, distance, metric. */
-  if (CHECK_FLAG (api.message, ZAPI_MESSAGE_NEXTHOP))
-    {
-      api.nexthop_num = stream_getc (s);
-      stream_get (&nexthop, s, 16);
-    }
-  if (CHECK_FLAG (api.message, ZAPI_MESSAGE_IFINDEX))
-    {
-      api.ifindex_num = stream_getc (s);
-      ifindex = stream_getl (s);
-    }
-  if (CHECK_FLAG (api.message, ZAPI_MESSAGE_DISTANCE))
-    api.distance = stream_getc (s);
-  else
-    api.distance = 0;
-  if (CHECK_FLAG (api.message, ZAPI_MESSAGE_METRIC))
-    api.metric = stream_getl (s);
-  else
-    api.metric = 0;
-
-  if (CHECK_FLAG (api.message, ZAPI_MESSAGE_TAG))
-    api.tag = stream_getl (s);
-  else
-    api.tag = 0;
-
-  if (command == ZEBRA_REDISTRIBUTE_IPV6_ADD)
-    ripng_redistribute_add (api.type, RIPNG_ROUTE_REDISTRIBUTE, &p, ifindex, &nexthop, api.tag);
-  else
-    ripng_redistribute_delete (api.type, RIPNG_ROUTE_REDISTRIBUTE, &p, ifindex);
-
-  return 0;
+	struct stream *s;
+	struct zapi_ipv6 api;
+	unsigned long ifindex;
+	struct in6_addr nexthop;
+	struct prefix_ipv6 p, src_p;
+
+	s = zclient->ibuf;
+	ifindex = 0;
+	memset(&nexthop, 0, sizeof(struct in6_addr));
+
+	/* Type, flags, message. */
+	api.type = stream_getc(s);
+	api.instance = stream_getw(s);
+	api.flags = stream_getl(s);
+	api.message = stream_getc(s);
+
+	/* IPv6 prefix. */
+	memset(&p, 0, sizeof(struct prefix_ipv6));
+	p.family = AF_INET6;
+	p.prefixlen = MIN(IPV6_MAX_PREFIXLEN, stream_getc(s));
+	stream_get(&p.prefix, s, PSIZE(p.prefixlen));
+
+	memset(&src_p, 0, sizeof(struct prefix_ipv6));
+	src_p.family = AF_INET6;
+	if (CHECK_FLAG(api.message, ZAPI_MESSAGE_SRCPFX)) {
+		src_p.prefixlen = stream_getc(s);
+		stream_get(&src_p.prefix, s, PSIZE(src_p.prefixlen));
+	}
+
+	if (src_p.prefixlen)
+		/* we completely ignore srcdest routes for now. */
+		return 0;
+
+	/* Nexthop, ifindex, distance, metric. */
+	if (CHECK_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP)) {
+		api.nexthop_num = stream_getc(s);
+		stream_get(&nexthop, s, 16);
+	}
+	if (CHECK_FLAG(api.message, ZAPI_MESSAGE_IFINDEX)) {
+		api.ifindex_num = stream_getc(s);
+		ifindex = stream_getl(s);
+	}
+	if (CHECK_FLAG(api.message, ZAPI_MESSAGE_DISTANCE))
+		api.distance = stream_getc(s);
+	else
+		api.distance = 0;
+	if (CHECK_FLAG(api.message, ZAPI_MESSAGE_METRIC))
+		api.metric = stream_getl(s);
+	else
+		api.metric = 0;
+
+	if (CHECK_FLAG(api.message, ZAPI_MESSAGE_TAG))
+		api.tag = stream_getl(s);
+	else
+		api.tag = 0;
+
+	if (command == ZEBRA_REDISTRIBUTE_IPV6_ADD)
+		ripng_redistribute_add(api.type, RIPNG_ROUTE_REDISTRIBUTE, &p,
+				       ifindex, &nexthop, api.tag);
+	else
+		ripng_redistribute_delete(api.type, RIPNG_ROUTE_REDISTRIBUTE,
+					  &p, ifindex);
+
+	return 0;
 }
 
-void
-ripng_zclient_reset (void)
+void ripng_zclient_reset(void)
 {
-  zclient_reset (zclient);
+	zclient_reset(zclient);
 }
 
-static int
-ripng_redistribute_unset (int type)
+static int ripng_redistribute_unset(int type)
 {
 
-  if (! vrf_bitmap_check (zclient->redist[AFI_IP6][type], VRF_DEFAULT))
-    return CMD_SUCCESS;
+	if (!vrf_bitmap_check(zclient->redist[AFI_IP6][type], VRF_DEFAULT))
+		return CMD_SUCCESS;
 
-  vrf_bitmap_set (zclient->redist[AFI_IP6][type], VRF_DEFAULT);
+	vrf_bitmap_set(zclient->redist[AFI_IP6][type], VRF_DEFAULT);
 
-  if (zclient->sock > 0)
-    zebra_redistribute_send (ZEBRA_REDISTRIBUTE_DELETE, zclient, AFI_IP6, type, 0, VRF_DEFAULT);
+	if (zclient->sock > 0)
+		zebra_redistribute_send(ZEBRA_REDISTRIBUTE_DELETE, zclient,
+					AFI_IP6, type, 0, VRF_DEFAULT);
 
-  ripng_redistribute_withdraw (type);
-  
-  return CMD_SUCCESS;
+	ripng_redistribute_withdraw(type);
+
+	return CMD_SUCCESS;
 }
 
-int
-ripng_redistribute_check (int type)
+int ripng_redistribute_check(int type)
 {
-  return vrf_bitmap_check (zclient->redist[AFI_IP6][type], VRF_DEFAULT);
+	return vrf_bitmap_check(zclient->redist[AFI_IP6][type], VRF_DEFAULT);
 }
 
-static void
-ripng_redistribute_metric_set (int type, int metric)
+static void ripng_redistribute_metric_set(int type, int metric)
 {
-  ripng->route_map[type].metric_config = 1;
-  ripng->route_map[type].metric = metric;
+	ripng->route_map[type].metric_config = 1;
+	ripng->route_map[type].metric = metric;
 }
 
-static int
-ripng_redistribute_metric_unset (int type)
+static int ripng_redistribute_metric_unset(int type)
 {
-  ripng->route_map[type].metric_config = 0;
-  ripng->route_map[type].metric = 0;
-  return 0;
+	ripng->route_map[type].metric_config = 0;
+	ripng->route_map[type].metric = 0;
+	return 0;
 }
 
-static void
-ripng_redistribute_routemap_set (int type, const char *name)
+static void ripng_redistribute_routemap_set(int type, const char *name)
 {
-  if (ripng->route_map[type].name)
-    free (ripng->route_map[type].name);
+	if (ripng->route_map[type].name)
+		free(ripng->route_map[type].name);
 
-  ripng->route_map[type].name = strdup (name);
-  ripng->route_map[type].map = route_map_lookup_by_name (name);
+	ripng->route_map[type].name = strdup(name);
+	ripng->route_map[type].map = route_map_lookup_by_name(name);
 }
 
-static void
-ripng_redistribute_routemap_unset (int type)
+static void ripng_redistribute_routemap_unset(int type)
 {
-  if (ripng->route_map[type].name)
-    free (ripng->route_map[type].name);
+	if (ripng->route_map[type].name)
+		free(ripng->route_map[type].name);
 
-  ripng->route_map[type].name = NULL;
-  ripng->route_map[type].map = NULL;
+	ripng->route_map[type].name = NULL;
+	ripng->route_map[type].map = NULL;
 }
 
 /* Redistribution types */
 static struct {
-  int type;
-  int str_min_len;
-  const char *str;
-} redist_type[] = {
-  {ZEBRA_ROUTE_KERNEL,  1, "kernel"},
-  {ZEBRA_ROUTE_CONNECT, 1, "connected"},
-  {ZEBRA_ROUTE_STATIC,  1, "static"},
-  {ZEBRA_ROUTE_OSPF6,   1, "ospf6"},
-  {ZEBRA_ROUTE_BGP,     2, "bgp"},
-  {ZEBRA_ROUTE_VNC,     1, "vnc"},
-  {0, 0, NULL}
-};
-
-void
-ripng_redistribute_clean ()
+	int type;
+	int str_min_len;
+	const char *str;
+} redist_type[] = {{ZEBRA_ROUTE_KERNEL, 1, "kernel"},
+		   {ZEBRA_ROUTE_CONNECT, 1, "connected"},
+		   {ZEBRA_ROUTE_STATIC, 1, "static"},
+		   {ZEBRA_ROUTE_OSPF6, 1, "ospf6"},
+		   {ZEBRA_ROUTE_BGP, 2, "bgp"},
+		   {ZEBRA_ROUTE_VNC, 1, "vnc"},
+		   {0, 0, NULL}};
+
+void ripng_redistribute_clean()
 {
-  int i;
-
-  for (i = 0; redist_type[i].str; i++)
-    {
-      if (vrf_bitmap_check (zclient->redist[AFI_IP6][redist_type[i].type], VRF_DEFAULT))
-        {
-          if (zclient->sock > 0)
-            zebra_redistribute_send (ZEBRA_REDISTRIBUTE_DELETE,
-                                     zclient, AFI_IP6, redist_type[i].type, 0,
-                                     VRF_DEFAULT);
-
-          vrf_bitmap_unset (zclient->redist[AFI_IP6][redist_type[i].type], VRF_DEFAULT);
-
-          /* Remove the routes from RIPng table. */
-          ripng_redistribute_withdraw (redist_type[i].type);
-        }
-    }
+	int i;
+
+	for (i = 0; redist_type[i].str; i++) {
+		if (vrf_bitmap_check(
+			    zclient->redist[AFI_IP6][redist_type[i].type],
+			    VRF_DEFAULT)) {
+			if (zclient->sock > 0)
+				zebra_redistribute_send(
+					ZEBRA_REDISTRIBUTE_DELETE, zclient,
+					AFI_IP6, redist_type[i].type, 0,
+					VRF_DEFAULT);
+
+			vrf_bitmap_unset(
+				zclient->redist[AFI_IP6][redist_type[i].type],
+				VRF_DEFAULT);
+
+			/* Remove the routes from RIPng table. */
+			ripng_redistribute_withdraw(redist_type[i].type);
+		}
+	}
 }
 
 DEFUN (ripng_redistribute_ripng,
@@ -310,8 +301,9 @@ DEFUN (ripng_redistribute_ripng,
        "Redistribute information from another routing protocol\n"
        "RIPng route\n")
 {
-  vrf_bitmap_set (zclient->redist[AFI_IP6][ZEBRA_ROUTE_RIPNG], VRF_DEFAULT);
-  return CMD_SUCCESS;
+	vrf_bitmap_set(zclient->redist[AFI_IP6][ZEBRA_ROUTE_RIPNG],
+		       VRF_DEFAULT);
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_ripng_redistribute_ripng,
@@ -321,8 +313,9 @@ DEFUN (no_ripng_redistribute_ripng,
        "Redistribute information from another routing protocol\n"
        "RIPng route\n")
 {
-  vrf_bitmap_unset (zclient->redist[AFI_IP6][ZEBRA_ROUTE_RIPNG], VRF_DEFAULT);
-  return CMD_SUCCESS;
+	vrf_bitmap_unset(zclient->redist[AFI_IP6][ZEBRA_ROUTE_RIPNG],
+			 VRF_DEFAULT);
+	return CMD_SUCCESS;
 }
 
 DEFUN (ripng_redistribute_type,
@@ -331,19 +324,19 @@ DEFUN (ripng_redistribute_type,
        "Redistribute\n"
        FRR_REDIST_HELP_STR_RIPNGD)
 {
-  int type;
+	int type;
 
-  char *proto = argv[argc - 1]->text;
-  type = proto_redistnum(AFI_IP6, proto);
+	char *proto = argv[argc - 1]->text;
+	type = proto_redistnum(AFI_IP6, proto);
 
-  if (type < 0)
-    {
-      vty_out(vty, "Invalid type %s%s", proto, VTY_NEWLINE);
-      return CMD_WARNING;
-    }
+	if (type < 0) {
+		vty_out(vty, "Invalid type %s%s", proto, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
 
-  zclient_redistribute (ZEBRA_REDISTRIBUTE_ADD, zclient, AFI_IP6, type, 0, VRF_DEFAULT);
-  return CMD_SUCCESS;
+	zclient_redistribute(ZEBRA_REDISTRIBUTE_ADD, zclient, AFI_IP6, type, 0,
+			     VRF_DEFAULT);
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_ripng_redistribute_type,
@@ -357,20 +350,19 @@ DEFUN (no_ripng_redistribute_type,
        "Route map reference\n"
        "Pointer to route-map entries\n")
 {
-  int type;
+	int type;
 
-  char *proto = argv[2]->text;
-  type = proto_redistnum(AFI_IP6, proto);
+	char *proto = argv[2]->text;
+	type = proto_redistnum(AFI_IP6, proto);
 
-  if (type < 0)
-    {
-      vty_out(vty, "Invalid type %s%s", proto, VTY_NEWLINE);
-      return CMD_WARNING;
-    }
+	if (type < 0) {
+		vty_out(vty, "Invalid type %s%s", proto, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
 
-  ripng_redistribute_metric_unset (type);
-  ripng_redistribute_routemap_unset (type);
-  return ripng_redistribute_unset (type);
+	ripng_redistribute_metric_unset(type);
+	ripng_redistribute_routemap_unset(type);
+	return ripng_redistribute_unset(type);
 }
 
 
@@ -382,24 +374,24 @@ DEFUN (ripng_redistribute_type_metric,
        "Metric\n"
        "Metric value\n")
 {
-  int idx_protocol = 1;
-  int idx_number = 3;
-  int type;
-  int metric;
-
-  metric = atoi (argv[idx_number]->arg);
-  type = proto_redistnum(AFI_IP6, argv[idx_protocol]->text);
-
-  if (type < 0)
-    {
-      vty_out(vty, "Invalid type %s%s", argv[idx_protocol]->text, VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  ripng_redistribute_metric_set (type, metric);
-  zclient_redistribute (ZEBRA_REDISTRIBUTE_ADD, zclient, AFI_IP6, type, 0,
-                        VRF_DEFAULT);
-  return CMD_SUCCESS;
+	int idx_protocol = 1;
+	int idx_number = 3;
+	int type;
+	int metric;
+
+	metric = atoi(argv[idx_number]->arg);
+	type = proto_redistnum(AFI_IP6, argv[idx_protocol]->text);
+
+	if (type < 0) {
+		vty_out(vty, "Invalid type %s%s", argv[idx_protocol]->text,
+			VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	ripng_redistribute_metric_set(type, metric);
+	zclient_redistribute(ZEBRA_REDISTRIBUTE_ADD, zclient, AFI_IP6, type, 0,
+			     VRF_DEFAULT);
+	return CMD_SUCCESS;
 }
 
 DEFUN (ripng_redistribute_type_routemap,
@@ -410,22 +402,22 @@ DEFUN (ripng_redistribute_type_routemap,
        "Route map reference\n"
        "Pointer to route-map entries\n")
 {
-  int idx_protocol = 1;
-  int idx_word = 3;
-  int type;
-
-  type = proto_redistnum(AFI_IP6, argv[idx_protocol]->text);
-
-  if (type < 0)
-    {
-      vty_out(vty, "Invalid type %s%s", argv[idx_protocol]->text, VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  ripng_redistribute_routemap_set (type, argv[idx_word]->text);
-  zclient_redistribute (ZEBRA_REDISTRIBUTE_ADD, zclient, AFI_IP6, type, 0,
-                        VRF_DEFAULT);
- return CMD_SUCCESS;
+	int idx_protocol = 1;
+	int idx_word = 3;
+	int type;
+
+	type = proto_redistnum(AFI_IP6, argv[idx_protocol]->text);
+
+	if (type < 0) {
+		vty_out(vty, "Invalid type %s%s", argv[idx_protocol]->text,
+			VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	ripng_redistribute_routemap_set(type, argv[idx_word]->text);
+	zclient_redistribute(ZEBRA_REDISTRIBUTE_ADD, zclient, AFI_IP6, type, 0,
+			     VRF_DEFAULT);
+	return CMD_SUCCESS;
 }
 
 DEFUN (ripng_redistribute_type_metric_routemap,
@@ -438,126 +430,129 @@ DEFUN (ripng_redistribute_type_metric_routemap,
        "Route map reference\n"
        "Pointer to route-map entries\n")
 {
-  int idx_protocol = 1;
-  int idx_number = 3;
-  int idx_word = 5;
-  int type;
-  int metric;
-
-  type = proto_redistnum(AFI_IP6, argv[idx_protocol]->text);
-  metric = atoi (argv[idx_number]->arg);
-
-  if (type < 0)
-    {
-      vty_out(vty, "Invalid type %s%s", argv[idx_protocol]->text, VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  ripng_redistribute_metric_set (type, metric);
-  ripng_redistribute_routemap_set (type, argv[idx_word]->text);
-  zclient_redistribute (ZEBRA_REDISTRIBUTE_ADD, zclient, AFI_IP6, type, 0, VRF_DEFAULT);
-  return CMD_SUCCESS;
-}
+	int idx_protocol = 1;
+	int idx_number = 3;
+	int idx_word = 5;
+	int type;
+	int metric;
 
-void
-ripng_redistribute_write (struct vty *vty, int config_mode)
-{
-  int i;
-
-  for (i = 0; i < ZEBRA_ROUTE_MAX; i++)
-    if (i != zclient->redist_default &&
-        vrf_bitmap_check (zclient->redist[AFI_IP6][i], VRF_DEFAULT))
-      {
-      if (config_mode)
-	{
-	  if (ripng->route_map[i].metric_config)
-	    {
-	      if (ripng->route_map[i].name)
-		vty_out (vty, " redistribute %s metric %d route-map %s%s",
-			 zebra_route_string(i), ripng->route_map[i].metric,
-			ripng->route_map[i].name, VTY_NEWLINE);
-	      else
-		vty_out (vty, " redistribute %s metric %d%s",
-			zebra_route_string(i), ripng->route_map[i].metric,
+	type = proto_redistnum(AFI_IP6, argv[idx_protocol]->text);
+	metric = atoi(argv[idx_number]->arg);
+
+	if (type < 0) {
+		vty_out(vty, "Invalid type %s%s", argv[idx_protocol]->text,
 			VTY_NEWLINE);
-	    }
-	  else
-	    {
-	      if (ripng->route_map[i].name)
-		vty_out (vty, " redistribute %s route-map %s%s",
-			 zebra_route_string(i), ripng->route_map[i].name,
-			 VTY_NEWLINE);
-	      else
-		vty_out (vty, " redistribute %s%s", zebra_route_string(i),
-			 VTY_NEWLINE);
-	    }
+		return CMD_WARNING;
 	}
-      else
-	vty_out (vty, "    %s", zebra_route_string(i));
-      }
+
+	ripng_redistribute_metric_set(type, metric);
+	ripng_redistribute_routemap_set(type, argv[idx_word]->text);
+	zclient_redistribute(ZEBRA_REDISTRIBUTE_ADD, zclient, AFI_IP6, type, 0,
+			     VRF_DEFAULT);
+	return CMD_SUCCESS;
+}
+
+void ripng_redistribute_write(struct vty *vty, int config_mode)
+{
+	int i;
+
+	for (i = 0; i < ZEBRA_ROUTE_MAX; i++)
+		if (i != zclient->redist_default
+		    && vrf_bitmap_check(zclient->redist[AFI_IP6][i],
+					VRF_DEFAULT)) {
+			if (config_mode) {
+				if (ripng->route_map[i].metric_config) {
+					if (ripng->route_map[i].name)
+						vty_out(vty,
+							" redistribute %s metric %d route-map %s%s",
+							zebra_route_string(i),
+							ripng->route_map[i]
+								.metric,
+							ripng->route_map[i]
+								.name,
+							VTY_NEWLINE);
+					else
+						vty_out(vty,
+							" redistribute %s metric %d%s",
+							zebra_route_string(i),
+							ripng->route_map[i]
+								.metric,
+							VTY_NEWLINE);
+				} else {
+					if (ripng->route_map[i].name)
+						vty_out(vty,
+							" redistribute %s route-map %s%s",
+							zebra_route_string(i),
+							ripng->route_map[i]
+								.name,
+							VTY_NEWLINE);
+					else
+						vty_out(vty,
+							" redistribute %s%s",
+							zebra_route_string(i),
+							VTY_NEWLINE);
+				}
+			} else
+				vty_out(vty, "    %s", zebra_route_string(i));
+		}
 }
 
 /* RIPng configuration write function. */
-static int
-zebra_config_write (struct vty *vty)
+static int zebra_config_write(struct vty *vty)
 {
-  if (! zclient->enable)
-    {
-      vty_out (vty, "no router zebra%s", VTY_NEWLINE);
-      return 1;
-    }
-  else if (! vrf_bitmap_check (zclient->redist[AFI_IP6][ZEBRA_ROUTE_RIPNG], VRF_DEFAULT))
-    {
-      vty_out (vty, "router zebra%s", VTY_NEWLINE);
-      vty_out (vty, " no redistribute ripng%s", VTY_NEWLINE);
-      return 1;
-    }
-  return 0;
+	if (!zclient->enable) {
+		vty_out(vty, "no router zebra%s", VTY_NEWLINE);
+		return 1;
+	} else if (!vrf_bitmap_check(
+			   zclient->redist[AFI_IP6][ZEBRA_ROUTE_RIPNG],
+			   VRF_DEFAULT)) {
+		vty_out(vty, "router zebra%s", VTY_NEWLINE);
+		vty_out(vty, " no redistribute ripng%s", VTY_NEWLINE);
+		return 1;
+	}
+	return 0;
 }
 
 /* Zebra node structure. */
-static struct cmd_node zebra_node =
-{
-  ZEBRA_NODE,
-  "%s(config-router)# ",
+static struct cmd_node zebra_node = {
+	ZEBRA_NODE, "%s(config-router)# ",
 };
 
-static void
-ripng_zebra_connected (struct zclient *zclient)
+static void ripng_zebra_connected(struct zclient *zclient)
 {
-  zclient_send_reg_requests (zclient, VRF_DEFAULT);
+	zclient_send_reg_requests(zclient, VRF_DEFAULT);
 }
 
 /* Initialize zebra structure and it's commands. */
-void
-zebra_init (struct thread_master *master)
+void zebra_init(struct thread_master *master)
 {
-  /* Allocate zebra structure. */
-  zclient = zclient_new(master);
-  zclient_init (zclient, ZEBRA_ROUTE_RIPNG, 0);
-
-  zclient->zebra_connected = ripng_zebra_connected;
-  zclient->interface_up = ripng_interface_up;
-  zclient->interface_down = ripng_interface_down;
-  zclient->interface_add = ripng_interface_add;
-  zclient->interface_delete = ripng_interface_delete;
-  zclient->interface_address_add = ripng_interface_address_add;
-  zclient->interface_address_delete = ripng_interface_address_delete;
-  zclient->redistribute_route_ipv6_add = ripng_zebra_read_ipv6;
-  zclient->redistribute_route_ipv6_del = ripng_zebra_read_ipv6;
-  
-  /* Install zebra node. */
-  install_node (&zebra_node, zebra_config_write);
-
-  /* Install command element for zebra node. */ 
-  install_default (ZEBRA_NODE);
-  install_element (ZEBRA_NODE, &ripng_redistribute_ripng_cmd);
-  install_element (ZEBRA_NODE, &no_ripng_redistribute_ripng_cmd);
-
-  /* Install command elements to ripng node */
-  install_element (RIPNG_NODE, &ripng_redistribute_type_cmd);
-  install_element (RIPNG_NODE, &ripng_redistribute_type_routemap_cmd);
-  install_element (RIPNG_NODE, &ripng_redistribute_type_metric_cmd);
-  install_element (RIPNG_NODE, &ripng_redistribute_type_metric_routemap_cmd);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_type_cmd);
+	/* Allocate zebra structure. */
+	zclient = zclient_new(master);
+	zclient_init(zclient, ZEBRA_ROUTE_RIPNG, 0);
+
+	zclient->zebra_connected = ripng_zebra_connected;
+	zclient->interface_up = ripng_interface_up;
+	zclient->interface_down = ripng_interface_down;
+	zclient->interface_add = ripng_interface_add;
+	zclient->interface_delete = ripng_interface_delete;
+	zclient->interface_address_add = ripng_interface_address_add;
+	zclient->interface_address_delete = ripng_interface_address_delete;
+	zclient->redistribute_route_ipv6_add = ripng_zebra_read_ipv6;
+	zclient->redistribute_route_ipv6_del = ripng_zebra_read_ipv6;
+
+	/* Install zebra node. */
+	install_node(&zebra_node, zebra_config_write);
+
+	/* Install command element for zebra node. */
+	install_default(ZEBRA_NODE);
+	install_element(ZEBRA_NODE, &ripng_redistribute_ripng_cmd);
+	install_element(ZEBRA_NODE, &no_ripng_redistribute_ripng_cmd);
+
+	/* Install command elements to ripng node */
+	install_element(RIPNG_NODE, &ripng_redistribute_type_cmd);
+	install_element(RIPNG_NODE, &ripng_redistribute_type_routemap_cmd);
+	install_element(RIPNG_NODE, &ripng_redistribute_type_metric_cmd);
+	install_element(RIPNG_NODE,
+			&ripng_redistribute_type_metric_routemap_cmd);
+	install_element(RIPNG_NODE, &no_ripng_redistribute_type_cmd);
 }