Rename device class from PPPPOE to PPPoE

[vpp.git] / src / plugins / pppoe / pppoe.c

diff --git a/src/plugins/pppoe/pppoe.c b/src/plugins/pppoe/pppoe.c
index e5ab5d0..d73a718 100644 (file)
--- a/src/plugins/pppoe/pppoe.c
+++ b/src/plugins/pppoe/pppoe.c
@@ -85,7 +85,7 @@ pppoe_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
 
 /* *INDENT-OFF* */
 VNET_DEVICE_CLASS (pppoe_device_class,static) = {
-  .name = "PPPPOE",
+  .name = "PPPoE",
   .format_device_name = format_pppoe_name,
   .tx_function = dummy_interface_tx,
   .admin_up_down_function = pppoe_interface_admin_up_down,
@@ -228,7 +228,7 @@ pppoe_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai)
 /* *INDENT-OFF* */
 VNET_HW_INTERFACE_CLASS (pppoe_hw_class) =
 {
-  .name = "PPPPOE",
+  .name = "PPPoE",
   .format_header = format_pppoe_header_with_length,
   .build_rewrite = pppoe_build_rewrite,
   .update_adjacency = pppoe_update_adj,
@@ -569,13 +569,13 @@ done:
 }
 
 /*?
- * Add or delete a PPPPOE Session.
+ * Add or delete a PPPoE Session.
  *
  * @cliexpar
- * Example of how to create a PPPPOE Session:
+ * Example of how to create a PPPoE Session:
  * @cliexcmd{create pppoe session client-ip 10.0.3.1 session-id 13
  *             client-mac 00:01:02:03:04:05 }
- * Example of how to delete a PPPPOE Session:
+ * Example of how to delete a PPPoE Session:
  * @cliexcmd{create pppoe session client-ip 10.0.3.1 session-id 13
  *             client-mac 00:01:02:03:04:05 del }
  ?*/
@@ -611,10 +611,10 @@ show_pppoe_session_command_fn (vlib_main_t * vm,
 /* *INDENT-ON* */
 
 /*?
- * Display all the PPPPOE Session entries.
+ * Display all the PPPoE Session entries.
  *
  * @cliexpar
- * Example of how to display the PPPPOE Session entries:
+ * Example of how to display the PPPoE Session entries:
  * @cliexstart{show pppoe session}
  * [0] client-ip 10.0.3.1 session_id 13 encap-if-index 0 decap-vrf-id 13 sw_if_index 5
  *     local-mac a0:b0:c0:d0:e0:f0 client-mac 00:01:02:03:04:05
@@ -628,69 +628,62 @@ VLIB_CLI_COMMAND (show_pppoe_session_command, static) = {
 };
 /* *INDENT-ON* */
 
+typedef struct pppoe_show_walk_ctx_t_
+{
+  vlib_main_t *vm;
+  u8 first_entry;
+  u32 total_entries;
+} pppoe_show_walk_ctx_t;
+
+static void
+pppoe_show_walk_cb (BVT (clib_bihash_kv) * kvp, void *arg)
+{
+  pppoe_show_walk_ctx_t *ctx = arg;
+  pppoe_entry_result_t result;
+  pppoe_entry_key_t key;
+
+  if (ctx->first_entry)
+    {
+      ctx->first_entry = 0;
+      vlib_cli_output (ctx->vm,
+                      "%=19s%=12s%=13s%=14s",
+                      "Mac-Address", "session_id", "sw_if_index",
+                      "session_index");
+    }
+
+  key.raw = kvp->key;
+  result.raw = kvp->value;
+
+  vlib_cli_output (ctx->vm,
+                  "%=19U%=12d%=13d%=14d",
+                  format_ethernet_address, key.fields.mac,
+                  clib_net_to_host_u16 (key.fields.session_id),
+                  result.fields.sw_if_index == ~0
+                  ? -1 : result.fields.sw_if_index,
+                  result.fields.session_index == ~0
+                  ? -1 : result.fields.session_index);
+  ctx->total_entries++;
+}
+
 /** Display the contents of the PPPoE Fib. */
 static clib_error_t *
 show_pppoe_fib_command_fn (vlib_main_t * vm,
                           unformat_input_t * input, vlib_cli_command_t * cmd)
 {
   pppoe_main_t *pem = &pppoe_main;
-  BVT (clib_bihash) * h = &pem->session_table;
-  BVT (clib_bihash_bucket) * b;
-  BVT (clib_bihash_value) * v;
-  pppoe_entry_key_t key;
-  pppoe_entry_result_t result;
-  u32 first_entry = 1;
-  u64 total_entries = 0;
-  int i, j, k;
-  u8 *s = 0;
+  pppoe_show_walk_ctx_t ctx = {
+    .first_entry = 1,
+    .vm = vm,
+  };
 
-  for (i = 0; i < h->nbuckets; i++)
-    {
-      b = &h->buckets[i];
-      if (b->offset == 0)
-       continue;
-      v = BV (clib_bihash_get_value) (h, b->offset);
-      for (j = 0; j < (1 << b->log2_pages); j++)
-       {
-         for (k = 0; k < BIHASH_KVP_PER_PAGE; k++)
-           {
-             if (v->kvp[k].key == ~0ULL && v->kvp[k].value == ~0ULL)
-               continue;
-
-             if (first_entry)
-               {
-                 first_entry = 0;
-                 vlib_cli_output (vm,
-                                  "%=19s%=12s%=13s%=14s",
-                                  "Mac-Address", "session_id", "sw_if_index",
-                                  "session_index");
-               }
-
-             key.raw = v->kvp[k].key;
-             result.raw = v->kvp[k].value;
-
-
-             vlib_cli_output (vm,
-                              "%=19U%=12d%=13d%=14d",
-                              format_ethernet_address, key.fields.mac,
-                              clib_net_to_host_u16 (key.fields.session_id),
-                              result.fields.sw_if_index == ~0
-                              ? -1 : result.fields.sw_if_index,
-                              result.fields.session_index == ~0
-                              ? -1 : result.fields.session_index);
-             vec_reset_length (s);
-             total_entries++;
-           }
-         v++;
-       }
-    }
+  BV (clib_bihash_foreach_key_value_pair)
+    (&pem->session_table, pppoe_show_walk_cb, &ctx);
 
-  if (total_entries == 0)
+  if (ctx.total_entries == 0)
     vlib_cli_output (vm, "no pppoe fib entries");
   else
-    vlib_cli_output (vm, "%lld pppoe fib entries", total_entries);
+    vlib_cli_output (vm, "%lld pppoe fib entries", ctx.total_entries);
 
-  vec_free (s);
   return 0;
 }