barbieri pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=371a3332efe86596531af90104b4fad45df87c2c
commit 371a3332efe86596531af90104b4fad45df87c2c Author: Gustavo Sverzut Barbieri <barbi...@profusion.mobi> Date: Fri Nov 18 12:52:08 2016 -0200 efl_net: remove getsockopt()/setsockopt() warning on windows. windows is nasty and defines the value to be set or retrieved as 'char *', which triggers a warning when we use another kind of pointer. Partially addresses D4357. --- src/lib/ecore_con/ecore_con.c | 16 ++++++++-------- src/lib/ecore_con/efl_net_dialer_udp.c | 4 ++-- src/lib/ecore_con/efl_net_server_fd.c | 10 +++++----- src/lib/ecore_con/efl_net_server_tcp.c | 4 ++-- src/lib/ecore_con/efl_net_server_udp.c | 8 ++++---- src/lib/ecore_con/efl_net_socket_tcp.c | 12 ++++++------ src/lib/ecore_con/efl_net_socket_udp.c | 16 ++++++++-------- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c index 14698b5..18087c9 100644 --- a/src/lib/ecore_con/ecore_con.c +++ b/src/lib/ecore_con/ecore_con.c @@ -5271,7 +5271,7 @@ efl_net_multicast_join(SOCKET fd, int family, const char *address) if (err) return err; - if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) == 0) + if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (const char *)&mreq, sizeof(mreq)) == 0) return 0; } else if (family == AF_INET6) @@ -5282,7 +5282,7 @@ efl_net_multicast_join(SOCKET fd, int family, const char *address) if (err) return err; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq, sizeof(mreq)) == 0) + if (setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, (const char *)&mreq, sizeof(mreq)) == 0) return 0; } else @@ -5307,7 +5307,7 @@ efl_net_multicast_leave(SOCKET fd, int family, const char *address) if (err) return err; - if (setsockopt(fd, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) == 0) + if (setsockopt(fd, IPPROTO_IP, IP_DROP_MEMBERSHIP, (const char *)&mreq, sizeof(mreq)) == 0) return 0; } else if (family == AF_INET6) @@ -5318,7 +5318,7 @@ efl_net_multicast_leave(SOCKET fd, int family, const char *address) if (err) return err; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_LEAVE_GROUP, &mreq, sizeof(mreq)) == 0) + if (setsockopt(fd, IPPROTO_IPV6, IPV6_LEAVE_GROUP, (const char *)&mreq, sizeof(mreq)) == 0) return 0; } else @@ -5341,7 +5341,7 @@ efl_net_multicast_ttl_set(SOCKET fd, int family, uint8_t ttl) int value = ttl; #endif - if (setsockopt(fd, level, opt, &value, sizeof(value)) == 0) + if (setsockopt(fd, level, opt, (const char *)&value, sizeof(value)) == 0) return 0; return efl_net_socket_error_get(); @@ -5360,7 +5360,7 @@ efl_net_multicast_ttl_get(SOCKET fd, int family, uint8_t *ttl) socklen_t valuelen = sizeof(value); #endif - if (getsockopt(fd, level, opt, &value, &valuelen) == 0) + if (getsockopt(fd, level, opt, (char *)&value, &valuelen) == 0) { *ttl = value; return 0; @@ -5380,7 +5380,7 @@ efl_net_multicast_loopback_set(SOCKET fd, int family, Eina_Bool loopback) int value = loopback; #endif - if (setsockopt(fd, level, opt, &value, sizeof(value)) == 0) + if (setsockopt(fd, level, opt, (const char *)&value, sizeof(value)) == 0) return 0; return efl_net_socket_error_get(); @@ -5399,7 +5399,7 @@ efl_net_multicast_loopback_get(SOCKET fd, int family, Eina_Bool *loopback) socklen_t valuelen = sizeof(value); #endif - if (getsockopt(fd, level, opt, &value, &valuelen) == 0) + if (getsockopt(fd, level, opt, (char *)&value, &valuelen) == 0) { *loopback = !!value; return 0; diff --git a/src/lib/ecore_con/efl_net_dialer_udp.c b/src/lib/ecore_con/efl_net_dialer_udp.c index 5a1a331..327a629 100644 --- a/src/lib/ecore_con/efl_net_dialer_udp.c +++ b/src/lib/ecore_con/efl_net_dialer_udp.c @@ -131,7 +131,7 @@ _efl_net_dialer_udp_resolved_bind(Eo *o, Efl_Net_Dialer_Udp_Data *pd EINA_UNUSED #else int enable = 1; #endif - if (setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &enable, sizeof(enable)) == 0) + if (setsockopt(fd, SOL_SOCKET, SO_BROADCAST, (const char *)&enable, sizeof(enable)) == 0) DBG("enabled SO_BROADCAST for socket=" SOCKET_FMT, fd); else WRN("could not enable SO_BROADCAST for socket=" SOCKET_FMT ": %s", fd, eina_error_msg_get(efl_net_socket_error_get())); @@ -145,7 +145,7 @@ _efl_net_dialer_udp_resolved_bind(Eo *o, Efl_Net_Dialer_Udp_Data *pd EINA_UNUSED struct ipv6_mreq mreq = { .ipv6mr_multiaddr = a->sin6_addr, }; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq, sizeof(mreq)) == 0) + if (setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, (const char *)&mreq, sizeof(mreq)) == 0) { efl_net_ip_port_fmt(buf, sizeof(buf), addr->ai_addr); DBG("joined multicast group %s socket=" SOCKET_FMT, buf, fd); diff --git a/src/lib/ecore_con/efl_net_server_fd.c b/src/lib/ecore_con/efl_net_server_fd.c index 418dd34..c771e9d 100644 --- a/src/lib/ecore_con/efl_net_server_fd.c +++ b/src/lib/ecore_con/efl_net_server_fd.c @@ -228,7 +228,7 @@ _efl_net_server_fd_socket_activate(Eo *o, Efl_Net_Server_Fd_Data *pd EINA_UNUSED int family; socklen_t len = sizeof(family); - if (getsockopt(fd, SOL_SOCKET, SO_DOMAIN, &family, &len) != 0) + if (getsockopt(fd, SOL_SOCKET, SO_DOMAIN, (char *)&family, &len) != 0) { WRN("socket " SOCKET_FMT " failed to return family: %s", fd, eina_error_msg_get(efl_net_socket_error_get())); return EINVAL; @@ -329,7 +329,7 @@ _efl_net_server_fd_reuse_address_set(Eo *o, Efl_Net_Server_Fd_Data *pd, Eina_Boo if (fd == INVALID_SOCKET) return EINA_TRUE; /* postpone until fd_set() */ value = reuse_address; - if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &value, sizeof(value)) != 0) + if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const char *)&value, sizeof(value)) != 0) { ERR("setsockopt(" SOCKET_FMT ", SOL_SOCKET, SO_REUSEADDR, %d): %s", fd, value, eina_error_msg_get(efl_net_socket_error_get())); @@ -354,7 +354,7 @@ _efl_net_server_fd_reuse_address_get(Eo *o, Efl_Net_Server_Fd_Data *pd) * elsewhere by nasty users. */ valuelen = sizeof(value); - if (getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &value, &valuelen) != 0) + if (getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&value, &valuelen) != 0) { ERR("getsockopt(" SOCKET_FMT ", SOL_SOCKET, SO_REUSEADDR): %s", fd, eina_error_msg_get(efl_net_socket_error_get())); @@ -381,7 +381,7 @@ _efl_net_server_fd_reuse_port_set(Eo *o, Efl_Net_Server_Fd_Data *pd, Eina_Bool r if (fd == INVALID_SOCKET) return EINA_TRUE; /* postpone until fd_set() */ value = reuse_port; - if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &value, sizeof(value)) != 0) + if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, (const char *)&value, sizeof(value)) != 0) { ERR("setsockopt(" SOCKET_FMT ", SOL_SOCKET, SO_REUSEPORT, %d): %s", fd, value, eina_error_msg_get(efl_net_socket_error_get())); @@ -408,7 +408,7 @@ _efl_net_server_fd_reuse_port_get(Eo *o, Efl_Net_Server_Fd_Data *pd) * elsewhere by nasty users. */ valuelen = sizeof(value); - if (getsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &value, &valuelen) != 0) + if (getsockopt(fd, SOL_SOCKET, SO_REUSEPORT, (char *)&value, &valuelen) != 0) { ERR("getsockopt(" SOCKET_FMT ", SOL_SOCKET, SO_REUSEPORT): %s", fd, eina_error_msg_get(efl_net_socket_error_get())); diff --git a/src/lib/ecore_con/efl_net_server_tcp.c b/src/lib/ecore_con/efl_net_server_tcp.c index abefc74..03afd89 100644 --- a/src/lib/ecore_con/efl_net_server_tcp.c +++ b/src/lib/ecore_con/efl_net_server_tcp.c @@ -322,7 +322,7 @@ _efl_net_server_tcp_ipv6_only_set(Eo *o, Efl_Net_Server_Tcp_Data *pd, Eina_Bool if (fd == INVALID_SOCKET) return; if (efl_net_server_fd_family_get(o) != AF_INET6) return; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &value, sizeof(value)) != 0) + if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (const char *)&value, sizeof(value)) != 0) { ERR("could not set socket=" SOCKET_FMT " IPV6_V6ONLY=%d: %s", fd, value, eina_error_msg_get(efl_net_socket_error_get())); pd->ipv6_only = old; @@ -347,7 +347,7 @@ _efl_net_server_tcp_ipv6_only_get(Eo *o EINA_UNUSED, Efl_Net_Server_Tcp_Data *pd if (efl_net_server_fd_family_get(o) != AF_INET6) goto end; valuelen = sizeof(value); - if (getsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &value, &valuelen) != 0) + if (getsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&value, &valuelen) != 0) { WRN("getsockopt(" SOCKET_FMT ", IPPROTO_IPV6, IPV6_V6ONLY): %s", fd, eina_error_msg_get(efl_net_socket_error_get())); goto end; diff --git a/src/lib/ecore_con/efl_net_server_udp.c b/src/lib/ecore_con/efl_net_server_udp.c index 1bf1d0e..6e38a8f 100644 --- a/src/lib/ecore_con/efl_net_server_udp.c +++ b/src/lib/ecore_con/efl_net_server_udp.c @@ -413,7 +413,7 @@ _efl_net_server_udp_ipv6_only_set(Eo *o, Efl_Net_Server_Udp_Data *pd, Eina_Bool if (fd == INVALID_SOCKET) return; if (efl_net_server_fd_family_get(o) != AF_INET6) return; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &value, sizeof(value)) != 0) + if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (const char *)&value, sizeof(value)) != 0) { ERR("could not set socket=" SOCKET_FMT " IPV6_V6ONLY=%d: %s", fd, value, eina_error_msg_get(efl_net_socket_error_get())); pd->ipv6_only = old; @@ -438,7 +438,7 @@ _efl_net_server_udp_ipv6_only_get(Eo *o EINA_UNUSED, Efl_Net_Server_Udp_Data *pd if (efl_net_server_fd_family_get(o) != AF_INET6) goto end; valuelen = sizeof(value); - if (getsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &value, &valuelen) != 0) + if (getsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&value, &valuelen) != 0) { WRN("getsockopt(" SOCKET_FMT ", IPPROTO_IPV6, IPV6_V6ONLY): %s", fd, eina_error_msg_get(efl_net_socket_error_get())); goto end; @@ -465,7 +465,7 @@ _efl_net_server_udp_dont_route_set(Eo *o, Efl_Net_Server_Udp_Data *pd, Eina_Bool if (fd == INVALID_SOCKET) return EINA_TRUE; - if (setsockopt(fd, SOL_SOCKET, SO_DONTROUTE, &value, sizeof(value)) != 0) + if (setsockopt(fd, SOL_SOCKET, SO_DONTROUTE, (const char *)&value, sizeof(value)) != 0) { Eina_Error err = efl_net_socket_error_get(); ERR("setsockopt(" SOCKET_FMT ", SOL_SOCKET, SO_DONTROUTE, %u): %s", fd, dont_route, eina_error_msg_get(err)); @@ -493,7 +493,7 @@ _efl_net_server_udp_dont_route_get(Eo *o, Efl_Net_Server_Udp_Data *pd) * elsewhere by nasty users. */ valuelen = sizeof(value); - if (getsockopt(fd, SOL_SOCKET, SO_DONTROUTE, &value, &valuelen) != 0) + if (getsockopt(fd, SOL_SOCKET, SO_DONTROUTE, (char *)&value, &valuelen) != 0) { Eina_Error err = efl_net_socket_error_get(); ERR("getsockopt(" SOCKET_FMT ", SOL_SOCKET, SO_DONTROUTE): %s", fd, eina_error_msg_get(err)); diff --git a/src/lib/ecore_con/efl_net_socket_tcp.c b/src/lib/ecore_con/efl_net_socket_tcp.c index 3a75e39..0948b35 100644 --- a/src/lib/ecore_con/efl_net_socket_tcp.c +++ b/src/lib/ecore_con/efl_net_socket_tcp.c @@ -102,7 +102,7 @@ _efl_net_socket_tcp_keep_alive_set(Eo *o, Efl_Net_Socket_Tcp_Data *pd, Eina_Bool if (fd == INVALID_SOCKET) return EINA_TRUE; /* postpone until fd_set() */ value = keep_alive; - if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &value, sizeof(value)) != 0) + if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (const char *)&value, sizeof(value)) != 0) { ERR("setsockopt(" SOCKET_FMT ", SOL_SOCKET, SO_KEEPALIVE, %d): %s", fd, value, eina_error_msg_get(efl_net_socket_error_get())); @@ -132,7 +132,7 @@ _efl_net_socket_tcp_keep_alive_get(Eo *o, Efl_Net_Socket_Tcp_Data *pd) * elsewhere by nasty users. */ valuelen = sizeof(value); - if (getsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &value, &valuelen) != 0) + if (getsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (char *)&value, &valuelen) != 0) { ERR("getsockopt(" SOCKET_FMT ", SOL_SOCKET, SO_KEEPALIVE): %s", fd, eina_error_msg_get(efl_net_socket_error_get())); @@ -160,7 +160,7 @@ _efl_net_socket_tcp_no_delay_set(Eo *o, Efl_Net_Socket_Tcp_Data *pd, Eina_Bool n if (fd == INVALID_SOCKET) return EINA_TRUE; /* postpone until fd_set() */ value = no_delay; - if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &value, sizeof(value)) != 0) + if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (const char *)&value, sizeof(value)) != 0) { ERR("setsockopt(" SOCKET_FMT ", IPPROTO_TCP, TCP_NODELAY, %d): %s", fd, value, eina_error_msg_get(efl_net_socket_error_get())); @@ -190,7 +190,7 @@ _efl_net_socket_tcp_no_delay_get(Eo *o, Efl_Net_Socket_Tcp_Data *pd) * elsewhere by nasty users. */ valuelen = sizeof(value); - if (getsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &value, &valuelen) != 0) + if (getsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&value, &valuelen) != 0) { ERR("getsockopt(" SOCKET_FMT ", IPPROTO_TCP, TCP_NODELAY): %s", fd, eina_error_msg_get(efl_net_socket_error_get())); @@ -234,7 +234,7 @@ _efl_net_socket_tcp_cork_set(Eo *o, Efl_Net_Socket_Tcp_Data *pd, Eina_Bool cork) if (fd == INVALID_SOCKET) return EINA_TRUE; /* postpone until fd_set() */ value = cork; - if (setsockopt(fd, IPPROTO_TCP, option, &value, sizeof(value)) != 0) + if (setsockopt(fd, IPPROTO_TCP, option, (const char *)&value, sizeof(value)) != 0) { ERR("setsockopt(" SOCKET_FMT ", IPPROTO_TCP, 0x%x, %d): %s", fd, option, value, eina_error_msg_get(efl_net_socket_error_get())); @@ -267,7 +267,7 @@ _efl_net_socket_tcp_cork_get(Eo *o, Efl_Net_Socket_Tcp_Data *pd) * elsewhere by nasty users. */ valuelen = sizeof(value); - if (getsockopt(fd, IPPROTO_TCP, option, &value, &valuelen) != 0) + if (getsockopt(fd, IPPROTO_TCP, option, (char *)&value, &valuelen) != 0) { ERR("getsockopt(" SOCKET_FMT ", IPPROTO_TCP, 0x%x): %s", fd, option, eina_error_msg_get(efl_net_socket_error_get())); diff --git a/src/lib/ecore_con/efl_net_socket_udp.c b/src/lib/ecore_con/efl_net_socket_udp.c index e744717..4e610f9 100644 --- a/src/lib/ecore_con/efl_net_socket_udp.c +++ b/src/lib/ecore_con/efl_net_socket_udp.c @@ -246,7 +246,7 @@ _efl_net_socket_udp_cork_set(Eo *o, Efl_Net_Socket_Udp_Data *pd, Eina_Bool cork) if (fd == INVALID_SOCKET) return EINA_TRUE; /* postpone until fd_set() */ value = cork; - if (setsockopt(fd, IPPROTO_UDP, option, &value, sizeof(value)) != 0) + if (setsockopt(fd, IPPROTO_UDP, option, (const char *)&value, sizeof(value)) != 0) { ERR("setsockopt(" SOCKET_FMT ", IPPROTO_UDP, 0x%x, %d): %s", fd, option, value, eina_error_msg_get(efl_net_socket_error_get())); @@ -279,7 +279,7 @@ _efl_net_socket_udp_cork_get(Eo *o, Efl_Net_Socket_Udp_Data *pd) * elsewhere by nasty users. */ valuelen = sizeof(value); - if (getsockopt(fd, IPPROTO_UDP, option, &value, &valuelen) != 0) + if (getsockopt(fd, IPPROTO_UDP, option, (char *)&value, &valuelen) != 0) { ERR("getsockopt(" SOCKET_FMT ", IPPROTO_UDP, 0x%x): %s", fd, option, eina_error_msg_get(efl_net_socket_error_get())); @@ -305,7 +305,7 @@ _efl_net_socket_udp_dont_route_set(Eo *o, Efl_Net_Socket_Udp_Data *pd, Eina_Bool if (fd == INVALID_SOCKET) return EINA_TRUE; - if (setsockopt(fd, SOL_SOCKET, SO_DONTROUTE, &value, sizeof(value)) != 0) + if (setsockopt(fd, SOL_SOCKET, SO_DONTROUTE, (const char *)&value, sizeof(value)) != 0) { Eina_Error err = efl_net_socket_error_get(); ERR("setsockopt(" SOCKET_FMT ", SOL_SOCKET, SO_DONTROUTE, %u): %s", fd, dont_route, eina_error_msg_get(err)); @@ -333,7 +333,7 @@ _efl_net_socket_udp_dont_route_get(Eo *o, Efl_Net_Socket_Udp_Data *pd) * elsewhere by nasty users. */ valuelen = sizeof(value); - if (getsockopt(fd, SOL_SOCKET, SO_DONTROUTE, &value, &valuelen) != 0) + if (getsockopt(fd, SOL_SOCKET, SO_DONTROUTE, (char *)&value, &valuelen) != 0) { Eina_Error err = efl_net_socket_error_get(); ERR("getsockopt(" SOCKET_FMT ", SOL_SOCKET, SO_DONTROUTE): %s", fd, eina_error_msg_get(err)); @@ -358,7 +358,7 @@ _efl_net_socket_udp_reuse_address_set(Eo *o, Efl_Net_Socket_Udp_Data *pd, Eina_B if (fd == INVALID_SOCKET) return EINA_TRUE; /* postpone until fd_set() */ value = reuse_address; - if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &value, sizeof(value)) != 0) + if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const char *)&value, sizeof(value)) != 0) { ERR("setsockopt(" SOCKET_FMT ", SOL_SOCKET, SO_REUSEADDR, %d): %s", fd, value, eina_error_msg_get(efl_net_socket_error_get())); @@ -383,7 +383,7 @@ _efl_net_socket_udp_reuse_address_get(Eo *o, Efl_Net_Socket_Udp_Data *pd) * elsewhere by nasty users. */ valuelen = sizeof(value); - if (getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &value, &valuelen) != 0) + if (getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&value, &valuelen) != 0) { ERR("getsockopt(" SOCKET_FMT ", SOL_SOCKET, SO_REUSEADDR): %s", fd, eina_error_msg_get(efl_net_socket_error_get())); @@ -410,7 +410,7 @@ _efl_net_socket_udp_reuse_port_set(Eo *o, Efl_Net_Socket_Udp_Data *pd, Eina_Bool if (fd == INVALID_SOCKET) return EINA_TRUE; /* postpone until fd_set() */ value = reuse_port; - if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &value, sizeof(value)) != 0) + if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, (const char *)&value, sizeof(value)) != 0) { ERR("setsockopt(" SOCKET_FMT ", SOL_SOCKET, SO_REUSEPORT, %d): %s", fd, value, eina_error_msg_get(efl_net_socket_error_get())); @@ -437,7 +437,7 @@ _efl_net_socket_udp_reuse_port_get(Eo *o, Efl_Net_Socket_Udp_Data *pd) * elsewhere by nasty users. */ valuelen = sizeof(value); - if (getsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &value, &valuelen) != 0) + if (getsockopt(fd, SOL_SOCKET, SO_REUSEPORT, (char *)&value, &valuelen) != 0) { ERR("getsockopt(" SOCKET_FMT ", SOL_SOCKET, SO_REUSEPORT): %s", fd, eina_error_msg_get(efl_net_socket_error_get())); --