#include <vnet/adj/adj_midchain.h>
#include <vnet/fib/fib_table.h>
+#include <vnet/fib/fib_entry_track.h>
#include <wireguard/wireguard_peer.h>
#include <wireguard/wireguard_if.h>
#include <wireguard/wireguard_messages.h>
wg_peer_endpoint_reset (&peer->src);
wg_peer_endpoint_reset (&peer->dst);
- adj_index_t *adj_index;
- vec_foreach (adj_index, peer->adj_indices)
+ wg_peer_adj_t *peer_adj;
+ vec_foreach (peer_adj, peer->adjs)
{
- if (INDEX_INVALID != *adj_index)
- {
- wg_peer_by_adj_index[*adj_index] = INDEX_INVALID;
- }
+ wg_peer_by_adj_index[peer_adj->adj_index] = INDEX_INVALID;
+ if (FIB_NODE_INDEX_INVALID != peer_adj->fib_entry_index)
+ fib_entry_untrack (peer_adj->fib_entry_index, peer_adj->sibling_index);
+ if (adj_is_valid (peer_adj->adj_index))
+ adj_nbr_midchain_unstack (peer_adj->adj_index);
}
peer->input_thread_index = ~0;
peer->output_thread_index = ~0;
peer->new_handshake_interval_tick = 0;
peer->rehandshake_interval_tick = 0;
peer->timer_need_another_keepalive = false;
+ vec_free (peer->rewrite);
vec_free (peer->allowed_ips);
- vec_free (peer->adj_indices);
+ vec_free (peer->adjs);
}
static void
}
static void
-wg_peer_adj_stack (wg_peer_t *peer, adj_index_t ai)
+wg_peer_adj_stack (wg_peer_t *peer, wg_peer_adj_t *peer_adj)
{
ip_adjacency_t *adj;
u32 sw_if_index;
wg_if_t *wgi;
fib_protocol_t fib_proto;
- if (!adj_is_valid (ai))
+ if (!adj_is_valid (peer_adj->adj_index))
return;
- adj = adj_get (ai);
+ adj = adj_get (peer_adj->adj_index);
sw_if_index = adj->rewrite_header.sw_if_index;
u8 is_ip4 = ip46_address_is_ip4 (&peer->src.addr);
fib_proto = is_ip4 ? FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6;
if (!wgi)
return;
- if (!vnet_sw_interface_is_admin_up (vnet_get_main (), wgi->sw_if_index))
+ if (!vnet_sw_interface_is_admin_up (vnet_get_main (), wgi->sw_if_index) ||
+ !wg_peer_can_send (peer))
{
- adj_midchain_delegate_unstack (ai);
+ adj_nbr_midchain_unstack (peer_adj->adj_index);
}
else
{
u32 fib_index;
fib_index = fib_table_find (fib_proto, peer->table_id);
+ peer_adj->fib_entry_index =
+ fib_entry_track (fib_index, &dst, FIB_NODE_TYPE_ADJ,
+ peer_adj->adj_index, &peer_adj->sibling_index);
- adj_midchain_delegate_stack (ai, fib_index, &dst);
+ adj_nbr_midchain_stack_on_fib_entry (
+ peer_adj->adj_index, peer_adj->fib_entry_index,
+ fib_forw_chain_type_from_fib_proto (dst.fp_proto));
}
}
wg_peer_if_admin_state_change (index_t peeri, void *data)
{
wg_peer_t *peer;
- adj_index_t *adj_index;
+ wg_peer_adj_t *peer_adj;
peer = wg_peer_get (peeri);
- vec_foreach (adj_index, peer->adj_indices)
+ vec_foreach (peer_adj, peer->adjs)
{
- wg_peer_adj_stack (peer, *adj_index);
+ wg_peer_adj_stack (peer, peer_adj);
}
return (WALK_CONTINUE);
}
ip_adjacency_t *adj;
wg_peer_t *peer;
fib_prefix_t *allowed_ip;
+ wg_peer_adj_t *peer_adj;
adj = adj_get (*adj_index);
if (fib_prefix_is_cover_addr_46 (allowed_ip,
&adj->sub_type.nbr.next_hop))
{
- vec_add1 (peer->adj_indices, *adj_index);
+ vec_add2 (peer->adjs, peer_adj, 1);
+ peer_adj->adj_index = *adj_index;
+ peer_adj->fib_entry_index = FIB_NODE_INDEX_INVALID;
+ peer_adj->sibling_index = ~0;
+
vec_validate_init_empty (wg_peer_by_adj_index, *adj_index,
INDEX_INVALID);
- wg_peer_by_adj_index[*adj_index] = peer - wg_peer_pool;
+ wg_peer_by_adj_index[*adj_index] = peeri;
fixup = wg_peer_get_fixup (peer, adj_get_link_type (*adj_index));
adj_nbr_midchain_update_rewrite (*adj_index, fixup, NULL,
ADJ_FLAG_MIDCHAIN_IP_STACK,
vec_dup (peer->rewrite));
- wg_peer_adj_stack (peer, *adj_index);
+ wg_peer_adj_stack (peer, peer_adj);
return (WALK_STOP);
}
}
wg_api_peer_event (peeri, peer->flags);
}
+void
+wg_peer_update_endpoint (index_t peeri, const ip46_address_t *addr, u16 port)
+{
+ wg_peer_t *peer = wg_peer_get (peeri);
+
+ if (ip46_address_is_equal (&peer->dst.addr, addr) && peer->dst.port == port)
+ return;
+
+ wg_peer_endpoint_init (&peer->dst, addr, port);
+
+ u8 is_ip4 = ip46_address_is_ip4 (&peer->dst.addr);
+ vec_free (peer->rewrite);
+ peer->rewrite = wg_build_rewrite (&peer->src.addr, peer->src.port,
+ &peer->dst.addr, peer->dst.port, is_ip4);
+
+ wg_peer_adj_t *peer_adj;
+ vec_foreach (peer_adj, peer->adjs)
+ {
+ if (FIB_NODE_INDEX_INVALID != peer_adj->fib_entry_index)
+ {
+ fib_entry_untrack (peer_adj->fib_entry_index,
+ peer_adj->sibling_index);
+ peer_adj->fib_entry_index = FIB_NODE_INDEX_INVALID;
+ peer_adj->sibling_index = ~0;
+ }
+
+ if (adj_is_valid (peer_adj->adj_index))
+ {
+ adj_midchain_fixup_t fixup =
+ wg_peer_get_fixup (peer, adj_get_link_type (peer_adj->adj_index));
+ adj_nbr_midchain_update_rewrite (peer_adj->adj_index, fixup, NULL,
+ ADJ_FLAG_MIDCHAIN_IP_STACK,
+ vec_dup (peer->rewrite));
+ wg_peer_adj_stack (peer, peer_adj);
+ }
+ }
+}
+
+typedef struct wg_peer_upd_ep_args_t_
+{
+ index_t peeri;
+ ip46_address_t addr;
+ u16 port;
+} wg_peer_upd_ep_args_t;
+
+static void
+wg_peer_update_endpoint_thread_fn (wg_peer_upd_ep_args_t *args)
+{
+ wg_peer_update_endpoint (args->peeri, &args->addr, args->port);
+}
+
+void
+wg_peer_update_endpoint_from_mt (index_t peeri, const ip46_address_t *addr,
+ u16 port)
+{
+ wg_peer_upd_ep_args_t args = {
+ .peeri = peeri,
+ .port = port,
+ };
+
+ ip46_address_copy (&args.addr, addr);
+ vlib_rpc_call_main_thread (wg_peer_update_endpoint_thread_fn, (u8 *) &args,
+ sizeof (args));
+}
+
int
wg_peer_add (u32 tun_sw_if_index, const u8 public_key[NOISE_PUBLIC_KEY_LEN],
u32 table_id, const ip46_address_t *endpoint,
if (pool_elts (wg_peer_pool) > MAX_PEERS)
return (VNET_API_ERROR_LIMIT_EXCEEDED);
- pool_get (wg_peer_pool, peer);
+ pool_get_zero (wg_peer_pool, peer);
wg_peer_init (vm, peer);
{
index_t peeri = va_arg (*va, index_t);
fib_prefix_t *allowed_ip;
- adj_index_t *adj_index;
u8 key[NOISE_KEY_LEN_BASE64];
wg_peer_t *peer;
+ wg_peer_adj_t *peer_adj;
peer = wg_peer_get (peeri);
key_to_base64 (peer->remote.r_public, NOISE_PUBLIC_KEY_LEN, key);
peer->wg_sw_if_index, peer->persistent_keepalive_interval, peer->flags,
pool_elts (peer->api_clients));
s = format (s, "\n adj:");
- vec_foreach (adj_index, peer->adj_indices)
+ vec_foreach (peer_adj, peer->adjs)
{
- s = format (s, " %d", *adj_index);
+ s = format (s, " %d", peer_adj->adj_index);
}
s = format (s, "\n key:%=s %U", key, format_hex_bytes,
peer->remote.r_public, NOISE_PUBLIC_KEY_LEN);
Code Review / vpp.git / blobdiff