aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet
diff options
context:
space:
mode:
authorJakub Grajciar <jgrajcia@cisco.com>2019-03-18 13:17:53 +0100
committerOle Trøan <otroan@employees.org>2019-08-20 09:57:10 +0000
commit053204ab039d34a990ff0e14c32ce3b294fcce0e (patch)
tree7261eaf0b905ea456ac536d8f728e89319b16a69 /src/vnet
parentdf36f4963f1a590ce9a02f048507c3d4590580ae (diff)
api: Cleanup APIs interface.api
Use of consistent API types for interface.api Type: fix Change-Id: I88206d7d0907cffd564031f73c9a996df2e5e21a Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Diffstat (limited to 'src/vnet')
-rw-r--r--src/vnet/ethernet/ethernet_types_api.h1
-rw-r--r--src/vnet/interface.api216
-rw-r--r--src/vnet/interface_api.c170
-rw-r--r--src/vnet/interface_types.api56
-rw-r--r--src/vnet/ip/ip_types_api.h1
5 files changed, 256 insertions, 188 deletions
diff --git a/src/vnet/ethernet/ethernet_types_api.h b/src/vnet/ethernet/ethernet_types_api.h
index e2c638d1fec..8bd8b7e514e 100644
--- a/src/vnet/ethernet/ethernet_types_api.h
+++ b/src/vnet/ethernet/ethernet_types_api.h
@@ -21,6 +21,7 @@
*/
#include <vnet/ethernet/mac_address.h>
+#include <vlibapi/api_types.h>
extern void mac_address_decode (const u8 * in, mac_address_t * out);
extern void mac_address_encode (const mac_address_t * in, u8 * out);
diff --git a/src/vnet/interface.api b/src/vnet/interface.api
index d30f1c285ea..8a2d0797b5c 100644
--- a/src/vnet/interface.api
+++ b/src/vnet/interface.api
@@ -14,9 +14,11 @@
* limitations under the License.
*/
-option version = "2.3.1";
+option version = "3.0.0";
import "vnet/interface_types.api";
+import "vnet/ethernet/ethernet_types.api";
+import "vnet/ip/ip_types.api";
service {
rpc want_interface_events returns want_interface_events_reply
@@ -27,16 +29,15 @@ service {
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request
@param sw_if_index - index of the interface to set flags on
- @param admin_up_down - set the admin state, 1 = up, 0 = down
- @param link_up_down - Oper state sent on change event, not used in config.
+ @param flags - interface_status flags
+ (only IF_STATUS_API_FLAG_ADMIN_UP used in config)
*/
autoreply define sw_interface_set_flags
{
u32 client_index;
u32 context;
- u32 sw_if_index;
- /* 1 = up, 0 = down */
- u8 admin_up_down;
+ vl_api_interface_index_t sw_if_index;
+ vl_api_if_status_flags_t flags;
};
/** \brief Set interface physical MTU
@@ -49,7 +50,7 @@ autoreply define hw_interface_set_mtu
{
u32 client_index;
u32 context;
- u32 sw_if_index;
+ vl_api_interface_index_t sw_if_index;
u16 mtu;
};
@@ -58,9 +59,8 @@ autoreply define sw_interface_set_mtu
{
u32 client_index;
u32 context;
- u32 sw_if_index;
- /* $$$$ Replace with enum */
- u32 mtu[4]; /* 0 - L3, 1 - IP4, 2 - IP6, 3 - MPLS */
+ vl_api_interface_index_t sw_if_index;
+ u32 mtu[4]; /* vl_api_mtu_proto_t 0 - L3, 1 - IP4, 2 - IP6, 3 - MPLS */
};
/** \brief Set IP4 directed broadcast
@@ -73,26 +73,24 @@ autoreply define sw_interface_set_ip_directed_broadcast
{
u32 client_index;
u32 context;
- u32 sw_if_index;
- u8 enable;
+ vl_api_interface_index_t sw_if_index;
+ bool enable;
};
/** \brief Interface Event generated by want_interface_events
@param client_index - opaque cookie to identify the sender
@param pid - client pid registered to receive notification
@param sw_if_index - index of the interface of the event
- @param admin_up_down - The administrative state; 1 = up, 0 = down
- @param link_up_down - The operational state; 1 = up, 0 = down
+ @param flags - interface_status flags
@param deleted - interface was deleted
*/
define sw_interface_event
{
u32 client_index;
u32 pid;
- u32 sw_if_index;
- u8 admin_up_down;
- u8 link_up_down;
- u8 deleted;
+ vl_api_interface_index_t sw_if_index;
+ vl_api_if_status_flags_t flags;
+ bool deleted;
};
/** \brief Register for interface events
@@ -109,25 +107,20 @@ autoreply define want_interface_events
u32 pid;
};
-/** \brief Interface details structure (fix this)
+/** \brief Interface details structure (fix this)
@param sw_if_index - index of the interface
@param sup_sw_if_index - index of parent interface if any, else same as sw_if_index
- @param l2_address_length - length of the interface's l2 address
@param l2_address - the interface's l2 address
- @param interface_name - name of the interface
+ @param flags - interface_status flags
+ @param type - interface type
@param link_duplex - 1 if half duplex, 2 if full duplex
@param link_speed - value in kbps
@param link_MTU - max. transmission unit
- @param sub_if_id - A number 0-N to uniquely identify this subif on super if
- @param sub_dot1ad - 0 = dot1q, 1 = dot1ad
- @param sub_dot1ah - 1 = dot1ah, 0 = otherwise
+ @param sub_id - A number 0-N to uniquely identify this subif on super if
@param sub_number_of_tags - Number of tags (0 - 2)
@param sub_outer_vlan_id
@param sub_inner_vlan_id
- @param sub_exact_match
- @param sub_default
- @param sub_outer_vlan_id_any
- @param sub_inner_vlan_id_any
+ @param sub_if_flags - sub interface flags
@param vtr_op - vlan tag rewrite operation
@param vtr_push_dot1q
@param vtr_tag1
@@ -137,29 +130,27 @@ autoreply define want_interface_events
@param pbb_b_smac[6] - B-tag local mac address
@param pbb_b_vlanid - B-tag vlanid
@param pbb_i_sid - I-tag service id
+ @param interface_name - name of the interface
+ @param tag - an ascii tag
*/
define sw_interface_details
{
u32 context;
- u32 sw_if_index;
+ vl_api_interface_index_t sw_if_index;
/* index of sup interface (e.g. hw interface).
equal to sw_if_index for super hw interface. */
u32 sup_sw_if_index;
/* Layer 2 address, if applicable */
- u32 l2_address_length;
- u8 l2_address[8];
+ vl_api_mac_address_t l2_address;
- /* Interface name */
- u8 interface_name[64];
+ vl_api_if_status_flags_t flags;
- /* 1 = up, 0 = down */
- u8 admin_up_down;
- u8 link_up_down;
+ vl_api_if_type_t type;
/* 1 = half duplex, 2 = full duplex */
- u8 link_duplex;
+ vl_api_link_duplex_t link_duplex;
/* link speed in kbps */
u32 link_speed;
@@ -168,38 +159,34 @@ define sw_interface_details
u16 link_mtu;
/* Per protocol MTUs */
- u32 mtu[4]; /* 0 - L3, 1 - IP4, 2 - IP6, 3 - MPLS */
+ u32 mtu[4]; /* vl_api_mtu_proto_t 0 - L3, 1 - IP4, 2 - IP6, 3 - MPLS */
/* Subinterface ID. A number 0-N to uniquely identify this subinterface under the super interface */
u32 sub_id;
- /* 0 = dot1q, 1=dot1ad */
- u8 sub_dot1ad;
- /* 1 = dot1h, 1=otherwise */
- u8 sub_dot1ah;
-
/* Number of tags 0-2 */
u8 sub_number_of_tags;
u16 sub_outer_vlan_id;
u16 sub_inner_vlan_id;
- u8 sub_exact_match;
- u8 sub_default;
- u8 sub_outer_vlan_id_any;
- u8 sub_inner_vlan_id_any;
+
+ vl_api_sub_if_flags_t sub_if_flags;
/* vlan tag rewrite state */
u32 vtr_op;
u32 vtr_push_dot1q; // ethertype of first pushed tag is dot1q/dot1ad
u32 vtr_tag1; // first pushed tag
u32 vtr_tag2; // second pushed tag
- u8 tag[64];
/* pbb tag rewrite info */
u16 outer_tag;
- u8 b_dmac[6];
- u8 b_smac[6];
+ vl_api_mac_address_t b_dmac;
+ vl_api_mac_address_t b_smac;
u16 b_vlanid;
u32 i_sid;
+
+ /* Interface name */
+ string interface_name;
+ string tag;
};
/** \brief Request all or filtered subset of sw_interface_details
@@ -216,30 +203,27 @@ define sw_interface_dump
u32 client_index;
u32 context;
vl_api_interface_index_t sw_if_index;
- u8 name_filter_valid;
- u8 name_filter[49];
+ bool name_filter_valid;
+ string name_filter;
};
/** \brief Set or delete one or all ip addresses on a specified interface
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request
- @param sw_if_index - index of the interface to add/del addresses
+ @param sw_if_index - index of the interface to add/del addresses
@param is_add - add address if non-zero, else delete
- @param is_ipv6 - if non-zero the address is ipv6, else ipv4
@param del_all - if non-zero delete all addresses on the interface
- @param address_length - address length in bytes, 4 for ip4, 16 for ip6
- @param address - array of address bytes
+ @param prefix - address + a prefix length for the implied connected route
*/
autoreply define sw_interface_add_del_address
{
u32 client_index;
u32 context;
- u32 sw_if_index;
- u8 is_add;
- u8 is_ipv6;
- u8 del_all;
- u8 address_length;
- u8 address[16];
+ vl_api_interface_index_t sw_if_index;
+ bool is_add;
+
+ bool del_all;
+ vl_api_prefix_t prefix;
};
/** \brief Associate the specified interface with a fib table
@@ -253,8 +237,8 @@ autoreply define sw_interface_set_table
{
u32 client_index;
u32 context;
- u32 sw_if_index;
- u8 is_ipv6;
+ vl_api_interface_index_t sw_if_index;
+ bool is_ipv6;
u32 vrf_id;
};
@@ -267,8 +251,8 @@ define sw_interface_get_table
{
u32 client_index;
u32 context;
- u32 sw_if_index;
- u8 is_ipv6;
+ vl_api_interface_index_t sw_if_index;
+ bool is_ipv6;
};
/** \brief Reply to get_sw_interface_vrf
@@ -293,9 +277,9 @@ autoreply define sw_interface_set_unnumbered
{
u32 client_index;
u32 context;
- u32 sw_if_index; /* use this intfc address */
- u32 unnumbered_sw_if_index; /* on this interface */
- u8 is_add;
+ vl_api_interface_index_t sw_if_index; /* use this intfc address */
+ vl_api_interface_index_t unnumbered_sw_if_index; /* on this interface */
+ bool is_add;
};
/** \brief Clear interface statistics
@@ -307,7 +291,7 @@ autoreply define sw_interface_clear_stats
{
u32 client_index;
u32 context;
- u32 sw_if_index;
+ vl_api_interface_index_t sw_if_index;
};
/** \brief Set / clear software interface tag
@@ -317,13 +301,13 @@ autoreply define sw_interface_clear_stats
@param add_del - 1 = add, 0 = delete
@param tag - an ascii tag
*/
-autoreply define sw_interface_tag_add_del
+autoreply define sw_interface_tag_add_del
{
- u32 client_index;
- u32 context;
- u8 is_add;
- u32 sw_if_index;
- u8 tag[64];
+ u32 client_index;
+ u32 context;
+ bool is_add;
+ vl_api_interface_index_t sw_if_index;
+ string tag;
};
/** \brief Set an interface's MAC address
@@ -334,10 +318,10 @@ autoreply define sw_interface_tag_add_del
*/
autoreply define sw_interface_set_mac_address
{
- u32 client_index;
- u32 context;
- u32 sw_if_index;
- u8 mac_address[6];
+ u32 client_index;
+ u32 context;
+ vl_api_interface_index_t sw_if_index;
+ vl_api_mac_address_t mac_address;
};
/** \brief Get interface's MAC address
@@ -347,9 +331,9 @@ autoreply define sw_interface_set_mac_address
*/
define sw_interface_get_mac_address
{
- u32 client_index;
- u32 context;
- u32 sw_if_index;
+ u32 client_index;
+ u32 context;
+ vl_api_interface_index_t sw_if_index;
};
/** \brief Reply for get interface's MAC address request
@@ -359,9 +343,9 @@ define sw_interface_get_mac_address
*/
define sw_interface_get_mac_address_reply
{
- u32 context;
- i32 retval;
- u8 mac_address[6];
+ u32 context;
+ i32 retval;
+ vl_api_mac_address_t mac_address;
};
/** \brief Set an interface's rx-mode
@@ -376,12 +360,12 @@ define sw_interface_get_mac_address_reply
*/
autoreply define sw_interface_set_rx_mode
{
- u32 client_index;
- u32 context;
- u32 sw_if_index;
- u8 queue_id_valid;
- u32 queue_id;
- u8 mode;
+ u32 client_index;
+ u32 context;
+ vl_api_interface_index_t sw_if_index;
+ bool queue_id_valid;
+ u32 queue_id;
+ vl_api_rx_mode_t mode;
};
/** \brief Set an interface's rx-placement
@@ -399,10 +383,10 @@ autoreply define sw_interface_set_rx_placement
{
u32 client_index;
u32 context;
- u32 sw_if_index;
+ vl_api_interface_index_t sw_if_index;
u32 queue_id;
u32 worker_id;
- u8 is_main;
+ bool is_main;
};
/** \brief dump the rx queue placement of interface(s)
@@ -415,7 +399,7 @@ define sw_interface_rx_placement_dump
{
u32 client_index;
u32 context;
- u32 sw_if_index;
+ vl_api_interface_index_t sw_if_index;
};
/** \brief show the interface's queue - thread placement
@@ -437,10 +421,10 @@ define sw_interface_rx_placement_details
{
u32 client_index;
u32 context;
- u32 sw_if_index;
+ vl_api_interface_index_t sw_if_index;
u32 queue_id;
u32 worker_id;
- u8 mode;
+ vl_api_rx_mode_t mode;
};
/* Gross kludge, DGMS */
@@ -448,7 +432,7 @@ autoreply define interface_name_renumber
{
u32 client_index;
u32 context;
- u32 sw_if_index;
+ vl_api_interface_index_t sw_if_index;
u32 new_show_dev_instance;
};
@@ -456,18 +440,10 @@ define create_subif
{
u32 client_index;
u32 context;
- u32 sw_if_index;
+ vl_api_interface_index_t sw_if_index;
u32 sub_id;
- /* These fields map directly onto the subif template */
- u8 no_tags;
- u8 one_tag;
- u8 two_tags;
- u8 dot1ad; // 0 = dot1q, 1=dot1ad
- u8 exact_match;
- u8 default_sub;
- u8 outer_vlan_id_any;
- u8 inner_vlan_id_any;
+ vl_api_sub_if_flags_t sub_if_flags;
u16 outer_vlan_id;
u16 inner_vlan_id;
};
@@ -476,7 +452,7 @@ define create_subif_reply
{
u32 context;
i32 retval;
- u32 sw_if_index;
+ vl_api_interface_index_t sw_if_index;
};
/** \brief Create a new subinterface with the given vlan id
@@ -489,7 +465,7 @@ define create_vlan_subif
{
u32 client_index;
u32 context;
- u32 sw_if_index;
+ vl_api_interface_index_t sw_if_index;
u32 vlan_id;
};
@@ -502,7 +478,7 @@ define create_vlan_subif_reply
{
u32 context;
i32 retval;
- u32 sw_if_index;
+ vl_api_interface_index_t sw_if_index;
};
/** \brief Delete sub interface request
@@ -513,7 +489,7 @@ define create_vlan_subif_reply
autoreply define delete_subif {
u32 client_index;
u32 context;
- u32 sw_if_index;
+ vl_api_interface_index_t sw_if_index;
};
/** \brief Create loopback interface request
@@ -525,7 +501,7 @@ define create_loopback
{
u32 client_index;
u32 context;
- u8 mac_address[6];
+ vl_api_mac_address_t mac_address;
};
/** \brief Create loopback interface response
@@ -537,7 +513,7 @@ define create_loopback_reply
{
u32 context;
i32 retval;
- u32 sw_if_index;
+ vl_api_interface_index_t sw_if_index;
};
/** \brief Create loopback interface instance request
@@ -551,8 +527,8 @@ define create_loopback_instance
{
u32 client_index;
u32 context;
- u8 mac_address[6];
- u8 is_specified;
+ vl_api_mac_address_t mac_address;
+ bool is_specified;
u32 user_instance;
};
@@ -565,7 +541,7 @@ define create_loopback_instance_reply
{
u32 context;
i32 retval;
- u32 sw_if_index;
+ vl_api_interface_index_t sw_if_index;
};
/** \brief Delete loopback interface request
@@ -577,7 +553,7 @@ autoreply define delete_loopback
{
u32 client_index;
u32 context;
- u32 sw_if_index;
+ vl_api_interface_index_t sw_if_index;
};
/** \brief Enable or disable detailed interface stats
@@ -591,8 +567,8 @@ autoreply define collect_detailed_interface_stats
{
u32 client_index;
u32 context;
- u32 sw_if_index;
- u8 enable_disable;
+ vl_api_interface_index_t sw_if_index;
+ bool enable_disable;
};
/*
diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c
index fb1982ae8b0..9a695ed5bdd 100644
--- a/src/vnet/interface_api.c
+++ b/src/vnet/interface_api.c
@@ -31,6 +31,11 @@
#include <vnet/fib/fib_api.h>
#include <vnet/mfib/mfib_table.h>
+#include <vlibapi/api_types.h>
+
+#include <vnet/ip/ip_types_api.h>
+#include <vnet/ethernet/ethernet_types_api.h>
+
#define vl_typedefs /* define message structures */
#include <vnet/vnet_all_api_h.h>
#undef vl_typedefs
@@ -87,7 +92,9 @@ vl_api_sw_interface_set_flags_t_handler (vl_api_sw_interface_set_flags_t * mp)
VALIDATE_SW_IF_INDEX (mp);
- flags = mp->admin_up_down ? VNET_SW_INTERFACE_FLAG_ADMIN_UP : 0;
+ flags =
+ ((ntohl (mp->flags)) & IF_STATUS_API_FLAG_ADMIN_UP) ?
+ VNET_SW_INTERFACE_FLAG_ADMIN_UP : 0;
error = vnet_sw_interface_set_flags (vnm, ntohl (mp->sw_if_index), flags);
if (error)
@@ -193,13 +200,40 @@ send_sw_interface_details (vpe_api_main_t * am,
vnet_hw_interface_t *hi =
vnet_get_sup_hw_interface (am->vnet_main, swif->sw_if_index);
- vl_api_sw_interface_details_t *mp = vl_msg_api_alloc (sizeof (*mp));
- clib_memset (mp, 0, sizeof (*mp));
+ uint32_t if_name_len = strlen ((char *) interface_name);
+ u8 *tag = vnet_get_sw_interface_tag (vnet_get_main (), swif->sw_if_index);
+ uint32_t tag_len = 0;
+ if (tag != NULL)
+ tag_len = strlen ((char *) tag);
+ vl_api_sw_interface_details_t *mp =
+ vl_msg_api_alloc (sizeof (*mp) + if_name_len + tag_len);
+ clib_memset (mp, 0, sizeof (*mp) + if_name_len + tag_len);
mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_DETAILS);
mp->sw_if_index = ntohl (swif->sw_if_index);
mp->sup_sw_if_index = ntohl (swif->sup_sw_if_index);
- mp->admin_up_down = (swif->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? 1 : 0;
- mp->link_up_down = (hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ? 1 : 0;
+
+ mp->flags |= (swif->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ?
+ IF_STATUS_API_FLAG_ADMIN_UP : 0;
+ mp->flags |= (hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ?
+ IF_STATUS_API_FLAG_LINK_UP : 0;
+ mp->flags = ntohl (mp->flags);
+
+ switch (swif->type)
+ {
+ case VNET_SW_INTERFACE_TYPE_SUB:
+ mp->type = IF_API_TYPE_SUB;
+ break;
+ case VNET_SW_INTERFACE_TYPE_P2P:
+ mp->type = IF_API_TYPE_P2P;
+ break;
+ case VNET_SW_INTERFACE_TYPE_PIPE:
+ mp->type = IF_API_TYPE_PIPE;
+ break;
+ default:
+ mp->type = IF_API_TYPE_HARDWARE;
+ }
+ mp->type = ntohl (mp->type);
+
mp->link_duplex = ((hi->flags & VNET_HW_INTERFACE_FLAG_DUPLEX_MASK) >>
VNET_HW_INTERFACE_FLAG_DUPLEX_SHIFT);
mp->link_speed = ntohl (hi->link_speed);
@@ -211,9 +245,6 @@ send_sw_interface_details (vpe_api_main_t * am,
mp->context = context;
- strncpy ((char *) mp->interface_name,
- (char *) interface_name, ARRAY_LEN (mp->interface_name) - 1);
-
/* Send the L2 address for ethernet physical intfcs */
if (swif->sup_sw_if_index == swif->sw_if_index
&& hi->hw_class_index == ethernet_hw_interface_class.index)
@@ -223,42 +254,38 @@ send_sw_interface_details (vpe_api_main_t * am,
ei = pool_elt_at_index (em->interfaces, hi->hw_instance);
ASSERT (sizeof (mp->l2_address) >= sizeof (ei->address));
- clib_memcpy (mp->l2_address, ei->address, sizeof (ei->address));
- mp->l2_address_length = ntohl (sizeof (ei->address));
+ mac_address_encode ((mac_address_t *) ei->address, mp->l2_address);
}
else if (swif->sup_sw_if_index != swif->sw_if_index)
{
vnet_sub_interface_t *sub = &swif->sub;
mp->sub_id = ntohl (sub->id);
- mp->sub_dot1ad = sub->eth.flags.dot1ad;
mp->sub_number_of_tags =
sub->eth.flags.one_tag + sub->eth.flags.two_tags * 2;
mp->sub_outer_vlan_id = ntohs (sub->eth.outer_vlan_id);
mp->sub_inner_vlan_id = ntohs (sub->eth.inner_vlan_id);
- mp->sub_exact_match = sub->eth.flags.exact_match;
- mp->sub_default = sub->eth.flags.default_sub;
- mp->sub_outer_vlan_id_any = sub->eth.flags.outer_vlan_id_any;
- mp->sub_inner_vlan_id_any = sub->eth.flags.inner_vlan_id_any;
- }
+ mp->sub_if_flags =
+ ntohl (sub->eth.raw_flags & SUB_IF_API_FLAG_MASK_VNET);
- /* vlan tag rewrite data */
- u32 vtr_op = L2_VTR_DISABLED;
- u32 vtr_push_dot1q = 0, vtr_tag1 = 0, vtr_tag2 = 0;
+ /* vlan tag rewrite data */
+ u32 vtr_op = L2_VTR_DISABLED;
+ u32 vtr_push_dot1q = 0, vtr_tag1 = 0, vtr_tag2 = 0;
- if (l2vtr_get (am->vlib_main, am->vnet_main, swif->sw_if_index,
- &vtr_op, &vtr_push_dot1q, &vtr_tag1, &vtr_tag2) != 0)
- {
- // error - default to disabled
- mp->vtr_op = ntohl (L2_VTR_DISABLED);
- clib_warning ("cannot get vlan tag rewrite for sw_if_index %d",
- swif->sw_if_index);
- }
- else
- {
- mp->vtr_op = ntohl (vtr_op);
- mp->vtr_push_dot1q = ntohl (vtr_push_dot1q);
- mp->vtr_tag1 = ntohl (vtr_tag1);
- mp->vtr_tag2 = ntohl (vtr_tag2);
+ if (l2vtr_get (am->vlib_main, am->vnet_main, swif->sw_if_index,
+ &vtr_op, &vtr_push_dot1q, &vtr_tag1, &vtr_tag2) != 0)
+ {
+ // error - default to disabled
+ mp->vtr_op = ntohl (L2_VTR_DISABLED);
+ clib_warning ("cannot get vlan tag rewrite for sw_if_index %d",
+ swif->sw_if_index);
+ }
+ else
+ {
+ mp->vtr_op = ntohl (vtr_op);
+ mp->vtr_push_dot1q = ntohl (vtr_push_dot1q);
+ mp->vtr_tag1 = ntohl (vtr_tag1);
+ mp->vtr_tag2 = ntohl (vtr_tag2);
+ }
}
/* pbb tag rewrite data */
@@ -272,18 +299,19 @@ send_sw_interface_details (vpe_api_main_t * am,
if (!l2pbb_get (am->vlib_main, am->vnet_main, swif->sw_if_index,
&pbb_vtr_op, &outer_tag, &eth_hdr, &b_vlanid, &i_sid))
{
- mp->sub_dot1ah = 1;
- clib_memcpy (mp->b_dmac, eth_hdr.dst_address,
- sizeof (eth_hdr.dst_address));
- clib_memcpy (mp->b_smac, eth_hdr.src_address,
- sizeof (eth_hdr.src_address));
+ mp->sub_if_flags |= ntohl (SUB_IF_API_FLAG_DOT1AH);
+ mac_address_encode ((mac_address_t *) eth_hdr.dst_address, mp->b_dmac);
+ mac_address_encode ((mac_address_t *) eth_hdr.src_address, mp->b_smac);
mp->b_vlanid = b_vlanid;
mp->i_sid = i_sid;
}
- u8 *tag = vnet_get_sw_interface_tag (vnet_get_main (), swif->sw_if_index);
- if (tag)
- strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1);
+ char *p = (char *) &mp->interface_name;
+ p +=
+ vl_api_to_api_string (if_name_len, (char *) interface_name,
+ (vl_api_string_t *) p);
+ if (tag != NULL)
+ vl_api_to_api_string (tag_len, (char *) tag, (vl_api_string_t *) p);
vl_api_send_msg (rp, (u8 *) mp);
}
@@ -327,8 +355,8 @@ vl_api_sw_interface_dump_t_handler (vl_api_sw_interface_dump_t * mp)
if (mp->name_filter_valid)
{
- mp->name_filter[ARRAY_LEN (mp->name_filter) - 1] = 0;
- filter = format (0, "%s%c", mp->name_filter, 0);
+ filter =
+ format (0, "%s%c", vl_api_from_api_string (&mp->name_filter), 0);
}
char *strcasestr (char *, char *); /* lnx hdr file botch */
@@ -362,6 +390,7 @@ static void
int rv = 0;
u32 is_del;
clib_error_t *error = 0;
+ ip46_address_t address;
VALIDATE_SW_IF_INDEX (mp);
@@ -370,14 +399,14 @@ static void
if (mp->del_all)
ip_del_all_interface_addresses (vm, ntohl (mp->sw_if_index));
- else if (mp->is_ipv6)
+ else if (ip_address_decode (&mp->prefix.address, &address) == IP46_TYPE_IP6)
error = ip6_add_del_interface_address (vm, ntohl (mp->sw_if_index),
- (void *) mp->address,
- mp->address_length, is_del);
+ (void *) &address.ip6,
+ mp->prefix.len, is_del);
else
error = ip4_add_del_interface_address (vm, ntohl (mp->sw_if_index),
- (void *) mp->address,
- mp->address_length, is_del);
+ (void *) &address.ip4,
+ mp->prefix.len, is_del);
if (error)
{
@@ -707,9 +736,13 @@ send_sw_interface_event (vpe_api_main_t * am,
mp->sw_if_index = ntohl (sw_if_index);
mp->client_index = reg->client_index;
mp->pid = reg->client_pid;
- mp->admin_up_down = events & API_ADMIN_UP_EVENT ? 1 : 0;
- mp->link_up_down = events & API_LINK_STATE_UP_EVENT ? 1 : 0;
- mp->deleted = events & API_SW_INTERFACE_DEL_EVENT ? 1 : 0;
+ mp->flags = 0;
+ mp->flags |= (events & API_ADMIN_UP_EVENT) ?
+ IF_STATUS_API_FLAG_ADMIN_UP : 0;
+ mp->flags |= (events & API_LINK_STATE_UP_EVENT) ?
+ IF_STATUS_API_FLAG_LINK_UP : 0;
+ mp->flags = ntohl (mp->flags);
+ mp->deleted = events & API_SW_INTERFACE_DEL_EVENT ? true : false;
vl_api_send_msg (vl_reg, (u8 *) mp);
}
@@ -851,14 +884,13 @@ static void vl_api_sw_interface_tag_add_del_t_handler
if (mp->is_add)
{
- if (mp->tag[0] == 0)
+ if (vl_api_from_api_string (&mp->tag)[0] == 0)
{
rv = VNET_API_ERROR_INVALID_VALUE;
goto out;
}
- mp->tag[ARRAY_LEN (mp->tag) - 1] = 0;
- tag = format (0, "%s%c", mp->tag, 0);
+ tag = format (0, "%s%c", vl_api_from_api_string (&mp->tag), 0);
vnet_set_sw_interface_tag (vnm, tag, sw_if_index);
}
else
@@ -878,12 +910,14 @@ static void vl_api_sw_interface_set_mac_address_t_handler
vnet_sw_interface_t *si;
clib_error_t *error;
int rv = 0;
+ mac_address_t mac;
VALIDATE_SW_IF_INDEX (mp);
si = vnet_get_sw_interface (vnm, sw_if_index);
- error = vnet_hw_interface_change_mac_address (vnm, si->hw_if_index,
- mp->mac_address);
+ mac_address_decode (mp->mac_address, &mac);
+ error =
+ vnet_hw_interface_change_mac_address (vnm, si->hw_if_index, (u8 *) & mac);
if (error)
{
rv = VNET_API_ERROR_UNIMPLEMENTED;
@@ -923,7 +957,7 @@ static void vl_api_sw_interface_get_mac_address_t_handler
rmp->context = mp->context;
rmp->retval = htonl (rv);
if (!rv && eth_if)
- memcpy (rmp->mac_address, eth_if->address, 6);
+ mac_address_encode ((mac_address_t *) eth_if->address, rmp->mac_address);
vl_api_send_msg (reg, (u8 *) rmp);
}
@@ -948,7 +982,10 @@ static void vl_api_sw_interface_set_rx_mode_t_handler
error = set_hw_interface_change_rx_mode (vnm, si->hw_if_index,
mp->queue_id_valid,
- ntohl (mp->queue_id), mp->mode);
+ ntohl (mp->queue_id),
+ (vnet_hw_interface_rx_mode)
+ mp->mode);
+
if (error)
{
rv = VNET_API_ERROR_UNIMPLEMENTED;
@@ -1215,14 +1252,7 @@ vl_api_create_subif_t_handler (vl_api_create_subif_t * mp)
template.flood_class = VNET_FLOOD_CLASS_NORMAL;
template.sup_sw_if_index = sw_if_index;
template.sub.id = sub_id;
- template.sub.eth.flags.no_tags = mp->no_tags;
- template.sub.eth.flags.one_tag = mp->one_tag;
- template.sub.eth.flags.two_tags = mp->two_tags;
- template.sub.eth.flags.dot1ad = mp->dot1ad;
- template.sub.eth.flags.exact_match = mp->exact_match;
- template.sub.eth.flags.default_sub = mp->default_sub;
- template.sub.eth.flags.outer_vlan_id_any = mp->outer_vlan_id_any;
- template.sub.eth.flags.inner_vlan_id_any = mp->inner_vlan_id_any;
+ template.sub.eth.raw_flags = ntohl (mp->sub_if_flags);
template.sub.eth.outer_vlan_id = ntohs (mp->outer_vlan_id);
template.sub.eth.inner_vlan_id = ntohs (mp->inner_vlan_id);
@@ -1286,8 +1316,10 @@ vl_api_create_loopback_t_handler (vl_api_create_loopback_t * mp)
vl_api_create_loopback_reply_t *rmp;
u32 sw_if_index;
int rv;
+ mac_address_t mac;
- rv = vnet_create_loopback_interface (&sw_if_index, mp->mac_address, 0, 0);
+ mac_address_decode (mp->mac_address, &mac);
+ rv = vnet_create_loopback_interface (&sw_if_index, (u8 *) & mac, 0, 0);
/* *INDENT-OFF* */
REPLY_MACRO2(VL_API_CREATE_LOOPBACK_REPLY,
@@ -1305,8 +1337,10 @@ static void vl_api_create_loopback_instance_t_handler
u8 is_specified = mp->is_specified;
u32 user_instance = ntohl (mp->user_instance);
int rv;
+ mac_address_t mac;
- rv = vnet_create_loopback_interface (&sw_if_index, mp->mac_address,
+ mac_address_decode (mp->mac_address, &mac);
+ rv = vnet_create_loopback_interface (&sw_if_index, (u8 *) & mac,
is_specified, user_instance);
/* *INDENT-OFF* */
diff --git a/src/vnet/interface_types.api b/src/vnet/interface_types.api
index f6fb4219ef8..a6178396e79 100644
--- a/src/vnet/interface_types.api
+++ b/src/vnet/interface_types.api
@@ -16,3 +16,59 @@
typedef u32 interface_index;
+enum if_status_flags
+{
+ IF_STATUS_API_FLAG_ADMIN_UP = 1,
+ IF_STATUS_API_FLAG_LINK_UP = 2,
+};
+
+/* Per protocol MTU */
+enum mtu_proto
+{
+ MTU_PROTO_API_L3, /* Default payload MTU (without L2 headers) */
+ MTU_PROTO_API_IP4, /* Per-protocol MTUs overriding default */
+ MTU_PROTO_API_IP6,
+ MTU_PROTO_API_MPLS,
+ MTU_PROTO_API_N,
+};
+
+enum link_duplex
+{
+ LINK_DUPLEX_API_UNKNOWN = 0,
+ LINK_DUPLEX_API_HALF = 1,
+ LINK_DUPLEX_API_FULL = 2,
+};
+
+enum sub_if_flags
+{
+ SUB_IF_API_FLAG_NO_TAGS = 1,
+ SUB_IF_API_FLAG_ONE_TAG = 2,
+ SUB_IF_API_FLAG_TWO_TAGS = 4,
+ SUB_IF_API_FLAG_DOT1AD = 8,
+ SUB_IF_API_FLAG_EXACT_MATCH = 16,
+ SUB_IF_API_FLAG_DEFAULT = 32,
+ SUB_IF_API_FLAG_OUTER_VLAN_ID_ANY = 64,
+ SUB_IF_API_FLAG_INNER_VLAN_ID_ANY = 128,
+ SUB_IF_API_FLAG_MASK_VNET = 254, /* use with vnet_sub_interface_t raw_flags */
+ SUB_IF_API_FLAG_DOT1AH = 256,
+};
+
+enum rx_mode
+{
+ RX_MODE_API_UNKNOWN = 0,
+ RX_MODE_API_POLLING,
+ RX_MODE_API_INTERRUPT,
+ RX_MODE_API_ADAPTIVE,
+ RX_MODE_API_DEFAULT,
+};
+
+enum if_type
+{
+ /* A hw interface. */
+ IF_API_TYPE_HARDWARE,
+
+ /* A sub-interface. */
+ IF_API_TYPE_SUB,
+ IF_API_TYPE_P2P,
+ IF_API_TYPE_PIPE,
+};
diff --git a/src/vnet/ip/ip_types_api.h b/src/vnet/ip/ip_types_api.h
index fc7a416a06d..09ca0e6e1a0 100644
--- a/src/vnet/ip/ip_types_api.h
+++ b/src/vnet/ip/ip_types_api.h
@@ -23,6 +23,7 @@
#include <vnet/ip/ip.h>
#include <vnet/fib/fib_types.h>
#include <vnet/mfib/mfib_types.h>
+#include <vlibapi/api_types.h>
/**
* Forward declarations so we need not #include the API definitions here