[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <f4baaf5b-0efc-4a10-9af0-e7915fc98287@openvpn.net>
Date: Thu, 21 Nov 2024 22:43:31 +0100
From: Antonio Quartulli <antonio@...nvpn.net>
To: Sabrina Dubroca <sd@...asysnail.net>
Cc: Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>, Donald Hunter <donald.hunter@...il.com>,
Shuah Khan <shuah@...nel.org>, ryazanov.s.a@...il.com,
Andrew Lunn <andrew@...n.ch>, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-kselftest@...r.kernel.org
Subject: Re: [PATCH net-next v11 18/23] ovpn: implement peer
add/get/dump/delete via netlink
On 21/11/2024 17:02, Sabrina Dubroca wrote:
> [I'm still thinking about the locking problems for ovpn_peer_float,
> but just noticed this while staring at the rehash code]
>
> 2024-10-29, 11:47:31 +0100, Antonio Quartulli wrote:
>> +void ovpn_peer_hash_vpn_ip(struct ovpn_peer *peer)
>> + __must_hold(&peer->ovpn->peers->lock)
>> +{
>> + struct hlist_nulls_head *nhead;
>> +
>> + if (peer->vpn_addrs.ipv4.s_addr != htonl(INADDR_ANY)) {
>> + /* remove potential old hashing */
>> + hlist_nulls_del_init_rcu(&peer->hash_entry_transp_addr);
>
> s/hash_entry_transp_addr/hash_entry_addr4/ ?
cr0p. very good catch!
Thanks
>
>
>> + nhead = ovpn_get_hash_head(peer->ovpn->peers->by_vpn_addr,
>> + &peer->vpn_addrs.ipv4,
>> + sizeof(peer->vpn_addrs.ipv4));
>> + hlist_nulls_add_head_rcu(&peer->hash_entry_addr4, nhead);
>> + }
>> +
>> + if (!ipv6_addr_any(&peer->vpn_addrs.ipv6)) {
>> + /* remove potential old hashing */
>> + hlist_nulls_del_init_rcu(&peer->hash_entry_transp_addr);
>
> s/hash_entry_transp_addr/hash_entry_addr6/ ?
ThanksĀ²
This is what happens when you copy/paste code around.
>
>
>> + nhead = ovpn_get_hash_head(peer->ovpn->peers->by_vpn_addr,
>> + &peer->vpn_addrs.ipv6,
>> + sizeof(peer->vpn_addrs.ipv6));
>> + hlist_nulls_add_head_rcu(&peer->hash_entry_addr6, nhead);
>> + }
>> +}
>
Regards,
--
Antonio Quartulli
OpenVPN Inc.
Powered by blists - more mailing lists