cron2 has uploaded a new patch set (#2) to the change originally created by plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/888?usp=email )
The following approvals got outdated and were removed: Code-Review+2 by cron2 Change subject: Fix oversight of link socket code change in Android code path ...................................................................... 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 <a...@rfc2549.org> Acked-by: Gert Doering <g...@greenie.muc.de> Message-Id: <20250212123820.19099-1-g...@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg30833.html Signed-off-by: Gert Doering <g...@greenie.muc.de> --- M src/openvpn/init.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/88/888/2 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; -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/888?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: If6a636b2099d948e249cf92ed2ba91d1698ee42f Gerrit-Change-Number: 888 Gerrit-PatchSet: 2 Gerrit-Owner: plaisthos <arne-open...@rfc2549.org> Gerrit-Reviewer: cron2 <g...@greenie.muc.de> Gerrit-Reviewer: flichtenheld <fr...@lichtenheld.com> Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net> Gerrit-MessageType: newpatchset
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
