Add TLS support for VCL

[vpp.git] / src / vcl / vppcom.c

diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c
index a94df84..70afdce 100644 (file)
--- a/src/vcl/vppcom.c
+++ b/src/vcl/vppcom.c
@@ -1191,7 +1191,7 @@ vppcom_session_bind (uint32_t session_handle, vppcom_endpt_t * ep)
        format_ip46_address, &session->transport.lcl_ip,
        session->transport.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6,
        clib_net_to_host_u16 (session->transport.lcl_port),
-       session->session_type ? "UDP" : "TCP");
+       vppcom_proto_str (session->session_type));
   vcl_evt (VCL_EVT_BIND, session);
 
   if (session->session_type == VPPCOM_PROTO_UDP)
@@ -1246,6 +1246,55 @@ vppcom_session_listen (uint32_t listen_sh, uint32_t q_len)
   return VPPCOM_OK;
 }
 
+int
+vppcom_session_tls_add_cert (uint32_t session_handle, char *cert,
+                            uint32_t cert_len)
+{
+
+  vcl_worker_t *wrk = vcl_worker_get_current ();
+  vcl_session_t *session = 0;
+
+  session = vcl_session_get_w_handle (wrk, session_handle);
+  if (!session)
+    return VPPCOM_EBADFD;
+
+  if (cert_len == 0 || cert_len == ~0)
+    return VPPCOM_EBADFD;
+
+  /*
+   * Send listen request to vpp and wait for reply
+   */
+  vppcom_send_application_tls_cert_add (session, cert, cert_len);
+
+  return VPPCOM_OK;
+
+}
+
+int
+vppcom_session_tls_add_key (uint32_t session_handle, char *key,
+                           uint32_t key_len)
+{
+
+  vcl_worker_t *wrk = vcl_worker_get_current ();
+  vcl_session_t *session = 0;
+
+  session = vcl_session_get_w_handle (wrk, session_handle);
+  if (!session)
+    return VPPCOM_EBADFD;
+
+  if (key_len == 0 || key_len == ~0)
+    return VPPCOM_EBADFD;
+
+  /*
+   * Send listen request to vpp and wait for reply
+   */
+  vppcom_send_application_tls_key_add (session, key, key_len);
+
+  return VPPCOM_OK;
+
+
+}
+
 static int
 validate_args_session_accept_ (vcl_worker_t * wrk,
                               vcl_session_t * listen_session)
@@ -1420,7 +1469,7 @@ vppcom_session_connect (uint32_t session_handle, vppcom_endpt_t * server_ep)
            &session->transport.rmt_ip, session->transport.is_ip4 ?
            IP46_TYPE_IP4 : IP46_TYPE_IP6,
            clib_net_to_host_u16 (session->transport.rmt_port),
-           session->session_type ? "UDP" : "TCP", session->session_state,
+           vppcom_proto_str (session->session_type), session->session_state,
            vppcom_session_state_str (session->session_state));
       return VPPCOM_OK;
     }
@@ -1442,7 +1491,7 @@ vppcom_session_connect (uint32_t session_handle, vppcom_endpt_t * server_ep)
        &session->transport.rmt_ip, session->transport.is_ip4 ?
        IP46_TYPE_IP4 : IP46_TYPE_IP6,
        clib_net_to_host_u16 (session->transport.rmt_port),
-       session->session_type ? "UDP" : "TCP");
+       vppcom_proto_str (session->session_type));
 
   /*
    * Send connect request and wait for reply from vpp
@@ -1571,8 +1620,8 @@ vppcom_session_read_internal (uint32_t session_handle, void *buf, int n,
                              SVM_Q_WAIT);
     }
 
-  VDBG (2, "VCL<%d>: vpp handle 0x%llx, sid %u: read %d bytes from (%p)",
-       getpid (), s->vpp_handle, session_handle, n_read, rx_fifo);
+  VDBG (2, "vpp handle 0x%llx, sid %u: read %d bytes from (%p)",
+       s->vpp_handle, session_handle, n_read, rx_fifo);
 
   return n_read;
 }
@@ -1944,7 +1993,7 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e,
        break;
       if (sid < n_bits && read_map)
        {
-         clib_bitmap_set_no_check (read_map, sid, 1);
+         clib_bitmap_set_no_check ((uword *) read_map, sid, 1);
          *bits_set += 1;
        }
       break;
@@ -1955,7 +2004,7 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e,
        break;
       if (sid < n_bits && write_map)
        {
-         clib_bitmap_set_no_check (write_map, sid, 1);
+         clib_bitmap_set_no_check ((uword *) write_map, sid, 1);
          *bits_set += 1;
        }
       break;
@@ -1967,7 +2016,7 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e,
       sid = session->session_index;
       if (sid < n_bits && read_map)
        {
-         clib_bitmap_set_no_check (read_map, sid, 1);
+         clib_bitmap_set_no_check ((uword *) read_map, sid, 1);
          *bits_set += 1;
        }
       break;
@@ -1978,7 +2027,7 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e,
       sid = session->session_index;
       if (sid < n_bits && write_map)
        {
-         clib_bitmap_set_no_check (write_map, sid, 1);
+         clib_bitmap_set_no_check ((uword *) write_map, sid, 1);
          *bits_set += 1;
        }
       break;
@@ -1990,7 +2039,7 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e,
       sid = session->session_index;
       if (sid < n_bits && read_map)
        {
-         clib_bitmap_set_no_check (read_map, sid, 1);
+         clib_bitmap_set_no_check ((uword *) read_map, sid, 1);
          *bits_set += 1;
        }
       break;
@@ -2006,7 +2055,7 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e,
       sid = session->session_index;
       if (sid < n_bits && except_map)
        {
-         clib_bitmap_set_no_check (except_map, sid, 1);
+         clib_bitmap_set_no_check ((uword *) except_map, sid, 1);
          *bits_set += 1;
        }
       break;
@@ -2014,7 +2063,7 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e,
       sid = vcl_session_reset_handler (wrk, (session_reset_msg_t *) e->data);
       if (sid < n_bits && except_map)
        {
-         clib_bitmap_set_no_check (except_map, sid, 1);
+         clib_bitmap_set_no_check ((uword *) except_map, sid, 1);
          *bits_set += 1;
        }
       break;
@@ -2144,30 +2193,35 @@ vppcom_select (unsigned long n_bits, unsigned long *read_map,
   vcl_session_t *session = 0;
   int rv, i;
 
-  ASSERT (sizeof (clib_bitmap_t) == sizeof (long int));
+  STATIC_ASSERT (sizeof (clib_bitmap_t) == sizeof (unsigned long),
+                "vppcom bitmap size mismatch");
+  STATIC_ASSERT (sizeof (clib_bitmap_t) == sizeof (fd_mask),
+                "vppcom bitmap size mismatch");
+  STATIC_ASSERT (sizeof (clib_bitmap_t) == sizeof (uword),
+                "vppcom bitmap size mismatch");
 
   if (n_bits && read_map)
     {
       clib_bitmap_validate (wrk->rd_bitmap, minbits);
       clib_memcpy_fast (wrk->rd_bitmap, read_map,
-                       vec_len (wrk->rd_bitmap) * sizeof (clib_bitmap_t));
-      memset (read_map, 0, vec_len (wrk->rd_bitmap) * sizeof (clib_bitmap_t));
+                       vec_len (wrk->rd_bitmap) * sizeof (unsigned long));
+      memset (read_map, 0, vec_len (wrk->rd_bitmap) * sizeof (unsigned long));
     }
   if (n_bits && write_map)
     {
       clib_bitmap_validate (wrk->wr_bitmap, minbits);
       clib_memcpy_fast (wrk->wr_bitmap, write_map,
-                       vec_len (wrk->wr_bitmap) * sizeof (clib_bitmap_t));
+                       vec_len (wrk->wr_bitmap) * sizeof (unsigned long));
       memset (write_map, 0,
-             vec_len (wrk->wr_bitmap) * sizeof (clib_bitmap_t));
+             vec_len (wrk->wr_bitmap) * sizeof (unsigned long));
     }
   if (n_bits && except_map)
     {
       clib_bitmap_validate (wrk->ex_bitmap, minbits);
       clib_memcpy_fast (wrk->ex_bitmap, except_map,
-                       vec_len (wrk->ex_bitmap) * sizeof (clib_bitmap_t));
+                       vec_len (wrk->ex_bitmap) * sizeof (unsigned long));
       memset (except_map, 0,
-             vec_len (wrk->ex_bitmap) * sizeof (clib_bitmap_t));
+             vec_len (wrk->ex_bitmap) * sizeof (unsigned long));
     }
 
   if (!n_bits)
@@ -2188,7 +2242,7 @@ vppcom_select (unsigned long n_bits, unsigned long *read_map,
     rv = svm_fifo_is_full (session->tx_fifo);
     if (!rv)
       {
-        clib_bitmap_set_no_check (write_map, sid, 1);
+        clib_bitmap_set_no_check ((uword*)write_map, sid, 1);
         bits_set++;
       }
   }));
@@ -2208,7 +2262,7 @@ check_rd:
     rv = vppcom_session_read_ready (session);
     if (rv)
       {
-        clib_bitmap_set_no_check (read_map, sid, 1);
+        clib_bitmap_set_no_check ((uword*)read_map, sid, 1);
         bits_set++;
       }
   }));
@@ -2330,9 +2384,8 @@ vppcom_epoll_create (void)
   vep_session->wait_cont_idx = ~0;
   vep_session->vpp_handle = ~0;
 
-  vcl_evt (VCL_EVT_EPOLL_CREATE, vep_session, vep_sh);
-  VDBG (0, "VCL<%d>: Created vep_idx %u / sid %u!",
-       getpid (), vep_session->session_index, vep_session->session_index);
+  vcl_evt (VCL_EVT_EPOLL_CREATE, vep_session, vep_session->session_index);
+  VDBG (0, "Created vep_idx %u", vep_session->session_index);
 
   return vcl_session_handle (vep_session);
 }
@@ -2348,21 +2401,19 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle,
 
   if (vep_handle == session_handle)
     {
-      clib_warning ("VCL<%d>: ERROR: vep_idx == session_index (%u)!",
-                   getpid (), vep_handle);
+      VDBG (0, "vep_sh == session handle (%u)!", vep_handle);
       return VPPCOM_EINVAL;
     }
 
   vep_session = vcl_session_get_w_handle (wrk, vep_handle);
   if (PREDICT_FALSE (!vep_session))
     {
-      clib_warning ("VCL<%d>: ERROR: Invalid vep_idx (%u)!", vep_handle);
+      VDBG (0, "Invalid vep_sh (%u)!", vep_handle);
       return VPPCOM_EBADFD;
     }
   if (PREDICT_FALSE (!vep_session->is_vep))
     {
-      clib_warning ("VCL<%d>: ERROR: vep_idx (%u) is not a vep!",
-                   getpid (), vep_handle);
+      VDBG (0, "vep_sh (%u) is not a vep!", vep_handle);
       return VPPCOM_EINVAL;
     }
 
@@ -2372,13 +2423,12 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle,
   session = vcl_session_get_w_handle (wrk, session_handle);
   if (PREDICT_FALSE (!session))
     {
-      VDBG (0, "VCL<%d>: ERROR: Invalid session_handle (%u)!",
-           getpid (), session_handle);
+      VDBG (0, "Invalid session_handle (%u)!", session_handle);
       return VPPCOM_EBADFD;
     }
   if (PREDICT_FALSE (session->is_vep))
     {
-      clib_warning ("ERROR: session_handle (%u) is a vep!", vep_handle);
+      VDBG (0, "session_handle (%u) is a vep!", vep_handle);
       return VPPCOM_EINVAL;
     }
 
@@ -2387,8 +2437,7 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle,
     case EPOLL_CTL_ADD:
       if (PREDICT_FALSE (!event))
        {
-         clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_ADD: NULL pointer to "
-                       "epoll_event structure!", getpid ());
+         VDBG (0, "EPOLL_CTL_ADD: NULL pointer to epoll_event structure!");
          return VPPCOM_EINVAL;
        }
       if (vep_session->vep.next_sh != ~0)
@@ -2398,9 +2447,8 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle,
                                                   vep_session->vep.next_sh);
          if (PREDICT_FALSE (!next_session))
            {
-             clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_ADD: Invalid "
-                           "vep.next_sid (%u) on vep_idx (%u)!",
-                           getpid (), vep_session->vep.next_sh, vep_handle);
+             VDBG (0, "EPOLL_CTL_ADD: Invalid vep.next_sid (%u) on "
+                   "vep_idx (%u)!", vep_session->vep.next_sh, vep_handle);
              return VPPCOM_EBADFD;
            }
          ASSERT (next_session->vep.prev_sh == vep_handle);
@@ -2415,57 +2463,49 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle,
       session->is_vep_session = 1;
       vep_session->vep.next_sh = session_handle;
 
-      VDBG (1, "VCL<%d>: EPOLL_CTL_ADD: vep_idx %u, sid %u, events 0x%x, "
-           "data 0x%llx!", getpid (), vep_handle, session_handle,
-           event->events, event->data.u64);
+      VDBG (1, "EPOLL_CTL_ADD: vep_sh %u, sh %u, events 0x%x, data 0x%llx!",
+           vep_handle, session_handle, event->events, event->data.u64);
       vcl_evt (VCL_EVT_EPOLL_CTLADD, session, event->events, event->data.u64);
       break;
 
     case EPOLL_CTL_MOD:
       if (PREDICT_FALSE (!event))
        {
-         clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_MOD: NULL pointer to "
-                       "epoll_event structure!", getpid ());
+         VDBG (0, "EPOLL_CTL_MOD: NULL pointer to epoll_event structure!");
          rv = VPPCOM_EINVAL;
          goto done;
        }
       else if (PREDICT_FALSE (!session->is_vep_session))
        {
-         clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_MOD: "
-                       "not a vep session!", getpid (), session_handle);
+         VDBG (0, "sid %u EPOLL_CTL_MOD: not a vep session!",
+               session_handle);
          rv = VPPCOM_EINVAL;
          goto done;
        }
       else if (PREDICT_FALSE (session->vep.vep_sh != vep_handle))
        {
-         clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_MOD: "
-                       "vep_idx (%u) != vep_idx (%u)!",
-                       getpid (), session_handle,
-                       session->vep.vep_sh, vep_handle);
+         VDBG (0, "EPOLL_CTL_MOD: sh %u vep_sh (%u) != vep_sh (%u)!",
+               session_handle, session->vep.vep_sh, vep_handle);
          rv = VPPCOM_EINVAL;
          goto done;
        }
       session->vep.et_mask = VEP_DEFAULT_ET_MASK;
       session->vep.ev = *event;
-      VDBG (1, "VCL<%d>: EPOLL_CTL_MOD: vep_idx %u, sid %u, events 0x%x,"
-           " data 0x%llx!", getpid (), vep_handle, session_handle,
-           event->events, event->data.u64);
+      VDBG (1, "EPOLL_CTL_MOD: vep_sh %u, sh %u, events 0x%x, data 0x%llx!",
+           vep_handle, session_handle, event->events, event->data.u64);
       break;
 
     case EPOLL_CTL_DEL:
       if (PREDICT_FALSE (!session->is_vep_session))
        {
-         clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_DEL: "
-                       "not a vep session!", getpid (), session_handle);
+         VDBG (0, "EPOLL_CTL_DEL: %u not a vep session!", session_handle);
          rv = VPPCOM_EINVAL;
          goto done;
        }
       else if (PREDICT_FALSE (session->vep.vep_sh != vep_handle))
        {
-         clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_DEL: "
-                       "vep_idx (%u) != vep_idx (%u)!",
-                       getpid (), session_handle,
-                       session->vep.vep_sh, vep_handle);
+         VDBG (0, "EPOLL_CTL_DEL: sh %u vep_sh (%u) != vep_sh (%u)!",
+               session_handle, session->vep.vep_sh, vep_handle);
          rv = VPPCOM_EINVAL;
          goto done;
        }
@@ -2482,9 +2522,8 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle,
          prev_session = vcl_session_get_w_handle (wrk, session->vep.prev_sh);
          if (PREDICT_FALSE (!prev_session))
            {
-             clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_DEL: Invalid "
-                           "vep.prev_sid (%u) on sid (%u)!",
-                           getpid (), session->vep.prev_sh, session_handle);
+             VDBG (0, "EPOLL_CTL_DEL: Invalid prev_sid (%u) on sid (%u)!",
+                   session->vep.prev_sh, session_handle);
              return VPPCOM_EBADFD;
            }
          ASSERT (prev_session->vep.next_sh == session_handle);
@@ -2496,9 +2535,8 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle,
          next_session = vcl_session_get_w_handle (wrk, session->vep.next_sh);
          if (PREDICT_FALSE (!next_session))
            {
-             clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_DEL: Invalid "
-                           "vep.next_sid (%u) on sid (%u)!",
-                           getpid (), session->vep.next_sh, session_handle);
+             VDBG (0, "EPOLL_CTL_DEL: Invalid next_sid (%u) on sid (%u)!",
+                   session->vep.next_sh, session_handle);
              return VPPCOM_EBADFD;
            }
          ASSERT (next_session->vep.prev_sh == session_handle);
@@ -2510,13 +2548,13 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle,
       session->vep.prev_sh = ~0;
       session->vep.vep_sh = ~0;
       session->is_vep_session = 0;
-      VDBG (1, "VCL<%d>: EPOLL_CTL_DEL: vep_idx %u, sid %u!",
-           getpid (), vep_handle, session_handle);
+      VDBG (1, "EPOLL_CTL_DEL: vep_idx %u, sid %u!", vep_handle,
+           session_handle);
       vcl_evt (VCL_EVT_EPOLL_CTLDEL, session, vep_sh);
       break;
 
     default:
-      clib_warning ("VCL<%d>: ERROR: Invalid operation (%d)!", getpid (), op);
+      VDBG (0, "Invalid operation (%d)!", op);
       rv = VPPCOM_EINVAL;
     }
 
@@ -3381,8 +3419,7 @@ vppcom_session_recvfrom (uint32_t session_handle, void *buffer,
     rv = vppcom_session_peek (session_handle, buffer, buflen);
   else
     {
-      clib_warning ("VCL<%d>: Unsupport flags for recvfrom %d",
-                   getpid (), flags);
+      VDBG (0, "Unsupport flags for recvfrom %d", flags);
       return VPPCOM_EAFNOSUPPORT;
     }