uh, the scope_id detection #defined the wrong constant. libowfat

always thought there was no scope_id.  Oops.
master
leitner 20 years ago
parent 4a3c687ea9
commit d6b7c29808

@ -1,4 +1,6 @@
0.22: 0.22:
uh, the scope_id detection #defined the wrong constant. libowfat
always thought there was no scope_id. Oops.
0.21: 0.21:
errno cleanup and man page updates (Rolf Eike Beer) errno cleanup and man page updates (Rolf Eike Beer)

@ -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 (ip) byte_copy(ip,16,(char *) &sa.sin6_addr);
if (port) uint16_unpack_big((char *) &sa.sin6_port,port); 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; if (scope_id) *scope_id=sa.sin6_scope_id;
#else #else
if (scope_id) *scope_id=0; if (scope_id) *scope_id=0;

@ -31,7 +31,7 @@ int socket_connect6(int s,const char ip[16],uint16 port,uint32 scope_id)
sa.sin6_family = PF_INET6; sa.sin6_family = PF_INET6;
uint16_pack_big((char *) &sa.sin6_port,port); uint16_pack_big((char *) &sa.sin6_port,port);
sa.sin6_flowinfo = 0; sa.sin6_flowinfo = 0;
#ifdef HAVE_SCOPE_ID #ifdef LIBC_HAS_SCOPE_ID
sa.sin6_scope_id = scope_id; sa.sin6_scope_id = scope_id;
#endif #endif
byte_copy((char *) &sa.sin6_addr,16,ip); byte_copy((char *) &sa.sin6_addr,16,ip);

@ -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 (ip) byte_copy(ip,16,(char *) &si.sin6_addr);
if (port) uint16_unpack_big((char *) &si.sin6_port,port); 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; if (scope_id) *scope_id=si.sin6_scope_id;
#else #else
if (scope_id) *scope_id=0; if (scope_id) *scope_id=0;

@ -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 (ip) byte_copy(ip,16,(char *) &si.sin6_addr);
if (port) uint16_unpack_big((char *) &si.sin6_port,port); 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; if (scope_id) *scope_id=si.sin6_scope_id;
#else #else
if (scope_id) *scope_id=0; if (scope_id) *scope_id=0;

@ -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 (ip) byte_copy(ip,16,(char *) &si.sin6_addr);
if (port) uint16_unpack_big((char *) &si.sin6_port,port); 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; if (scope_id) *scope_id=si.sin6_scope_id;
#else #else
if (scope_id) *scope_id=0; if (scope_id) *scope_id=0;

@ -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; si.sin6_family = AF_INET6;
uint16_pack_big((char *) &si.sin6_port,port); uint16_pack_big((char *) &si.sin6_port,port);
byte_copy((char *) &si.sin6_addr,16,ip); byte_copy((char *) &si.sin6_addr,16,ip);
#ifdef HAVE_SCOPE_ID #ifdef LIBC_HAS_SCOPE_ID
si.sin6_scope_id=scope_id; si.sin6_scope_id=scope_id;
#else #else
si.sin6_scope_id=0; si.sin6_scope_id=0;

Loading…
Cancel
Save