diff --git a/CHANGES b/CHANGES index 5144f49..3a97a7b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,6 @@ 0.22: + uh, the scope_id detection #defined the wrong constant. libowfat + always thought there was no scope_id. Oops. 0.21: errno cleanup and man page updates (Rolf Eike Beer) diff --git a/socket/socket_accept6.c b/socket/socket_accept6.c index 1e3220a..ba49f0a 100644 --- a/socket/socket_accept6.c +++ b/socket/socket_accept6.c @@ -38,7 +38,7 @@ int socket_accept6(int s,char* ip,uint16* port,uint32* scope_id) } if (ip) byte_copy(ip,16,(char *) &sa.sin6_addr); if (port) uint16_unpack_big((char *) &sa.sin6_port,port); -#ifdef HAVE_SCOPE_ID +#ifdef LIBC_HAS_SCOPE_ID if (scope_id) *scope_id=sa.sin6_scope_id; #else if (scope_id) *scope_id=0; diff --git a/socket/socket_connect6.c b/socket/socket_connect6.c index 095c0fd..274e0ab 100644 --- a/socket/socket_connect6.c +++ b/socket/socket_connect6.c @@ -31,7 +31,7 @@ int socket_connect6(int s,const char ip[16],uint16 port,uint32 scope_id) sa.sin6_family = PF_INET6; uint16_pack_big((char *) &sa.sin6_port,port); sa.sin6_flowinfo = 0; -#ifdef HAVE_SCOPE_ID +#ifdef LIBC_HAS_SCOPE_ID sa.sin6_scope_id = scope_id; #endif byte_copy((char *) &sa.sin6_addr,16,ip); diff --git a/socket/socket_local6.c b/socket/socket_local6.c index 1d708bf..17e4192 100644 --- a/socket/socket_local6.c +++ b/socket/socket_local6.c @@ -35,7 +35,7 @@ int socket_local6(int s,char ip[16],uint16 *port,uint32 *scope_id) } if (ip) byte_copy(ip,16,(char *) &si.sin6_addr); if (port) uint16_unpack_big((char *) &si.sin6_port,port); -#ifdef HAVE_SCOPE_ID +#ifdef LIBC_HAS_SCOPE_ID if (scope_id) *scope_id=si.sin6_scope_id; #else if (scope_id) *scope_id=0; diff --git a/socket/socket_recv6.c b/socket/socket_recv6.c index 78bad0c..43c5f90 100644 --- a/socket/socket_recv6.c +++ b/socket/socket_recv6.c @@ -37,7 +37,7 @@ int socket_recv6(int s,char *buf,unsigned int len,char ip[16],uint16 *port,uint3 } if (ip) byte_copy(ip,16,(char *) &si.sin6_addr); if (port) uint16_unpack_big((char *) &si.sin6_port,port); -#ifdef HAVE_SCOPE_ID +#ifdef LIBC_HAS_SCOPE_ID if (scope_id) *scope_id=si.sin6_scope_id; #else if (scope_id) *scope_id=0; diff --git a/socket/socket_remote6.c b/socket/socket_remote6.c index fc02ca2..8b91488 100644 --- a/socket/socket_remote6.c +++ b/socket/socket_remote6.c @@ -35,7 +35,7 @@ int socket_remote6(int s,char ip[16],uint16 *port,uint32 *scope_id) } if (ip) byte_copy(ip,16,(char *) &si.sin6_addr); if (port) uint16_unpack_big((char *) &si.sin6_port,port); -#ifdef HAVE_SCOPE_ID +#ifdef LIBC_HAS_SCOPE_ID if (scope_id) *scope_id=si.sin6_scope_id; #else if (scope_id) *scope_id=0; diff --git a/socket/socket_send6.c b/socket/socket_send6.c index 39d00aa..a6da300 100644 --- a/socket/socket_send6.c +++ b/socket/socket_send6.c @@ -36,7 +36,7 @@ int socket_send6(int s,const char *buf,unsigned int len,const char ip[16],uint16 si.sin6_family = AF_INET6; uint16_pack_big((char *) &si.sin6_port,port); byte_copy((char *) &si.sin6_addr,16,ip); -#ifdef HAVE_SCOPE_ID +#ifdef LIBC_HAS_SCOPE_ID si.sin6_scope_id=scope_id; #else si.sin6_scope_id=0;