* limitations under the License.
*/
+#include <vnet/vnet.h>
+#include <vnet/plugin/plugin.h>
#include <lb/lb.h>
#include <vppinfra/byte_order.h>
+#include <vppinfra/string.h>
#include <vlibapi/api.h>
#include <vlibapi/api.h>
#include <vlibmemory/api.h>
+#include <vpp/app/version.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum {
-#include <lb/lb.api.h>
- /* We'll want to know how many messages IDs we need... */
- VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
-
+/* define message IDs */
+#include <lb/lb_msg_enum.h>
/* define message structures */
#define vl_typedefs
-#include <lb/lb.api.h>
+#include <lb/lb_all_api_h.h>
#undef vl_typedefs
/* define generated endian-swappers */
#define vl_endianfun
-#include <lb/lb.api.h>
+#include <lb/lb_all_api_h.h>
#undef vl_endianfun
+/* instantiate all the print functions we know about */
#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <lb/lb_all_api_h.h>
+#undef vl_printfun
/* Get the API version number */
#define vl_api_version(n,v) static u32 api_version=(v);
-#include <lb/lb.api.h>
+#include <lb/lb_all_api_h.h>
#undef vl_api_version
-#define vl_msg_name_crc_list
-#include <lb/lb.api.h>
-#undef vl_msg_name_crc_list
-
-
#define REPLY_MSG_ID_BASE lbm->msg_id_base
#include <vlibapi/api_helper_macros.h>
-static void
-setup_message_id_table (lb_main_t * lbm, api_main_t * am)
-{
-#define _(id,n,crc) \
- vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + lbm->msg_id_base);
- foreach_vl_msg_name_crc_lb;
-#undef _
-}
+/* List of message types that this plugin understands */
+#define foreach_lb_plugin_api_msg \
+_(LB_CONF, lb_conf) \
+_(LB_ADD_DEL_VIP, lb_add_del_vip) \
+_(LB_ADD_DEL_AS, lb_add_del_as) \
+_(LB_FLUSH_VIP, lb_flush_vip) \
+
/* Macro to finish up custom dump fns */
#define FINISH \
vl_api_lb_conf_reply_t * rmp;
int rv = 0;
+ if (mp->sticky_buckets_per_core == ~0) {
+ mp->sticky_buckets_per_core = lbm->per_cpu_sticky_buckets;
+ }
+ if (mp->flow_timeout == ~0) {
+ mp->flow_timeout = lbm->flow_timeout;
+ }
+
rv = lb_conf((ip4_address_t *)&mp->ip4_src_address,
- (ip6_address_t *)mp->ip6_src_address,
+ (ip6_address_t *)&mp->ip6_src_address,
mp->sticky_buckets_per_core,
mp->flow_timeout);
u8 * s;
s = format (0, "SCRIPT: lb_conf ");
s = format (s, "%U ", format_ip4_address, (ip4_address_t *)&mp->ip4_src_address);
- s = format (s, "%U ", format_ip6_address, (ip6_address_t *)mp->ip6_src_address);
+ s = format (s, "%U ", format_ip6_address, (ip6_address_t *)&mp->ip6_src_address);
s = format (s, "%u ", mp->sticky_buckets_per_core);
s = format (s, "%u ", mp->flow_timeout);
FINISH;
int rv = 0;
lb_vip_add_args_t args;
- if((mp->protocol != IP_PROTOCOL_TCP)
- && (mp->protocol != IP_PROTOCOL_UDP))
+ /* if port == 0, it means all-port VIP */
+ if (mp->port == 0)
{
mp->protocol = ~0;
- mp->port = 0;
}
memcpy (&(args.prefix.ip6), mp->ip_prefix, sizeof(args.prefix.ip6));
if (mp->is_del) {
u32 vip_index;
if (!(rv = lb_vip_find_index(&(args.prefix), mp->prefix_length,
- mp->protocol, mp->port, &vip_index)))
+ mp->protocol, ntohs(mp->port), &vip_index)))
rv = lb_vip_del(vip_index);
} else {
u32 vip_index;
}
args.plen = mp->prefix_length;
+ args.protocol = mp->protocol;
+ args.port = ntohs(mp->port);
args.type = type;
args.new_length = ntohl(mp->new_flows_table_length);
sizeof(as_address.ip6));
if ((rv = lb_vip_find_index(&vip_ip_prefix, mp->vip_prefix_length,
- mp->protocol, mp->port, &vip_index)))
+ mp->protocol, ntohs(mp->port), &vip_index)))
goto done;
if (mp->is_del)
- rv = lb_vip_del_ass(vip_index, &as_address, 1);
+ rv = lb_vip_del_ass(vip_index, &as_address, 1, mp->is_flush);
else
rv = lb_vip_add_ass(vip_index, &as_address, 1);
FINISH;
}
-/* List of message types that this plugin understands */
-#define foreach_lb_plugin_api_msg \
-_(LB_CONF, lb_conf) \
-_(LB_ADD_DEL_VIP, lb_add_del_vip) \
-_(LB_ADD_DEL_AS, lb_add_del_as)
-
-static clib_error_t * lb_api_init (vlib_main_t * vm)
+static void
+vl_api_lb_flush_vip_t_handler
+(vl_api_lb_flush_vip_t * mp)
{
lb_main_t *lbm = &lb_main;
- u8 *name = format (0, "lb_%08x%c", api_version, 0);
- lbm->msg_id_base = vl_msg_api_get_msg_ids
- ((char *) name, VL_MSG_FIRST_AVAILABLE);
+ int rv = 0;
+ ip46_address_t vip_prefix;
+ u8 vip_plen;
+ u32 vip_index;
+ vl_api_lb_flush_vip_reply_t * rmp;
+
+ if (mp->port == 0)
+ {
+ mp->protocol = ~0;
+ }
+
+ memcpy (&(vip_prefix.ip6), mp->ip_prefix, sizeof(vip_prefix.ip6));
+
+ vip_plen = mp->prefix_length;
+ rv = lb_vip_find_index(&vip_prefix, vip_plen, mp->protocol,
+ ntohs(mp->port), &vip_index);
+
+ rv = lb_flush_vip_as(vip_index, ~0);
+
+ REPLY_MACRO (VL_API_LB_FLUSH_VIP_REPLY);
+}
+
+static void *vl_api_lb_flush_vip_t_print
+(vl_api_lb_flush_vip_t *mp, void * handle)
+{
+ u8 * s;
+ s = format (0, "SCRIPT: lb_add_del_vip ");
+ s = format (s, "%U ", format_ip46_prefix,
+ (ip46_address_t *)mp->ip_prefix, mp->prefix_length, IP46_TYPE_ANY);
+
+ s = format (s, "protocol %u ", mp->protocol);
+ s = format (s, "port %u ", mp->port);
+
+ FINISH;
+}
+
+/* Set up the API message handling tables */
+static clib_error_t *
+lb_plugin_api_hookup (vlib_main_t *vm)
+{
+lb_main_t *lbm = &lb_main;
#define _(N,n) \
vl_msg_api_set_handlers((VL_API_##N + lbm->msg_id_base), \
#n, \
foreach_lb_plugin_api_msg;
#undef _
+ return 0;
+}
+
+#define vl_msg_name_crc_list
+#include <lb/lb_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (lb_main_t * lmp, api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + lmp->msg_id_base);
+ foreach_vl_msg_name_crc_lb ;
+#undef _
+}
+
+static clib_error_t * lb_api_init (vlib_main_t * vm)
+{
+ lb_main_t * lbm = &lb_main;
+ clib_error_t * error = 0;
+ u8 * name;
+
+ lbm->vlib_main = vm;
+ lbm->vnet_main = vnet_get_main();
+
+ name = format (0, "lb_%08x%c", api_version, 0);
+
+ /* Ask for a correctly-sized block of API message decode slots */
+ lbm->msg_id_base = vl_msg_api_get_msg_ids
+ ((char *) name, VL_MSG_FIRST_AVAILABLE);
+
+ error = lb_plugin_api_hookup (vm);
+
/* Add our API messages to the global name_crc hash table */
setup_message_id_table (lbm, &api_main);
- return 0;
+ vec_free (name);
+
+ return error;
}
VLIB_INIT_FUNCTION (lb_api_init);
Code Review / vpp.git / blobdiff