Nest: Trivial whitespace cleanup

2024-11-17 08:38:42 +00:00 · 2018-02-06 17:43:55 +01:00 · 2018-02-06 17:43:55 +01:00 · a82f692e58
commit a82f692e58
parent 28b3b55122
16 changed files with 63 additions and 65 deletions
--- a/lib/net.c
+++ b/lib/net.c
@ -6,50 +6,50 @@


 const char * const net_label[] = {
-  [NET_IP4] 	= "ipv4",
-  [NET_IP6] 	= "ipv6",
-  [NET_VPN4] 	= "vpn4",
-  [NET_VPN6] 	= "vpn6",
-  [NET_ROA4] 	= "roa4",
-  [NET_ROA6] 	= "roa6",
-  [NET_FLOW4] 	= "flow4",
-  [NET_FLOW6] 	= "flow6",
+  [NET_IP4]	= "ipv4",
+  [NET_IP6]	= "ipv6",
+  [NET_VPN4]	= "vpn4",
+  [NET_VPN6]	= "vpn6",
+  [NET_ROA4]	= "roa4",
+  [NET_ROA6]	= "roa6",
+  [NET_FLOW4]	= "flow4",
+  [NET_FLOW6]	= "flow6",
  [NET_MPLS]	= "mpls",
 };

 const u16 net_addr_length[] = {
-  [NET_IP4] 	= sizeof(net_addr_ip4),
-  [NET_IP6] 	= sizeof(net_addr_ip6),
-  [NET_VPN4] 	= sizeof(net_addr_vpn4),
-  [NET_VPN6] 	= sizeof(net_addr_vpn6),
-  [NET_ROA4] 	= sizeof(net_addr_roa4),
-  [NET_ROA6] 	= sizeof(net_addr_roa6),
-  [NET_FLOW4] 	= 0,
-  [NET_FLOW6] 	= 0,
+  [NET_IP4]	= sizeof(net_addr_ip4),
+  [NET_IP6]	= sizeof(net_addr_ip6),
+  [NET_VPN4]	= sizeof(net_addr_vpn4),
+  [NET_VPN6]	= sizeof(net_addr_vpn6),
+  [NET_ROA4]	= sizeof(net_addr_roa4),
+  [NET_ROA6]	= sizeof(net_addr_roa6),
+  [NET_FLOW4]	= 0,
+  [NET_FLOW6]	= 0,
  [NET_MPLS]	= sizeof(net_addr_mpls),
 };

 const u8 net_max_prefix_length[] = {
-  [NET_IP4] 	= IP4_MAX_PREFIX_LENGTH,
-  [NET_IP6] 	= IP6_MAX_PREFIX_LENGTH,
-  [NET_VPN4] 	= IP4_MAX_PREFIX_LENGTH,
-  [NET_VPN6] 	= IP6_MAX_PREFIX_LENGTH,
-  [NET_ROA4] 	= IP4_MAX_PREFIX_LENGTH,
-  [NET_ROA6] 	= IP6_MAX_PREFIX_LENGTH,
-  [NET_FLOW4] 	= IP4_MAX_PREFIX_LENGTH,
-  [NET_FLOW6] 	= IP6_MAX_PREFIX_LENGTH,
+  [NET_IP4]	= IP4_MAX_PREFIX_LENGTH,
+  [NET_IP6]	= IP6_MAX_PREFIX_LENGTH,
+  [NET_VPN4]	= IP4_MAX_PREFIX_LENGTH,
+  [NET_VPN6]	= IP6_MAX_PREFIX_LENGTH,
+  [NET_ROA4]	= IP4_MAX_PREFIX_LENGTH,
+  [NET_ROA6]	= IP6_MAX_PREFIX_LENGTH,
+  [NET_FLOW4]	= IP4_MAX_PREFIX_LENGTH,
+  [NET_FLOW6]	= IP6_MAX_PREFIX_LENGTH,
  [NET_MPLS]	= 0,
 };

 const u16 net_max_text_length[] = {
-  [NET_IP4] 	= 18,	/* "255.255.255.255/32" */
-  [NET_IP6] 	= 43,	/* "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128" */
-  [NET_VPN4] 	= 40,	/* "4294967296:4294967296 255.255.255.255/32" */
-  [NET_VPN6] 	= 65,	/* "4294967296:4294967296 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128" */
-  [NET_ROA4] 	= 34,	/* "255.255.255.255/32-32 AS4294967295" */
-  [NET_ROA6] 	= 60,	/* "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128-128 AS4294967295" */
-  [NET_FLOW4] 	= 0,	/* "flow4 { ... }" */
-  [NET_FLOW6] 	= 0,	/* "flow6 { ... }" */
+  [NET_IP4]	= 18,	/* "255.255.255.255/32" */
+  [NET_IP6]	= 43,	/* "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128" */
+  [NET_VPN4]	= 40,	/* "4294967296:4294967296 255.255.255.255/32" */
+  [NET_VPN6]	= 65,	/* "4294967296:4294967296 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128" */
+  [NET_ROA4]	= 34,	/* "255.255.255.255/32-32 AS4294967295" */
+  [NET_ROA6]	= 60,	/* "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128-128 AS4294967295" */
+  [NET_FLOW4]	= 0,	/* "flow4 { ... }" */
+  [NET_FLOW6]	= 0,	/* "flow6 { ... }" */
  [NET_MPLS]	= 7,	/* "1048575" */
 };

--- a/nest/a-path.c
+++ b/nest/a-path.c
@ -810,7 +810,7 @@ as_path_match(const struct adata *path, struct f_path_mask *mask)
 	case PM_ASN_RANGE:
 	  val = mask->val;
 	  val2 = mask->val2;
-          goto step;
+	  goto step;
 	case PM_QUESTION:
 	step:
 	  nh = nl = -1;
--- a/nest/a-path_test.c
+++ b/nest/a-path_test.c
@ -43,14 +43,14 @@ t_as_path_match(void)
      bt_debug("Prepending ASN: %10u \n", val);

      if (i == 0)
-        first_prepended = val;
+	first_prepended = val;
      if (i == AS_PATH_LENGTH-1)
-        last_prepended = val;
+	last_prepended = val;

      mask[i].kind = PM_ASN;
      mask[i].val  = val;
      if (i)
-        mask[i].next = &mask[i-1];
+	mask[i].next = &mask[i-1];
    }

    bt_assert_msg(as_path_match(as_path, &mask[AS_PATH_LENGTH-1]), "Mask should match with AS path");
--- a/nest/config.Y
+++ b/nest/config.Y
@ -151,7 +151,7 @@ CF_ENUM(T_ENUM_NETTYPE, NET_, IP4, IP6, VPN4, VPN6, ROA4, ROA6, FLOW4, FLOW6)
 CF_ADDTO(conf, table)

 table_sorted:
-          { $$ = 0; }
+	  { $$ = 0; }
 | SORTED { $$ = 1; }
 ;

@ -454,9 +454,9 @@ password_item:
 password_item_begin:
   PASSWORD text {
     if (!this_p_list) {
-     	this_p_list = cfg_alloc(sizeof(list));
-     	init_list(this_p_list);
-        password_id = 1;
+	this_p_list = cfg_alloc(sizeof(list));
+	init_list(this_p_list);
+	password_id = 1;
     }
     this_p_item = cfg_alloc(sizeof (struct password_item));
     this_p_item->password = $2;
--- a/nest/iface.c
+++ b/nest/iface.c
@ -317,7 +317,7 @@ if_update(struct iface *new)
 	    new->sysdep = i->sysdep;
 	    memcpy(&new->addrs, &i->addrs, sizeof(i->addrs));
 	    memcpy(i, new, sizeof(*i));
-	    i->flags &= ~IF_UP; 	/* IF_TMP_DOWN will be added later */
+	    i->flags &= ~IF_UP;		/* IF_TMP_DOWN will be added later */
 	    goto newif;
 	  }

--- a/nest/mrtdump.h
+++ b/nest/mrtdump.h
@ -28,4 +28,3 @@
 void mrt_dump_message(struct proto *p, u16 type, u16 subtype, byte *buf, u32 len);

 #endif
-
--- a/nest/neighbor.c
+++ b/nest/neighbor.c
@ -156,7 +156,7 @@ neigh_find2(struct proto *p, ip_addr *a, struct iface *ifa, unsigned flags)
    WALK_LIST(i, iface_list)
      if ((!p->vrf || p->vrf == i->master) &&
 	  ((scope = if_connected(a, i, &addr)) >= 0))
-        {
+	{
 	  ifa = i;
 	  break;
 	}
--- a/nest/protocol.h
+++ b/nest/protocol.h
@ -337,7 +337,7 @@ void proto_notify_state(struct proto *p, unsigned state);
 *
 *		HUNGRY    ---->   FEEDING
 *		 ^		     |
- *		 | 		     V
+ *		 |		     V
 *		FLUSHING  <----   HAPPY
 *
 *	States:	HUNGRY	Protocol either administratively down (i.e.,
--- a/nest/route.h
+++ b/nest/route.h
@ -74,7 +74,7 @@ static inline struct fib_node * fib_user_to_node(struct fib *f, void *e)
 void fib_init(struct fib *f, pool *p, uint addr_type, uint node_size, uint node_offset, uint hash_order, fib_init_fn init);
 void *fib_find(struct fib *, const net_addr *);	/* Find or return NULL if doesn't exist */
 void *fib_get_chain(struct fib *f, const net_addr *a); /* Find first node in linked list from hash table */
-void *fib_get(struct fib *, const net_addr *); 	/* Find or create new if nonexistent */
+void *fib_get(struct fib *, const net_addr *);	/* Find or create new if nonexistent */
 void *fib_route(struct fib *, const net_addr *); /* Longest-match routing lookup */
 void fib_delete(struct fib *, void *);	/* Remove fib entry */
 void fib_free(struct fib *);		/* Destroy the fib */
@ -104,7 +104,7 @@ void fit_put_next(struct fib *f, struct fib_iterator *i, struct fib_node *n, uin
 	type *z;						\
 	for(;;) {						\
 	  if (!fn_)						\
-            {							\
+	    {							\
 	       if (++hpos_ >= count_)				\
 		 break;						\
 	       fn_ = (fib)->hash_table[hpos_];			\
@ -663,7 +663,7 @@ extern struct protocol *attr_class_to_protocol[EAP_MAX];
 *	Default protocol preferences
 */

-#define DEF_PREF_DIRECT	    	240	/* Directly connected */
+#define DEF_PREF_DIRECT		240	/* Directly connected */
 #define DEF_PREF_STATIC		200	/* Static route */
 #define DEF_PREF_OSPF		150	/* OSPF intra-area, inter-area and type 1 external routes */
 #define DEF_PREF_BABEL		130	/* Babel */
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@ -1204,7 +1204,7 @@ rta_dump(rta *a)
  static char *rts[] = { "RTS_DUMMY", "RTS_STATIC", "RTS_INHERIT", "RTS_DEVICE",
 			 "RTS_STAT_DEV", "RTS_REDIR", "RTS_RIP",
 			 "RTS_OSPF", "RTS_OSPF_IA", "RTS_OSPF_EXT1",
-                         "RTS_OSPF_EXT2", "RTS_BGP", "RTS_PIPE", "RTS_BABEL" };
+			 "RTS_OSPF_EXT2", "RTS_BGP", "RTS_PIPE", "RTS_BABEL" };
  static char *rtd[] = { "", " DEV", " HOLE", " UNREACH", " PROHIBIT" };

  debug("p=%s uc=%d %s %s%s h=%04x",
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@ -159,13 +159,13 @@ dev_copy_config(struct proto_config *dest, struct proto_config *src)
 }

 struct protocol proto_device = {
-  .name = 		"Direct",
-  .template = 		"direct%d",
+  .name =		"Direct",
+  .template =		"direct%d",
  .preference =		DEF_PREF_DIRECT,
  .channel_mask =	NB_IP,
  .proto_size =		sizeof(struct rt_dev_proto),
  .config_size =	sizeof(struct rt_dev_config),
-  .init = 		dev_init,
-  .reconfigure = 	dev_reconfigure,
-  .copy_config = 	dev_copy_config
+  .init =		dev_init,
+  .reconfigure =	dev_reconfigure,
+  .copy_config =	dev_copy_config
 };
--- a/nest/rt-fib.c
+++ b/nest/rt-fib.c
@ -603,7 +603,7 @@ fib_histogram(struct fib *f)
      for (e = f->hash_table[i]; e != NULL; e = e->next)
 	j++;
      if (j > 0)
-        log(L_WARN "Histogram line %d: %d", i, j);
+	log(L_WARN "Histogram line %d: %d", i, j);
    }

  log(L_WARN "Histogram dump end");
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@ -74,7 +74,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, ea_list *tm
      char weight[16] = "";

      if (nh->labels)
-        {
+	{
 	  lsp += bsprintf(lsp, " mpls %d", nh->label[0]);
 	  for (int i=1;i<nh->labels; i++)
 	    lsp += bsprintf(lsp, "/%d", nh->label[i]);
@ -129,7 +129,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)

      /* Special case for merged export */
      if ((d->export_mode == RSEM_EXPORT) && (ec->ra_mode == RA_MERGED))
-        {
+	{
 	  rte *rt_free;
 	  e = rt_export_merged(ec, n, &rt_free, &tmpa, c->show_pool, 1);
 	  pass = 1;
@ -419,4 +419,3 @@ rt_show(struct rt_show_data *d)
      cli_msg(8001, "Network not found");
  }
 }
-
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@ -825,7 +825,7 @@ rt_notify_merged(struct channel *c, net *net, rte *new_changed, rte *old_changed
 * @new_best: the new best route for the same network
 * @old_best: the previous best route for the same network
 * @before_old: The previous route before @old for the same network.
- * 		If @before_old is NULL @old was the first.
+ *		If @before_old is NULL @old was the first.
 *
 * This function gets a routing table update and announces it
 * to all protocols that acccepts given type of route announcement