commit 048b1d6ab787e46ad91574ac950329bccc7fe809
author Dave Wallace <dwallacelf@gmail.com> Wed Jan 03 22:24:41 2018 -0500
committer Keith Burns <alagalah@gmail.com> Wed Jan 17 22:26:17 2018 +0000
tree f2db18c1781bc351311dbe935dce51e7bd63b5ab
parent d3e83a9c82b4a57c24061828db6a309692f7f2d4

LD_PRELOAD: stateless LDP

- Refactor LDP to be stateless.
- Use upper bit of fd to identify
  tag as VCL session.
- Clean up debug output.
- Add VCOM config env vars for
  app name and sid bit.
- Add VCL get/set attributes
- Add VCL poll implementation.

Change-Id: I4603ae88254c460a024fdb79fe91c6d1ef9bc7b9
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

src/vcl/vppcom.h

diff --git a/src/vcl/vppcom.h b/src/vcl/vppcom.h
index 5511f04..208b371 100644
--- a/src/vcl/vppcom.h
+++ b/src/vcl/vppcom.h
@@ -18,6 +18,7 @@
 
 #include <netdb.h>
 #include <errno.h>
+#include <sys/poll.h>
 #include <sys/epoll.h>
 
 /*
@@ -41,6 +42,26 @@
   VPPCOM_PROTO_UDP,
 } vppcom_proto_t;
 
+static inline char *
+vppcom_proto_str (vppcom_proto_t proto)
+{
+  char *proto_str;
+
+  switch (proto)
+    {
+    case VPPCOM_PROTO_TCP:
+      proto_str = "VPPCOM_PROTO_TCP";
+      break;
+    case VPPCOM_PROTO_UDP:
+      proto_str = "VPPCOM_PROTO_UDP";
+      break;
+    default:
+      proto_str = "UNKNOWN";
+      break;
+    }
+  return proto_str;
+}
+
 typedef enum
 {
   VPPCOM_IS_IP6 = 0,
@@ -60,6 +81,7 @@
 {
   VPPCOM_OK = 0,
   VPPCOM_EAGAIN = -EAGAIN,
+  VPPCOM_EFAULT = -EFAULT,
   VPPCOM_ENOMEM = -ENOMEM,
   VPPCOM_EINVAL = -EINVAL,
   VPPCOM_EBADFD = -EBADFD,
@@ -79,14 +101,43 @@
   VPPCOM_ATTR_SET_FLAGS,
   VPPCOM_ATTR_GET_LCL_ADDR,
   VPPCOM_ATTR_GET_PEER_ADDR,
+  VPPCOM_ATTR_GET_LIBC_EPFD,
+  VPPCOM_ATTR_SET_LIBC_EPFD,
+  VPPCOM_ATTR_GET_PROTOCOL,
+  VPPCOM_ATTR_GET_LISTEN,
+  VPPCOM_ATTR_GET_ERROR,
+  VPPCOM_ATTR_GET_TX_FIFO_LEN,
+  VPPCOM_ATTR_SET_TX_FIFO_LEN,
+  VPPCOM_ATTR_GET_RX_FIFO_LEN,
+  VPPCOM_ATTR_SET_RX_FIFO_LEN,
+  VPPCOM_ATTR_GET_REUSEADDR,
   VPPCOM_ATTR_SET_REUSEADDR,
+  VPPCOM_ATTR_GET_REUSEPORT,
+  VPPCOM_ATTR_SET_REUSEPORT,
+  VPPCOM_ATTR_GET_BROADCAST,
   VPPCOM_ATTR_SET_BROADCAST,
+  VPPCOM_ATTR_GET_V6ONLY,
   VPPCOM_ATTR_SET_V6ONLY,
+  VPPCOM_ATTR_GET_KEEPALIVE,
   VPPCOM_ATTR_SET_KEEPALIVE,
+  VPPCOM_ATTR_GET_TCP_NODELAY,
+  VPPCOM_ATTR_SET_TCP_NODELAY,
+  VPPCOM_ATTR_GET_TCP_KEEPIDLE,
   VPPCOM_ATTR_SET_TCP_KEEPIDLE,
+  VPPCOM_ATTR_GET_TCP_KEEPINTVL,
   VPPCOM_ATTR_SET_TCP_KEEPINTVL,
+  VPPCOM_ATTR_GET_TCP_USER_MSS,
+  VPPCOM_ATTR_SET_TCP_USER_MSS,
 } vppcom_attr_op_t;
 
+typedef struct _vcl_poll
+{
+  uint32_t fds_ndx;
+  uint32_t sid;
+  short events;
+  short *revents;
+} vcl_poll_t;
+
 /*
  * VPPCOM Public API Functions
  */
@@ -105,6 +156,10 @@
       st = "VPPCOM_EAGAIN";
       break;
 
+    case VPPCOM_EFAULT:
+      st = "VPPCOM_EFAULT";
+      break;
+
     case VPPCOM_ENOMEM:
       st = "VPPCOM_ENOMEM";
       break;
@@ -160,13 +215,12 @@
 extern int vppcom_session_bind (uint32_t session_index, vppcom_endpt_t * ep);
 extern int vppcom_session_listen (uint32_t session_index, uint32_t q_len);
 extern int vppcom_session_accept (uint32_t session_index,
-				  vppcom_endpt_t * client_ep,
-				  uint32_t flags, double wait_for_time);
+				  vppcom_endpt_t * client_ep, uint32_t flags);
 
 extern int vppcom_session_connect (uint32_t session_index,
 				   vppcom_endpt_t * server_ep);
-extern int vppcom_session_read (uint32_t session_index, void *buf, int n);
-extern int vppcom_session_write (uint32_t session_index, void *buf, int n);
+extern int vppcom_session_read (uint32_t session_index, void *buf, size_t n);
+extern int vppcom_session_write (uint32_t session_index, void *buf, size_t n);
 
 extern int vppcom_select (unsigned long n_bits,
 			  unsigned long *read_map,
@@ -187,6 +241,8 @@
 extern int vppcom_session_sendto (uint32_t session_index, void *buffer,
 				  uint32_t buflen, int flags,
 				  vppcom_endpt_t * ep);
+extern int vppcom_poll (vcl_poll_t * vp, uint32_t n_sids,
+			double wait_for_time);
 
 #endif /* included_vppcom_h */