1 files changed, 67 insertions, 35 deletions

diff --git a/src/plugins/hs_apps/http_client_cli.c b/src/plugins/hs_apps/http_client_cli.c
index a99169bafea..722499b24c3 100644
--- a/src/plugins/hs_apps/http_client_cli.c
+++ b/src/plugins/hs_apps/http_client_cli.c
@@ -16,6 +16,9 @@
 #include <vnet/session/application_interface.h>
 #include <vnet/session/session.h>
 #include <http/http.h>
+#include <http/http_header_names.h>
+#include <http/http_content_types.h>
+#include <http/http_status_codes.h>
 
 #define HCC_DEBUG 0
 
@@ -34,12 +37,12 @@ typedef struct
   u32 vpp_session_index;
   u32 to_recv;
   u8 is_closed;
+  http_header_t *req_headers;
 } hcc_session_t;
 
 typedef struct
 {
   hcc_session_t *sessions;
-  u8 *rx_buf;
   u32 thread_index;
 } hcc_worker_t;
 
@@ -95,13 +98,6 @@ hcc_session_get (u32 hs_index, u32 thread_index)
   return pool_elt_at_index (wrk->sessions, hs_index);
 }
 
-static void
-hcc_session_free (u32 thread_index, hcc_session_t *hs)
-{
-  hcc_worker_t *wrk = hcc_worker_get (thread_index);
-  pool_put (wrk->sessions, hs);
-}
-
 static int
 hcc_ts_accept_callback (session_t *ts)
 {
@@ -128,6 +124,7 @@ hcc_ts_connected_callback (u32 app_index, u32 hc_index, session_t *as,
   hcc_session_t *hs, *new_hs;
   hcc_worker_t *wrk;
   http_msg_t msg;
+  u8 *headers_buf;
   int rv;
 
   HCC_DBG ("hc_index: %d", hc_index);
@@ -149,24 +146,42 @@ hcc_ts_connected_callback (u32 app_index, u32 hc_index, session_t *as,
 
   hs->vpp_session_index = as->session_index;
 
+  http_add_header (&hs->req_headers,
+		   http_header_name_token (HTTP_HEADER_ACCEPT),
+		   http_content_type_token (HTTP_CONTENT_TEXT_HTML));
+  headers_buf = http_serialize_headers (hs->req_headers);
+  vec_free (hs->req_headers);
+
   msg.type = HTTP_MSG_REQUEST;
   msg.method_type = HTTP_REQ_GET;
-  msg.content_type = HTTP_CONTENT_TEXT_HTML;
+  /* request target */
+  msg.data.target_form = HTTP_TARGET_ORIGIN_FORM;
+  msg.data.target_path_offset = 0;
+  msg.data.target_path_len = vec_len (hcm->http_query);
+  /* custom headers */
+  msg.data.headers_offset = msg.data.target_path_len;
+  msg.data.headers_len = vec_len (headers_buf);
+  /* request body */
+  msg.data.body_len = 0;
+  /* data type and total length */
   msg.data.type = HTTP_MSG_DATA_INLINE;
-  msg.data.len = vec_len (hcm->http_query);
+  msg.data.len =
+    msg.data.target_path_len + msg.data.headers_len + msg.data.body_len;
 
-  svm_fifo_seg_t segs[2] = { { (u8 *) &msg, sizeof (msg) },
-			     { hcm->http_query, vec_len (hcm->http_query) } };
+  svm_fifo_seg_t segs[3] = { { (u8 *) &msg, sizeof (msg) },
+			     { hcm->http_query, vec_len (hcm->http_query) },
+			     { headers_buf, vec_len (headers_buf) } };
 
-  rv = svm_fifo_enqueue_segments (as->tx_fifo, segs, 2, 0 /* allow partial */);
-  if (rv < 0 || rv != sizeof (msg) + vec_len (hcm->http_query))
+  rv = svm_fifo_enqueue_segments (as->tx_fifo, segs, 3, 0 /* allow partial */);
+  vec_free (headers_buf);
+  if (rv < 0 || rv != sizeof (msg) + msg.data.len)
     {
       clib_warning ("failed app enqueue");
       return -1;
     }
 
   if (svm_fifo_set_event (as->tx_fifo))
-    session_send_io_evt_to_thread (as->tx_fifo, SESSION_IO_EVT_TX);
+    session_program_tx_io_evt (as->handle, SESSION_IO_EVT_TX);
 
   return 0;
 }
@@ -221,17 +236,26 @@ hcc_ts_rx_callback (session_t *ts)
 
   if (hs->to_recv == 0)
     {
+      /* read the http message header */
       rv = svm_fifo_dequeue (ts->rx_fifo, sizeof (msg), (u8 *) &msg);
       ASSERT (rv == sizeof (msg));
 
-      if (msg.type != HTTP_MSG_REPLY || msg.code != HTTP_STATUS_OK)
+      if (msg.type != HTTP_MSG_REPLY)
 	{
 	  clib_warning ("unexpected msg type %d", msg.type);
 	  return 0;
 	}
-      vec_validate (hcm->http_response, msg.data.len - 1);
+      /* drop everything up to body */
+      svm_fifo_dequeue_drop (ts->rx_fifo, msg.data.body_offset);
+      hs->to_recv = msg.data.body_len;
+      if (msg.code != HTTP_STATUS_OK && hs->to_recv == 0)
+	{
+	  hcm->http_response = format (0, "request failed, response code: %U",
+				       format_http_status_code, msg.code);
+	  goto done;
+	}
+      vec_validate (hcm->http_response, msg.data.body_len - 1);
       vec_reset_length (hcm->http_response);
-      hs->to_recv = msg.data.len;
     }
 
   u32 max_deq = svm_fifo_max_dequeue (ts->rx_fifo);
@@ -253,8 +277,10 @@ hcc_ts_rx_callback (session_t *ts)
   hs->to_recv -= rv;
   HCC_DBG ("app rcvd %d, remains %d", rv, hs->to_recv);
 
+done:
   if (hs->to_recv == 0)
     {
+      HCC_DBG ("all data received, going to disconnect");
       hcc_session_disconnect (ts);
       vlib_process_signal_event_mt (hcm->vlib_main, hcm->cli_node_index,
 				    HCC_REPLY_RECEIVED, 0);
@@ -264,18 +290,6 @@ hcc_ts_rx_callback (session_t *ts)
 }
 
 static void
-hcc_ts_cleanup_callback (session_t *s, session_cleanup_ntf_t ntf)
-{
-  hcc_session_t *hs;
-
-  hs = hcc_session_get (s->thread_index, s->opaque);
-  if (!hs)
-    return;
-
-  hcc_session_free (s->thread_index, hs);
-}
-
-static void
 hcc_ts_transport_closed (session_t *s)
 {
   hcc_main_t *hcm = &hcc_main;
@@ -293,7 +307,6 @@ static session_cb_vft_t hcc_session_cb_vft = {
   .builtin_app_rx_callback = hcc_ts_rx_callback,
   .builtin_app_tx_callback = hcc_ts_tx_callback,
   .session_reset_callback = hcc_ts_reset_callback,
-  .session_cleanup_callback = hcc_ts_cleanup_callback,
   .session_transport_closed_callback = hcc_ts_transport_closed,
 };
 
@@ -423,7 +436,6 @@ hcc_run (vlib_main_t *vm, int print_output)
     case HCC_REPLY_RECEIVED:
       if (print_output)
 	vlib_cli_output (vm, "%v", hcm->http_response);
-      vec_free (hcm->http_response);
       break;
     case HCC_TRANSPORT_CLOSED:
       err = clib_error_return (0, "error, transport closed");
@@ -460,6 +472,28 @@ hcc_detach ()
   return rv;
 }
 
+static void
+hcc_worker_cleanup (hcc_worker_t *wrk)
+{
+  pool_free (wrk->sessions);
+}
+
+static void
+hcc_cleanup ()
+{
+  hcc_main_t *hcm = &hcc_main;
+  hcc_worker_t *wrk;
+
+  vec_foreach (wrk, hcm->wrk)
+    hcc_worker_cleanup (wrk);
+
+  vec_free (hcm->uri);
+  vec_free (hcm->http_query);
+  vec_free (hcm->http_response);
+  vec_free (hcm->appns_id);
+  vec_free (hcm->wrk);
+}
+
 static clib_error_t *
 hcc_command_fn (vlib_main_t *vm, unformat_input_t *input,
 		vlib_cli_command_t *cmd)
@@ -509,7 +543,6 @@ hcc_command_fn (vlib_main_t *vm, unformat_input_t *input,
 	}
     }
 
-  vec_free (hcm->appns_id);
   hcm->appns_id = appns_id;
   hcm->cli_node_index = vlib_get_current_process (vm)->node_runtime.node_index;
 
@@ -540,8 +573,7 @@ hcc_command_fn (vlib_main_t *vm, unformat_input_t *input,
     }
 
 done:
-  vec_free (hcm->uri);
-  vec_free (hcm->http_query);
+  hcc_cleanup ();
   unformat_free (line_input);
   return err;
 }