]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
Fix oversight of link socket code change in Android code path
authorArne Schwabe <arne@rfc2549.org>
Wed, 12 Feb 2025 12:38:20 +0000 (13:38 +0100)
committerGert Doering <gert@greenie.muc.de>
Wed, 12 Feb 2025 13:02:12 +0000 (14:02 +0100)
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 <arne@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
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 <gert@greenie.muc.de>
src/openvpn/init.c

index 4014517a51431e8eb479a1fc0d1a560211924d55..a7f7db40ac23b17b053cb6cd6397aafb4c37a5e0 100644 (file)
@@ -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;