aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2016-04-15 08:25:08 -0400
committerDave Barach <dave@barachs.net>2016-04-15 08:25:20 -0400
commit51c02a477811444e7ef3091b81100974d68afc63 (patch)
treef652491211365bdb0ac74813e440b530348252de
parent595395d47b71d880d49febae3d06629ba88727d0 (diff)
Remove historical netconf message switch APIs
The scheme is unused, and never to be used again; it was a bad idea in the first place. Change-Id: I1479a1fa9191e0374e00f7326545d216c3a11e32 Signed-off-by: Dave Barach <dave@barachs.net>
-rw-r--r--vpp/api/api.c22
-rw-r--r--vpp/api/vpe.api79
2 files changed, 0 insertions, 101 deletions
diff --git a/vpp/api/api.c b/vpp/api/api.c
index 32be34f7c01..37cd57ffc3b 100644
--- a/vpp/api/api.c
+++ b/vpp/api/api.c
@@ -208,14 +208,6 @@ bad_tx_sw_if_index: \
#define foreach_vpe_api_msg \
_(WANT_INTERFACE_EVENTS, want_interface_events) \
-_(WANT_FROM_NETCONF_SERVER, want_from_netconf_server) \
-_(WANT_TO_NETCONF_SERVER, want_to_netconf_server) \
-_(WANT_FROM_NETCONF_CLIENT, want_from_netconf_client) \
-_(WANT_TO_NETCONF_CLIENT, want_to_netconf_client) \
-_(FROM_NETCONF_SERVER, from_netconf_server) \
-_(TO_NETCONF_SERVER, to_netconf_server) \
-_(FROM_NETCONF_CLIENT, from_netconf_client) \
-_(TO_NETCONF_CLIENT, to_netconf_client) \
_(WANT_OAM_EVENTS, want_oam_events) \
_(OAM_ADD_DEL, oam_add_del) \
_(SW_INTERFACE_DUMP, sw_interface_dump) \
@@ -570,10 +562,6 @@ reply: \
}
pub_sub_handler (interface_events,INTERFACE_EVENTS)
-pub_sub_handler (from_netconf_server,FROM_NETCONF_SERVER)
-pub_sub_handler (to_netconf_server,TO_NETCONF_SERVER)
-pub_sub_handler (from_netconf_client,FROM_NETCONF_CLIENT)
-pub_sub_handler (to_netconf_client,TO_NETCONF_CLIENT)
pub_sub_handler (oam_events,OAM_EVENTS)
#define RESOLUTION_EVENT 1
@@ -5668,11 +5656,6 @@ static void vl_api_##nn##_t_handler ( \
vl_msg_api_free (mp); \
}
-BOUNCE_HANDLER(to_netconf_server);
-BOUNCE_HANDLER(from_netconf_server);
-BOUNCE_HANDLER(to_netconf_client);
-BOUNCE_HANDLER(from_netconf_client);
-
/*
* vpe_api_hookup
* Add vpe's API message handlers to the table.
@@ -5708,11 +5691,6 @@ vpe_api_hookup (vlib_main_t *vm)
vl_api_sr_tunnel_add_del_t_print,
256, 1);
- am->message_bounce [VL_API_FROM_NETCONF_SERVER] = 1;
- am->message_bounce [VL_API_TO_NETCONF_SERVER] = 1;
- am->message_bounce [VL_API_FROM_NETCONF_CLIENT] = 1;
- am->message_bounce [VL_API_TO_NETCONF_CLIENT] = 1;
-
/*
* Trace space for 8 MPLS encap labels, classifier mask+match
*/
diff --git a/vpp/api/vpe.api b/vpp/api/vpe.api
index 4414a7f7ade..f255fdaf622 100644
--- a/vpp/api/vpe.api
+++ b/vpp/api/vpe.api
@@ -819,85 +819,6 @@ define dhcp_proxy_set_vss_reply {
i32 retval;
};
-/*
- * These messages bounce off the dataplane and are not otherwise
- * interpreted; each has its own publish / subscribe API.
- * If the dataplane receives one of these and doesn't have an
- * active subscription for it, the message will be silently freed.
- */
-
-define from_netconf_server {
- u32 client_index;
- u32 context;
- u8 data[0];
-};
-
-define want_from_netconf_server {
- u32 client_index;
- u32 context;
- u32 enable_disable;
- u32 pid;
-};
-
-define want_from_netconf_server_reply {
- u32 context;
- i32 retval;
-};
-
-define to_netconf_server {
- u32 client_index;
- u32 context;
- u8 data[0];
-};
-
-define want_to_netconf_server {
- u32 client_index;
- u32 context;
- u32 enable_disable;
- u32 pid;
-};
-
-define want_to_netconf_server_reply {
- u32 context;
- i32 retval;
-};
-
-define from_netconf_client {
- u32 client_index;
- u32 context;
- u8 data[0];
-};
-
-define want_from_netconf_client {
- u32 client_index;
- u32 context;
- u32 enable_disable;
- u32 pid;
-};
-
-define want_from_netconf_client_reply {
- u32 context;
- i32 retval;
-};
-
-define to_netconf_client {
- u32 client_index;
- u32 context;
- u8 data[0];
-};
-
-define want_to_netconf_client {
- u32 client_index;
- u32 context;
- u32 enable_disable;
- u32 pid;
-};
-
-define want_to_netconf_client_reply {
- u32 context;
- i32 retval;
-};
-
/** \brief Set the ip flow hash config for a fib request
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request