#include <vnet/interface.h>
#include <vnet/api_errno.h>
#include <vnet/feature/feature.h>
+#include <vnet/ip/ip_types_api.h>
-#include <vnet/vnet_msg_enum.h>
+#include <vnet/format_fns.h>
+#include <vnet/srmpls/sr_mpls.api_enum.h>
+#include <vnet/srmpls/sr_mpls.api_types.h>
-#define vl_typedefs /* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+
+#define vl_api_version(n, v) static u32 api_version = v;
+#include <vnet/srmpls/sr_mpls.api.h>
+#undef vl_api_version
-#define vl_endianfun /* define message structures */
-#include <vnet/vnet_all_api_h.h>
+#define vl_endianfun
+#include <vnet/srmpls/sr_mpls.api.h>
#undef vl_endianfun
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_calcsizefun
+#include <vnet/srmpls/sr_mpls.api.h>
+#undef vl_calcsizefun
+
#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
+#include <vnet/srmpls/sr_mpls.api.h>
#undef vl_printfun
+#define vl_msg_name_crc_list
+#include <vnet/srmpls/sr_mpls.api.h>
+#undef vl_msg_name_crc_list
+
+#define REPLY_MSG_ID_BASE msg_id_base
#include <vlibapi/api_helper_macros.h>
#define foreach_vpe_api_msg \
_(SR_MPLS_STEERING_ADD_DEL, sr_mpls_steering_add_del) \
_(SR_MPLS_POLICY_ASSIGN_ENDPOINT_COLOR, sr_mpls_policy_assign_endpoint_color)
+static u16 msg_id_base;
static void
vl_api_sr_mpls_policy_add_t_handler (vl_api_sr_mpls_policy_add_t * mp)
int rv = 0;
rv = sr_mpls_policy_add (ntohl (mp->bsid),
- segments, mp->type, ntohl (mp->weight));
+ segments, mp->is_spray, ntohl (mp->weight));
vec_free (segments);
REPLY_MACRO (VL_API_SR_MPLS_POLICY_ADD_REPLY);
int rv = 0;
rv = sr_mpls_policy_mod (ntohl (mp->bsid),
- mp->operation, segments, ntohl (mp->sl_index),
- ntohl (mp->weight));
+ ntohl (mp->operation), segments,
+ ntohl (mp->sl_index), ntohl (mp->weight));
vec_free (segments);
REPLY_MACRO (VL_API_SR_MPLS_POLICY_MOD_REPLY);
(vl_api_sr_mpls_steering_add_del_t * mp)
{
vl_api_sr_mpls_steering_add_del_reply_t *rmp;
- ip46_address_t prefix;
+ fib_prefix_t prefix;
+ ip46_address_t next_hop;
clib_memset (&prefix, 0, sizeof (ip46_address_t));
- if (mp->traffic_type == SR_STEER_IPV4)
- memcpy (&prefix.ip4, mp->prefix_addr, sizeof (prefix.ip4));
- else
- memcpy (&prefix, mp->prefix_addr, sizeof (prefix.ip6));
+
+ ip_prefix_decode (&mp->prefix, &prefix);
+ ip_address_decode (&mp->next_hop, &next_hop);
int rv = 0;
if (mp->is_del)
- rv = sr_mpls_steering_policy_del (&prefix,
- ntohl (mp->mask_width),
- mp->traffic_type,
+ rv = sr_mpls_steering_policy_del (&prefix.fp_addr,
+ prefix.fp_len,
+ ip46_address_is_ip4 (&prefix.fp_addr) ?
+ SR_STEER_IPV4 : SR_STEER_IPV6,
ntohl (mp->table_id),
ntohl (mp->color));
else
rv = sr_mpls_steering_policy_add (ntohl (mp->bsid),
ntohl (mp->table_id),
- &prefix,
- ntohl (mp->mask_width),
- mp->traffic_type,
- (ip46_address_t *) & mp->next_hop,
- mp->nh_type,
+ &prefix.fp_addr,
+ prefix.fp_len,
+ ip46_address_is_ip4 (&prefix.fp_addr) ?
+ SR_STEER_IPV4 : SR_STEER_IPV6,
+ &next_hop,
+ ip46_address_is_ip4 (&next_hop) ?
+ SR_STEER_IPV4 : SR_STEER_IPV6,
ntohl (mp->color), mp->co_bits,
ntohl (mp->vpn_label));
ip46_address_t endpoint;
clib_memset (&endpoint, 0, sizeof (ip46_address_t));
- if (mp->endpoint_type == SR_STEER_IPV4)
- memcpy (&endpoint.ip4, mp->endpoint, sizeof (endpoint.ip4));
- else
- memcpy (&endpoint, mp->endpoint, sizeof (endpoint.ip6));
+ ip_address_decode (&mp->endpoint, &endpoint);
rv = sr_mpls_policy_assign_endpoint_color (ntohl (mp->bsid),
- &endpoint, mp->endpoint_type,
+ &endpoint,
+ ip46_address_is_ip4 (&endpoint) ?
+ SR_STEER_IPV4 : SR_STEER_IPV6,
ntohl (mp->color));
REPLY_MACRO (VL_API_SR_MPLS_POLICY_ASSIGN_ENDPOINT_COLOR_REPLY);
}
-/*
- * sr_mpls_api_hookup Add vpe's API message handlers to the table. vlib has
- * already mapped shared memory and added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/vnet_all_api_h.h>
-#undef vl_msg_name_crc_list
-
static void
setup_message_id_table (api_main_t * am)
{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+#define _(id, n, crc) \
+ vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + REPLY_MSG_ID_BASE);
foreach_vl_msg_name_crc_sr_mpls;
#undef _
}
static clib_error_t *
sr_mpls_api_hookup (vlib_main_t * vm)
{
- api_main_t *am = &api_main;
-
-#define _(N,n) \
- vl_msg_api_set_handlers(VL_API_##N, #n, \
- vl_api_##n##_t_handler, \
- vl_noop_handler, \
- vl_api_##n##_t_endian, \
- vl_api_##n##_t_print, \
- sizeof(vl_api_##n##_t), 1);
+ api_main_t *am = vlibapi_get_main ();
+
+ u8 *name = format (0, "sr_mpls_%08x%c", api_version, 0);
+ REPLY_MSG_ID_BASE =
+ vl_msg_api_get_msg_ids ((char *) name, VL_MSG_SR_MPLS_LAST);
+ vec_free (name);
+
+#define _(N, n) \
+ vl_msg_api_set_handlers ( \
+ REPLY_MSG_ID_BASE + VL_API_##N, #n, vl_api_##n##_t_handler, \
+ vl_noop_handler, vl_api_##n##_t_endian, vl_api_##n##_t_print, \
+ sizeof (vl_api_##n##_t), 1, vl_api_##n##_t_print_json, \
+ vl_api_##n##_t_tojson, vl_api_##n##_t_fromjson, \
+ vl_api_##n##_t_calc_size);
foreach_vpe_api_msg;
#undef _
* Manually register the sr policy add msg, so we trace enough bytes
* to capture a typical segment list
*/
- vl_msg_api_set_handlers (VL_API_SR_MPLS_POLICY_ADD,
- "sr_mpls_policy_add",
- vl_api_sr_mpls_policy_add_t_handler,
- vl_noop_handler,
- vl_api_sr_mpls_policy_add_t_endian,
- vl_api_sr_mpls_policy_add_t_print, 256, 1);
+ vl_msg_api_set_handlers (
+ REPLY_MSG_ID_BASE + VL_API_SR_MPLS_POLICY_ADD, "sr_mpls_policy_add",
+ vl_api_sr_mpls_policy_add_t_handler, vl_noop_handler,
+ vl_api_sr_mpls_policy_add_t_endian, vl_api_sr_mpls_policy_add_t_print, 256,
+ 1, vl_api_sr_mpls_policy_add_t_print_json,
+ vl_api_sr_mpls_policy_add_t_tojson, vl_api_sr_mpls_policy_add_t_fromjson,
+ vl_api_sr_mpls_policy_add_t_calc_size);
/*
* Manually register the sr policy mod msg, so we trace enough bytes
* to capture a typical segment list
*/
- vl_msg_api_set_handlers (VL_API_SR_MPLS_POLICY_MOD,
- "sr_mpls_policy_mod",
- vl_api_sr_mpls_policy_mod_t_handler,
- vl_noop_handler,
- vl_api_sr_mpls_policy_mod_t_endian,
- vl_api_sr_mpls_policy_mod_t_print, 256, 1);
+ vl_msg_api_set_handlers (
+ REPLY_MSG_ID_BASE + VL_API_SR_MPLS_POLICY_MOD, "sr_mpls_policy_mod",
+ vl_api_sr_mpls_policy_mod_t_handler, vl_noop_handler,
+ vl_api_sr_mpls_policy_mod_t_endian, vl_api_sr_mpls_policy_mod_t_print, 256,
+ 1, vl_api_sr_mpls_policy_mod_t_print_json,
+ vl_api_sr_mpls_policy_mod_t_tojson, vl_api_sr_mpls_policy_mod_t_fromjson,
+ vl_api_sr_mpls_policy_mod_t_calc_size);
/*
* Set up the (msg_name, crc, message-id) table