vppinfra: Improve code portability

[vpp.git] / src / plugins / builtinurl / builtins.c

diff --git a/src/plugins/builtinurl/builtins.c b/src/plugins/builtinurl/builtins.c
index 7358222..6a09755 100644 (file)
--- a/src/plugins/builtinurl/builtins.c
+++ b/src/plugins/builtinurl/builtins.c
@@ -18,8 +18,8 @@
 #include <http_static/http_static.h>
 #include <vpp/app/version.h>
 
-int
-handle_get_version (u8 * request, http_session_t * hs)
+hss_url_handler_rc_t
+handle_get_version (hss_url_handler_args_t *args)
 {
   u8 *s = 0;
 
@@ -28,11 +28,10 @@ handle_get_version (u8 * request, http_session_t * hs)
   s = format (s, "   \"version\": \"%s\",", VPP_BUILD_VER);
   s = format (s, "   \"build_date\": \"%s\"}}\r\n", VPP_BUILD_DATE);
 
-  hs->data = s;
-  hs->data_offset = 0;
-  hs->cache_pool_index = ~0;
-  hs->free_data = 1;
-  return 0;
+  args->data = s;
+  args->data_len = vec_len (s);
+  args->free_vec_data = 1;
+  return HSS_URL_HANDLER_OK;
 }
 
 void
@@ -55,69 +54,135 @@ trim_path_from_request (u8 * s, char *path)
           * like a c-string.
           */
          *cp = 0;
-         _vec_len (s) = cp - s;
+         vec_set_len (s, cp - s);
          break;
        }
       cp++;
     }
 }
 
-int
-handle_get_interface_stats (u8 * request, http_session_t * hs)
+hss_url_handler_rc_t
+handle_get_interface_stats (hss_url_handler_args_t *args)
 {
   u8 *s = 0, *stats = 0;
-  u32 sw_if_index;
   uword *p;
+  u32 *sw_if_indices = 0;
+  vnet_hw_interface_t *hi;
   vnet_sw_interface_t *si;
+  char *q = "\"";
+  int i;
+  int need_comma = 0;
   u8 *format_vnet_sw_interface_cntrs (u8 * s, vnet_interface_main_t * im,
                                      vnet_sw_interface_t * si, int json);
-
   vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
 
-  trim_path_from_request (request, "interface_stats.json");
-
-  /* get data */
+  /* Get stats for a single interface via http POST */
+  if (args->req_type == HTTP_REQ_POST)
+    {
+      /* Find the sw_if_index */
+      p = hash_get (im->hw_interface_by_name, args->req_data);
+      if (!p)
+       {
+         s = format (s, "{\"interface_stats\": {[\n");
+         s = format (s, "   \"name\": \"%s\",", args->req_data);
+         s = format (s, "   \"error\": \"%s\"", "UnknownInterface");
+         s = format (s, "]}\n");
+         goto out;
+       }
 
-  p = hash_get (vnm->interface_main.hw_interface_by_name, request);
-  if (!p)
+      vec_add1 (sw_if_indices, p[0]);
+    }
+  else                         /* default, HTTP_BUILTIN_METHOD_GET */
     {
-      clib_warning ("Couldn't find interface '%v'", request);
+      pool_foreach (hi, im->hw_interfaces)
+       {
+        vec_add1 (sw_if_indices, hi->sw_if_index);
+      }
+    }
+
+  s = format (s, "{%sinterface_stats%s: [\n", q, q);
 
-      s = format (s, "{\"interface_stats\": {");
-      s = format (s, "   \"name\": \"%s\",", request);
-      s = format (s, "   \"stats\": \"%s\"", "ERRORUnknownInterface");
-      s = format (s, "}}\r\n");
-      goto out;
+  for (i = 0; i < vec_len (sw_if_indices); i++)
+    {
+      si = vnet_get_sw_interface (vnm, sw_if_indices[i]);
+      if (need_comma)
+       s = format (s, ",\n");
+
+      need_comma = 1;
+
+      s = format (s, "{%sname%s: %s%U%s, ", q, q, q,
+                 format_vnet_sw_if_index_name, vnm, sw_if_indices[i], q);
+
+      stats = format_vnet_sw_interface_cntrs (stats, &vnm->interface_main, si,
+                                             1 /* want json */ );
+      if (vec_len (stats))
+       s = format (s, "%v}", stats);
+      else
+       s = format (s, "%snone%s: %strue%s}", q, q, q, q);
+      vec_reset_length (stats);
     }
 
-  sw_if_index = p[0];
-  si = vnet_get_sw_interface (vnm, sw_if_index);
+  s = format (s, "]}\n");
 
-  stats = format_vnet_sw_interface_cntrs (stats, &vnm->interface_main, si,
-                                         1 /* want json */ );
-  /* Build answer */
-  s = format (s, "{\"interface_stats\": {");
-  s = format (s, "\"name\": \"%s\",\n", request);
-  s = format (s, "%s", stats);
-  s = format (s, "}}\n");
+out:
+  args->data = s;
+  args->data_len = vec_len (s);
+  args->free_vec_data = 1;
+  vec_free (sw_if_indices);
   vec_free (stats);
+  return HSS_URL_HANDLER_OK;
+}
 
-out:
-  hs->data = s;
-  hs->data_offset = 0;
-  hs->cache_pool_index = ~0;
-  hs->free_data = 1;
-  return 0;
+hss_url_handler_rc_t
+handle_get_interface_list (hss_url_handler_args_t *args)
+{
+  u8 *s = 0;
+  int i;
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vnet_hw_interface_t *hi;
+  u32 *hw_if_indices = 0;
+  int need_comma = 0;
+
+  /* Construct vector of active hw_if_indexes ... */
+  pool_foreach (hi, im->hw_interfaces)
+   {
+    /* No point in mentioning "local0"... */
+    if (hi - im->hw_interfaces)
+      vec_add1 (hw_if_indices, hi - im->hw_interfaces);
+  }
+
+  /* Build answer */
+  s = format (s, "{\"interface_list\": [\n");
+  for (i = 0; i < vec_len (hw_if_indices); i++)
+    {
+      if (need_comma)
+       s = format (s, ",\n");
+      hi = pool_elt_at_index (im->hw_interfaces, hw_if_indices[i]);
+      s = format (s, "\"%v\"", hi->name);
+      need_comma = 1;
+    }
+  s = format (s, "]}\n");
+  vec_free (hw_if_indices);
+
+  args->data = s;
+  args->data_len = vec_len (s);
+  args->free_vec_data = 1;
+  return HSS_URL_HANDLER_OK;
 }
 
 void
 builtinurl_handler_init (builtinurl_main_t * bm)
 {
 
-  bm->register_handler (handle_get_version, "version.json",
-                       HTTP_BUILTIN_METHOD_GET);
-  bm->register_handler (handle_get_interface_stats,
-                       "interface_stats.json", HTTP_BUILTIN_METHOD_POST);
+  bm->register_handler (handle_get_version, "version.json", HTTP_REQ_GET);
+  bm->register_handler (handle_get_interface_list, "interface_list.json",
+                       HTTP_REQ_GET);
+  bm->register_handler (handle_get_interface_stats, "interface_stats.json",
+                       HTTP_REQ_GET);
+  bm->register_handler (handle_get_interface_stats, "interface_stats.json",
+                       HTTP_REQ_POST);
 }
 
 /*