From 59b2565cd91a67ced650739f36129650830211ac Mon Sep 17 00:00:00 2001
From: Dave Barach <dave@barachs.net>
Date: Sun, 10 Sep 2017 15:04:27 -0400
Subject: Repair vlib API socket server

- Teach vpp_api_test to send/receive API messages over sockets
- Add memfd-based shared memory
- Add api messages to create memfd-based shared memory segments
- vpp_api_test supports both socket and shared memory segment connections
- vpp_api_test pivot from socket to shared memory API messaging
- add socket client support to libvlibclient.so
- dead client reaper sends ping messages, container-friendly
- dead client reaper falls back to kill (<pid>, 0) live checking
  if e.g. a python app goes silent for tens of seconds
- handle ping messages in python client support code
- teach show api ring about pairwise shared-memory segments
- fix ip probing of already resolved destinations (VPP-998)

We'll need this work to implement proper host-stack client isolation

Change-Id: Ic23b65f75c854d0393d9a2e9d6b122a9551be769
Signed-off-by: Dave Barach <dave@barachs.net>
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Signed-off-by: Florin Coras <fcoras@cisco.com>
---
 src/plugins/acl/acl.c                                          | 1 -
 src/plugins/acl/acl_test.c                                     | 1 -
 src/plugins/acl/hash_lookup.c                                  | 1 -
 src/plugins/dpdk/api/dpdk_test.c                               | 1 -
 src/plugins/flowprobe/flowprobe.c                              | 1 -
 src/plugins/flowprobe/flowprobe_test.c                         | 1 -
 src/plugins/gtpu/gtpu_api.c                                    | 1 -
 src/plugins/gtpu/gtpu_test.c                                   | 1 -
 src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c      | 1 -
 src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c | 1 -
 src/plugins/ioam/export/ioam_export.c                          | 1 -
 src/plugins/ioam/export/ioam_export_test.c                     | 1 -
 src/plugins/ioam/ip6/ioam_cache.c                              | 1 -
 src/plugins/ioam/lib-pot/pot_api.c                             | 1 -
 src/plugins/ioam/lib-pot/pot_test.c                            | 2 +-
 src/plugins/ioam/lib-trace/trace_api.c                         | 2 +-
 src/plugins/ioam/lib-trace/trace_test.c                        | 2 +-
 src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c                 | 2 +-
 src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c                | 2 +-
 src/plugins/ioam/udp-ping/udp_ping_api.c                       | 2 +-
 src/plugins/ioam/udp-ping/udp_ping_node.c                      | 2 +-
 src/plugins/ioam/udp-ping/udp_ping_test.c                      | 2 +-
 src/plugins/lb/api.c                                           | 2 +-
 src/plugins/lb/lb_test.c                                       | 2 +-
 src/plugins/memif/memif_api.c                                  | 2 +-
 src/plugins/memif/memif_test.c                                 | 2 +-
 src/plugins/nat/nat_api.c                                      | 2 +-
 src/plugins/nat/nat_test.c                                     | 2 +-
 src/plugins/pppoe/pppoe_api.c                                  | 2 +-
 src/plugins/pppoe/pppoe_test.c                                 | 2 +-
 30 files changed, 16 insertions(+), 30 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/acl/acl.c b/src/plugins/acl/acl.c
index efd506de805..b8d8c71151d 100644
--- a/src/plugins/acl/acl.c
+++ b/src/plugins/acl/acl.c
@@ -25,7 +25,6 @@
 
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 
 /* define message IDs */
 #include <acl/acl_msg_enum.h>
diff --git a/src/plugins/acl/acl_test.c b/src/plugins/acl/acl_test.c
index abb9643ef1c..90fd49980de 100644
--- a/src/plugins/acl/acl_test.c
+++ b/src/plugins/acl/acl_test.c
@@ -21,7 +21,6 @@
 #include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 #include <vppinfra/error.h>
 #include <vnet/ip/ip.h>
 #include <arpa/inet.h>
diff --git a/src/plugins/acl/hash_lookup.c b/src/plugins/acl/hash_lookup.c
index 7869027b301..2262402d52f 100644
--- a/src/plugins/acl/hash_lookup.c
+++ b/src/plugins/acl/hash_lookup.c
@@ -20,7 +20,6 @@
 
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 
 #include <vlib/vlib.h>
 #include <vnet/vnet.h>
diff --git a/src/plugins/dpdk/api/dpdk_test.c b/src/plugins/dpdk/api/dpdk_test.c
index ea17e5d0e7a..8204edfe66a 100644
--- a/src/plugins/dpdk/api/dpdk_test.c
+++ b/src/plugins/dpdk/api/dpdk_test.c
@@ -18,7 +18,6 @@
 #include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 #include <vppinfra/error.h>
 #include <vnet/ip/ip.h>
 
diff --git a/src/plugins/flowprobe/flowprobe.c b/src/plugins/flowprobe/flowprobe.c
index 884b5a2e0a5..35999d2edb2 100644
--- a/src/plugins/flowprobe/flowprobe.c
+++ b/src/plugins/flowprobe/flowprobe.c
@@ -30,7 +30,6 @@
 
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 
 /* define message IDs */
 #include <flowprobe/flowprobe_msg_enum.h>
diff --git a/src/plugins/flowprobe/flowprobe_test.c b/src/plugins/flowprobe/flowprobe_test.c
index 91793f552c9..19b7a733795 100644
--- a/src/plugins/flowprobe/flowprobe_test.c
+++ b/src/plugins/flowprobe/flowprobe_test.c
@@ -17,7 +17,6 @@
 #include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 #include <vppinfra/error.h>
 #include <flowprobe/flowprobe.h>
 
diff --git a/src/plugins/gtpu/gtpu_api.c b/src/plugins/gtpu/gtpu_api.c
index 49a5053d9f4..5a77ab7f851 100644
--- a/src/plugins/gtpu/gtpu_api.c
+++ b/src/plugins/gtpu/gtpu_api.c
@@ -24,7 +24,6 @@
 
 #include <vppinfra/byte_order.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 
 #include <gtpu/gtpu.h>
 
diff --git a/src/plugins/gtpu/gtpu_test.c b/src/plugins/gtpu/gtpu_test.c
index e7fd0d54ac1..1eb54d6a6b8 100644
--- a/src/plugins/gtpu/gtpu_test.c
+++ b/src/plugins/gtpu/gtpu_test.c
@@ -16,7 +16,6 @@
 #include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 #include <vppinfra/error.h>
 #include <gtpu/gtpu.h>
 
diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c
index ec43e4849b4..976c831fcce 100644
--- a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c
@@ -25,7 +25,6 @@
 
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 
 #include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
 
diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c
index 17d31c95bcb..7e66329a998 100644
--- a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c
@@ -21,7 +21,6 @@
 #include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 #include <vppinfra/error.h>
 
 #define __plugin_msg_base export_test_main.msg_id_base
diff --git a/src/plugins/ioam/export/ioam_export.c b/src/plugins/ioam/export/ioam_export.c
index 46ac3d4a582..98e5f116c8a 100644
--- a/src/plugins/ioam/export/ioam_export.c
+++ b/src/plugins/ioam/export/ioam_export.c
@@ -24,7 +24,6 @@
 
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 #include <vnet/ip/ip6_hop_by_hop.h>
 
 
diff --git a/src/plugins/ioam/export/ioam_export_test.c b/src/plugins/ioam/export/ioam_export_test.c
index 5023afd7d63..70efc7e3e4e 100644
--- a/src/plugins/ioam/export/ioam_export_test.c
+++ b/src/plugins/ioam/export/ioam_export_test.c
@@ -21,7 +21,6 @@
 #include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 #include <vppinfra/error.h>
 
 #define __plugin_msg_base export_test_main.msg_id_base
diff --git a/src/plugins/ioam/ip6/ioam_cache.c b/src/plugins/ioam/ip6/ioam_cache.c
index 4c9997f4923..4e147da34dc 100644
--- a/src/plugins/ioam/ip6/ioam_cache.c
+++ b/src/plugins/ioam/ip6/ioam_cache.c
@@ -24,7 +24,6 @@
 
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 #include <vnet/ip/ip6_hop_by_hop.h>
 
 #include "ioam_cache.h"
diff --git a/src/plugins/ioam/lib-pot/pot_api.c b/src/plugins/ioam/lib-pot/pot_api.c
index cc1b7b76a78..52ea68e083d 100644
--- a/src/plugins/ioam/lib-pot/pot_api.c
+++ b/src/plugins/ioam/lib-pot/pot_api.c
@@ -25,7 +25,6 @@
 
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 
 /* define message IDs */
 #include <ioam/lib-pot/pot_msg_enum.h>
diff --git a/src/plugins/ioam/lib-pot/pot_test.c b/src/plugins/ioam/lib-pot/pot_test.c
index 1c6dd02dae1..2b528ece54e 100644
--- a/src/plugins/ioam/lib-pot/pot_test.c
+++ b/src/plugins/ioam/lib-pot/pot_test.c
@@ -21,7 +21,7 @@
 #include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
 #include <vppinfra/error.h>
 
 #define __plugin_msg_base pot_test_main.msg_id_base
diff --git a/src/plugins/ioam/lib-trace/trace_api.c b/src/plugins/ioam/lib-trace/trace_api.c
index 6889859baa0..cd00c591fda 100644
--- a/src/plugins/ioam/lib-trace/trace_api.c
+++ b/src/plugins/ioam/lib-trace/trace_api.c
@@ -26,7 +26,7 @@
 
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
 
 /* define message IDs */
 #include <ioam/lib-trace/trace_msg_enum.h>
diff --git a/src/plugins/ioam/lib-trace/trace_test.c b/src/plugins/ioam/lib-trace/trace_test.c
index 1e287deede4..f598b7ee936 100644
--- a/src/plugins/ioam/lib-trace/trace_test.c
+++ b/src/plugins/ioam/lib-trace/trace_test.c
@@ -21,7 +21,7 @@
 #include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
 #include <vppinfra/error.h>
 
 #define __plugin_msg_base trace_test_main.msg_id_base
diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c
index 634133a4f7f..3bc682bfbfb 100644
--- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c
@@ -25,7 +25,7 @@
 
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
 
 /* define message IDs */
 #include <ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h>
diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
index 80e656448c6..fdb4cf63b8b 100644
--- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
@@ -21,7 +21,7 @@
 #include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
 #include <vppinfra/error.h>
 
 #define __plugin_msg_base vxlan_gpe_test_main.msg_id_base
diff --git a/src/plugins/ioam/udp-ping/udp_ping_api.c b/src/plugins/ioam/udp-ping/udp_ping_api.c
index 7593873103d..52190097f1a 100644
--- a/src/plugins/ioam/udp-ping/udp_ping_api.c
+++ b/src/plugins/ioam/udp-ping/udp_ping_api.c
@@ -25,7 +25,7 @@
 
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
 
 /* define message IDs */
 #include <ioam/udp-ping/udp_ping_msg_enum.h>
diff --git a/src/plugins/ioam/udp-ping/udp_ping_node.c b/src/plugins/ioam/udp-ping/udp_ping_node.c
index e1a57955fbc..7a725258d65 100644
--- a/src/plugins/ioam/udp-ping/udp_ping_node.c
+++ b/src/plugins/ioam/udp-ping/udp_ping_node.c
@@ -17,7 +17,7 @@
 #include <vlib/vlib.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
 #include <vnet/ip/ip.h>
 #include <vnet/ip/ip6_hop_by_hop.h>
 #include <ioam/encap/ip6_ioam_trace.h>
diff --git a/src/plugins/ioam/udp-ping/udp_ping_test.c b/src/plugins/ioam/udp-ping/udp_ping_test.c
index 4ec11351221..a5cc4f3f7e3 100644
--- a/src/plugins/ioam/udp-ping/udp_ping_test.c
+++ b/src/plugins/ioam/udp-ping/udp_ping_test.c
@@ -21,7 +21,7 @@
 #include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
 #include <vppinfra/error.h>
 #include <vnet/ip/ip.h>
 
diff --git a/src/plugins/lb/api.c b/src/plugins/lb/api.c
index 9e3bcd651a0..7eb49ff6c26 100644
--- a/src/plugins/lb/api.c
+++ b/src/plugins/lb/api.c
@@ -19,7 +19,7 @@
 #include <vlibapi/api.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
 
 #define vl_msg_id(n,h) n,
 typedef enum {
diff --git a/src/plugins/lb/lb_test.c b/src/plugins/lb/lb_test.c
index 9b30c18d459..35bda262fee 100644
--- a/src/plugins/lb/lb_test.c
+++ b/src/plugins/lb/lb_test.c
@@ -16,7 +16,7 @@
 #include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
 #include <vppinfra/error.h>
 #include <lb/lb.h>
 
diff --git a/src/plugins/memif/memif_api.c b/src/plugins/memif/memif_api.c
index 07347bc05a4..684f53c5193 100644
--- a/src/plugins/memif/memif_api.c
+++ b/src/plugins/memif/memif_api.c
@@ -25,7 +25,7 @@
 
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
 
 /* define message IDs */
 #include <memif/memif_msg_enum.h>
diff --git a/src/plugins/memif/memif_test.c b/src/plugins/memif/memif_test.c
index 4ca7526df13..559d0f7d19f 100644
--- a/src/plugins/memif/memif_test.c
+++ b/src/plugins/memif/memif_test.c
@@ -20,7 +20,7 @@
 #include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
 #include <vppinfra/error.h>
 #include <vnet/ip/ip.h>
 #include <memif/memif.h>
diff --git a/src/plugins/nat/nat_api.c b/src/plugins/nat/nat_api.c
index b56b4436adc..3bacdfed051 100644
--- a/src/plugins/nat/nat_api.c
+++ b/src/plugins/nat/nat_api.c
@@ -23,7 +23,7 @@
 #include <nat/nat64.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
 #include <nat/nat_msg_enum.h>
 #include <vnet/fib/fib_table.h>
 
diff --git a/src/plugins/nat/nat_test.c b/src/plugins/nat/nat_test.c
index e0b0494048b..7cc85f5ccfa 100644
--- a/src/plugins/nat/nat_test.c
+++ b/src/plugins/nat/nat_test.c
@@ -18,7 +18,7 @@
 #include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
 #include <vppinfra/error.h>
 #include <vnet/ip/ip.h>
 #include <nat/nat.h>
diff --git a/src/plugins/pppoe/pppoe_api.c b/src/plugins/pppoe/pppoe_api.c
index 9b7584606a2..04326572ce7 100644
--- a/src/plugins/pppoe/pppoe_api.c
+++ b/src/plugins/pppoe/pppoe_api.c
@@ -24,7 +24,7 @@
 
 #include <vppinfra/byte_order.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
 
 #include <pppoe/pppoe.h>
 
diff --git a/src/plugins/pppoe/pppoe_test.c b/src/plugins/pppoe/pppoe_test.c
index 2b67d989418..a32f1b76fe0 100644
--- a/src/plugins/pppoe/pppoe_test.c
+++ b/src/plugins/pppoe/pppoe_test.c
@@ -16,7 +16,7 @@
 #include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
 #include <vppinfra/error.h>
 #include <pppoe/pppoe.h>
 
-- 
cgit 1.2.3-korg