sr: new messages created to return packet statistics in sr localsid details
[vpp.git] / src / vnet / srv6 / sr_api.c
index 37a4fab..1b95125 100644 (file)
 #include <vnet/interface.h>
 #include <vnet/api_errno.h>
 #include <vnet/feature/feature.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/ip/ip_types_api.h>
 
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs            /* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun           /* define message structures */
-#include <vnet/vnet_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 <vnet/vnet_all_api_h.h>
-#undef vl_printfun
+#include <vnet/format_fns.h>
+#include <vnet/srv6/sr.api_enum.h>
+#include <vnet/srv6/sr.api_types.h>
 
+#define REPLY_MSG_ID_BASE sr_main.msg_id_base
 #include <vlibapi/api_helper_macros.h>
 
-#define foreach_vpe_api_msg                             \
-_(SR_LOCALSID_ADD_DEL, sr_localsid_add_del)             \
-_(SR_POLICY_ADD, sr_policy_add)                         \
-_(SR_POLICY_MOD, sr_policy_mod)                         \
-_(SR_POLICY_DEL, sr_policy_del)                         \
-_(SR_STEERING_ADD_DEL, sr_steering_add_del)             \
-_(SR_SET_ENCAP_SOURCE, sr_set_encap_source)             \
-_(SR_LOCALSIDS_DUMP, sr_localsids_dump)                 \
-_(SR_POLICIES_DUMP, sr_policies_dump)                   \
-_(SR_STEERING_POL_DUMP, sr_steering_pol_dump)
-
 static void vl_api_sr_localsid_add_del_t_handler
   (vl_api_sr_localsid_add_del_t * mp)
 {
   vl_api_sr_localsid_add_del_reply_t *rmp;
   int rv = 0;
+  ip46_address_t prefix;
+  ip6_address_t localsid;
 /*
  * int sr_cli_localsid (char is_del, ip6_address_t *localsid_addr,
  *  char end_psp, u8 behavior, u32 sw_if_index, u32 vlan_index, u32 fib_table,
@@ -69,22 +51,16 @@ static void vl_api_sr_localsid_add_del_t_handler
       mp->behavior == SR_BEHAVIOR_DX4 || mp->behavior == SR_BEHAVIOR_DX2)
     VALIDATE_SW_IF_INDEX (mp);
 
-  ip46_address_t prefix;
-
-  clib_memset (&prefix, 0, sizeof (ip46_address_t));
-  if ((mp->nh_addr4[0] | mp->nh_addr4[1] | mp->
-       nh_addr4[2] | mp->nh_addr4[3]) != 0)
-    memcpy (&prefix.ip4, mp->nh_addr4, sizeof (prefix.ip4));
-  else
-    memcpy (&prefix.ip6, mp->nh_addr6, sizeof (prefix.ip6));
+  ip6_address_decode (mp->localsid, &localsid);
+  ip_address_decode (&mp->nh_addr, &prefix);
 
   rv = sr_cli_localsid (mp->is_del,
-                       (ip6_address_t *) & mp->localsid,
+                       &localsid, 128,
                        mp->end_psp,
                        mp->behavior,
                        ntohl (mp->sw_if_index),
                        ntohl (mp->vlan_index),
-                       ntohl (mp->fib_table), &prefix, NULL);
+                       ntohl (mp->fib_table), &prefix, 0, NULL);
 
   BAD_SW_IF_INDEX_LABEL;
   REPLY_MACRO (VL_API_SR_LOCALSID_ADD_DEL_REPLY);
@@ -95,25 +71,28 @@ vl_api_sr_policy_add_t_handler (vl_api_sr_policy_add_t * mp)
 {
   vl_api_sr_policy_add_reply_t *rmp;
   ip6_address_t *segments = 0, *seg;
-  ip6_address_t *this_address = (ip6_address_t *) mp->sids.sids;
+  ip6_address_t bsid_addr;
 
   int i;
   for (i = 0; i < mp->sids.num_sids; i++)
     {
       vec_add2 (segments, seg, 1);
-      clib_memcpy (seg->as_u8, this_address->as_u8, sizeof (*this_address));
-      this_address++;
+      ip6_address_decode (mp->sids.sids[i], seg);
     }
 
+  ip6_address_decode (mp->bsid_addr, &bsid_addr);
+
 /*
  * sr_policy_add (ip6_address_t *bsid, ip6_address_t *segments,
- *                u32 weight, u8 behavior, u32 fib_table, u8 is_encap)
+ *                u32 weight, u8 behavior, u32 fib_table, u8 is_encap,
+ *                u16 behavior, void *plugin_mem)
  */
   int rv = 0;
-  rv = sr_policy_add ((ip6_address_t *) & mp->bsid_addr,
+  rv = sr_policy_add (&bsid_addr,
                      segments,
                      ntohl (mp->sids.weight),
-                     mp->type, ntohl (mp->fib_table), mp->is_encap);
+                     mp->is_spray, ntohl (mp->fib_table), mp->is_encap, 0,
+                     NULL);
   vec_free (segments);
 
   REPLY_MACRO (VL_API_SR_POLICY_ADD_REPLY);
@@ -123,18 +102,18 @@ static void
 vl_api_sr_policy_mod_t_handler (vl_api_sr_policy_mod_t * mp)
 {
   vl_api_sr_policy_mod_reply_t *rmp;
-
   ip6_address_t *segments = 0, *seg;
-  ip6_address_t *this_address = (ip6_address_t *) mp->sids.sids;
+  ip6_address_t bsid_addr;
 
   int i;
   for (i = 0; i < mp->sids.num_sids; i++)
     {
       vec_add2 (segments, seg, 1);
-      clib_memcpy (seg->as_u8, this_address->as_u8, sizeof (*this_address));
-      this_address++;
+      ip6_address_decode (mp->sids.sids[i], seg);
     }
 
+  ip6_address_decode (mp->bsid_addr, &bsid_addr);
+
   int rv = 0;
 /*
  * int
@@ -142,7 +121,7 @@ vl_api_sr_policy_mod_t_handler (vl_api_sr_policy_mod_t * mp)
  *               u8 operation, ip6_address_t *segments, u32 sl_index,
  *               u32 weight, u8 is_encap)
  */
-  rv = sr_policy_mod ((ip6_address_t *) & mp->bsid_addr,
+  rv = sr_policy_mod (&bsid_addr,
                      ntohl (mp->sr_policy_index),
                      ntohl (mp->fib_table),
                      mp->operation,
@@ -158,12 +137,13 @@ vl_api_sr_policy_del_t_handler (vl_api_sr_policy_del_t * mp)
 {
   vl_api_sr_policy_del_reply_t *rmp;
   int rv = 0;
+  ip6_address_t bsid_addr;
 /*
  * int
  * sr_policy_del (ip6_address_t *bsid, u32 index)
  */
-  rv = sr_policy_del ((ip6_address_t *) & mp->bsid_addr,
-                     ntohl (mp->sr_policy_index));
+  ip6_address_decode (mp->bsid_addr, &bsid_addr);
+  rv = sr_policy_del (&bsid_addr, ntohl (mp->sr_policy_index));
 
   REPLY_MACRO (VL_API_SR_POLICY_DEL_REPLY);
 }
@@ -173,9 +153,26 @@ vl_api_sr_set_encap_source_t_handler (vl_api_sr_set_encap_source_t * mp)
 {
   vl_api_sr_set_encap_source_reply_t *rmp;
   int rv = 0;
-  sr_set_source ((ip6_address_t *) & mp->encaps_source);
+  ip6_address_t encaps_source;
 
-  REPLY_MACRO (VL_API_SR_POLICY_DEL_REPLY);
+  ip6_address_decode (mp->encaps_source, &encaps_source);
+  sr_set_source (&encaps_source);
+
+  REPLY_MACRO (VL_API_SR_SET_ENCAP_SOURCE_REPLY);
+}
+
+static void
+vl_api_sr_set_encap_hop_limit_t_handler (vl_api_sr_set_encap_hop_limit_t * mp)
+{
+  vl_api_sr_set_encap_hop_limit_reply_t *rmp;
+  int rv = 0;
+
+  if (mp->hop_limit == 0)
+    rv = VNET_API_ERROR_INVALID_VALUE;
+  else
+    sr_set_hop_limit (mp->hop_limit);
+
+  REPLY_MACRO (VL_API_SR_SET_ENCAP_HOP_LIMIT_REPLY);
 }
 
 static void vl_api_sr_steering_add_del_t_handler
@@ -183,21 +180,27 @@ static void vl_api_sr_steering_add_del_t_handler
 {
   vl_api_sr_steering_add_del_reply_t *rmp;
   int rv = 0;
+  ip6_address_t bsid_addr;
+  ip46_address_t prefix_addr;
 /*
  * int
  * sr_steering_policy(int is_del, ip6_address_t *bsid, u32 sr_policy_index,
  *  u32 table_id, ip46_address_t *prefix, u32 mask_width, u32 sw_if_index,
  *  u8 traffic_type)
  */
+
+  ip6_address_decode (mp->bsid_addr, &bsid_addr);
+  ip_address_decode (&mp->prefix.address, &prefix_addr);
+
   if (mp->traffic_type == SR_STEER_L2)
     VALIDATE_SW_IF_INDEX (mp);
 
   rv = sr_steering_policy (mp->is_del,
-                          (ip6_address_t *) & mp->bsid_addr,
+                          &bsid_addr,
                           ntohl (mp->sr_policy_index),
                           ntohl (mp->table_id),
-                          (ip46_address_t *) & mp->prefix_addr,
-                          ntohl (mp->mask_width),
+                          &prefix_addr,
+                          mp->prefix.len,
                           ntohl (mp->sw_if_index), mp->traffic_type);
 
   BAD_SW_IF_INDEX_LABEL;
@@ -211,19 +214,23 @@ static void send_sr_localsid_details
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
   clib_memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_SR_LOCALSIDS_DETAILS);
-  clib_memcpy (rmp->addr.addr, &t->localsid, sizeof (ip6_address_t));
+  rmp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_SR_LOCALSIDS_DETAILS);
+  ip6_address_encode (&t->localsid, rmp->addr);
   rmp->end_psp = t->end_psp;
-  rmp->behavior = htons (t->behavior);
+  rmp->behavior = t->behavior;
   rmp->fib_table = htonl (t->fib_table);
   rmp->vlan_index = htonl (t->vlan_index);
-  if (ip46_address_is_ip4 (&t->next_hop))
-    clib_memcpy (rmp->xconnect_nh_addr4, &t->next_hop.ip4,
-                sizeof (ip4_address_t));
+  ip_address_encode (&t->next_hop, IP46_TYPE_ANY, &rmp->xconnect_nh_addr);
+
+  if (t->behavior == SR_BEHAVIOR_T || t->behavior == SR_BEHAVIOR_DT6)
+    rmp->xconnect_iface_or_vrf_table =
+      htonl (fib_table_get_table_id (t->sw_if_index, FIB_PROTOCOL_IP6));
+  else if (t->behavior == SR_BEHAVIOR_DT4)
+    rmp->xconnect_iface_or_vrf_table =
+      htonl (fib_table_get_table_id (t->sw_if_index, FIB_PROTOCOL_IP4));
   else
-    clib_memcpy (rmp->xconnect_nh_addr6, &t->next_hop.ip6,
-                sizeof (ip6_address_t));
-  rmp->xconnect_iface_or_vrf_table = htonl (t->sw_if_index);
+    rmp->xconnect_iface_or_vrf_table = htonl (t->sw_if_index);
+
   rmp->context = context;
 
   vl_api_send_msg (reg, (u8 *) rmp);
@@ -241,22 +248,90 @@ static void vl_api_sr_localsids_dump_t_handler
     return;
 
   /* *INDENT-OFF* */
-  pool_foreach (t, sm->localsids,
-  ({
+  pool_foreach (t, sm->localsids)
+   {
     send_sr_localsid_details(t, reg, mp->context);
-  }));
+  }
   /* *INDENT-ON* */
 }
 
+static void
+send_sr_localsid_with_packet_stats_details (int local_sid_index,
+                                           ip6_sr_localsid_t *t,
+                                           vl_api_registration_t *reg,
+                                           u32 context)
+{
+  vl_api_sr_localsids_with_packet_stats_details_t *rmp;
+  vlib_counter_t good_traffic, bad_traffic;
+  ip6_sr_main_t *sm = &sr_main;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id =
+    ntohs (REPLY_MSG_ID_BASE + VL_API_SR_LOCALSIDS_WITH_PACKET_STATS_DETAILS);
+  ip6_address_encode (&t->localsid, rmp->addr);
+  rmp->end_psp = t->end_psp;
+  rmp->behavior = t->behavior;
+  rmp->fib_table = htonl (t->fib_table);
+  rmp->vlan_index = htonl (t->vlan_index);
+  ip_address_encode (&t->next_hop, IP46_TYPE_ANY, &rmp->xconnect_nh_addr);
+
+  if (t->behavior == SR_BEHAVIOR_T || t->behavior == SR_BEHAVIOR_DT6)
+    rmp->xconnect_iface_or_vrf_table =
+      htonl (fib_table_get_table_id (t->sw_if_index, FIB_PROTOCOL_IP6));
+  else if (t->behavior == SR_BEHAVIOR_DT4)
+    rmp->xconnect_iface_or_vrf_table =
+      htonl (fib_table_get_table_id (t->sw_if_index, FIB_PROTOCOL_IP4));
+  else
+    rmp->xconnect_iface_or_vrf_table = htonl (t->sw_if_index);
+
+  rmp->context = context;
+  vlib_get_combined_counter (&(sm->sr_ls_valid_counters), local_sid_index,
+                            &good_traffic);
+  vlib_get_combined_counter (&(sm->sr_ls_invalid_counters), local_sid_index,
+                            &bad_traffic);
+  rmp->good_traffic_bytes = clib_host_to_net_u64 (good_traffic.bytes);
+  rmp->good_traffic_pkt_count = clib_host_to_net_u64 (good_traffic.packets);
+  rmp->bad_traffic_bytes = clib_host_to_net_u64 (bad_traffic.bytes);
+  rmp->bad_traffic_pkt_count = clib_host_to_net_u64 (bad_traffic.packets);
+  vl_api_send_msg (reg, (u8 *) rmp);
+}
+
+static void
+vl_api_sr_localsids_with_packet_stats_dump_t_handler (
+  vl_api_sr_localsids_with_packet_stats_dump_t *mp)
+{
+  vl_api_registration_t *reg;
+  ip6_sr_main_t *sm = &sr_main;
+  ip6_sr_localsid_t **localsid_list = 0;
+  ip6_sr_localsid_t *t;
+  int i;
+
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
+    return;
+
+  pool_foreach (t, sm->localsids)
+    {
+      vec_add1 (localsid_list, t);
+    }
+  for (i = 0; i < vec_len (localsid_list); i++)
+    {
+      t = localsid_list[i];
+      send_sr_localsid_with_packet_stats_details (i, t, reg, mp->context);
+    }
+}
+
 static void send_sr_policies_details
   (ip6_sr_policy_t * t, vl_api_registration_t * reg, u32 context)
 {
   vl_api_sr_policies_details_t *rmp;
   ip6_sr_main_t *sm = &sr_main;
 
-  u32 *sl_index;
+  u32 *sl_index, slidx = 0;
   ip6_sr_sl_t *segment_list = 0;
-  vl_api_srv6_sid_list_t *write_sid_list;
+  ip6_address_t *segment;
+  vl_api_srv6_sid_list_t *api_sid_list;
 
   rmp = vl_msg_api_alloc (sizeof (*rmp) +
                          vec_len (t->segments_lists) *
@@ -266,10 +341,10 @@ static void send_sr_policies_details
                vec_len (t->segments_lists) *
                sizeof (vl_api_srv6_sid_list_t)));
 
-  rmp->_vl_msg_id = ntohs (VL_API_SR_POLICIES_DETAILS);
-  clib_memcpy (rmp->bsid.addr, &t->bsid, sizeof (ip6_address_t));
+  rmp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_SR_POLICIES_DETAILS);
+  ip6_address_encode (&t->bsid, rmp->bsid);
   rmp->is_encap = t->is_encap;
-  rmp->type = t->type;
+  rmp->is_spray = t->type;
   rmp->fib_table = htonl (t->fib_table);
   rmp->num_sid_lists = vec_len (t->segments_lists);
 
@@ -277,11 +352,16 @@ static void send_sr_policies_details
   vec_foreach (sl_index, t->segments_lists)
   {
     segment_list = pool_elt_at_index (sm->sid_lists, *sl_index);
-    write_sid_list = &rmp->sid_lists[sl_index - t->segments_lists];
-    write_sid_list->num_sids = vec_len (segment_list->segments);
-    write_sid_list->weight = htonl (segment_list->weight);
-    clib_memcpy (write_sid_list->sids, segment_list->segments,
-                vec_len (segment_list->segments) * sizeof (ip6_address_t));
+
+    api_sid_list = &rmp->sid_lists[sl_index - t->segments_lists];
+
+    api_sid_list->num_sids = vec_len (segment_list->segments);
+    api_sid_list->weight = htonl (segment_list->weight);
+    slidx = 0;
+    vec_foreach (segment, segment_list->segments)
+    {
+      ip6_address_encode (segment, api_sid_list->sids[slidx++]);
+    }
   }
 
   rmp->context = context;
@@ -300,10 +380,79 @@ vl_api_sr_policies_dump_t_handler (vl_api_sr_policies_dump_t * mp)
     return;
 
   /* *INDENT-OFF* */
-  pool_foreach (t, sm->sr_policies,
-  ({
+  pool_foreach (t, sm->sr_policies)
+   {
     send_sr_policies_details(t, reg, mp->context);
-  }));
+  }
+  /* *INDENT-ON* */
+}
+
+
+
+static void send_sr_policies_details_with_sl_index
+  (ip6_sr_policy_t * t, vl_api_registration_t * reg, u32 context)
+{
+  vl_api_sr_policies_with_sl_index_details_t *rmp;
+  ip6_sr_main_t *sm = &sr_main;
+
+  u32 *sl_index, slidx = 0;
+  ip6_sr_sl_t *segment_list = 0;
+  ip6_address_t *segment;
+  vl_api_srv6_sid_list_with_sl_index_t *api_sid_list;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp) +
+                         vec_len (t->segments_lists) *
+                         sizeof (vl_api_srv6_sid_list_with_sl_index_t));
+  clib_memset (rmp, 0,
+              (sizeof (*rmp) +
+               vec_len (t->segments_lists) *
+               sizeof (vl_api_srv6_sid_list_with_sl_index_t)));
+
+  rmp->_vl_msg_id =
+    ntohs (REPLY_MSG_ID_BASE + VL_API_SR_POLICIES_WITH_SL_INDEX_DETAILS);
+  ip6_address_encode (&t->bsid, rmp->bsid);
+  rmp->is_encap = t->is_encap;
+  rmp->is_spray = t->type;
+  rmp->fib_table = htonl (t->fib_table);
+  rmp->num_sid_lists = vec_len (t->segments_lists);
+
+  /* Fill in all the segments lists */
+  vec_foreach (sl_index, t->segments_lists)
+  {
+    segment_list = pool_elt_at_index (sm->sid_lists, *sl_index);
+
+    api_sid_list = &rmp->sid_lists[sl_index - t->segments_lists];
+    api_sid_list->sl_index = htonl (*sl_index);
+    api_sid_list->num_sids = vec_len (segment_list->segments);
+    api_sid_list->weight = htonl (segment_list->weight);
+    slidx = 0;
+    vec_foreach (segment, segment_list->segments)
+    {
+      ip6_address_encode (segment, api_sid_list->sids[slidx++]);
+    }
+  }
+
+  rmp->context = context;
+  vl_api_send_msg (reg, (u8 *) rmp);
+}
+
+static void
+  vl_api_sr_policies_with_sl_index_dump_t_handler
+  (vl_api_sr_policies_with_sl_index_dump_t * mp)
+{
+  vl_api_registration_t *reg;
+  ip6_sr_main_t *sm = &sr_main;
+  ip6_sr_policy_t *t;
+
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
+    return;
+
+  /* *INDENT-OFF* */
+  pool_foreach (t, sm->sr_policies)
+   {
+    send_sr_policies_details_with_sl_index(t, reg, mp->context);
+  }
   /* *INDENT-ON* */
 }
 
@@ -315,23 +464,19 @@ static void send_sr_steering_pol_details
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
   clib_memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_SR_STEERING_POL_DETAILS);
+  rmp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_SR_STEERING_POL_DETAILS);
 
   //Get the SR policy BSID
   ip6_sr_policy_t *p;
   p = pool_elt_at_index (sm->sr_policies, t->sr_policy);
-  clib_memcpy (rmp->bsid.addr, &p->bsid, sizeof (ip6_address_t));
+  ip6_address_encode (&p->bsid, rmp->bsid);
 
   //Get the steering
   rmp->traffic_type = t->classify.traffic_type;
   rmp->fib_table = htonl (t->classify.l3.fib_table);
-  rmp->mask_width = htonl (t->classify.l3.mask_width);
-  if (ip46_address_is_ip4 (&t->classify.l3.prefix))
-    clib_memcpy (rmp->prefix_addr, &t->classify.l3.prefix.ip4,
-                sizeof (ip4_address_t));
-  else
-    clib_memcpy (rmp->prefix_addr, &t->classify.l3.prefix.ip6,
-                sizeof (ip6_address_t));
+  ip_address_encode (&t->classify.l3.prefix, IP46_TYPE_ANY,
+                    &rmp->prefix.address);
+  rmp->prefix.len = t->classify.l3.mask_width;
 
   rmp->sw_if_index = htonl (t->classify.l2.sw_if_index);
 
@@ -351,51 +496,21 @@ static void vl_api_sr_steering_pol_dump_t_handler
     return;
 
   /* *INDENT-OFF* */
-  pool_foreach (t, sm->steer_policies,
-  ({
+  pool_foreach (t, sm->steer_policies)
+   {
     send_sr_steering_pol_details(t, reg, mp->context);
-  }));
+  }
   /* *INDENT-ON* */
 }
 
-/*
- * sr_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);
-  foreach_vl_msg_name_crc_sr;
-#undef _
-}
-
+#include <vnet/srv6/sr.api.c>
 static clib_error_t *
 sr_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);
-  foreach_vpe_api_msg;
-#undef _
-
   /*
    * Set up the (msg_name, crc, message-id) table
    */
-  setup_message_id_table (am);
+  REPLY_MSG_ID_BASE = setup_message_id_table ();
 
   return 0;
 }