diff options
| author | fcolin | 2010-10-20 14:32:41 +0000 |
|---|---|---|
| committer | fcolin | 2010-10-20 14:32:41 +0000 |
| commit | a4fdccfa707a8e9bfff4dee7abaa561a2c797646 (patch) | |
| tree | 3c25e901391ac0a73bb1d631b4306e1835fb26c1 /src/ivy.c | |
| parent | 9be158369991834e2da8afc7308ceee0c7ef9b13 (diff) | |
| download | ivy-c-a4fdccfa707a8e9bfff4dee7abaa561a2c797646.zip ivy-c-a4fdccfa707a8e9bfff4dee7abaa561a2c797646.tar.gz ivy-c-a4fdccfa707a8e9bfff4dee7abaa561a2c797646.tar.bz2 ivy-c-a4fdccfa707a8e9bfff4dee7abaa561a2c797646.tar.xz | |
portage IPV6 Windows
Diffstat (limited to 'src/ivy.c')
| -rw-r--r-- | src/ivy.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -25,6 +25,7 @@ #include <stdlib.h> #ifdef WIN32 +#include <Ws2tcpip.h> #include <windows.h> #define snprintf _snprintf #else @@ -494,19 +495,19 @@ static RWIvyClientPtr CheckConnected( Client sclnt ) /* client different mais port identique */ if ((iclient->client != sclnt) && (remoteport == iclient->app_port)) { + int same_addr = 0; /* et meme machine */ addr1 = SocketGetRemoteAddr( iclient->client ); addr2 = SocketGetRemoteAddr( sclnt ); - int same = 0; if ( ipv6 ) { - same = memcmp( &((struct sockaddr_in6 *)addr1)->sin6_addr, &( (struct sockaddr_in6 *)addr2)->sin6_addr, sizeof( struct in6_addr) )== 0 ; + same_addr = memcmp( &((struct sockaddr_in6 *)addr1)->sin6_addr, &( (struct sockaddr_in6 *)addr2)->sin6_addr, sizeof( struct in6_addr) )== 0 ; } else { - same = ( (struct sockaddr_in *)addr1)->sin_addr.s_addr == ( (struct sockaddr_in *)addr2)->sin_addr.s_addr; + same_addr = ( (struct sockaddr_in *)addr1)->sin_addr.s_addr == ( (struct sockaddr_in *)addr2)->sin_addr.s_addr; } - if ( same ) + if ( same_addr ) { TRACE ("DBG> CheckConnected " "clnt->app_uuid[%s] et iclient->app_uuid[%s] %s\n", @@ -995,7 +996,7 @@ void IvyStart (const char* bus) if ( ipv6 ) { char dst[1024]; - char * bcast_addr = inet_ntop(AF_INET6, &ipv6addr, + const char * bcast_addr = inet_ntop(AF_INET6, &ipv6addr, dst, sizeof(dst) ); if ( bcast_addr ) { |