mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-05-23 13:52:28 +00:00
Polyfill IPv6 on non-Linux
This commit is contained in:
parent
b73e35c6fa
commit
0547eabcd6
10 changed files with 185 additions and 78 deletions
|
@ -18,6 +18,7 @@
|
|||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/sock/internal.h"
|
||||
#include "libc/sock/struct/sockaddr.internal.h"
|
||||
#include "libc/sock/struct/sockaddr6-bsd.internal.h"
|
||||
#include "libc/str/str.h"
|
||||
#include "libc/sysv/consts/af.h"
|
||||
#include "libc/sysv/errfuns.h"
|
||||
|
@ -41,6 +42,21 @@ int sockaddr2bsd(const void *addr, uint32_t addrsize,
|
|||
} else {
|
||||
return einval();
|
||||
}
|
||||
} else if (((struct sockaddr *)addr)->sa_family == AF_INET6) {
|
||||
if (addrsize >= sizeof(struct sockaddr_in6)) {
|
||||
out_addr->sin6.sin6_len = 0;
|
||||
out_addr->sin6.sin6_family = AF_INET6;
|
||||
out_addr->sin6.sin6_port = ((struct sockaddr_in6 *)addr)->sin6_port;
|
||||
out_addr->sin6.sin6_flowinfo =
|
||||
((struct sockaddr_in6 *)addr)->sin6_flowinfo;
|
||||
out_addr->sin6.sin6_addr = ((struct sockaddr_in6 *)addr)->sin6_addr;
|
||||
out_addr->sin6.sin6_scope_id =
|
||||
((struct sockaddr_in6 *)addr)->sin6_scope_id;
|
||||
*out_addrsize = sizeof(struct sockaddr_in6_bsd);
|
||||
return 0;
|
||||
} else {
|
||||
return einval();
|
||||
}
|
||||
} else if (((struct sockaddr *)addr)->sa_family == AF_UNIX) {
|
||||
famsize = sizeof(((struct sockaddr_un *)addr)->sun_family);
|
||||
if (addrsize >= famsize &&
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#include "libc/macros.internal.h"
|
||||
#include "libc/sock/internal.h"
|
||||
#include "libc/sock/struct/sockaddr.internal.h"
|
||||
#include "libc/sock/struct/sockaddr6-bsd.internal.h"
|
||||
#include "libc/str/str.h"
|
||||
#include "libc/sysv/consts/af.h"
|
||||
#include "libc/sysv/errfuns.h"
|
||||
|
@ -42,6 +43,16 @@ void sockaddr2linux(const union sockaddr_storage_bsd *addr, uint32_t addrsize,
|
|||
out_addr->sin.sin_addr = addr->sin.sin_addr;
|
||||
*inout_addrsize = sizeof(struct sockaddr_in);
|
||||
}
|
||||
} else if (addr->sa.sa_family == AF_INET6) {
|
||||
if (addrsize >= sizeof(struct sockaddr_in6_bsd) &&
|
||||
size >= sizeof(struct sockaddr_in6)) {
|
||||
out_addr->sin6.sin6_family = AF_INET6;
|
||||
out_addr->sin6.sin6_port = addr->sin6.sin6_port;
|
||||
out_addr->sin6.sin6_addr = addr->sin6.sin6_addr;
|
||||
out_addr->sin6.sin6_flowinfo = addr->sin6.sin6_flowinfo;
|
||||
out_addr->sin6.sin6_scope_id = addr->sin6.sin6_scope_id;
|
||||
*inout_addrsize = sizeof(struct sockaddr_in6);
|
||||
}
|
||||
} else if (addr->sa.sa_family == AF_UNIX) {
|
||||
if (addrsize >=
|
||||
sizeof(addr->sun.sun_len) + sizeof(addr->sun.sun_family) &&
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
#define COSMOPOLITAN_LIBC_SOCK_STRUCT_SOCKADDR_INTERNAL_H_
|
||||
#include "libc/mem/alloca.h"
|
||||
#include "libc/sock/struct/sockaddr.h"
|
||||
#include "libc/sock/struct/sockaddr6-bsd.internal.h"
|
||||
#if !(__ASSEMBLER__ + __LINKER__ + 0)
|
||||
COSMOPOLITAN_C_START_
|
||||
|
||||
|
@ -29,12 +30,14 @@ struct sockaddr_un_bsd {
|
|||
union sockaddr_storage_bsd {
|
||||
struct sockaddr_bsd sa;
|
||||
struct sockaddr_in_bsd sin;
|
||||
struct sockaddr_in6_bsd sin6;
|
||||
struct sockaddr_un_bsd sun;
|
||||
};
|
||||
|
||||
union sockaddr_storage_linux {
|
||||
struct sockaddr sa;
|
||||
struct sockaddr_in sin;
|
||||
struct sockaddr_in6 sin6;
|
||||
struct sockaddr_un sun;
|
||||
};
|
||||
|
||||
|
|
18
libc/sock/struct/sockaddr6-bsd.internal.h
Normal file
18
libc/sock/struct/sockaddr6-bsd.internal.h
Normal file
|
@ -0,0 +1,18 @@
|
|||
#ifndef COSMOPOLITAN_LIBC_SOCK_STRUCT_SOCKADDR6_BSD_INTERNAL_H_
|
||||
#define COSMOPOLITAN_LIBC_SOCK_STRUCT_SOCKADDR6_BSD_INTERNAL_H_
|
||||
#include "libc/sock/struct/sockaddr6.h"
|
||||
#if !(__ASSEMBLER__ + __LINKER__ + 0)
|
||||
COSMOPOLITAN_C_START_
|
||||
|
||||
struct sockaddr_in6_bsd {
|
||||
uint8_t sin6_len;
|
||||
uint8_t sin6_family;
|
||||
uint16_t sin6_port;
|
||||
uint32_t sin6_flowinfo;
|
||||
struct in6_addr sin6_addr;
|
||||
uint32_t sin6_scope_id;
|
||||
};
|
||||
|
||||
COSMOPOLITAN_C_END_
|
||||
#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
|
||||
#endif /* COSMOPOLITAN_LIBC_SOCK_STRUCT_SOCKADDR6_BSD_INTERNAL_H_ */
|
Loading…
Add table
Add a link
Reference in a new issue