*: reindentreindent-master-after

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

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

1 files changed, 140 insertions, 158 deletions

diff --git a/zebra/client_main.c b/zebra/client_main.c
index 2903b8425..17130c602 100644
--- a/zebra/client_main.c
+++ b/zebra/client_main.c
@@ -38,194 +38,176 @@ struct zclient *zclient = NULL;
 int sock;
 
 /* IPv4 route add and delete test. */
-void
-zebra_test_ipv4 (int command, int type, char *prefix, char *gateway,
-		 u_char distance)
+void zebra_test_ipv4(int command, int type, char *prefix, char *gateway,
+		     u_char distance)
 {
-  struct zapi_ipv4 api;
-  struct prefix_ipv4 p;
-  struct in_addr gate;
-  struct in_addr *gpnt;
-
-  str2prefix_ipv4 (prefix, &p);
-  if (!inet_aton (gateway, &gate))
-    {
-      printf("Gateway specified: %s is illegal\n", gateway);
-      return;
-    }
-
-  gpnt = &gate;
-
-  api.vrf_id = VRF_DEFAULT;
-  api.type = type;
-  api.flags = 0;
-
-  api.message = 0;
-  SET_FLAG (api.message, ZAPI_MESSAGE_NEXTHOP);
-  api.nexthop_num = 1;
-  api.nexthop = &gpnt;
-  api.ifindex_num = 0;
-  if (distance)
-    {
-      SET_FLAG (api.message, ZAPI_MESSAGE_DISTANCE);
-      api.distance = distance;
-    }
-  
-
-  switch (command)
-    {
-    case ZEBRA_IPV4_ROUTE_ADD:
-      zapi_ipv4_add (zclient, &p, &api);
-      break;
-    case ZEBRA_IPV4_ROUTE_DELETE:
-      zapi_ipv4_delete (zclient, &p, &api);
-      break;
-    }
+	struct zapi_ipv4 api;
+	struct prefix_ipv4 p;
+	struct in_addr gate;
+	struct in_addr *gpnt;
+
+	str2prefix_ipv4(prefix, &p);
+	if (!inet_aton(gateway, &gate)) {
+		printf("Gateway specified: %s is illegal\n", gateway);
+		return;
+	}
+
+	gpnt = &gate;
+
+	api.vrf_id = VRF_DEFAULT;
+	api.type = type;
+	api.flags = 0;
+
+	api.message = 0;
+	SET_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP);
+	api.nexthop_num = 1;
+	api.nexthop = &gpnt;
+	api.ifindex_num = 0;
+	if (distance) {
+		SET_FLAG(api.message, ZAPI_MESSAGE_DISTANCE);
+		api.distance = distance;
+	}
+
+
+	switch (command) {
+	case ZEBRA_IPV4_ROUTE_ADD:
+		zapi_ipv4_add(zclient, &p, &api);
+		break;
+	case ZEBRA_IPV4_ROUTE_DELETE:
+		zapi_ipv4_delete(zclient, &p, &api);
+		break;
+	}
 }
 
 /* IPv6 route add and delete test. */
-void
-zebra_test_v6 (int sock)
+void zebra_test_v6(int sock)
 {
-  struct prefix_ipv6 p;
-  struct in6_addr nexthop;
+	struct prefix_ipv6 p;
+	struct in6_addr nexthop;
 
-  str2prefix_ipv6 ("3ffe:506::2/128", &p);
-  inet_pton (AF_INET6, "::1", &nexthop);
+	str2prefix_ipv6("3ffe:506::2/128", &p);
+	inet_pton(AF_INET6, "::1", &nexthop);
 
-  /* zebra_ipv6_add (sock, ZEBRA_ROUTE_STATIC, 0, &p, &nexthop, 1); */
+	/* zebra_ipv6_add (sock, ZEBRA_ROUTE_STATIC, 0, &p, &nexthop, 1); */
 
-  sleep (5);
-  /* zebra_ipv6_delete (sock, ZEBRA_ROUTE_STATIC, 0, &p, &nexthop, 1); */
+	sleep(5);
+	/* zebra_ipv6_delete (sock, ZEBRA_ROUTE_STATIC, 0, &p, &nexthop, 1); */
 }
 
 /* Print out usage and exit. */
-void
-usage_exit ()
+void usage_exit()
 {
-  fprintf (stderr, "Usage: client filename\n");
-  exit (1);
+	fprintf(stderr, "Usage: client filename\n");
+	exit(1);
 }
 
-struct zebra_info 
-{
-  char *str;
-  int type;
-} zebra_type[] = 
-{
-  { "static", ZEBRA_ROUTE_STATIC },
-  { "rip",    ZEBRA_ROUTE_RIP },
-  { "ripng",  ZEBRA_ROUTE_RIPNG },
-  { "ospf",   ZEBRA_ROUTE_OSPF },
-  { "ospf6",  ZEBRA_ROUTE_OSPF6 },
-  { "bgp",    ZEBRA_ROUTE_BGP },
-  { "nhrp",   ZEBRA_ROUTE_NHRP },
-  { "pim",    ZEBRA_ROUTE_PIM },
-  { NULL,     0 }
-};
+struct zebra_info {
+	char *str;
+	int type;
+} zebra_type[] = {{"static", ZEBRA_ROUTE_STATIC},
+		  {"rip", ZEBRA_ROUTE_RIP},
+		  {"ripng", ZEBRA_ROUTE_RIPNG},
+		  {"ospf", ZEBRA_ROUTE_OSPF},
+		  {"ospf6", ZEBRA_ROUTE_OSPF6},
+		  {"bgp", ZEBRA_ROUTE_BGP},
+		  {"nhrp", ZEBRA_ROUTE_NHRP},
+		  {"pim", ZEBRA_ROUTE_PIM},
+		  {NULL, 0}};
 
 /* Zebra route simulator. */
-void
-zebra_sim (FILE *fp)
+void zebra_sim(FILE *fp)
 {
-  char buf[BUFSIZ];
-  char distance_str[BUFSIZ];
-  u_char distance;
-
-  while (fgets (buf, sizeof buf, fp))
-    {
-      int i;
-      int ret;
-      int type;
-      char str[BUFSIZ], command[BUFSIZ], prefix[BUFSIZ], gateway[BUFSIZ];
-
-      distance = 0;
-
-      if (*buf == '#')
-	continue;
-
-      type = ZEBRA_ROUTE_STATIC;
-
-      ret = sscanf (buf, "%s %s %s %s %s\n", command, str, prefix, gateway,
-		    distance_str);
-
-      if (ret == 5)
-	{
-	  distance = atoi (distance_str);
-	}
-      else
-	{
-	  ret = sscanf (buf, "%s %s %s %s\n", command, str, prefix, gateway);
-
-	  if (ret != 4)
-	    continue;
+	char buf[BUFSIZ];
+	char distance_str[BUFSIZ];
+	u_char distance;
+
+	while (fgets(buf, sizeof buf, fp)) {
+		int i;
+		int ret;
+		int type;
+		char str[BUFSIZ], command[BUFSIZ], prefix[BUFSIZ],
+			gateway[BUFSIZ];
+
+		distance = 0;
+
+		if (*buf == '#')
+			continue;
+
+		type = ZEBRA_ROUTE_STATIC;
+
+		ret = sscanf(buf, "%s %s %s %s %s\n", command, str, prefix,
+			     gateway, distance_str);
+
+		if (ret == 5) {
+			distance = atoi(distance_str);
+		} else {
+			ret = sscanf(buf, "%s %s %s %s\n", command, str, prefix,
+				     gateway);
+
+			if (ret != 4)
+				continue;
+		}
+
+		for (i = 0; i < 10; i++) {
+			if (!zebra_type[i].str)
+				break;
+			if (strcmp(zebra_type[i].str, str) == 0) {
+				type = zebra_type[i].type;
+				break;
+			}
+		}
+
+		if (strcmp(command, "add") == 0) {
+			zebra_test_ipv4(ZEBRA_IPV4_ROUTE_ADD, type, prefix,
+					gateway, distance);
+			printf("%s", buf);
+			continue;
+		}
+
+		if (strcmp(command, "del") == 0) {
+			zebra_test_ipv4(ZEBRA_IPV4_ROUTE_DELETE, type, prefix,
+					gateway, distance);
+			printf("%s", buf);
+			continue;
+		}
 	}
-
-      for (i = 0; i < 10; i++)
-	{
-	  if (!zebra_type[i].str)
-	    break;
-	  if (strcmp (zebra_type[i].str, str) == 0)
-	    {
-	      type = zebra_type[i].type;
-	      break;
-	    }
-	}
-      
-      if (strcmp (command, "add") == 0)
-	{
-	  zebra_test_ipv4 (ZEBRA_IPV4_ROUTE_ADD, type, prefix, gateway,
-			   distance);
-	  printf ("%s", buf);
-	  continue;
-	}
-
-      if (strcmp (command, "del") == 0)
-	{
-	  zebra_test_ipv4 (ZEBRA_IPV4_ROUTE_DELETE, type, prefix, gateway,
-			   distance);
-	  printf ("%s", buf);
-	  continue;
-	}
-    }
 }
 
 /* Test zebra client main routine. */
-int
-main (int argc, char **argv)
+int main(int argc, char **argv)
 {
-  struct thread_master *master;
-  FILE *fp;
+	struct thread_master *master;
+	FILE *fp;
 
-  if (argc == 1)
-      usage_exit ();
+	if (argc == 1)
+		usage_exit();
 
-  master = thread_master_create(NULL);
-  /* Establish connection to zebra. */
-  zclient = zclient_new(master);
-  zclient->enable = 1;
+	master = thread_master_create(NULL);
+	/* Establish connection to zebra. */
+	zclient = zclient_new(master);
+	zclient->enable = 1;
 #ifdef HAVE_TCP_ZEBRA
-  zclient->sock = zclient_socket ();
+	zclient->sock = zclient_socket();
 #else
-  zclient->sock = zclient_socket_un (ZEBRA_SERV_PATH);
+	zclient->sock = zclient_socket_un(ZEBRA_SERV_PATH);
 #endif /* HAVE_TCP_ZEBRA */
 
-  /* Open simulation file. */
-  fp = fopen (argv[1], "r");
-  if (fp == NULL)
-    {
-      fprintf (stderr,"%% Can't open configuration file %s due to '%s'\n",
-               argv[1], safe_strerror(errno));
-      exit (1);
-    }
+	/* Open simulation file. */
+	fp = fopen(argv[1], "r");
+	if (fp == NULL) {
+		fprintf(stderr,
+			"%% Can't open configuration file %s due to '%s'\n",
+			argv[1], safe_strerror(errno));
+		exit(1);
+	}
 
-  /* Do main work. */
-  zebra_sim (fp);
+	/* Do main work. */
+	zebra_sim(fp);
 
-  sleep (100);
+	sleep(100);
 
-  fclose (fp);
-  close (sock);
+	fclose(fp);
+	close(sock);
 
-  return 0;
+	return 0;
 }