mirror of
https://github.com/torvalds/linux.git
synced 2026-05-28 09:04:39 +02:00
Merge branch 'wireguard-updates-for-6-16'
Jason A. Donenfeld says:
====================
wireguard updates for 6.16
This small series contains mostly cleanups and one new feature:
1) Kees' __nonstring annotation comes to wireguard.
2) Two selftest fixes, one to help with compilation on gcc 15, and one
removing stale config options.
3) Adoption of NLA_POLICY_MASK.
4) Jordan has added the ability to run:
# wg set ... peer ... allowed-ips -192.168.1.0/24
Which will remove the allowed IP for that peer. Previously you had to
replace all the IPs non-atomically, or move it to a dummy peer
atomically, which wasn't very clean.
====================
Link: https://patch.msgid.link/20250521212707.1767879-1-Jason@zx2c4.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Paolo Abeni
commit
f484a3029a
|
|
@ -249,6 +249,52 @@ static int add(struct allowedips_node __rcu **trie, u8 bits, const u8 *key,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void remove_node(struct allowedips_node *node, struct mutex *lock)
|
||||
{
|
||||
struct allowedips_node *child, **parent_bit, *parent;
|
||||
bool free_parent;
|
||||
|
||||
list_del_init(&node->peer_list);
|
||||
RCU_INIT_POINTER(node->peer, NULL);
|
||||
if (node->bit[0] && node->bit[1])
|
||||
return;
|
||||
child = rcu_dereference_protected(node->bit[!rcu_access_pointer(node->bit[0])],
|
||||
lockdep_is_held(lock));
|
||||
if (child)
|
||||
child->parent_bit_packed = node->parent_bit_packed;
|
||||
parent_bit = (struct allowedips_node **)(node->parent_bit_packed & ~3UL);
|
||||
*parent_bit = child;
|
||||
parent = (void *)parent_bit -
|
||||
offsetof(struct allowedips_node, bit[node->parent_bit_packed & 1]);
|
||||
free_parent = !rcu_access_pointer(node->bit[0]) && !rcu_access_pointer(node->bit[1]) &&
|
||||
(node->parent_bit_packed & 3) <= 1 && !rcu_access_pointer(parent->peer);
|
||||
if (free_parent)
|
||||
child = rcu_dereference_protected(parent->bit[!(node->parent_bit_packed & 1)],
|
||||
lockdep_is_held(lock));
|
||||
call_rcu(&node->rcu, node_free_rcu);
|
||||
if (!free_parent)
|
||||
return;
|
||||
if (child)
|
||||
child->parent_bit_packed = parent->parent_bit_packed;
|
||||
*(struct allowedips_node **)(parent->parent_bit_packed & ~3UL) = child;
|
||||
call_rcu(&parent->rcu, node_free_rcu);
|
||||
}
|
||||
|
||||
static int remove(struct allowedips_node __rcu **trie, u8 bits, const u8 *key,
|
||||
u8 cidr, struct wg_peer *peer, struct mutex *lock)
|
||||
{
|
||||
struct allowedips_node *node;
|
||||
|
||||
if (unlikely(cidr > bits))
|
||||
return -EINVAL;
|
||||
if (!rcu_access_pointer(*trie) || !node_placement(*trie, key, cidr, bits, &node, lock) ||
|
||||
peer != rcu_access_pointer(node->peer))
|
||||
return 0;
|
||||
|
||||
remove_node(node, lock);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void wg_allowedips_init(struct allowedips *table)
|
||||
{
|
||||
table->root4 = table->root6 = NULL;
|
||||
|
|
@ -300,44 +346,38 @@ int wg_allowedips_insert_v6(struct allowedips *table, const struct in6_addr *ip,
|
|||
return add(&table->root6, 128, key, cidr, peer, lock);
|
||||
}
|
||||
|
||||
int wg_allowedips_remove_v4(struct allowedips *table, const struct in_addr *ip,
|
||||
u8 cidr, struct wg_peer *peer, struct mutex *lock)
|
||||
{
|
||||
/* Aligned so it can be passed to fls */
|
||||
u8 key[4] __aligned(__alignof(u32));
|
||||
|
||||
++table->seq;
|
||||
swap_endian(key, (const u8 *)ip, 32);
|
||||
return remove(&table->root4, 32, key, cidr, peer, lock);
|
||||
}
|
||||
|
||||
int wg_allowedips_remove_v6(struct allowedips *table, const struct in6_addr *ip,
|
||||
u8 cidr, struct wg_peer *peer, struct mutex *lock)
|
||||
{
|
||||
/* Aligned so it can be passed to fls64 */
|
||||
u8 key[16] __aligned(__alignof(u64));
|
||||
|
||||
++table->seq;
|
||||
swap_endian(key, (const u8 *)ip, 128);
|
||||
return remove(&table->root6, 128, key, cidr, peer, lock);
|
||||
}
|
||||
|
||||
void wg_allowedips_remove_by_peer(struct allowedips *table,
|
||||
struct wg_peer *peer, struct mutex *lock)
|
||||
{
|
||||
struct allowedips_node *node, *child, **parent_bit, *parent, *tmp;
|
||||
bool free_parent;
|
||||
struct allowedips_node *node, *tmp;
|
||||
|
||||
if (list_empty(&peer->allowedips_list))
|
||||
return;
|
||||
++table->seq;
|
||||
list_for_each_entry_safe(node, tmp, &peer->allowedips_list, peer_list) {
|
||||
list_del_init(&node->peer_list);
|
||||
RCU_INIT_POINTER(node->peer, NULL);
|
||||
if (node->bit[0] && node->bit[1])
|
||||
continue;
|
||||
child = rcu_dereference_protected(node->bit[!rcu_access_pointer(node->bit[0])],
|
||||
lockdep_is_held(lock));
|
||||
if (child)
|
||||
child->parent_bit_packed = node->parent_bit_packed;
|
||||
parent_bit = (struct allowedips_node **)(node->parent_bit_packed & ~3UL);
|
||||
*parent_bit = child;
|
||||
parent = (void *)parent_bit -
|
||||
offsetof(struct allowedips_node, bit[node->parent_bit_packed & 1]);
|
||||
free_parent = !rcu_access_pointer(node->bit[0]) &&
|
||||
!rcu_access_pointer(node->bit[1]) &&
|
||||
(node->parent_bit_packed & 3) <= 1 &&
|
||||
!rcu_access_pointer(parent->peer);
|
||||
if (free_parent)
|
||||
child = rcu_dereference_protected(
|
||||
parent->bit[!(node->parent_bit_packed & 1)],
|
||||
lockdep_is_held(lock));
|
||||
call_rcu(&node->rcu, node_free_rcu);
|
||||
if (!free_parent)
|
||||
continue;
|
||||
if (child)
|
||||
child->parent_bit_packed = parent->parent_bit_packed;
|
||||
*(struct allowedips_node **)(parent->parent_bit_packed & ~3UL) = child;
|
||||
call_rcu(&parent->rcu, node_free_rcu);
|
||||
}
|
||||
list_for_each_entry_safe(node, tmp, &peer->allowedips_list, peer_list)
|
||||
remove_node(node, lock);
|
||||
}
|
||||
|
||||
int wg_allowedips_read_node(struct allowedips_node *node, u8 ip[16], u8 *cidr)
|
||||
|
|
|
|||
|
|
@ -38,6 +38,10 @@ int wg_allowedips_insert_v4(struct allowedips *table, const struct in_addr *ip,
|
|||
u8 cidr, struct wg_peer *peer, struct mutex *lock);
|
||||
int wg_allowedips_insert_v6(struct allowedips *table, const struct in6_addr *ip,
|
||||
u8 cidr, struct wg_peer *peer, struct mutex *lock);
|
||||
int wg_allowedips_remove_v4(struct allowedips *table, const struct in_addr *ip,
|
||||
u8 cidr, struct wg_peer *peer, struct mutex *lock);
|
||||
int wg_allowedips_remove_v6(struct allowedips *table, const struct in6_addr *ip,
|
||||
u8 cidr, struct wg_peer *peer, struct mutex *lock);
|
||||
void wg_allowedips_remove_by_peer(struct allowedips *table,
|
||||
struct wg_peer *peer, struct mutex *lock);
|
||||
/* The ip input pointer should be __aligned(__alignof(u64))) */
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ void wg_cookie_checker_init(struct cookie_checker *checker,
|
|||
}
|
||||
|
||||
enum { COOKIE_KEY_LABEL_LEN = 8 };
|
||||
static const u8 mac1_key_label[COOKIE_KEY_LABEL_LEN] = "mac1----";
|
||||
static const u8 cookie_key_label[COOKIE_KEY_LABEL_LEN] = "cookie--";
|
||||
static const u8 mac1_key_label[COOKIE_KEY_LABEL_LEN] __nonstring = "mac1----";
|
||||
static const u8 cookie_key_label[COOKIE_KEY_LABEL_LEN] __nonstring = "cookie--";
|
||||
|
||||
static void precompute_key(u8 key[NOISE_SYMMETRIC_KEY_LEN],
|
||||
const u8 pubkey[NOISE_PUBLIC_KEY_LEN],
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ static const struct nla_policy device_policy[WGDEVICE_A_MAX + 1] = {
|
|||
[WGDEVICE_A_IFNAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },
|
||||
[WGDEVICE_A_PRIVATE_KEY] = NLA_POLICY_EXACT_LEN(NOISE_PUBLIC_KEY_LEN),
|
||||
[WGDEVICE_A_PUBLIC_KEY] = NLA_POLICY_EXACT_LEN(NOISE_PUBLIC_KEY_LEN),
|
||||
[WGDEVICE_A_FLAGS] = { .type = NLA_U32 },
|
||||
[WGDEVICE_A_FLAGS] = NLA_POLICY_MASK(NLA_U32, __WGDEVICE_F_ALL),
|
||||
[WGDEVICE_A_LISTEN_PORT] = { .type = NLA_U16 },
|
||||
[WGDEVICE_A_FWMARK] = { .type = NLA_U32 },
|
||||
[WGDEVICE_A_PEERS] = { .type = NLA_NESTED }
|
||||
|
|
@ -33,7 +33,7 @@ static const struct nla_policy device_policy[WGDEVICE_A_MAX + 1] = {
|
|||
static const struct nla_policy peer_policy[WGPEER_A_MAX + 1] = {
|
||||
[WGPEER_A_PUBLIC_KEY] = NLA_POLICY_EXACT_LEN(NOISE_PUBLIC_KEY_LEN),
|
||||
[WGPEER_A_PRESHARED_KEY] = NLA_POLICY_EXACT_LEN(NOISE_SYMMETRIC_KEY_LEN),
|
||||
[WGPEER_A_FLAGS] = { .type = NLA_U32 },
|
||||
[WGPEER_A_FLAGS] = NLA_POLICY_MASK(NLA_U32, __WGPEER_F_ALL),
|
||||
[WGPEER_A_ENDPOINT] = NLA_POLICY_MIN_LEN(sizeof(struct sockaddr)),
|
||||
[WGPEER_A_PERSISTENT_KEEPALIVE_INTERVAL] = { .type = NLA_U16 },
|
||||
[WGPEER_A_LAST_HANDSHAKE_TIME] = NLA_POLICY_EXACT_LEN(sizeof(struct __kernel_timespec)),
|
||||
|
|
@ -46,7 +46,8 @@ static const struct nla_policy peer_policy[WGPEER_A_MAX + 1] = {
|
|||
static const struct nla_policy allowedip_policy[WGALLOWEDIP_A_MAX + 1] = {
|
||||
[WGALLOWEDIP_A_FAMILY] = { .type = NLA_U16 },
|
||||
[WGALLOWEDIP_A_IPADDR] = NLA_POLICY_MIN_LEN(sizeof(struct in_addr)),
|
||||
[WGALLOWEDIP_A_CIDR_MASK] = { .type = NLA_U8 }
|
||||
[WGALLOWEDIP_A_CIDR_MASK] = { .type = NLA_U8 },
|
||||
[WGALLOWEDIP_A_FLAGS] = NLA_POLICY_MASK(NLA_U32, __WGALLOWEDIP_F_ALL),
|
||||
};
|
||||
|
||||
static struct wg_device *lookup_interface(struct nlattr **attrs,
|
||||
|
|
@ -329,6 +330,7 @@ static int set_port(struct wg_device *wg, u16 port)
|
|||
static int set_allowedip(struct wg_peer *peer, struct nlattr **attrs)
|
||||
{
|
||||
int ret = -EINVAL;
|
||||
u32 flags = 0;
|
||||
u16 family;
|
||||
u8 cidr;
|
||||
|
||||
|
|
@ -337,19 +339,30 @@ static int set_allowedip(struct wg_peer *peer, struct nlattr **attrs)
|
|||
return ret;
|
||||
family = nla_get_u16(attrs[WGALLOWEDIP_A_FAMILY]);
|
||||
cidr = nla_get_u8(attrs[WGALLOWEDIP_A_CIDR_MASK]);
|
||||
if (attrs[WGALLOWEDIP_A_FLAGS])
|
||||
flags = nla_get_u32(attrs[WGALLOWEDIP_A_FLAGS]);
|
||||
|
||||
if (family == AF_INET && cidr <= 32 &&
|
||||
nla_len(attrs[WGALLOWEDIP_A_IPADDR]) == sizeof(struct in_addr))
|
||||
ret = wg_allowedips_insert_v4(
|
||||
&peer->device->peer_allowedips,
|
||||
nla_data(attrs[WGALLOWEDIP_A_IPADDR]), cidr, peer,
|
||||
&peer->device->device_update_lock);
|
||||
else if (family == AF_INET6 && cidr <= 128 &&
|
||||
nla_len(attrs[WGALLOWEDIP_A_IPADDR]) == sizeof(struct in6_addr))
|
||||
ret = wg_allowedips_insert_v6(
|
||||
&peer->device->peer_allowedips,
|
||||
nla_data(attrs[WGALLOWEDIP_A_IPADDR]), cidr, peer,
|
||||
&peer->device->device_update_lock);
|
||||
nla_len(attrs[WGALLOWEDIP_A_IPADDR]) == sizeof(struct in_addr)) {
|
||||
if (flags & WGALLOWEDIP_F_REMOVE_ME)
|
||||
ret = wg_allowedips_remove_v4(&peer->device->peer_allowedips,
|
||||
nla_data(attrs[WGALLOWEDIP_A_IPADDR]), cidr,
|
||||
peer, &peer->device->device_update_lock);
|
||||
else
|
||||
ret = wg_allowedips_insert_v4(&peer->device->peer_allowedips,
|
||||
nla_data(attrs[WGALLOWEDIP_A_IPADDR]), cidr,
|
||||
peer, &peer->device->device_update_lock);
|
||||
} else if (family == AF_INET6 && cidr <= 128 &&
|
||||
nla_len(attrs[WGALLOWEDIP_A_IPADDR]) == sizeof(struct in6_addr)) {
|
||||
if (flags & WGALLOWEDIP_F_REMOVE_ME)
|
||||
ret = wg_allowedips_remove_v6(&peer->device->peer_allowedips,
|
||||
nla_data(attrs[WGALLOWEDIP_A_IPADDR]), cidr,
|
||||
peer, &peer->device->device_update_lock);
|
||||
else
|
||||
ret = wg_allowedips_insert_v6(&peer->device->peer_allowedips,
|
||||
nla_data(attrs[WGALLOWEDIP_A_IPADDR]), cidr,
|
||||
peer, &peer->device->device_update_lock);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -373,9 +386,6 @@ static int set_peer(struct wg_device *wg, struct nlattr **attrs)
|
|||
|
||||
if (attrs[WGPEER_A_FLAGS])
|
||||
flags = nla_get_u32(attrs[WGPEER_A_FLAGS]);
|
||||
ret = -EOPNOTSUPP;
|
||||
if (flags & ~__WGPEER_F_ALL)
|
||||
goto out;
|
||||
|
||||
ret = -EPFNOSUPPORT;
|
||||
if (attrs[WGPEER_A_PROTOCOL_VERSION]) {
|
||||
|
|
@ -506,9 +516,6 @@ static int wg_set_device(struct sk_buff *skb, struct genl_info *info)
|
|||
|
||||
if (info->attrs[WGDEVICE_A_FLAGS])
|
||||
flags = nla_get_u32(info->attrs[WGDEVICE_A_FLAGS]);
|
||||
ret = -EOPNOTSUPP;
|
||||
if (flags & ~__WGDEVICE_F_ALL)
|
||||
goto out;
|
||||
|
||||
if (info->attrs[WGDEVICE_A_LISTEN_PORT] || info->attrs[WGDEVICE_A_FWMARK]) {
|
||||
struct net *net;
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@
|
|||
* <- e, ee, se, psk, {}
|
||||
*/
|
||||
|
||||
static const u8 handshake_name[37] = "Noise_IKpsk2_25519_ChaChaPoly_BLAKE2s";
|
||||
static const u8 identifier_name[34] = "WireGuard v1 zx2c4 Jason@zx2c4.com";
|
||||
static const u8 handshake_name[37] __nonstring = "Noise_IKpsk2_25519_ChaChaPoly_BLAKE2s";
|
||||
static const u8 identifier_name[34] __nonstring = "WireGuard v1 zx2c4 Jason@zx2c4.com";
|
||||
static u8 handshake_init_hash[NOISE_HASH_LEN] __ro_after_init;
|
||||
static u8 handshake_init_chaining_key[NOISE_HASH_LEN] __ro_after_init;
|
||||
static atomic64_t keypair_counter = ATOMIC64_INIT(0);
|
||||
|
|
|
|||
|
|
@ -460,6 +460,10 @@ static __init struct wg_peer *init_peer(void)
|
|||
wg_allowedips_insert_v##version(&t, ip##version(ipa, ipb, ipc, ipd), \
|
||||
cidr, mem, &mutex)
|
||||
|
||||
#define remove(version, mem, ipa, ipb, ipc, ipd, cidr) \
|
||||
wg_allowedips_remove_v##version(&t, ip##version(ipa, ipb, ipc, ipd), \
|
||||
cidr, mem, &mutex)
|
||||
|
||||
#define maybe_fail() do { \
|
||||
++i; \
|
||||
if (!_s) { \
|
||||
|
|
@ -585,6 +589,50 @@ bool __init wg_allowedips_selftest(void)
|
|||
test_negative(4, a, 192, 0, 0, 0);
|
||||
test_negative(4, a, 255, 0, 0, 0);
|
||||
|
||||
insert(4, a, 1, 0, 0, 0, 32);
|
||||
insert(4, a, 192, 0, 0, 0, 24);
|
||||
insert(6, a, 0x24446801, 0x40e40800, 0xdeaebeef, 0xdefbeef, 128);
|
||||
insert(6, a, 0x24446800, 0xf0e40800, 0xeeaebeef, 0, 98);
|
||||
test(4, a, 1, 0, 0, 0);
|
||||
test(4, a, 192, 0, 0, 1);
|
||||
test(6, a, 0x24446801, 0x40e40800, 0xdeaebeef, 0xdefbeef);
|
||||
test(6, a, 0x24446800, 0xf0e40800, 0xeeaebeef, 0x10101010);
|
||||
/* Must be an exact match to remove */
|
||||
remove(4, a, 192, 0, 0, 0, 32);
|
||||
test(4, a, 192, 0, 0, 1);
|
||||
/* NULL peer should have no effect and return 0 */
|
||||
test_boolean(!remove(4, NULL, 192, 0, 0, 0, 24));
|
||||
test(4, a, 192, 0, 0, 1);
|
||||
/* different peer should have no effect and return 0 */
|
||||
test_boolean(!remove(4, b, 192, 0, 0, 0, 24));
|
||||
test(4, a, 192, 0, 0, 1);
|
||||
/* invalid CIDR should have no effect and return -EINVAL */
|
||||
test_boolean(remove(4, b, 192, 0, 0, 0, 33) == -EINVAL);
|
||||
test(4, a, 192, 0, 0, 1);
|
||||
remove(4, a, 192, 0, 0, 0, 24);
|
||||
test_negative(4, a, 192, 0, 0, 1);
|
||||
remove(4, a, 1, 0, 0, 0, 32);
|
||||
test_negative(4, a, 1, 0, 0, 0);
|
||||
/* Must be an exact match to remove */
|
||||
remove(6, a, 0x24446801, 0x40e40800, 0xdeaebeef, 0xdefbeef, 96);
|
||||
test(6, a, 0x24446801, 0x40e40800, 0xdeaebeef, 0xdefbeef);
|
||||
/* NULL peer should have no effect and return 0 */
|
||||
test_boolean(!remove(6, NULL, 0x24446801, 0x40e40800, 0xdeaebeef, 0xdefbeef, 128));
|
||||
test(6, a, 0x24446801, 0x40e40800, 0xdeaebeef, 0xdefbeef);
|
||||
/* different peer should have no effect and return 0 */
|
||||
test_boolean(!remove(6, b, 0x24446801, 0x40e40800, 0xdeaebeef, 0xdefbeef, 128));
|
||||
test(6, a, 0x24446801, 0x40e40800, 0xdeaebeef, 0xdefbeef);
|
||||
/* invalid CIDR should have no effect and return -EINVAL */
|
||||
test_boolean(remove(6, a, 0x24446801, 0x40e40800, 0xdeaebeef, 0xdefbeef, 129) == -EINVAL);
|
||||
test(6, a, 0x24446801, 0x40e40800, 0xdeaebeef, 0xdefbeef);
|
||||
remove(6, a, 0x24446801, 0x40e40800, 0xdeaebeef, 0xdefbeef, 128);
|
||||
test_negative(6, a, 0x24446801, 0x40e40800, 0xdeaebeef, 0xdefbeef);
|
||||
/* Must match the peer to remove */
|
||||
remove(6, b, 0x24446800, 0xf0e40800, 0xeeaebeef, 0, 98);
|
||||
test(6, a, 0x24446800, 0xf0e40800, 0xeeaebeef, 0x10101010);
|
||||
remove(6, a, 0x24446800, 0xf0e40800, 0xeeaebeef, 0, 98);
|
||||
test_negative(6, a, 0x24446800, 0xf0e40800, 0xeeaebeef, 0x10101010);
|
||||
|
||||
wg_allowedips_free(&t, &mutex);
|
||||
wg_allowedips_init(&t);
|
||||
insert(4, a, 192, 168, 0, 0, 16);
|
||||
|
|
|
|||
|
|
@ -101,6 +101,10 @@
|
|||
* WGALLOWEDIP_A_FAMILY: NLA_U16
|
||||
* WGALLOWEDIP_A_IPADDR: struct in_addr or struct in6_addr
|
||||
* WGALLOWEDIP_A_CIDR_MASK: NLA_U8
|
||||
* WGALLOWEDIP_A_FLAGS: NLA_U32, WGALLOWEDIP_F_REMOVE_ME if
|
||||
* the specified IP should be removed;
|
||||
* otherwise, this IP will be added if
|
||||
* it is not already present.
|
||||
* 0: NLA_NESTED
|
||||
* ...
|
||||
* 0: NLA_NESTED
|
||||
|
|
@ -184,11 +188,16 @@ enum wgpeer_attribute {
|
|||
};
|
||||
#define WGPEER_A_MAX (__WGPEER_A_LAST - 1)
|
||||
|
||||
enum wgallowedip_flag {
|
||||
WGALLOWEDIP_F_REMOVE_ME = 1U << 0,
|
||||
__WGALLOWEDIP_F_ALL = WGALLOWEDIP_F_REMOVE_ME
|
||||
};
|
||||
enum wgallowedip_attribute {
|
||||
WGALLOWEDIP_A_UNSPEC,
|
||||
WGALLOWEDIP_A_FAMILY,
|
||||
WGALLOWEDIP_A_IPADDR,
|
||||
WGALLOWEDIP_A_CIDR_MASK,
|
||||
WGALLOWEDIP_A_FLAGS,
|
||||
__WGALLOWEDIP_A_LAST
|
||||
};
|
||||
#define WGALLOWEDIP_A_MAX (__WGALLOWEDIP_A_LAST - 1)
|
||||
|
|
|
|||
|
|
@ -611,6 +611,35 @@ n0 wg set wg0 peer "$pub2" allowed-ips "$allowedips"
|
|||
} < <(n0 wg show wg0 allowed-ips)
|
||||
ip0 link del wg0
|
||||
|
||||
allowedips=( )
|
||||
for i in {1..197}; do
|
||||
allowedips+=( 192.168.0.$i )
|
||||
allowedips+=( abcd::$i )
|
||||
done
|
||||
saved_ifs="$IFS"
|
||||
IFS=,
|
||||
allowedips="${allowedips[*]}"
|
||||
IFS="$saved_ifs"
|
||||
ip0 link add wg0 type wireguard
|
||||
n0 wg set wg0 peer "$pub1" allowed-ips "$allowedips"
|
||||
n0 wg set wg0 peer "$pub1" allowed-ips -192.168.0.1/32,-192.168.0.20/32,-192.168.0.100/32,-abcd::1/128,-abcd::20/128,-abcd::100/128
|
||||
{
|
||||
read -r pub allowedips
|
||||
[[ $pub == "$pub1" ]]
|
||||
i=0
|
||||
for ip in $allowedips; do
|
||||
[[ $ip != "192.168.0.1" ]]
|
||||
[[ $ip != "192.168.0.20" ]]
|
||||
[[ $ip != "192.168.0.100" ]]
|
||||
[[ $ip != "abcd::1" ]]
|
||||
[[ $ip != "abcd::20" ]]
|
||||
[[ $ip != "abcd::100" ]]
|
||||
((++i))
|
||||
done
|
||||
((i == 388))
|
||||
} < <(n0 wg show wg0 allowed-ips)
|
||||
ip0 link del wg0
|
||||
|
||||
! n0 wg show doesnotexist || false
|
||||
|
||||
ip0 link add wg0 type wireguard
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ $(eval $(call tar_download,IPROUTE2,iproute2,5.17.0,.tar.gz,https://www.kernel.o
|
|||
$(eval $(call tar_download,IPTABLES,iptables,1.8.7,.tar.bz2,https://www.netfilter.org/projects/iptables/files/,c109c96bb04998cd44156622d36f8e04b140701ec60531a10668cfdff5e8d8f0))
|
||||
$(eval $(call tar_download,NMAP,nmap,7.92,.tgz,https://nmap.org/dist/,064183ea642dc4c12b1ab3b5358ce1cef7d2e7e11ffa2849f16d339f5b717117))
|
||||
$(eval $(call tar_download,IPUTILS,iputils,s20190709,.tar.gz,https://github.com/iputils/iputils/archive/s20190709.tar.gz/#,a15720dd741d7538dd2645f9f516d193636ae4300ff7dbc8bfca757bf166490a))
|
||||
$(eval $(call tar_download,WIREGUARD_TOOLS,wireguard-tools,1.0.20210914,.tar.xz,https://git.zx2c4.com/wireguard-tools/snapshot/,97ff31489217bb265b7ae850d3d0f335ab07d2652ba1feec88b734bc96bd05ac))
|
||||
$(eval $(call tar_download,WIREGUARD_TOOLS,wireguard-tools,1.0.20250521,.tar.xz,https://git.zx2c4.com/wireguard-tools/snapshot/,b6f2628b85b1b23cc06517ec9c74f82d52c4cdbd020f3dd2f00c972a1782950e))
|
||||
|
||||
export CFLAGS := -O3 -pipe
|
||||
ifeq ($(HOST_ARCH),$(ARCH))
|
||||
|
|
@ -401,6 +401,7 @@ $(BASH_PATH)/.installed: $(BASH_TAR)
|
|||
flock -s $<.lock tar -C $(BUILD_PATH) -xf $<
|
||||
touch $@
|
||||
|
||||
$(BASH_PATH)/bash: export CFLAGS_FOR_BUILD += -std=gnu17
|
||||
$(BASH_PATH)/bash: | $(BASH_PATH)/.installed $(USERSPACE_DEPS)
|
||||
cd $(BASH_PATH) && ./configure --prefix=/ $(CROSS_COMPILE_FLAG) --without-bash-malloc --disable-debugger --disable-help-builtin --disable-history --disable-progcomp --disable-readline --disable-mem-scramble
|
||||
$(MAKE) -C $(BASH_PATH)
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ CONFIG_HAVE_ARCH_KASAN=y
|
|||
CONFIG_KASAN=y
|
||||
CONFIG_KASAN_INLINE=y
|
||||
CONFIG_UBSAN=y
|
||||
CONFIG_UBSAN_SANITIZE_ALL=y
|
||||
CONFIG_DEBUG_KMEMLEAK=y
|
||||
CONFIG_DEBUG_STACK_USAGE=y
|
||||
CONFIG_DEBUG_SHIRQ=y
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user