Attention is currently required from: flichtenheld, plaisthos.
Hello ordex, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1195?usp=email
to look at the new patch set (#2).
The change is no longer submittable: checks~ChecksSubmitRule is unsatisfied now.
Change subject: dco: Change sd argument to dco_new_peer from int to
socket_descriptor_t
......................................................................
dco: Change sd argument to dco_new_peer from int to socket_descriptor_t
Doesn't change anything for non-Win32 platforms.
Change-Id: I28f856c1c156b54089d95b2e2539ecdb374cdd37
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M src/openvpn/dco.c
M src/openvpn/dco_internal.h
M src/openvpn/dco_win.c
3 files changed, 4 insertions(+), 13 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/95/1195/2
diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c
index 50c72c3..3429ab6 100644
--- a/src/openvpn/dco.c
+++ b/src/openvpn/dco.c
@@ -496,11 +496,6 @@
return true;
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
int
dco_p2p_add_new_peer(struct context *c)
{
@@ -609,7 +604,7 @@
int peer_id = c->c2.tls_multi->peer_id;
struct sockaddr *remoteaddr, *localaddr = NULL;
struct sockaddr_storage local = { 0 };
- int sd = c->c2.link_sockets[0]->sd;
+ const socket_descriptor_t sd = c->c2.link_sockets[0]->sd;
if (c->mode == CM_CHILD_TCP)
@@ -655,10 +650,6 @@
return 0;
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
void
dco_install_iroute(struct multi_context *m, struct multi_instance *mi, struct
mroute_addr *addr)
{
diff --git a/src/openvpn/dco_internal.h b/src/openvpn/dco_internal.h
index 83013ef..86af003 100644
--- a/src/openvpn/dco_internal.h
+++ b/src/openvpn/dco_internal.h
@@ -59,7 +59,7 @@
* They are implemented by dco_linux.c
*/
-int dco_new_peer(dco_context_t *dco, unsigned int peerid, int sd, struct
sockaddr *localaddr,
+int dco_new_peer(dco_context_t *dco, unsigned int peerid, socket_descriptor_t
sd, struct sockaddr *localaddr,
struct sockaddr *remoteaddr, struct in_addr *vpn_ipv4, struct
in6_addr *vpn_ipv6);
int dco_del_peer(dco_context_t *dco, unsigned int peerid);
diff --git a/src/openvpn/dco_win.c b/src/openvpn/dco_win.c
index b7908a9..a86804b 100644
--- a/src/openvpn/dco_win.c
+++ b/src/openvpn/dco_win.c
@@ -420,10 +420,10 @@
}
int
-dco_new_peer(dco_context_t *dco, unsigned int peerid, int sd, struct sockaddr
*localaddr,
+dco_new_peer(dco_context_t *dco, unsigned int peerid, socket_descriptor_t sd,
struct sockaddr *localaddr,
struct sockaddr *remoteaddr, struct in_addr *vpn_ipv4, struct
in6_addr *vpn_ipv6)
{
- msg(D_DCO_DEBUG, "%s: peer-id %d, fd %d", __func__, peerid, sd);
+ msg(D_DCO_DEBUG, "%s: peer-id %d, fd " SOCKET_PRINTF, __func__, peerid,
sd);
if (dco->ifmode == DCO_MODE_P2P)
{
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1195?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: I28f856c1c156b54089d95b2e2539ecdb374cdd37
Gerrit-Change-Number: 1195
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]>
Gerrit-Reviewer: ordex <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]>
Gerrit-MessageType: newpatchset
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
