From 3ddfe26e491f9d74da54feb981116f7b8ef19a70 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Wed, 12 Feb 2025 13:38:20 +0100 Subject: [PATCH] Fix oversight of link socket code change in Android code path Commit 94b391d7ef5 changed context->link_socket to context->link_sockets but did not change the Android code path. Change-Id: If6a636b2099d948e249cf92ed2ba91d1698ee42f Signed-off-by: Arne Schwabe Acked-by: Gert Doering Message-Id: <20250212123820.19099-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg30833.html Signed-off-by: Gert Doering --- src/openvpn/init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 4014517a514..a7f7db40ac2 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -4381,16 +4381,16 @@ management_callback_network_change(void *arg, bool samenetwork) int socketfd = -1; struct context *c = (struct context *) arg; - if (!c->c2.link_socket) + if (!c->c2.link_sockets || !c->c2.link_sockets[0]) { return -1; } - if (c->c2.link_socket->sd == SOCKET_UNDEFINED) + if (c->c2.link_sockets[0]->sd == SOCKET_UNDEFINED) { return -1; } - socketfd = c->c2.link_socket->sd; + socketfd = c->c2.link_sockets[0]->sd; if (!c->options.pull || c->c2.tls_multi->use_peer_id || samenetwork) { return socketfd;