diff options
| author | Heiko Hund <heiko.hund@sophos.com> | 2014-11-15 17:25:08 +0100 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2014-11-17 21:17:18 +0100 |
| commit | a2466d9e6c78c57d579a1fa99c8554eabb9dbe44 (patch) | |
| tree | dce61b0b06b3204a285fd3693a7355e38827cd22 /src | |
| parent | 78b8fc720b6e6c31a889e4efaa28dbbc31da65ea (diff) | |
| download | openvpn-a2466d9e6c78c57d579a1fa99c8554eabb9dbe44.tar.gz openvpn-a2466d9e6c78c57d579a1fa99c8554eabb9dbe44.tar.xz openvpn-a2466d9e6c78c57d579a1fa99c8554eabb9dbe44.zip | |
fix warnings on Windows
Just add a few valid casts that shut up mingw gcc.
Signed-off-by: Heiko Hund <heiko.hund@sophos.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1416068708-6871-2-git-send-email-heiko.hund@sophos.com>
URL: http://article.gmane.org/gmane.network.openvpn.devel/9229
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/openvpn/mtu.c | 5 | ||||
| -rw-r--r-- | src/openvpn/route.c | 2 | ||||
| -rw-r--r-- | src/openvpn/socket.c | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/openvpn/mtu.c b/src/openvpn/mtu.c index 13f3f6c..3665a34 100644 --- a/src/openvpn/mtu.c +++ b/src/openvpn/mtu.c @@ -158,8 +158,7 @@ set_mtu_discover_type (int sd, int mtu_type) if (mtu_type >= 0) { #if defined(HAVE_SETSOCKOPT) && defined(SOL_IP) && defined(IP_MTU_DISCOVER) - if (setsockopt - (sd, SOL_IP, IP_MTU_DISCOVER, &mtu_type, sizeof (mtu_type))) + if (setsockopt (sd, SOL_IP, IP_MTU_DISCOVER, (void *) &mtu_type, sizeof (mtu_type))) msg (M_ERR, "Error setting IP_MTU_DISCOVER type=%d on TCP/UDP socket", mtu_type); #else @@ -288,7 +287,7 @@ void set_sock_extended_error_passing (int sd) { int on = 1; - if (setsockopt (sd, SOL_IP, IP_RECVERR, &on, sizeof (on))) + if (setsockopt (sd, SOL_IP, IP_RECVERR, (void *) &on, sizeof (on))) msg (M_WARN | M_ERRNO, "Note: enable extended error passing on TCP/UDP socket failed (IP_RECVERR)"); } diff --git a/src/openvpn/route.c b/src/openvpn/route.c index e76c2bd..5d18213 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -277,7 +277,7 @@ init_route (struct route_ipv4 *r, /* get_special_addr replaces specialaddr with a special ip addr like gw. getaddrinfo is called to convert a a addrinfo struct */ - if(get_special_addr (rl, ro->network, &special.s_addr, &status)) + if(get_special_addr (rl, ro->network, (in_addr_t *) &special.s_addr, &status)) { special.s_addr = htonl(special.s_addr); ret = openvpn_getaddrinfo(0, inet_ntoa(special), NULL, 0, NULL, diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 9ed8a5a..2499ab0 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -729,7 +729,7 @@ static inline void socket_set_mark (int sd, int mark) { #if defined(TARGET_LINUX) && HAVE_DECL_SO_MARK - if (mark && setsockopt (sd, SOL_SOCKET, SO_MARK, &mark, sizeof (mark)) != 0) + if (mark && setsockopt (sd, SOL_SOCKET, SO_MARK, (void *) &mark, sizeof (mark)) != 0) msg (M_WARN, "NOTE: setsockopt SO_MARK=%d failed", mark); #endif } @@ -1117,7 +1117,7 @@ socket_bind (socket_descriptor_t sd, int v6only = ipv6only ? 1: 0; /* setsockopt must have an "int" */ msg (M_INFO, "setsockopt(IPV6_V6ONLY=%d)", v6only); - if (setsockopt(sd, IPPROTO_IPV6, IPV6_V6ONLY, &v6only, sizeof(v6only))) + if (setsockopt (sd, IPPROTO_IPV6, IPV6_V6ONLY, (void *) &v6only, sizeof(v6only))) { msg (M_NONFATAL|M_ERRNO, "Setting IPV6_V6ONLY=%d failed", v6only); } |