vec_validate (rewrite, n_bytes - 1);
h = (ethernet_header_t *) rewrite;
ei = pool_elt_at_index (em->interfaces, hw->hw_instance);
- clib_memcpy (h->src_address, ei->address, sizeof (h->src_address));
+ clib_memcpy (h->src_address, &ei->address, sizeof (h->src_address));
if (is_p2p)
{
clib_memcpy (h->dst_address, sub_sw->p2p.client_mac,
}
}
+static void
+ethernet_interface_address_copy (ethernet_interface_address_t * dst,
+ const u8 * mac)
+{
+ clib_memcpy (&dst->mac, (u8 *) mac, sizeof (dst->mac));
+ /*
+ * ethernet dataplane loads mac as u64, makes sure the last 2 bytes are 0
+ * for comparison purpose
+ */
+ dst->zero = 0;
+}
+
+static void
+ethernet_set_mac (vnet_hw_interface_t * hi, ethernet_interface_t * ei,
+ const u8 * mac_address)
+{
+ vec_validate (hi->hw_address, sizeof (mac_address_t) - 1);
+ clib_memcpy (hi->hw_address, mac_address, sizeof (mac_address_t));
+ ethernet_interface_address_copy (&ei->address, mac_address);
+}
+
static clib_error_t *
ethernet_mac_change (vnet_hw_interface_t * hi,
const u8 * old_address, const u8 * mac_address)
em = ðernet_main;
ei = pool_elt_at_index (em->interfaces, hi->hw_instance);
- vec_validate (hi->hw_address,
- STRUCT_SIZE_OF (ethernet_header_t, src_address) - 1);
- clib_memcpy (hi->hw_address, mac_address, vec_len (hi->hw_address));
-
- clib_memcpy (ei->address, (u8 *) mac_address, sizeof (ei->address));
+ ethernet_set_mac (hi, ei, mac_address);
{
ethernet_address_change_ctx_t *cb;
/* Default ethernet MTU, 9000 unless set by ethernet_config see below */
vnet_sw_interface_set_mtu (vnm, hi->sw_if_index, em->default_mtu);
- clib_memcpy (ei->address, address, sizeof (ei->address));
- vec_add (hi->hw_address, address, sizeof (ei->address));
- CLIB_MEM_UNPOISON (hi->hw_address, 8);
+ ethernet_set_mac (hi, ei, address);
if (error)
{
ethernet_main_t *em = ðernet_main;
vnet_hw_interface_t *hi;
ethernet_interface_t *ei;
+ u32 opn_flags = flags & ETHERNET_INTERFACE_FLAGS_SET_OPN_MASK;
hi = vnet_get_hw_interface (vnm, hw_if_index);
ASSERT (hi->hw_class_index == ethernet_hw_interface_class.index);
ei = pool_elt_at_index (em->interfaces, hi->hw_instance);
- ei->flags = flags;
+
+ /* preserve status bits and update last set operation bits */
+ ei->flags = (ei->flags & ETHERNET_INTERFACE_FLAGS_STATUS_MASK) | opn_flags;
+
if (ei->flag_change)
- return ei->flag_change (vnm, hi, flags);
- return (u32) ~ 0;
+ {
+ switch (opn_flags)
+ {
+ case ETHERNET_INTERFACE_FLAG_DEFAULT_L3:
+ if (hi->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_MAC_FILTER)
+ {
+ if (ei->flag_change (vnm, hi, opn_flags) != ~0)
+ {
+ ei->flags |= ETHERNET_INTERFACE_FLAG_STATUS_L3;
+ return 0;
+ }
+ ei->flags &= ~ETHERNET_INTERFACE_FLAG_STATUS_L3;
+ return ~0;
+ }
+ /* fall through */
+ case ETHERNET_INTERFACE_FLAG_ACCEPT_ALL:
+ ei->flags &= ~ETHERNET_INTERFACE_FLAG_STATUS_L3;
+ /* fall through */
+ case ETHERNET_INTERFACE_FLAG_MTU:
+ return ei->flag_change (vnm, hi, opn_flags);
+ default:
+ return ~0;
+ }
+ }
+ return ~0;
}
/**
/* Ordinarily, this is the only config lookup. */
config = l2input_intf_config (vnet_buffer (b[0])->sw_if_index[VLIB_TX]);
- next_index =
- config->bridge ? VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
- VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT;
- new_tx_sw_if_index = config->bvi ? L2INPUT_BVI : ~0;
+ next_index = (l2_input_is_bridge (config) ?
+ VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
+ VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
+ new_tx_sw_if_index = l2_input_is_bvi (config) ? L2INPUT_BVI : ~0;
new_rx_sw_if_index = vnet_buffer (b[0])->sw_if_index[VLIB_TX];
while (n_left_from >= 4)
{
config = l2input_intf_config
(vnet_buffer (b[0])->sw_if_index[VLIB_TX]);
- next_index =
- config->bridge ? VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
- VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT;
- new_tx_sw_if_index = config->bvi ? L2INPUT_BVI : ~0;
+ next_index = (l2_input_is_bridge (config) ?
+ VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
+ VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
+ new_tx_sw_if_index = l2_input_is_bvi (config) ? L2INPUT_BVI : ~0;
new_rx_sw_if_index = vnet_buffer (b[0])->sw_if_index[VLIB_TX];
}
next[0] = next_index;
{
config = l2input_intf_config
(vnet_buffer (b[1])->sw_if_index[VLIB_TX]);
- next_index =
- config->bridge ? VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
- VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT;
+ next_index = (l2_input_is_bridge (config) ?
+ VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
+ VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
new_rx_sw_if_index = vnet_buffer (b[1])->sw_if_index[VLIB_TX];
- new_tx_sw_if_index = config->bvi ? L2INPUT_BVI : ~0;
+ new_tx_sw_if_index = l2_input_is_bvi (config) ? L2INPUT_BVI : ~0;
}
next[1] = next_index;
vnet_buffer (b[1])->sw_if_index[VLIB_RX] = new_rx_sw_if_index;
{
config = l2input_intf_config
(vnet_buffer (b[2])->sw_if_index[VLIB_TX]);
- next_index =
- config->bridge ? VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
- VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT;
+ next_index = (l2_input_is_bridge (config) ?
+ VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
+ VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
new_rx_sw_if_index = vnet_buffer (b[2])->sw_if_index[VLIB_TX];
- new_tx_sw_if_index = config->bvi ? L2INPUT_BVI : ~0;
+ new_tx_sw_if_index = l2_input_is_bvi (config) ? L2INPUT_BVI : ~0;
}
next[2] = next_index;
vnet_buffer (b[2])->sw_if_index[VLIB_RX] = new_rx_sw_if_index;
{
config = l2input_intf_config
(vnet_buffer (b[3])->sw_if_index[VLIB_TX]);
- next_index =
- config->bridge ? VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
- VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT;
+ next_index = (l2_input_is_bridge (config) ?
+ VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
+ VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
new_rx_sw_if_index = vnet_buffer (b[3])->sw_if_index[VLIB_TX];
- new_tx_sw_if_index = config->bvi ? L2INPUT_BVI : ~0;
+ new_tx_sw_if_index = l2_input_is_bvi (config) ? L2INPUT_BVI : ~0;
}
next[3] = next_index;
vnet_buffer (b[3])->sw_if_index[VLIB_RX] = new_rx_sw_if_index;
{
config = l2input_intf_config
(vnet_buffer (b[0])->sw_if_index[VLIB_TX]);
- next_index =
- config->bridge ? VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
- VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT;
- new_tx_sw_if_index = config->bvi ? L2INPUT_BVI : ~0;
+ next_index = (l2_input_is_bridge (config) ?
+ VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
+ VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
+ new_tx_sw_if_index = l2_input_is_bvi (config) ? L2INPUT_BVI : ~0;
new_rx_sw_if_index = vnet_buffer (b[0])->sw_if_index[VLIB_TX];
}
next[0] = next_index;
u8 is_add)
{
ethernet_interface_t *ei = ethernet_get_interface (em, hw_if_index);
- mac_address_t *if_addr = 0;
+ ethernet_interface_address_t *if_addr = 0;
+ int found = 0;
/* return if there is not an ethernet interface for this hw interface */
if (!ei)
/* 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 (ethernet_mac_address_equal (if_addr->mac.bytes, address))
+ {
+ found = 1;
+ 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 (is_add)
{
- /* if_addr could be 0 or past the end of the vector. reset to 0 */
- if_addr = 0;
-
- /* add new address */
- if (is_add)
+ if (!found)
{
+ /* address not found yet: add it */
vec_add2 (ei->secondary_addrs, if_addr, 1);
- clib_memcpy (&if_addr->bytes, address, sizeof (if_addr->bytes));
+ ethernet_interface_address_copy (if_addr, address);
}
+ return &if_addr->mac;
}
- return if_addr;
+ /* delete case */
+ if (found)
+ vec_delete (ei->secondary_addrs, 1, if_addr - ei->secondary_addrs);
+
+ return 0;
}
int
};
/* *INDENT-ON* */
+/* ethernet { ... } configuration. */
+/*?
+ *
+ * @cfgcmd{default-mtu <n>}
+ * Specify the default mtu in the range of 64-9000. The default is 9000 bytes.
+ *
+ */
static clib_error_t *
ethernet_config (vlib_main_t * vm, unformat_input_t * input)
{
Code Review / vpp.git / blobdiff