#include <vnet/ip/ip.h>
#include <vnet/pg/pg.h>
#include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/arp.h>
+//#include <vnet/ethernet/arp.h>
#include <vnet/l2/l2_input.h>
#include <vnet/l2/l2_bd.h>
#include <vnet/adj/adj.h>
+#include <vnet/adj/adj_mcast.h>
+#include <vnet/ip-neighbor/ip_neighbor.h>
/**
* @file
* This file contains code to manage loopback interfaces.
*/
-const u8 *
+static const u8 *
ethernet_ip4_mcast_dst_addr (void)
{
const static u8 ethernet_mcast_dst_mac[] = {
return (ethernet_mcast_dst_mac);
}
-const u8 *
+static const u8 *
ethernet_ip6_mcast_dst_addr (void)
{
const static u8 ethernet_mcast_dst_mac[] = {
void
ethernet_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
{
- ip_adjacency_t *adj;
-
- adj = adj_get (ai);
-
vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, sw_if_index);
+
if ((si->type == VNET_SW_INTERFACE_TYPE_P2P) ||
(si->type == VNET_SW_INTERFACE_TYPE_PIPE))
{
default_update_adjacency (vnm, sw_if_index, ai);
}
- else if (FIB_PROTOCOL_IP4 == adj->ia_nh_proto)
- {
- arp_update_adjacency (vnm, sw_if_index, ai);
- }
- else if (FIB_PROTOCOL_IP6 == adj->ia_nh_proto)
- {
- ip6_ethernet_update_adjacency (vnm, sw_if_index, ai);
- }
else
{
- ASSERT (0);
+ ip_adjacency_t *adj;
+
+ adj = adj_get (ai);
+
+ switch (adj->lookup_next_index)
+ {
+ case IP_LOOKUP_NEXT_GLEAN:
+ adj_glean_update_rewrite (ai);
+ break;
+ case IP_LOOKUP_NEXT_ARP:
+ ip_neighbor_update (vnm, ai);
+ break;
+ case IP_LOOKUP_NEXT_BCAST:
+ adj_nbr_update_rewrite (ai,
+ ADJ_NBR_REWRITE_FLAG_COMPLETE,
+ ethernet_build_rewrite
+ (vnm,
+ adj->rewrite_header.sw_if_index,
+ adj->ia_link,
+ VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST));
+ break;
+ case IP_LOOKUP_NEXT_MCAST:
+ {
+ /*
+ * Construct a partial rewrite from the known ethernet mcast dest MAC
+ */
+ u8 *rewrite;
+ u8 offset;
+
+ rewrite = ethernet_build_rewrite
+ (vnm,
+ sw_if_index,
+ adj->ia_link,
+ (adj->ia_nh_proto == FIB_PROTOCOL_IP6 ?
+ ethernet_ip6_mcast_dst_addr () :
+ ethernet_ip4_mcast_dst_addr ()));
+
+ /*
+ * Complete the remaining fields of the adj's rewrite to direct the
+ * complete of the rewrite at switch time by copying in the IP
+ * dst address's bytes.
+ * Ofset is 2 bytes into the destintation address.
+ */
+ offset = vec_len (rewrite) - 2;
+ adj_mcast_update_rewrite (ai, rewrite, offset);
+
+ break;
+ }
+ case IP_LOOKUP_NEXT_DROP:
+ case IP_LOOKUP_NEXT_PUNT:
+ case IP_LOOKUP_NEXT_LOCAL:
+ case IP_LOOKUP_NEXT_REWRITE:
+ case IP_LOOKUP_NEXT_MCAST_MIDCHAIN:
+ case IP_LOOKUP_NEXT_MIDCHAIN:
+ case IP_LOOKUP_NEXT_ICMP_ERROR:
+ case IP_LOOKUP_N_NEXT:
+ ASSERT (0);
+ break;
+ }
}
}
clib_memcpy (hi->hw_address, mac_address, vec_len (hi->hw_address));
clib_memcpy (ei->address, (u8 *) mac_address, sizeof (ei->address));
- ethernet_arp_change_mac (hi->sw_if_index);
- ethernet_ndp_change_mac (hi->sw_if_index);
+
+ {
+ ethernet_address_change_ctx_t *cb;
+ vec_foreach (cb, em->address_change_callbacks)
+ cb->function (em, hi->sw_if_index, cb->function_opaque);
+ }
return (NULL);
}
ethernet_register_interface (vnet_main_t * vnm,
u32 dev_class_index,
u32 dev_instance,
- u8 * address,
+ const u8 * address,
u32 * hw_if_index_return,
ethernet_flag_change_function_t flag_change)
{
clib_memcpy (ei->address, address, sizeof (ei->address));
vec_add (hi->hw_address, address, sizeof (ei->address));
+ CLIB_MEM_UNPOISON (hi->hw_address, 8);
if (error)
{
};
/* *INDENT-ON* */
-VLIB_DEVICE_TX_FUNCTION_MULTIARCH (ethernet_simulated_device_class,
- simulated_ethernet_interface_tx);
-
/*
* Maintain a bitmap of allocated loopback instance numbers.
*/
index ? pool_elt_at_index (em->interfaces, i->hw_instance) : 0);
}
+mac_address_t *
+ethernet_interface_add_del_address (ethernet_main_t * em,
+ u32 hw_if_index, const u8 * address,
+ u8 is_add)
+{
+ ethernet_interface_t *ei = ethernet_get_interface (em, hw_if_index);
+ mac_address_t *if_addr = 0;
+
+ /* return if there is not an ethernet interface for this hw interface */
+ if (!ei)
+ return 0;
+
+ /* determine whether the address is configured on the interface */
+ vec_foreach (if_addr, ei->secondary_addrs)
+ {
+ if (!ethernet_mac_address_equal (if_addr->bytes, address))
+ continue;
+
+ break;
+ }
+
+ if (if_addr && vec_is_member (ei->secondary_addrs, if_addr))
+ {
+ /* delete found address */
+ if (!is_add)
+ {
+ vec_delete (ei->secondary_addrs, 1, if_addr - ei->secondary_addrs);
+ if_addr = 0;
+ }
+ /* address already found, so nothing needs to be done if adding */
+ }
+ else
+ {
+ /* if_addr could be 0 or past the end of the vector. reset to 0 */
+ if_addr = 0;
+
+ /* add new address */
+ if (is_add)
+ {
+ vec_add2 (ei->secondary_addrs, if_addr, 1);
+ clib_memcpy (&if_addr->bytes, address, sizeof (if_addr->bytes));
+ }
+ }
+
+ return if_addr;
+}
+
int
vnet_delete_loopback_interface (u32 sw_if_index)
{
return 0;
}
+int
+vnet_create_sub_interface (u32 sw_if_index, u32 id,
+ u32 flags, u16 inner_vlan_id, u16 outer_vlan_id,
+ u32 * sub_sw_if_index)
+{
+ vnet_main_t *vnm = vnet_get_main ();
+ vnet_interface_main_t *im = &vnm->interface_main;
+ vnet_hw_interface_t *hi;
+ u64 sup_and_sub_key = ((u64) (sw_if_index) << 32) | (u64) id;
+ vnet_sw_interface_t template;
+ uword *p;
+ u64 *kp;
+
+ hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+
+ p = hash_get_mem (im->sw_if_index_by_sup_and_sub, &sup_and_sub_key);
+ if (p)
+ {
+ return (VNET_API_ERROR_VLAN_ALREADY_EXISTS);
+ }
+
+ clib_memset (&template, 0, sizeof (template));
+ template.type = VNET_SW_INTERFACE_TYPE_SUB;
+ template.flood_class = VNET_FLOOD_CLASS_NORMAL;
+ template.sup_sw_if_index = sw_if_index;
+ template.sub.id = id;
+ template.sub.eth.raw_flags = flags;
+ template.sub.eth.outer_vlan_id = outer_vlan_id;
+ template.sub.eth.inner_vlan_id = inner_vlan_id;
+
+ if (vnet_create_sw_interface (vnm, &template, sub_sw_if_index))
+ return (VNET_API_ERROR_UNSPECIFIED);
+
+ kp = clib_mem_alloc (sizeof (*kp));
+ *kp = sup_and_sub_key;
+
+ hash_set (hi->sub_interface_sw_if_index_by_id, id, *sub_sw_if_index);
+ hash_set_mem (im->sw_if_index_by_sup_and_sub, kp, *sub_sw_if_index);
+
+ return (0);
+}
+
int
vnet_delete_sub_interface (u32 sw_if_index)
{