On 27 Apr 2022, at 9:55, Antonio Quartulli wrote:
> Hi Kristof,
>
> On 27/04/2022 09:48, Kristof Provost via Openvpn-devel wrote:
>> From: Kristof Provost <k...@freebsd.org>
>>
>> Handle the DCO driver telling us that the peer went away, even if we're
>> not running in multi-instance mode.
>
> thanks for catching and fixing this. It was indeed on the todo list, but well 
> hidden under the rest :-D
>
I know how todo piles work all too well.

>>
>> Signed-off-by:       Kristof Provost <kprov...@netgate.com>
>> ---
>>   src/openvpn/forward.c | 6 ++++++
>>   1 file changed, 6 insertions(+)
>>
>> diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c
>> index 9ddea439..f60c56a8 100644
>> --- a/src/openvpn/forward.c
>> +++ b/src/openvpn/forward.c
>> @@ -1111,6 +1111,12 @@ process_incoming_dco(struct context *c)
>>        dco_do_read(dco);
>>  +    if (dco->dco_message_type == OVPN_NOTIF_DEL_PEER)
>
> Not sure where this constant is coming from, but on ovpn_dco_linux.h we have 
> OVPN_CMD_DEL_PEER (similar format as the following OVPN_CMD_PACKET).
>
> Is that a format we can adhere to on BSD as well?
>
Good catch. OVPN_NOTIF_DEL_PEER  is specific to the FreeBSD DCO interface and 
shouldn’t be used in the generic openvpn code. It worked accidentally because 
it has the same value as OVPN_CMD_DEL_PEER. We should indeed be using 
OVPN_CMD_DEL_PEER here.

I’ll update the patch and probably submit both the freebsd dco patch and this 
together in a few hours.

Kristof


_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

Reply via email to