misc: harmonize names

Type: fix

Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: Ibad744788e200ce012ad88ff59c2c34920742454

13 files changed, 66 insertions, 62 deletions

diff --git a/src/vnet/adj/adj_midchain.c b/src/vnet/adj/adj_midchain.c
index 050c25a9e34..49ac24aa49c 100644
--- a/src/vnet/adj/adj_midchain.c
+++ b/src/vnet/adj/adj_midchain.c
@@ -327,7 +327,7 @@ adj_midchain_get_feature_arc_index_for_link_type (const ip_adjacency_t *adj)
 	}
     case VNET_LINK_NSH:
         {
-          arc = nsh_main_dummy.output_feature_arc_index;
+          arc = nsh_main_placeholder.output_feature_arc_index;
           break;
         }
     case VNET_LINK_ARP:
diff --git a/src/vnet/adj/adj_nsh.c b/src/vnet/adj/adj_nsh.c
index 19851b13b24..00d945729d8 100644
--- a/src/vnet/adj/adj_nsh.c
+++ b/src/vnet/adj/adj_nsh.c
@@ -18,7 +18,7 @@
 #include <vnet/ip/ip.h>
 
 #ifndef CLIB_MARCH_VARIANT
-nsh_main_dummy_t nsh_main_dummy;
+nsh_main_placeholder_t nsh_main_placeholder;
 #endif /* CLIB_MARCH_VARIANT */
 
 /**
@@ -124,7 +124,7 @@ adj_nsh_rewrite_inline (vlib_main_t * vm,
                  * Follow the feature ARC. this will result eventually in
                  * the midchain-tx node
                  */
-                vnet_feature_arc_start (nsh_main_dummy.output_feature_arc_index,
+                vnet_feature_arc_start (nsh_main_placeholder.output_feature_arc_index,
                                         tx_sw_if_index0, &next0, p0);
             }
             else
@@ -195,7 +195,7 @@ VNET_FEATURE_ARC_INIT (nsh_output, static) =
 {
   .arc_name  = "nsh-output",
   .start_nodes = VNET_FEATURES ("adj-nsh-midchain"),
-  .arc_index_ptr = &nsh_main_dummy.output_feature_arc_index,
+  .arc_index_ptr = &nsh_main_placeholder.output_feature_arc_index,
 };
 
 VNET_FEATURE_INIT (nsh_tx_drop, static) =
diff --git a/src/vnet/adj/adj_nsh.h b/src/vnet/adj/adj_nsh.h
index 5501fbb9bdc..eff20699dfc 100644
--- a/src/vnet/adj/adj_nsh.h
+++ b/src/vnet/adj/adj_nsh.h
@@ -21,11 +21,11 @@
 extern vlib_node_registration_t adj_nsh_midchain_node;
 extern vlib_node_registration_t adj_nsh_rewrite_node;
 
-typedef struct _nsh_main_dummy
+typedef struct _nsh_main_placeholder
 {
   u8 output_feature_arc_index;
-} nsh_main_dummy_t;
+} nsh_main_placeholder_t;
 
-extern nsh_main_dummy_t nsh_main_dummy;
+extern nsh_main_placeholder_t nsh_main_placeholder;
 
 #endif
diff --git a/src/vnet/ethernet/node.c b/src/vnet/ethernet/node.c
index e26c3617667..551754dca6d 100644
--- a/src/vnet/ethernet/node.c
+++ b/src/vnet/ethernet/node.c
@@ -1942,14 +1942,14 @@ static clib_error_t *
 ethernet_sw_interface_up_down (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
 {
   subint_config_t *subint;
-  u32 dummy_flags;
-  u32 dummy_unsup;
+  u32 placeholder_flags;
+  u32 placeholder_unsup;
   clib_error_t *error = 0;
 
   // Find the config for this subinterface
   subint =
-    ethernet_sw_interface_get_config (vnm, sw_if_index, &dummy_flags,
-				      &dummy_unsup);
+    ethernet_sw_interface_get_config (vnm, sw_if_index, &placeholder_flags,
+				      &placeholder_unsup);
 
   if (subint == 0)
     {
@@ -1973,8 +1973,8 @@ void
 ethernet_sw_interface_set_l2_mode (vnet_main_t * vnm, u32 sw_if_index, u32 l2)
 {
   subint_config_t *subint;
-  u32 dummy_flags;
-  u32 dummy_unsup;
+  u32 placeholder_flags;
+  u32 placeholder_unsup;
   int is_port;
   vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, sw_if_index);
 
@@ -1982,8 +1982,8 @@ ethernet_sw_interface_set_l2_mode (vnet_main_t * vnm, u32 sw_if_index, u32 l2)
 
   // Find the config for this subinterface
   subint =
-    ethernet_sw_interface_get_config (vnm, sw_if_index, &dummy_flags,
-				      &dummy_unsup);
+    ethernet_sw_interface_get_config (vnm, sw_if_index, &placeholder_flags,
+				      &placeholder_unsup);
 
   if (subint == 0)
     {
@@ -2023,13 +2023,13 @@ ethernet_sw_interface_set_l2_mode_noport (vnet_main_t * vnm,
 					  u32 sw_if_index, u32 l2)
 {
   subint_config_t *subint;
-  u32 dummy_flags;
-  u32 dummy_unsup;
+  u32 placeholder_flags;
+  u32 placeholder_unsup;
 
   /* Find the config for this subinterface */
   subint =
-    ethernet_sw_interface_get_config (vnm, sw_if_index, &dummy_flags,
-				      &dummy_unsup);
+    ethernet_sw_interface_get_config (vnm, sw_if_index, &placeholder_flags,
+				      &placeholder_unsup);
 
   if (subint == 0)
     {
diff --git a/src/vnet/interface.h b/src/vnet/interface.h
index f9081442338..07da2617d71 100644
--- a/src/vnet/interface.h
+++ b/src/vnet/interface.h
@@ -450,7 +450,7 @@ typedef struct _vnet_hw_interface_class
 } vnet_hw_interface_class_t;
 
 /**
- * @brief Return a complete, zero-length (aka dummy) rewrite
+ * @brief Return a complete, zero-length (aka placeholder) rewrite
  */
 extern u8 *default_build_rewrite (struct vnet_main_t *vnm,
 				  u32 sw_if_index,
diff --git a/src/vnet/interface_cli.c b/src/vnet/interface_cli.c
index 531710fd5ad..b27d157d18b 100644
--- a/src/vnet/interface_cli.c
+++ b/src/vnet/interface_cli.c
@@ -1992,7 +1992,8 @@ vnet_pcap_dispatch_trace_configure (vnet_pcap_dispatch_trace_args_t * a)
 
       pm->pcap_data = save_pcap_data;
 
-      vec_validate_aligned (vnet_trace_dummy, 2048, CLIB_CACHE_LINE_BYTES);
+      vec_validate_aligned (vnet_trace_placeholder, 2048,
+			    CLIB_CACHE_LINE_BYTES);
       if (pm->lock == 0)
 	clib_spinlock_init (&(pm->lock));
 
diff --git a/src/vnet/l2/l2_api.c b/src/vnet/l2/l2_api.c
index ce08ab17050..d9bc47ab2e8 100644
--- a/src/vnet/l2/l2_api.c
+++ b/src/vnet/l2/l2_api.c
@@ -544,7 +544,7 @@ vl_api_bridge_domain_dump_t_handler (vl_api_bridge_domain_dump_t * mp)
     {
       l2_bridge_domain_t *bd_config =
 	l2input_bd_config_from_index (l2im, bd_index);
-      /* skip dummy bd_id 0 */
+      /* skip placeholder bd_id 0 */
       if (bd_config && (bd_config->bd_id > 0))
 	send_bridge_domain_details (l2im, reg, bd_config,
 				    vec_len (bd_config->members),
diff --git a/src/vnet/l2/l2_bd.c b/src/vnet/l2/l2_bd.c
index e54d437f0ea..e6fb6223d93 100644
--- a/src/vnet/l2/l2_bd.c
+++ b/src/vnet/l2/l2_bd.c
@@ -229,7 +229,7 @@ l2bd_init (vlib_main_t * vm)
   bd_main_t *bdm = &bd_main;
   bdm->bd_index_by_bd_id = hash_create (0, sizeof (uword));
   /*
-   * create a dummy bd with bd_id of 0 and bd_index of 0 with feature set
+   * create a placeholder bd with bd_id of 0 and bd_index of 0 with feature set
    * to packet drop only. Thus, packets received from any L2 interface with
    * uninitialized bd_index of 0 can be dropped safely.
    */
diff --git a/src/vnet/lisp-cp/control.c b/src/vnet/lisp-cp/control.c
index cc3963d563c..c1593662b6d 100644
--- a/src/vnet/lisp-cp/control.c
+++ b/src/vnet/lisp-cp/control.c
@@ -1699,7 +1699,7 @@ vnet_lisp_use_petr (ip_address_t * ip, u8 is_add)
 
   if (is_add)
     {
-      /* Create dummy petr locator-set */
+      /* Create placeholder petr locator-set */
       clib_memset (&loc, 0, sizeof (loc));
       gid_address_from_ip (&loc.address, ip);
       loc.priority = 1;
@@ -2872,7 +2872,7 @@ lisp_cp_output (vlib_main_t * vm, vlib_node_runtime_t * node,
   return 0;
 }
 
-/* dummy node used only for statistics */
+/* placeholder node used only for statistics */
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (lisp_cp_output_node) = {
   .function = lisp_cp_output,
diff --git a/src/vnet/lisp-gpe/decap.c b/src/vnet/lisp-gpe/decap.c
index fd3f1751fe1..ab35c7ea73d 100644
--- a/src/vnet/lisp-gpe/decap.c
+++ b/src/vnet/lisp-gpe/decap.c
@@ -546,27 +546,27 @@ gpe_decap_init (vlib_main_t * vm)
 }
 
 static uword
-lisp_gpe_nsh_dummy_input (vlib_main_t * vm, vlib_node_runtime_t * node,
-			  vlib_frame_t * from_frame)
+lisp_gpe_nsh_placeholder_input (vlib_main_t * vm, vlib_node_runtime_t * node,
+				vlib_frame_t * from_frame)
 {
   vlib_node_increment_counter (vm, node->node_index, 0, 1);
   return from_frame->n_vectors;
 }
 
-static char *lisp_gpe_nsh_dummy_error_strings[] = {
-  "lisp gpe dummy nsh decap",
+static char *lisp_gpe_nsh_placeholder_error_strings[] = {
+  "lisp gpe placeholder nsh decap",
 };
 
 /* *INDENT-OFF* */
-VLIB_REGISTER_NODE (lisp_gpe_nsh_dummy_input_node) = {
-  .function = lisp_gpe_nsh_dummy_input,
-  .name = "lisp-gpe-nsh-dummy-input",
+VLIB_REGISTER_NODE (lisp_gpe_nsh_placeholder_input_node) = {
+  .function = lisp_gpe_nsh_placeholder_input,
+  .name = "lisp-gpe-nsh-placeholder-input",
   .vector_size = sizeof (u32),
   .type = VLIB_NODE_TYPE_INTERNAL,
   .n_next_nodes = 1,
 
   .n_errors = 1,
-  .error_strings = lisp_gpe_nsh_dummy_error_strings,
+  .error_strings = lisp_gpe_nsh_placeholder_error_strings,
 
   .next_nodes = {
       [0] = "error-drop",
@@ -575,22 +575,22 @@ VLIB_REGISTER_NODE (lisp_gpe_nsh_dummy_input_node) = {
 /* *INDENT-ON* */
 
 static clib_error_t *
-lisp_add_dummy_nsh_node_command_fn (vlib_main_t * vm,
-				    unformat_input_t * input,
-				    vlib_cli_command_t * cmd)
+lisp_add_placeholder_nsh_node_command_fn (vlib_main_t * vm,
+					  unformat_input_t * input,
+					  vlib_cli_command_t * cmd)
 {
   lisp_gpe_main_t *lgm = vnet_lisp_gpe_get_main ();
   vlib_node_add_next (lgm->vlib_main, lisp_gpe_ip4_input_node.index,
-		      lisp_gpe_nsh_dummy_input_node.index);
+		      lisp_gpe_nsh_placeholder_input_node.index);
   next_proto_to_next_index[LISP_GPE_NEXT_PROTO_NSH] =
     LISP_GPE_INPUT_NEXT_NSH_INPUT;
   return 0;
 }
 
 /* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_add_dummy_nsh_node_command, static) = {
-  .path = "test one nsh add-dummy-decap-node",
-  .function = lisp_add_dummy_nsh_node_command_fn,
+VLIB_CLI_COMMAND (lisp_add_placeholder_nsh_node_command, static) = {
+  .path = "test one nsh add-placeholder-decap-node",
+  .function = lisp_add_placeholder_nsh_node_command_fn,
 };
 /* *INDENT-ON* */
 
diff --git a/src/vnet/lisp-gpe/lisp_gpe.h b/src/vnet/lisp-gpe/lisp_gpe.h
index f1fa7715820..3a3d0e9f4da 100644
--- a/src/vnet/lisp-gpe/lisp_gpe.h
+++ b/src/vnet/lisp-gpe/lisp_gpe.h
@@ -159,7 +159,7 @@ typedef struct lisp_gpe_main
 
   gpe_encap_mode_t encap_mode;
 
-  u8 *dummy_stats_pool;
+  u8 *placeholder_stats_pool;
   uword *lisp_stats_index_by_key;
   vlib_combined_counter_main_t counters;
 
diff --git a/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c
index d31fdd7e799..487ba246b4d 100644
--- a/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c
+++ b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c
@@ -473,7 +473,7 @@ vnet_lisp_gpe_add_fwd_counters (vnet_lisp_gpe_add_del_fwd_entry_args_t * a,
   const lisp_gpe_adjacency_t *ladj;
   lisp_fwd_path_t *path;
   lisp_gpe_main_t *lgm = vnet_lisp_gpe_get_main ();
-  u8 *dummy_elt;
+  u8 *placeholder_elt;
   lisp_gpe_fwd_entry_t *lfe;
   lisp_gpe_fwd_entry_key_t fe_key;
   lisp_stats_key_t key;
@@ -495,14 +495,16 @@ vnet_lisp_gpe_add_fwd_counters (vnet_lisp_gpe_add_del_fwd_entry_args_t * a,
     key.tunnel_index = ladj->tunnel_index;
     lisp_stats_key_t *key_copy = clib_mem_alloc (sizeof (*key_copy));
     memcpy (key_copy, &key, sizeof (*key_copy));
-    pool_get (lgm->dummy_stats_pool, dummy_elt);
+    pool_get (lgm->placeholder_stats_pool, placeholder_elt);
     hash_set_mem (lgm->lisp_stats_index_by_key, key_copy,
-		  dummy_elt - lgm->dummy_stats_pool);
+		  placeholder_elt - lgm->placeholder_stats_pool);
 
     vlib_validate_combined_counter (&lgm->counters,
-				    dummy_elt - lgm->dummy_stats_pool);
+				    placeholder_elt -
+				    lgm->placeholder_stats_pool);
     vlib_zero_combined_counter (&lgm->counters,
-				dummy_elt - lgm->dummy_stats_pool);
+				placeholder_elt -
+				lgm->placeholder_stats_pool);
   }
 }
 
@@ -1314,12 +1316,12 @@ lisp_del_adj_stats (lisp_gpe_main_t * lgm, u32 fwd_entry_index, u32 ti)
   p = hash_get_mem (lgm->lisp_stats_index_by_key, &key);
   if (p)
     {
-      s = pool_elt_at_index (lgm->dummy_stats_pool, p[0]);
+      s = pool_elt_at_index (lgm->placeholder_stats_pool, p[0]);
       hp = hash_get_pair (lgm->lisp_stats_index_by_key, &key);
       key_copy = (void *) (hp->key);
       hash_unset_mem (lgm->lisp_stats_index_by_key, &key);
       clib_mem_free (key_copy);
-      pool_put (lgm->dummy_stats_pool, s);
+      pool_put (lgm->placeholder_stats_pool, s);
     }
 }
 
diff --git a/src/vnet/tcp/tcp_cli.c b/src/vnet/tcp/tcp_cli.c
index 6030440435d..6ad2425b53d 100644
--- a/src/vnet/tcp/tcp_cli.c
+++ b/src/vnet/tcp/tcp_cli.c
@@ -688,7 +688,7 @@ tcp_scoreboard_replay (u8 * s, tcp_connection_t * tc, u8 verbose)
   int i, trace_len;
   scoreboard_trace_elt_t *trace;
   u32 next_ack, left, group, has_new_ack = 0;
-  tcp_connection_t _dummy_tc, *dummy_tc = &_dummy_tc;
+  tcp_connection_t _placeholder_tc, *placeholder_tc = &_placeholder_tc;
   sack_block_t *block;
 
   if (!TCP_SCOREBOARD_TRACE)
@@ -700,10 +700,10 @@ tcp_scoreboard_replay (u8 * s, tcp_connection_t * tc, u8 verbose)
   if (!tc)
     return s;
 
-  clib_memset (dummy_tc, 0, sizeof (*dummy_tc));
-  tcp_connection_timers_init (dummy_tc);
-  scoreboard_init (&dummy_tc->sack_sb);
-  dummy_tc->rcv_opts.flags |= TCP_OPTS_FLAG_SACK;
+  clib_memset (placeholder_tc, 0, sizeof (*placeholder_tc));
+  tcp_connection_timers_init (placeholder_tc);
+  scoreboard_init (&placeholder_tc->sack_sb);
+  placeholder_tc->rcv_opts.flags |= TCP_OPTS_FLAG_SACK;
 
 #if TCP_SCOREBOARD_TRACE
   trace = tc->sack_sb.trace;
@@ -714,8 +714,8 @@ tcp_scoreboard_replay (u8 * s, tcp_connection_t * tc, u8 verbose)
     {
       if (trace[i].ack != 0)
 	{
-	  dummy_tc->snd_una = trace[i].ack - 1448;
-	  dummy_tc->snd_una_max = trace[i].ack;
+	  placeholder_tc->snd_una = trace[i].ack - 1448;
+	  placeholder_tc->snd_una_max = trace[i].ack;
 	}
     }
 
@@ -723,7 +723,7 @@ tcp_scoreboard_replay (u8 * s, tcp_connection_t * tc, u8 verbose)
   while (left < trace_len)
     {
       group = trace[left].group;
-      vec_reset_length (dummy_tc->rcv_opts.sacks);
+      vec_reset_length (placeholder_tc->rcv_opts.sacks);
       has_new_ack = 0;
       while (trace[left].group == group)
 	{
@@ -732,7 +732,7 @@ tcp_scoreboard_replay (u8 * s, tcp_connection_t * tc, u8 verbose)
 	      if (verbose)
 		s = format (s, "Adding ack %u, snd_una_max %u, segs: ",
 			    trace[left].ack, trace[left].snd_una_max);
-	      dummy_tc->snd_una_max = trace[left].snd_una_max;
+	      placeholder_tc->snd_una_max = trace[left].snd_una_max;
 	      next_ack = trace[left].ack;
 	      has_new_ack = 1;
 	    }
@@ -741,7 +741,7 @@ tcp_scoreboard_replay (u8 * s, tcp_connection_t * tc, u8 verbose)
 	      if (verbose)
 		s = format (s, "[%u, %u], ", trace[left].start,
 			    trace[left].end);
-	      vec_add2 (dummy_tc->rcv_opts.sacks, block, 1);
+	      vec_add2 (placeholder_tc->rcv_opts.sacks, block, 1);
 	      block->start = trace[left].start;
 	      block->end = trace[left].end;
 	    }
@@ -749,16 +749,17 @@ tcp_scoreboard_replay (u8 * s, tcp_connection_t * tc, u8 verbose)
 	}
 
       /* Push segments */
-      tcp_rcv_sacks (dummy_tc, next_ack);
+      tcp_rcv_sacks (placeholder_tc, next_ack);
       if (has_new_ack)
-	dummy_tc->snd_una = next_ack;
+	placeholder_tc->snd_una = next_ack;
 
       if (verbose)
 	s = format (s, "result: %U", format_tcp_scoreboard,
-		    &dummy_tc->sack_sb);
+		    &placeholder_tc->sack_sb);
 
     }
-  s = format (s, "result: %U", format_tcp_scoreboard, &dummy_tc->sack_sb);
+  s =
+    format (s, "result: %U", format_tcp_scoreboard, &placeholder_tc->sack_sb);
 
   return s;
 }