#include <vnet/l2/l2_vtr.h>
#include <vnet/l2/l2_learn.h>
#include <vnet/l2/l2_bd.h>
+#include <vnet/l2/l2_bvi.h>
#include <vnet/ip/ip_types_api.h>
#include <vnet/ethernet/ethernet_types_api.h>
_(L2_PATCH_ADD_DEL, l2_patch_add_del) \
_(L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter) \
_(BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del) \
+_(BD_IP_MAC_FLUSH, bd_ip_mac_flush) \
_(BD_IP_MAC_DUMP, bd_ip_mac_dump) \
_(BRIDGE_DOMAIN_ADD_DEL, bridge_domain_add_del) \
_(BRIDGE_DOMAIN_DUMP, bridge_domain_dump) \
_(L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite) \
_(L2_INTERFACE_PBB_TAG_REWRITE, l2_interface_pbb_tag_rewrite) \
_(BRIDGE_DOMAIN_SET_MAC_AGE, bridge_domain_set_mac_age) \
-_(SW_INTERFACE_SET_VPATH, sw_interface_set_vpath)
+_(SW_INTERFACE_SET_VPATH, sw_interface_set_vpath) \
+_(BVI_CREATE, bvi_create) \
+_(BVI_DELETE, bvi_delete)
static void
send_l2_xconnect_details (vl_api_registration_t * reg, u32 context,
.forward = mp->forward,
.learn = mp->learn,
.arp_term = mp->arp_term,
+ .arp_ufwd = mp->arp_ufwd,
.mac_age = mp->mac_age,
.bd_id = ntohl (mp->bd_id),
.bd_tag = mp->bd_tag
mp->forward = bd_feature_forward (bd_config);
mp->learn = bd_feature_learn (bd_config);
mp->arp_term = bd_feature_arp_term (bd_config);
+ mp->arp_ufwd = bd_feature_arp_ufwd (bd_config);
mp->bvi_sw_if_index = ntohl (bd_config->bvi_sw_if_index);
mp->uu_fwd_sw_if_index = ntohl (bd_config->uu_fwd_sw_if_index);
mp->mac_age = bd_config->mac_age;
f |= L2_UU_FLOOD;
if (v & BRIDGE_API_FLAG_ARP_TERM)
f |= L2_ARP_TERM;
+ if (v & BRIDGE_API_FLAG_ARP_UFWD)
+ f |= L2_ARP_UFWD;
return (f);
}
vlib_main_t *vm = vlib_get_main ();
bd_main_t *bdm = &bd_main;
vl_api_bridge_flags_reply_t *rmp;
+ u32 bitmap = 0;
int rv = 0;
bd_flags_t flags = bd_flags_decode (mp->flags);
goto out;
}
- u32 bitmap = bd_set_flags (vm, bd_index, flags, mp->is_set);
+ bitmap = bd_set_flags (vm, bd_index, flags, mp->is_set);
out:
/* *INDENT-OFF* */
static void
send_bd_ip_mac_entry (vpe_api_main_t * am,
vl_api_registration_t * reg,
- u32 bd_id, u8 is_ipv6,
- u8 * ip_address, u8 * mac_address, u32 context)
+ u32 bd_id,
+ const ip46_address_t * ip,
+ ip46_type_t itype,
+ const mac_address_t * mac, u32 context)
{
vl_api_bd_ip_mac_details_t *mp;
clib_memset (mp, 0, sizeof (*mp));
mp->_vl_msg_id = ntohs (VL_API_BD_IP_MAC_DETAILS);
- mp->bd_id = ntohl (bd_id);
-
- clib_memcpy (mp->mac_address, mac_address, 6);
- mp->is_ipv6 = is_ipv6;
- clib_memcpy (mp->ip_address, ip_address, (is_ipv6) ? 16 : 4);
mp->context = context;
+ mp->entry.bd_id = ntohl (bd_id);
+
+ ip_address_encode (ip, itype, &mp->entry.ip);
+ mac_address_encode (mac, mp->entry.mac);
vl_api_send_msg (reg, (u8 *) mp);
}
{
ip4_address_t ip4_addr;
ip6_address_t *ip6_addr;
- u64 mac_addr;
+ mac_address_t mac;
+ u64 mac64;
bd_id = bd_config->bd_id;
/* *INDENT-OFF* */
- hash_foreach (ip4_addr.as_u32, mac_addr, bd_config->mac_by_ip4,
+ hash_foreach (ip4_addr.as_u32, mac64, bd_config->mac_by_ip4,
({
- send_bd_ip_mac_entry (am, reg, bd_id, 0, (u8 *) &(ip4_addr.as_u8), (u8 *) &mac_addr, mp->context);
+ ip46_address_t ip = {
+ .ip4 = ip4_addr,
+ };
+ mac_address_from_u64(&mac, mac64);
+
+ send_bd_ip_mac_entry (am, reg, bd_id, &ip, IP46_TYPE_IP4,
+ &mac, mp->context);
}));
- hash_foreach_mem (ip6_addr, mac_addr, bd_config->mac_by_ip6,
+ hash_foreach_mem (ip6_addr, mac64, bd_config->mac_by_ip6,
({
- send_bd_ip_mac_entry (am, reg, bd_id, 1, (u8 *) &(ip6_addr->as_u8), (u8 *) &mac_addr, mp->context);
+ ip46_address_t ip = {
+ .ip6 = *ip6_addr,
+ };
+ mac_address_from_u64(&mac, mac64);
+
+ send_bd_ip_mac_entry (am, reg, bd_id, &ip, IP46_TYPE_IP6,
+ &mac, mp->context);
}));
/* *INDENT-ON* */
}
int rv = 0;
uword *p;
- bd_id = ntohl (mp->bd_id);
+ bd_id = ntohl (mp->entry.bd_id);
if (bd_id == 0)
{
}
bd_index = p[0];
- type = ip_address_decode (&mp->ip, &ip_addr);
- mac_address_decode (mp->mac, &mac);
+ type = ip_address_decode (&mp->entry.ip, &ip_addr);
+ mac_address_decode (mp->entry.mac, &mac);
if (bd_add_del_ip_mac (bd_index, type, &ip_addr, &mac, mp->is_add))
rv = VNET_API_ERROR_UNSPECIFIED;
REPLY_MACRO (VL_API_BD_IP_MAC_ADD_DEL_REPLY);
}
+static void
+vl_api_bd_ip_mac_flush_t_handler (vl_api_bd_ip_mac_flush_t * mp)
+{
+ vl_api_bd_ip_mac_flush_reply_t *rmp;
+ bd_main_t *bdm = &bd_main;
+ u32 bd_index, bd_id;
+ int rv = 0;
+ uword *p;
+
+ bd_id = ntohl (mp->bd_id);
+
+ if (bd_id == 0)
+ {
+ rv = VNET_API_ERROR_BD_NOT_MODIFIABLE;
+ goto out;
+ }
+
+ p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+ if (p == 0)
+ {
+ rv = VNET_API_ERROR_NO_SUCH_ENTRY;
+ goto out;
+ }
+ bd_index = p[0];
+
+ bd_flush_ip_mac (bd_index);
+
+out:
+ REPLY_MACRO (VL_API_BD_IP_MAC_FLUSH_REPLY);
+}
+
extern void l2_efp_filter_configure (vnet_main_t * vnet_main,
u32 sw_if_index, u8 enable);
REPLY_MACRO (VL_API_SW_INTERFACE_SET_VPATH_REPLY);
}
+static void
+vl_api_bvi_create_t_handler (vl_api_bvi_create_t * mp)
+{
+ vl_api_bvi_create_reply_t *rmp;
+ mac_address_t mac;
+ u32 sw_if_index;
+ int rv;
+
+ mac_address_decode (mp->mac, &mac);
+
+ rv = l2_bvi_create (ntohl (mp->user_instance), &mac, &sw_if_index);
+
+ /* *INDENT-OFF* */
+ REPLY_MACRO2(VL_API_BVI_CREATE_REPLY,
+ ({
+ rmp->sw_if_index = ntohl (sw_if_index);
+ }));
+ /* *INDENT-ON* */
+}
+
+static void
+vl_api_bvi_delete_t_handler (vl_api_bvi_delete_t * mp)
+{
+ vl_api_bvi_delete_reply_t *rmp;
+ int rv;
+
+ rv = l2_bvi_delete (ntohl (mp->sw_if_index));
+
+ REPLY_MACRO (VL_API_BVI_DELETE_REPLY);
+}
+
/*
* l2_api_hookup
* Add vpe's API message handlers to the table.
foreach_vpe_api_msg;
#undef _
+ /* Mark VL_API_BRIDGE_DOMAIN_DUMP as mp safe */
+ am->is_mp_safe[VL_API_BRIDGE_DOMAIN_DUMP] = 1;
+
/*
* Set up the (msg_name, crc, message-id) table
*/
Code Review / vpp.git / blobdiff