From: Arne Schwabe <a...@rfc2549.org> 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 <a...@rfc2549.org> Acked-by: Gert Doering <g...@greenie.muc.de> --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/888 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering <g...@greenie.muc.de> diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 4014517..a7f7db4 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -4381,16 +4381,16 @@ 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; _______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
