Attention is currently required from: flichtenheld.
Hello flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/888?usp=email
to review the following change.
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 <[email protected]>
---
M src/openvpn/init.c
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/88/888/1
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: 1
Gerrit-Owner: plaisthos <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
