aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet/srv6
diff options
context:
space:
mode:
Diffstat (limited to 'src/vnet/srv6')
-rw-r--r--src/vnet/srv6/sr.api86
-rw-r--r--src/vnet/srv6/sr_api.c105
-rw-r--r--src/vnet/srv6/sr_types.api45
3 files changed, 138 insertions, 98 deletions
diff --git a/src/vnet/srv6/sr.api b/src/vnet/srv6/sr.api
index 543f3fd7d00..75a23b06e04 100644
--- a/src/vnet/srv6/sr.api
+++ b/src/vnet/srv6/sr.api
@@ -14,20 +14,18 @@
* limitations under the License.
*/
-option version = "1.2.1";
+option version = "2.0.0";
+
+import "vnet/interface_types.api";
+import "vnet/ip/ip_types.api";
+import "vnet/srv6/sr_types.api";
-/** \brief SRv6 SID
-*/
-typedef srv6_sid
-{
- u8 addr[16];
-};
typedef srv6_sid_list
{
u8 num_sids;
u32 weight;
- vl_api_srv6_sid_t sids[16];
+ vl_api_ip6_address_t sids[16];
};
/** \brief IPv6 SR LocalSID add/del request
@@ -41,27 +39,20 @@ typedef srv6_sid_list
fib_table.
@param vlan_index Only for L2 xconnect. Outgoing VLAN tag.
@param fib_table FIB table in which we should install the localsid entry
- @param nh_addr6 Next Hop IPv6 address. Only for L2/L3 xconnect.
- @param nh_addr4 Next Hop IPv4 address. Only for L2/L3 xconnect.
+ @param nh_addr Next Hop IPv46 address. Only for L2/L3 xconnect.
*/
autoreply define sr_localsid_add_del
{
u32 client_index;
u32 context;
- u8 is_del;
- vl_api_srv6_sid_t localsid;
- u8 end_psp;
- u8 behavior;
- u32 sw_if_index;
+ bool is_del [default=false];
+ vl_api_ip6_address_t localsid;
+ bool end_psp;
+ vl_api_sr_behavior_t behavior;
+ vl_api_interface_index_t sw_if_index;
u32 vlan_index;
u32 fib_table;
- u8 nh_addr6[16];
- u8 nh_addr4[4];
-};
-
-typedef sr_ip6_address
-{
- u8 data[16];
+ vl_api_address_t nh_addr;
};
/** \brief IPv6 SR policy add
@@ -70,7 +61,7 @@ typedef sr_ip6_address
@param bsid is the bindingSID of the SR Policy
@param weight is the weight of the sid list. optional.
@param is_encap is the behavior of the SR policy. (0.SRH insert // 1.Encapsulation)
- @param type is the type of the SR policy. (0.Default // 1.Spray)
+ @param is_spray is the type of the SR policy. (0.Default // 1.Spray)
@param fib_table is the VRF where to install the FIB entry for the BSID
@param sids is a srv6_sid_list object
*/
@@ -78,10 +69,10 @@ autoreply define sr_policy_add
{
u32 client_index;
u32 context;
- u8 bsid_addr[16];
+ vl_api_ip6_address_t bsid_addr;
u32 weight;
- u8 is_encap;
- u8 type;
+ bool is_encap;
+ bool is_spray;
u32 fib_table;
vl_api_srv6_sid_list_t sids;
};
@@ -101,10 +92,10 @@ autoreply define sr_policy_mod
{
u32 client_index;
u32 context;
- u8 bsid_addr[16];
+ vl_api_ip6_address_t bsid_addr;
u32 sr_policy_index;
u32 fib_table;
- u8 operation;
+ vl_api_sr_policy_op_t operation;
u32 sl_index;
u32 weight;
vl_api_srv6_sid_list_t sids;
@@ -120,7 +111,7 @@ autoreply define sr_policy_del
{
u32 client_index;
u32 context;
- vl_api_srv6_sid_t bsid_addr;
+ vl_api_ip6_address_t bsid_addr;
u32 sr_policy_index;
};
@@ -134,7 +125,7 @@ autoreply define sr_set_encap_source
{
u32 client_index;
u32 context;
- u8 encaps_source[16];
+ vl_api_ip6_address_t encaps_source;
};
/** \brief IPv6 SR Set SRv6 encapsulation hop-limit
@@ -165,14 +156,13 @@ autoreply define sr_steering_add_del
{
u32 client_index;
u32 context;
- u8 is_del;
- u8 bsid_addr[16];
+ bool is_del [default=false];
+ vl_api_ip6_address_t bsid_addr;
u32 sr_policy_index;
u32 table_id;
- u8 prefix_addr[16];
- u32 mask_width;
- u32 sw_if_index;
- u8 traffic_type;
+ vl_api_prefix_t prefix;
+ vl_api_interface_index_t sw_if_index;
+ vl_api_sr_steer_t traffic_type;
};
/** \brief Dump the list of SR LocalSIDs
@@ -188,13 +178,12 @@ define sr_localsids_dump
define sr_localsids_details
{
u32 context;
- vl_api_srv6_sid_t addr;
- u8 end_psp;
- u16 behavior;
+ vl_api_ip6_address_t addr;
+ bool end_psp;
+ vl_api_sr_behavior_t behavior;
u32 fib_table;
u32 vlan_index;
- u8 xconnect_nh_addr6[16];
- u8 xconnect_nh_addr4[4];
+ vl_api_address_t xconnect_nh_addr;
u32 xconnect_iface_or_vrf_table;
};
@@ -211,9 +200,9 @@ define sr_policies_dump
define sr_policies_details
{
u32 context;
- vl_api_srv6_sid_t bsid;
- u8 type;
- u8 is_encap;
+ vl_api_ip6_address_t bsid;
+ bool is_spray;
+ bool is_encap;
u32 fib_table;
u8 num_sid_lists;
vl_api_srv6_sid_list_t sid_lists[num_sid_lists];
@@ -232,12 +221,11 @@ define sr_steering_pol_dump
define sr_steering_pol_details
{
u32 context;
- u8 traffic_type;
+ vl_api_sr_steer_t traffic_type;
u32 fib_table;
- u8 prefix_addr[16];
- u32 mask_width;
- u32 sw_if_index;
- vl_api_srv6_sid_t bsid;
+ vl_api_prefix_t prefix;
+ vl_api_interface_index_t sw_if_index;
+ vl_api_ip6_address_t bsid;
};
/*
diff --git a/src/vnet/srv6/sr_api.c b/src/vnet/srv6/sr_api.c
index cd8182480a4..142b5c2a4b6 100644
--- a/src/vnet/srv6/sr_api.c
+++ b/src/vnet/srv6/sr_api.c
@@ -26,6 +26,8 @@
#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 */
@@ -61,6 +63,8 @@ static void vl_api_sr_localsid_add_del_t_handler
{
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,
@@ -71,17 +75,11 @@ 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, 128,
+ &localsid, 128,
mp->end_psp,
mp->behavior,
ntohl (mp->sw_if_index),
@@ -97,26 +95,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,
* 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, 0, NULL);
+ mp->is_spray, ntohl (mp->fib_table), mp->is_encap, 0,
+ NULL);
vec_free (segments);
REPLY_MACRO (VL_API_SR_POLICY_ADD_REPLY);
@@ -126,18 +126,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
@@ -145,7 +145,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,
@@ -161,12 +161,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);
}
@@ -176,7 +177,10 @@ 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;
+
+ ip6_address_decode (mp->encaps_source, &encaps_source);
+ sr_set_source (&encaps_source);
REPLY_MACRO (VL_API_SR_SET_ENCAP_SOURCE_REPLY);
}
@@ -200,21 +204,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,
+ ntohl (mp->prefix.len),
ntohl (mp->sw_if_index), mp->traffic_type);
BAD_SW_IF_INDEX_LABEL;
@@ -229,17 +239,12 @@ 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));
+ ip6_address_encode (&t->localsid, rmp->addr);
rmp->end_psp = t->end_psp;
rmp->behavior = htons (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));
- else
- clib_memcpy (rmp->xconnect_nh_addr6, &t->next_hop.ip6,
- sizeof (ip6_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 =
@@ -280,9 +285,10 @@ static void send_sr_policies_details
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) *
@@ -293,9 +299,9 @@ static void send_sr_policies_details
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));
+ 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);
@@ -303,11 +309,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);
+
+ vec_foreach (segment, segment_list->segments)
+ {
+ ip6_address_encode (segment, api_sid_list->sids[slidx++]);
+ }
}
rmp->context = context;
@@ -346,18 +357,14 @@ static void send_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 = htonl (t->classify.l3.mask_width);
rmp->sw_if_index = htonl (t->classify.l2.sw_if_index);
diff --git a/src/vnet/srv6/sr_types.api b/src/vnet/srv6/sr_types.api
new file mode 100644
index 00000000000..ba99a325544
--- /dev/null
+++ b/src/vnet/srv6/sr_types.api
@@ -0,0 +1,45 @@
+/* Hey Emacs use -*- mode: C -*- */
+/*
+ * Copyright (c) 2015-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+enum sr_policy_op : u8
+{
+ SR_POLICY_OP_API_NONE = 0,
+ SR_POLICY_OP_API_ADD = 1,
+ SR_POLICY_OP_API_DEL = 2,
+ SR_POLICY_OP_API_MOD = 3,
+
+};
+
+enum sr_behavior : u8
+{
+ SR_BEHAVIOR_API_END = 1,
+ SR_BEHAVIOR_API_X = 2,
+ SR_BEHAVIOR_API_T = 3,
+ SR_BEHAVIOR_API_D_FIRST = 4, /* Unused. Separator in between regular and D */
+ SR_BEHAVIOR_API_DX2 = 5,
+ SR_BEHAVIOR_API_DX6 = 6,
+ SR_BEHAVIOR_API_DX4 = 7,
+ SR_BEHAVIOR_API_DT6 = 8,
+ SR_BEHAVIOR_API_DT4 = 9,
+ SR_BEHAVIOR_API_LAST = 10, /* Must always be the last one */
+};
+
+enum sr_steer : u8
+{
+ SR_STEER_API_L2 = 2,
+ SR_STEER_API_IPV4 = 4,
+ SR_STEER_API_IPV6 = 6,
+};