mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-05-23 13:52:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add test for ioctl(SIOCGIFCONF) and polyfill on BSDs

Browse source 
- Use nullness checks when calling weakly linked functions.

- Avoid typedef for reasons described in Linux Kernel style guide.

- Avoid enum in in Windows headers. Earlier in Cosmo's history all one
  hundred files in libc/nt/enum/ used to be enums and it resulted in
  gigabytes of DWARF data almost as large as everything else in the
  codebase combined.

- Bitfields aren't our friends. They have frequent ABI breakages,
  inconsistent arithmetic across compilers, and different endianness
  between cpus. Compiler authors also haven't invested much roi into
  making bit fields go fast so they produce poor assembly.

- Use memccpy() instead of strncpy() or snprintf() for length-bounded
  copying of C strings. strncpy() is a misunderstood function and
  snprintf() is awesome but memccpy() deserves more love.
This commit is contained in:
Justine Tunney 2021-06-25 18:41:02 -07:00
parent 86ab24ce56
commit 5144c22189
41 changed files with 502 additions and 476 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libc/calls/calls.mk
View file

@ -83,6 +83,12 @@ o/$(MODE)/libc/calls/mkntenvblock.o: \
OVERRIDE_CPPFLAGS += \ OVERRIDE_CPPFLAGS += \
-DSTACK_FRAME_UNLIMITED -DSTACK_FRAME_UNLIMITED
o/$(MODE)/libc/calls/ioctl-siocgifconf.o \
o/$(MODE)/libc/calls/ioctl-siocgifconf-nt.o: \
OVERRIDE_COPTS += \
-ffunction-sections \
-fdata-sections
LIBC_CALLS_LIBS = $(foreach x,$(LIBC_CALLS_ARTIFACTS),$($(x))) LIBC_CALLS_LIBS = $(foreach x,$(LIBC_CALLS_ARTIFACTS),$($(x)))
LIBC_CALLS_SRCS = $(foreach x,$(LIBC_CALLS_ARTIFACTS),$($(x)_SRCS)) LIBC_CALLS_SRCS = $(foreach x,$(LIBC_CALLS_ARTIFACTS),$($(x)_SRCS))
LIBC_CALLS_HDRS = $(foreach x,$(LIBC_CALLS_ARTIFACTS),$($(x)_HDRS)) LIBC_CALLS_HDRS = $(foreach x,$(LIBC_CALLS_ARTIFACTS),$($(x)_HDRS))

0
libc/calls/ioctl-default.c → libc/calls/ioctl_default.c
View file

258
libc/calls/ioctl-siocgifconf-nt.c → libc/calls/ioctl_siocgifconf-nt.c
View file

@ -16,45 +16,45 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │ │ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/ ╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/assert.h"
#include "libc/bits/weaken.h"
#include "libc/calls/calls.h" #include "libc/calls/calls.h"
#include "libc/calls/internal.h" #include "libc/calls/internal.h"
#include "libc/sysv/consts/o.h"
#include "libc/sysv/consts/af.h"
#include "libc/sock/sock.h"
#include "libc/sock/internal.h"
#include "libc/sysv/errfuns.h"
#include "libc/sysv/consts/iff.h"
#include "libc/nt/winsock.h"
#include "libc/nt/errors.h" #include "libc/nt/errors.h"
#include "libc/nt/iphlpapi.h" #include "libc/nt/iphlpapi.h"
#include "libc/nt/runtime.h"
#include "libc/nt/struct/ipadapteraddresses.h" #include "libc/nt/struct/ipadapteraddresses.h"
#include "libc/bits/weaken.h" #include "libc/nt/winsock.h"
#include "libc/sock/internal.h"
#include "libc/sock/sock.h"
#include "libc/str/str.h" #include "libc/str/str.h"
#include "libc/assert.h" #include "libc/sysv/consts/af.h"
//#include "libc/nt/windows.h" /* Needed for WideCharToMultiByte */ #include "libc/sysv/consts/iff.h"
#include "libc/sysv/consts/o.h"
#include "libc/sysv/errfuns.h"
/* Maximum number of unicast addresses handled for each interface */ /* Maximum number of unicast addresses handled for each interface */
#define MAX_UNICAST_ADDR 32 #define MAX_UNICAST_ADDR 32
#define MAX_NAME_CLASH ((int)('z'-'a')) /* Allow a..z */ #define MAX_NAME_CLASH ((int)('z' - 'a')) /* Allow a..z */
static int insertAdapterName(NtIpAdapterAddresses *aa);
struct HostAdapterInfoNode { struct HostAdapterInfoNode {
struct HostAdapterInfoNode * next; struct HostAdapterInfoNode *next;
char name[IFNAMSIZ]; /* Obtained from FriendlyName */ char name[IFNAMSIZ]; /* Obtained from FriendlyName */
struct sockaddr unicast; struct sockaddr unicast;
struct sockaddr netmask; struct sockaddr netmask;
struct sockaddr broadcast; struct sockaddr broadcast;
short flags; short flags;
} *__hostInfo; } * __hostInfo;
/* Frees all the nodes of the _hostInfo */ /* Frees all the nodes of the _hostInfo */
static void freeHostInfo() { static void freeHostInfo(void) {
struct HostAdapterInfoNode *next, *node = __hostInfo; struct HostAdapterInfoNode *next, *node = __hostInfo;
while(node) { if (weaken(free)) {
next = node->next; while (node) {
weaken(free)(node); next = node->next;
node = next; weaken(free)(node);
node = next;
}
} }
__hostInfo = NULL; __hostInfo = NULL;
} }
@ -65,14 +65,12 @@ static void freeHostInfo() {
*/ */
static struct HostAdapterInfoNode *findAdapterByName(const char *name) { static struct HostAdapterInfoNode *findAdapterByName(const char *name) {
struct HostAdapterInfoNode *node = __hostInfo; struct HostAdapterInfoNode *node = __hostInfo;
while(node) { while (node) {
if (!strncmp(name, node->name, IFNAMSIZ)) { if (!strncmp(name, node->name, IFNAMSIZ)) {
/* Found */
return node; return node;
} }
node=node->next; node = node->next;
} }
/* Not found */
return NULL; return NULL;
} }
@ -86,19 +84,22 @@ static struct HostAdapterInfoNode *findAdapterByName(const char *name) {
*/ */
struct HostAdapterInfoNode *appendHostInfo( struct HostAdapterInfoNode *appendHostInfo(
struct HostAdapterInfoNode *parentInfoNode, struct HostAdapterInfoNode *parentInfoNode,
const char *baseName, /* Max length = IFNAMSIZ-1 */ const char *baseName, /* Max length = IFNAMSIZ-1 */
const NtIpAdapterAddresses *aa, /* Top level adapter object being processed */ const struct NtIpAdapterAddresses
NtIpAdapterUnicastAddress **ptrUA, /* Ptr to ptr to unicast address list node */ *aa, /* Top level adapter object being processed */
NtIpAdapterPrefix **ptrAP, /* Ptr to ptr to Adapter prefix list node */ struct NtIpAdapterUnicastAddress *
int count) { /* count is used to create a unique name in case of alias */ *ptrUA, /* Ptr to ptr to unicast address list node */
struct NtIpAdapterPrefix *
*ptrAP, /* Ptr to ptr to Adapter prefix list node */
int count) { /* count is used to create a unique name in case of alias */
struct HostAdapterInfoNode *temp; struct HostAdapterInfoNode *temp;
struct HostAdapterInfoNode *node; struct HostAdapterInfoNode *node;
struct sockaddr_in tempAddr; uint32_t ip, netmask, broadcast;
struct sockaddr_in *a;
int attemptNum; int attemptNum;
node = weaken(calloc)(1, sizeof(*node)); if (!weaken(calloc) || !(node = weaken(calloc)(1, sizeof(*node)))) {
if (!node) {
errno = ENOMEM; errno = ENOMEM;
return NULL; return NULL;
} }
@ -109,37 +110,38 @@ struct HostAdapterInfoNode *appendHostInfo(
if (count > 0 || ((*ptrUA)->Next != NULL)) { if (count > 0 || ((*ptrUA)->Next != NULL)) {
/* Yes, compose it using <baseName>:<count> */ /* Yes, compose it using <baseName>:<count> */
size_t nameLen = strlen(node->name); size_t nameLen = strlen(node->name);
if (nameLen+2 > IFNAMSIZ-2) { if (nameLen + 2 > IFNAMSIZ - 2) {
/* Appending the ":x" will exceed the size, need to chop the end */ /* Appending the ":x" will exceed the size, need to chop the end */
nameLen -= 2; nameLen -= 2;
} }
node->name[nameLen-2] = ':'; node->name[nameLen - 2] = ':';
node->name[nameLen-1] = '0'+count; node->name[nameLen - 1] = '0' + count;
node->name[nameLen] = '\0'; node->name[nameLen] = '\0';
} }
/* Is there a name clash with other interfaces? */ /* Is there a name clash with other interfaces? */
for (attemptNum=0; attemptNum < MAX_NAME_CLASH; ++attemptNum) { for (attemptNum = 0; attemptNum < MAX_NAME_CLASH; ++attemptNum) {
temp = findAdapterByName(node->name); temp = findAdapterByName(node->name);
if (!temp) { if (!temp) {
break; break;
} else { } else {
/* Yes, this name has been already used, append an extra /* Yes, this name has been already used, append an extra
* character to resolve conflict. Note since the max length * character to resolve conflict. Note since the max length
* of the string now is IFNAMSIZ-2, we have just enough space for this. * of the string now is IFNAMSIZ-2, we have just enough space for this.
* E.g. 'Ethernet_1' -> 'Ethernet_1a' * E.g. 'Ethernet_1' -> 'Ethernet_1a'
*/ */
size_t pos = strlen(node->name); size_t pos = strlen(node->name);
node->name[pos] = 'a' + attemptNum; node->name[pos] = 'a' + attemptNum;
node->name[pos+1] = '\0'; node->name[pos + 1] = '\0';
/* Try again */ /* Try again */
} }
} }
if (attemptNum == MAX_NAME_CLASH) { if (attemptNum == MAX_NAME_CLASH) {
/* Cannot resolve the conflict */ /* Cannot resolve the conflict */
weaken(free)(node); if (weaken(free)) {
weaken(free)(node);
}
errno = EEXIST; errno = EEXIST;
return NULL; return NULL;
} }
@ -161,28 +163,47 @@ struct HostAdapterInfoNode *appendHostInfo(
flags = 0; flags = 0;
if (aa->OperStatus == kNtIfOperStatusUp) flags |= IFF_UP | IFF_RUNNING; if (aa->OperStatus == kNtIfOperStatusUp) flags |= IFF_UP | IFF_RUNNING;
if (aa->IfType == kNtIfTypePpp) flags |= IFF_POINTOPOINT; if (aa->IfType == kNtIfTypePpp) flags |= IFF_POINTOPOINT;
//if (aa->TunnelType != TUNNEL_TYPE_NONE) flags |= IFF_POINTOPOINT; if (!(aa->Flags & kNtIpAdapterNoMulticast)) flags |= IFF_MULTICAST;
if (aa->NoMulticast == 0) flags |= IFF_MULTICAST;
if (aa->IfType == kNtIfTypeSoftwareLoopback) flags |= IFF_LOOPBACK; if (aa->IfType == kNtIfTypeSoftwareLoopback) flags |= IFF_LOOPBACK;
if (aa->FirstPrefix != NULL) flags |= IFF_BROADCAST; if (aa->FirstPrefix) flags |= IFF_BROADCAST;
node->flags = flags; node->flags = flags;
} else { } else {
/* Copy from previous node */ /* Copy from previous node */
node->flags = parentInfoNode->flags; node->flags = parentInfoNode->flags;
} }
ip = ntohl(
((struct sockaddr_in *)(*ptrUA)->Address.lpSockaddr)->sin_addr.s_addr);
netmask = (uint32_t)-1 << (32 - (*ptrUA)->OnLinkPrefixLength);
broadcast = (ip & netmask) | (~netmask & -1);
a = (struct sockaddr_in *)&node->netmask;
a->sin_family = AF_INET;
a->sin_addr.s_addr = htonl(netmask);
a = (struct sockaddr_in *)&node->broadcast;
a->sin_family = AF_INET;
a->sin_addr.s_addr = htonl(broadcast);
/* Process the prefix and extract the netmask and broadcast */ /* Process the prefix and extract the netmask and broadcast */
/* According to the doc: /* According to the doc:
* ... On Windows Vista and later, the linked IP_ADAPTER_PREFIX structures pointed to *
* by the FirstPrefix member include three IP adapter prefixes for each IP address * On Windows Vista and later, the linked IP_ADAPTER_PREFIX
* assigned to the adapter. These include the host IP address prefix, the subnet IP * structures pointed to by the FirstPrefix member include three
* address prefix, and the subnet broadcast IP address prefix. In addition, for each * IP adapter prefixes for each IP address assigned to the
* adapter there is a multicast address prefix and a broadcast address prefix. * adapter. These include the host IP address prefix, the subnet
* IP address prefix, and the subnet broadcast IP address prefix.
* In addition, for each adapter there is a multicast address
* prefix and a broadcast address prefix.
* -Source: MSDN on IP_ADAPTER_ADDRESSES_LH
* *
* For example, interface "Ethernet", with 2 unicast addresses: * For example, interface "Ethernet", with 2 unicast addresses:
* - 192.168.1.84 *
* - 192.168.1.84
* - 192.168.5.99 * - 192.168.5.99
*
* The Prefix list has 8 elements: * The Prefix list has 8 elements:
*
* #1: 192.168.1.0/24 <- Network, use the PrefixLength for netmask * #1: 192.168.1.0/24 <- Network, use the PrefixLength for netmask
* #2: 192.168.1.84/32 <- Host IP * #2: 192.168.1.84/32 <- Host IP
* #3: 192.168.1.255/32 <- Subnet broadcast * #3: 192.168.1.255/32 <- Subnet broadcast
@ -195,20 +216,16 @@ struct HostAdapterInfoNode *appendHostInfo(
* #8: 255.255.255.255/32 <- Broadcast * #8: 255.255.255.255/32 <- Broadcast
*/ */
/* Netmask */ if (ptrAP && *ptrAP) {
memset(&tempAddr, 0, sizeof(tempAddr)); *ptrAP = (*ptrAP)->Next; /* skip net ip */
tempAddr.sin_family = AF_INET; if (*ptrAP) {
tempAddr.sin_addr.s_addr = (uint32_t)((1LLU << (*ptrAP)->PrefixLength) - 1LLU); *ptrAP = (*ptrAP)->Next; /* skip host ip */
memcpy(&node->netmask, &tempAddr, sizeof(tempAddr)); if (*ptrAP) {
node->broadcast = *((*ptrAP)->Address.lpSockaddr);
}
}
}
*ptrAP = (*ptrAP)->Next;
*ptrAP = (*ptrAP)->Next; /* Skip over Host IP */
/* Broadcast */
node->broadcast = *((*ptrAP)->Address.lpSockaddr);
*ptrAP = (*ptrAP)->Next;
/* Move pointer to Unicast Address record */
*ptrUA = (*ptrUA)->Next; *ptrUA = (*ptrUA)->Next;
/* Append this node to the last node (if any) */ /* Append this node to the last node (if any) */
@ -221,10 +238,10 @@ struct HostAdapterInfoNode *appendHostInfo(
} }
/* Returns -1 in case of failure */ /* Returns -1 in case of failure */
static int createHostInfo(NtIpAdapterAddresses *firstAdapter) { static int createHostInfo(struct NtIpAdapterAddresses *firstAdapter) {
NtIpAdapterAddresses *aa; struct NtIpAdapterAddresses *aa;
NtIpAdapterUnicastAddress *ua; struct NtIpAdapterUnicastAddress *ua;
NtIpAdapterPrefix *ap; struct NtIpAdapterPrefix *ap;
struct HostAdapterInfoNode *node = NULL; struct HostAdapterInfoNode *node = NULL;
char baseName[IFNAMSIZ]; char baseName[IFNAMSIZ];
char name[IFNAMSIZ]; char name[IFNAMSIZ];
@ -232,34 +249,31 @@ static int createHostInfo(NtIpAdapterAddresses *firstAdapter) {
/* __hostInfo must be empty */ /* __hostInfo must be empty */
assert(__hostInfo == NULL); assert(__hostInfo == NULL);
assert(weaken(tprecode16to8));
for (aa = firstAdapter; aa; aa = aa->Next) { for (aa = firstAdapter; aa; aa = aa->Next) {
/* Skip all the interfaces with no address and the ones that are not AF_INET */ /* Skip all the interfaces with no address and the ones that are not AF_INET
if (!aa->FirstUnicastAddress || */
if (!aa->FirstUnicastAddress ||
aa->FirstUnicastAddress->Address.lpSockaddr->sa_family != AF_INET) { aa->FirstUnicastAddress->Address.lpSockaddr->sa_family != AF_INET) {
continue; continue;
} }
/* Use max IFNAMSIZ-1 chars, leave the last char for eventual conficts */ /* Use max IFNAMSIZ-1 chars, leave the last char for eventual conficts */
tprecode16to8(baseName, IFNAMSIZ-1, aa->FriendlyName); tprecode16to8(baseName, IFNAMSIZ - 1, aa->FriendlyName);
baseName[IFNAMSIZ-2] = '\0'; baseName[IFNAMSIZ - 2] = '\0';
/* Replace any space with a '_' */ /* Replace any space with a '_' */
for (i = 0; i < IFNAMSIZ-2; ++i) { for (i = 0; i < IFNAMSIZ - 2; ++i) {
if (baseName[i] == ' ') baseName[i] = '_'; if (baseName[i] == ' ') baseName[i] = '_';
if (!baseName[i]) break; if (!baseName[i]) break;
} }
for (count = 0, ua = aa->FirstUnicastAddress, ap = aa->FirstPrefix; for (count = 0, ua = aa->FirstUnicastAddress, ap = aa->FirstPrefix;
(ua != NULL) && (count < MAX_UNICAST_ADDR); (ua != NULL) && (count < MAX_UNICAST_ADDR); ++count) {
++count) {
node = appendHostInfo(node, baseName, aa, &ua, &ap, count); node = appendHostInfo(node, baseName, aa, &ua, &ap, count);
if (!node) { if (!node) goto err;
goto err;
}
if (!__hostInfo) __hostInfo = node; if (!__hostInfo) __hostInfo = node;
} }
/* Note: do we need to process the remaining adapter prefix? /* Note: do we need to process the remaining adapter prefix?
* ap - points to broadcast addr * ap - points to broadcast addr
* ap->Next - points to interface multicast addr * ap->Next - points to interface multicast addr
* Ignoring them for now * Ignoring them for now
@ -268,55 +282,57 @@ static int createHostInfo(NtIpAdapterAddresses *firstAdapter) {
return 0; return 0;
err: err:
freeHostInfo(__hostInfo); freeHostInfo();
return -1; return -1;
} }
static int readAdapterAddresses(void) { static int readAdapterAddresses(void) {
uint32_t size, rc; uint32_t size, rc;
NtIpAdapterAddresses * aa = NULL; struct NtIpAdapterAddresses *aa = NULL;
assert(weaken(GetAdaptersAddresses));
/* Calculate the required data size /* Calculate the required data size
* Note: alternatively you can use AF_UNSPEC to also return IPv6 interfaces * Note: alternatively you can use AF_UNSPEC to also return IPv6 interfaces
*/ */
rc = weaken(GetAdaptersAddresses)(AF_INET, rc = GetAdaptersAddresses(AF_INET,
kNtGaaFlagSkipAnycast | kNtGaaFlagSkipMulticast | kNtGaaFlagSkipDnsServer | kNtGaaFlagIncludePrefix, kNtGaaFlagSkipAnycast | kNtGaaFlagSkipMulticast |
NULL, /* Reserved */ kNtGaaFlagSkipDnsServer |
NULL, /* Ptr */ kNtGaaFlagIncludePrefix,
&size); NULL, /* Reserved */
NULL, /* Ptr */
&size);
if (rc != kNtErrorBufferOverflow) { if (rc != kNtErrorBufferOverflow) {
ebadf(); ebadf();
goto err; goto err;
} }
aa = (NtIpAdapterAddresses *)weaken(malloc)(size); if (!weaken(malloc) ||
if (!aa) { !(aa = (struct NtIpAdapterAddresses *)weaken(malloc)(size))) {
enomem(); enomem();
goto err; goto err;
} }
/* Re-run GetAdaptersAddresses this time with a valid buffer */ /* Re-run GetAdaptersAddresses this time with a valid buffer */
rc = weaken(GetAdaptersAddresses)(AF_INET, rc = GetAdaptersAddresses(AF_INET,
kNtGaaFlagSkipAnycast | kNtGaaFlagSkipMulticast | kNtGaaFlagSkipDnsServer | kNtGaaFlagIncludePrefix, kNtGaaFlagSkipAnycast | kNtGaaFlagSkipMulticast |
//kNtGaaFlagIncludePrefix, kNtGaaFlagSkipDnsServer |
NULL, kNtGaaFlagIncludePrefix,
aa, // kNtGaaFlagIncludePrefix,
&size); NULL, aa, &size);
if (rc != kNtErrorSuccess) { if (rc != kNtErrorSuccess) {
efault(); errno = GetLastError();
goto err; goto err;
} }
if (createHostInfo(aa) == -1) { if (createHostInfo(aa) == -1) {
goto err; goto err;
} }
weaken(free)(aa); if (weaken(free)) {
weaken(free)(aa);
}
return 0; return 0;
err: err:
if (aa) { if (weaken(free)) {
weaken(free)(aa); weaken(free)(aa);
} }
freeHostInfo(); freeHostInfo();
@ -324,7 +340,7 @@ err:
} }
textwindows int ioctl_siocgifconf_nt(int fd, struct ifconf *ifc) { textwindows int ioctl_siocgifconf_nt(int fd, struct ifconf *ifc) {
NtIpAdapterAddresses *aa; struct NtIpAdapterAddresses *aa;
struct HostAdapterInfoNode *node; struct HostAdapterInfoNode *node;
struct ifreq *ptr; struct ifreq *ptr;
@ -337,8 +353,8 @@ textwindows int ioctl_siocgifconf_nt(int fd, struct ifconf *ifc) {
} }
for (ptr = ifc->ifc_req, node = __hostInfo; for (ptr = ifc->ifc_req, node = __hostInfo;
(((char *)(ptr+1) - ifc->ifc_buf) < ifc->ifc_len) && node; (((char *)(ptr + 1) - ifc->ifc_buf) < ifc->ifc_len) && node;
ptr++, node = node->next) { ptr++, node = node->next) {
memcpy(ptr->ifr_name, node->name, IFNAMSIZ); memcpy(ptr->ifr_name, node->name, IFNAMSIZ);
memcpy(&ptr->ifr_addr, &node->unicast, sizeof(struct sockaddr)); memcpy(&ptr->ifr_addr, &node->unicast, sizeof(struct sockaddr));
} }
@ -347,14 +363,13 @@ textwindows int ioctl_siocgifconf_nt(int fd, struct ifconf *ifc) {
return 0; return 0;
} }
/* Performs the SIOCGIFADDR operation */ /**
* Returns unicast addresses.
*/
int ioctl_siocgifaddr_nt(int fd, struct ifreq *ifr) { int ioctl_siocgifaddr_nt(int fd, struct ifreq *ifr) {
struct HostAdapterInfoNode *node; struct HostAdapterInfoNode *node;
node = findAdapterByName(ifr->ifr_name); node = findAdapterByName(ifr->ifr_name);
if (!node) { if (!node) return ebadf();
return ebadf();
}
memcpy(&ifr->ifr_addr, &node->unicast, sizeof(struct sockaddr)); memcpy(&ifr->ifr_addr, &node->unicast, sizeof(struct sockaddr));
return 0; return 0;
} }
@ -362,37 +377,28 @@ int ioctl_siocgifaddr_nt(int fd, struct ifreq *ifr) {
/* Performs the SIOCGIFFLAGS operation */ /* Performs the SIOCGIFFLAGS operation */
int ioctl_siocgifflags_nt(int fd, struct ifreq *ifr) { int ioctl_siocgifflags_nt(int fd, struct ifreq *ifr) {
struct HostAdapterInfoNode *node; struct HostAdapterInfoNode *node;
node = findAdapterByName(ifr->ifr_name); node = findAdapterByName(ifr->ifr_name);
if (!node) { if (!node) return ebadf();
return ebadf();
}
ifr->ifr_flags = node->flags; ifr->ifr_flags = node->flags;
return 0; return 0;
} }
/* Performs the SIOCGIFNETMASK operation */ /* Performs the SIOCGIFNETMASK operation */
int ioctl_siocgifnetmask_nt(int fd, struct ifreq *ifr) { int ioctl_siocgifnetmask_nt(int fd, struct ifreq *ifr) {
struct HostAdapterInfoNode *node; struct HostAdapterInfoNode *node;
node = findAdapterByName(ifr->ifr_name); node = findAdapterByName(ifr->ifr_name);
if (!node) { if (!node) return ebadf();
return ebadf();
}
memcpy(&ifr->ifr_netmask, &node->netmask, sizeof(struct sockaddr)); memcpy(&ifr->ifr_netmask, &node->netmask, sizeof(struct sockaddr));
return 0; return 0;
} }
/* Performs the SIOCGIFBRDADDR operation */ /**
* Returns broadcast address.
*/
int ioctl_siocgifbrdaddr_nt(int fd, struct ifreq *ifr) { int ioctl_siocgifbrdaddr_nt(int fd, struct ifreq *ifr) {
struct HostAdapterInfoNode *node; struct HostAdapterInfoNode *node;
node = findAdapterByName(ifr->ifr_name); node = findAdapterByName(ifr->ifr_name);
if (!node) { if (!node) return ebadf();
return ebadf();
}
memcpy(&ifr->ifr_broadaddr, &node->broadcast, sizeof(struct sockaddr)); memcpy(&ifr->ifr_broadaddr, &node->broadcast, sizeof(struct sockaddr));
return 0; return 0;
} }

118
libc/calls/ioctl-siocgifconf.c → libc/calls/ioctl_siocgifconf.c
View file

@ -16,12 +16,15 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │ │ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/ ╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/assert.h"
#include "libc/bits/weaken.h" #include "libc/bits/weaken.h"
#include "libc/sysv/errfuns.h"
#include "libc/calls/internal.h" #include "libc/calls/internal.h"
#include "libc/sock/sock.h"
#include "libc/sock/internal.h" #include "libc/sock/internal.h"
#include "libc/sock/sock.h"
#include "libc/str/str.h"
#include "libc/sysv/consts/af.h"
#include "libc/sysv/consts/sio.h" #include "libc/sysv/consts/sio.h"
#include "libc/sysv/errfuns.h"
/* SIOCGIFCONF: /* SIOCGIFCONF:
* Takes an struct ifconf object of a given size * Takes an struct ifconf object of a given size
@ -29,7 +32,7 @@
* - ifc_len: set it to the number of valid ifreq structures representing * - ifc_len: set it to the number of valid ifreq structures representing
* the interfaces * the interfaces
* - ifc_ifcu.ifcu_req: sets the name of the interface for each interface * - ifc_ifcu.ifcu_req: sets the name of the interface for each interface
* The ifc_len is an input/output parameter: set it to the total size of * The ifc_len is an input/output parameter: set it to the total size of
* the ifcu_buf (ifcu_req) buffer on input. * the ifcu_buf (ifcu_req) buffer on input.
*/ */
int ioctl_default(int, uint64_t, void *) hidden; int ioctl_default(int, uint64_t, void *) hidden;
@ -40,79 +43,59 @@ int ioctl_siocgifnetmask_nt(int, struct ifreq *) hidden;
int ioctl_siocgifbrdaddr_nt(int, struct ifreq *) hidden; int ioctl_siocgifbrdaddr_nt(int, struct ifreq *) hidden;
static int ioctl_siocgifconf_sysv(int fd, struct ifconf *ifc) { static int ioctl_siocgifconf_sysv(int fd, struct ifconf *ifc) {
if (IsBsd()) { /*
/* BSD uses a slightly different memory structure where: * We're 100% compatible with Linux.
* - sizeof(struct ifreq) is 32 bytes instead of 40 bytes * BSD ABIs mainly differ by having sockaddr::sa_len
* - ifc.ifc_len is uint32_t instead of uint64_t * XNU uses a 32-bit length in a struct that's packed!
* - struct ifconf is #pragma pack(4) (instead of the default pack(8)) */
*/ int i, rc, fam;
int i; char *b, *p, *e;
char *buf; /* Temporary buffer to store ifreq */ char ifcBsd[16];
char *pBsdReq; /* Scan through buf records */ struct ifreq *req;
char *pBsdEnd; /* End of the ifreq */ struct ifreq *end;
uint32_t bufLen, ip;
struct ifconf_bsd ifc_bsd; size_t numReq, bufMax;
struct ifreq_bsd *bsdReq; if (IsLinux()) return sys_ioctl(fd, SIOCGIFCONF, ifc);
struct ifreq *req; if (!weaken(malloc)) return enomem();
size_t numReq = ifc->ifc_len / sizeof(struct ifreq); bufMax = 15000; /* conservative guesstimate */
if (!(b = weaken(malloc)(bufMax))) return enomem();
if (!weaken(malloc)) { memcpy(ifcBsd, &bufMax, 8); /* ifc_len */
return enomem(); memcpy(ifcBsd + (IsXnu() ? 4 : 8), &b, 8); /* ifc_buf */
} if ((rc = sys_ioctl(fd, SIOCGIFCONF, &ifcBsd)) != -1) {
ifc_bsd.ifc_len = numReq * sizeof(struct ifreq_bsd); /*
buf = weaken(malloc)(ifc_bsd.ifc_len); * On XNU the size of the struct ifreq is different than Linux.
if (!buf) { * On Linux is fixed (40 bytes), but on XNU the struct sockaddr
return enomem();
}
ifc_bsd.ifc_buf = buf;
if ((i = sys_ioctl(fd, SIOCGIFCONF, &ifc_bsd)) < 0) {
weaken(free)(buf);
return -1;
}
/* On BSD the size of the struct ifreq is different than Linux.
* On Linux is fixed (40 bytes), but on BSD the struct sockaddr
* has variable length, making the whole struct ifreq a variable * has variable length, making the whole struct ifreq a variable
* sized record. * sized record.
*/ */
for (pBsdReq = buf, pBsdEnd = buf + ifc_bsd.ifc_len, req = ifc->ifc_req; memcpy(&bufLen, b, 4);
pBsdReq < pBsdEnd; req = ifc->ifc_req;
++req) { end = req + ifc->ifc_len / sizeof(*req);
bsdReq = (struct ifreq_bsd *)pBsdReq; for (p = b, e = p + MIN(bufMax, READ32LE(ifcBsd)); p + 16 + 16 <= e;
memcpy(req->ifr_name, bsdReq->ifr_name, IFNAMSIZ); p += IsBsd() ? 16 + MAX(16, p[16] & 255) : 40) {
memcpy(&req->ifr_addr, &bsdReq->ifr_addr, sizeof(struct sockaddr_bsd)); fam = p[IsBsd() ? 17 : 16] & 255;
sockaddr2linux(&req->ifr_addr); if (fam != AF_INET) continue;
ip = READ32BE(p + 20);
pBsdReq += IFNAMSIZ + bsdReq->ifr_addr.sa_len; memset(req, 0, sizeof(*req));
memcpy(req->ifr_name, p, 16);
memcpy(&req->ifr_addr, p + 16, 16);
req->ifr_addr.sa_family = fam;
((struct sockaddr_in *)&req->ifr_addr)->sin_addr.s_addr = htonl(ip);
++req;
} }
ifc->ifc_len = (char *)req - ifc->ifc_buf; /* Adjust len */
/* Adjust len */
ifc->ifc_len = (size_t)((char *)req - ifc->ifc_buf);
weaken(free)(buf);
return 0;
} else {
/* 100% compatible with Linux */
return sys_ioctl(fd, SIOCGIFCONF, ifc);
} }
if (weaken(free)) weaken(free)(b);
return rc;
} }
/* Used for all the ioctl that returns sockaddr structure that /* Used for all the ioctl that returns sockaddr structure that
* requires adjustment between Linux and BSD * requires adjustment between Linux and XNU
*/ */
static int ioctl_siocgifaddr_sysv(int fd, uint64_t op, struct ifreq *ifr) { static int ioctl_siocgifaddr_sysv(int fd, uint64_t op, struct ifreq *ifr) {
int i; if (IsBsd()) sockaddr2bsd(&ifr->ifr_addr);
if (sys_ioctl(fd, op, ifr) == -1) return -1;
if (IsBsd()) { if (IsBsd()) sockaddr2linux(&ifr->ifr_addr);
sockaddr2bsd(&ifr->ifr_addr);
}
if ((i = sys_ioctl(fd, op, ifr)) < 0) {
return -1;
}
if (IsBsd()) {
sockaddr2linux(&ifr->ifr_addr);
}
return 0; return 0;
} }
@ -163,14 +146,13 @@ int ioctl_siocgifdstaddr(int fd, void *ifr) {
* GetAdaptersAddresses function * GetAdaptersAddresses function
* *
return ioctl_siocgifbrdaddr_nt(fd, ifc); return ioctl_siocgifbrdaddr_nt(fd, ifc);
*/ */
} }
} }
int ioctl_siocgifflags(int fd, void *ifr) { int ioctl_siocgifflags(int fd, void *ifr) {
if (!IsWindows()) { if (!IsWindows()) {
/* Both BSD and Linux are for once compatible here... */ /* Both XNU and Linux are for once compatible here... */
return ioctl_default(fd, SIOCGIFFLAGS, ifr); return ioctl_default(fd, SIOCGIFFLAGS, ifr);
} else { } else {
return ioctl_siocgifflags_nt(fd, (struct ifreq *)ifr); return ioctl_siocgifflags_nt(fd, (struct ifreq *)ifr);

0
libc/calls/ioctl-tcgets-nt.c → libc/calls/ioctl_tcgets-nt.c
View file

0
libc/calls/ioctl-tcgets.c → libc/calls/ioctl_tcgets.c
View file

0
libc/calls/ioctl-tcsets-nt.c → libc/calls/ioctl_tcsets-nt.c
View file

0
libc/calls/ioctl-tcsets.c → libc/calls/ioctl_tcsets.c
View file

0
libc/calls/ioctl-tiocgwinsz-nt.c → libc/calls/ioctl_tiocgwinsz-nt.c
View file

0
libc/calls/ioctl-tiocgwinsz.c → libc/calls/ioctl_tiocgwinsz.c
View file

0
libc/calls/ioctl-tiocswinsz-nt.c → libc/calls/ioctl_tiocswinsz-nt.c
View file

0
libc/calls/ioctl-tiocswinsz.c → libc/calls/ioctl_tiocswinsz.c
View file

22
libc/calls/struct/sockaddr6.h Normal file
View file

@ -0,0 +1,22 @@
#ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_SOCKADDR6_H_
#define COSMOPOLITAN_LIBC_CALLS_STRUCT_SOCKADDR6_H_
#if !(__ASSEMBLER__ + __LINKER__ + 0)
struct in6_addr {
union {
uint8_t s6_addr[16];
uint16_t s6_addr16[8];
uint32_t s6_addr32[4];
};
};
struct sockaddr_in6 { /* Linux+NT ABI */
uint16_t sin6_family;
uint16_t sin6_port;
uint32_t sin6_flowinfo;
struct in6_addr sin6_addr;
uint32_t sin6_scope_id; /* rfc2553 */
};
#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
#endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_SOCKADDR6_H_ */

9
libc/dns/getnameinfo.c
View file

@ -33,6 +33,7 @@
#include "libc/dns/resolvconf.h" #include "libc/dns/resolvconf.h"
#include "libc/fmt/conv.h" #include "libc/fmt/conv.h"
#include "libc/fmt/fmt.h" #include "libc/fmt/fmt.h"
#include "libc/fmt/itoa.h"
#include "libc/mem/mem.h" #include "libc/mem/mem.h"
#include "libc/sock/sock.h" #include "libc/sock/sock.h"
#include "libc/str/str.h" #include "libc/str/str.h"
@ -56,7 +57,7 @@
int getnameinfo(const struct sockaddr *addr, socklen_t addrlen, char *name, int getnameinfo(const struct sockaddr *addr, socklen_t addrlen, char *name,
socklen_t namelen, char *service, socklen_t servicelen, socklen_t namelen, char *service, socklen_t servicelen,
int flags) { int flags) {
char rdomain[1 + sizeof "255.255.255.255.in-addr.arpa"]; char *p, rdomain[1 + sizeof "255.255.255.255.in-addr.arpa"];
char info[512]; char info[512];
int rc, port; int rc, port;
uint8_t *ip; uint8_t *ip;
@ -71,7 +72,11 @@ int getnameinfo(const struct sockaddr *addr, socklen_t addrlen, char *name,
return EAI_FAMILY; return EAI_FAMILY;
ip = (uint8_t *)&(((struct sockaddr_in *)addr)->sin_addr); ip = (uint8_t *)&(((struct sockaddr_in *)addr)->sin_addr);
sprintf(rdomain, "%d.%d.%d.%d.in-addr.arpa", ip[3], ip[2], ip[1], ip[0]); p = rdomain;
p += int64toarray_radix10(ip[3], p), *p++ = '.';
p += int64toarray_radix10(ip[2], p), *p++ = '.';
p += int64toarray_radix10(ip[1], p), *p++ = '.';
p += int64toarray_radix10(ip[0], p), stpcpy(p, ".in-addr.arpa");
info[0] = '\0'; info[0] = '\0';
if (name != NULL && namelen != 0) { if (name != NULL && namelen != 0) {
if ((flags & NI_NUMERICHOST) && (flags & NI_NAMEREQD)) return EAI_NONAME; if ((flags & NI_NUMERICHOST) && (flags & NI_NAMEREQD)) return EAI_NONAME;

5
libc/dns/resolvehostsreverse.c
View file

@ -44,8 +44,9 @@ int ResolveHostsReverse(const struct HostsTxt *ht, int af, const uint8_t *ip,
if (af != AF_INET && af != AF_UNSPEC) return eafnosupport(); if (af != AF_INET && af != AF_UNSPEC) return eafnosupport();
for (i = 0; i < ht->entries.i; ++i) { for (i = 0; i < ht->entries.i; ++i) {
if (READ32LE(ip) == READ32LE(ht->entries.p[i].ip)) { if (READ32LE(ip) == READ32LE(ht->entries.p[i].ip)) {
snprintf(buf, bufsize, "%s", ht->strings.p + ht->entries.p[i].name); if (memccpy(buf, ht->strings.p + ht->entries.p[i].name, '\0', bufsize)) {
return 1; return 1;
}
} }
} }
return 0; return 0;

2
libc/nt/iphlpapi.h
View file

@ -29,7 +29,7 @@ COSMOPOLITAN_C_START_
╚────────────────────────────────────────────────────────────────────────────│*/ ╚────────────────────────────────────────────────────────────────────────────│*/
uint32_t GetAdaptersAddresses(uint32_t Family, uint32_t Flags, void *Reserved, uint32_t GetAdaptersAddresses(uint32_t Family, uint32_t Flags, void *Reserved,
NtIpAdapterAddresses *AdapterAddresses, struct NtIpAdapterAddresses *AdapterAddresses,
uint32_t *SizePointer); uint32_t *SizePointer);
COSMOPOLITAN_C_END_ COSMOPOLITAN_C_END_

308
libc/nt/struct/ipadapteraddresses.h
View file

@ -1,10 +1,10 @@
#ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IP_ADAPTER_ADDRESSES_H_ #ifndef COSMOPOLITAN_LIBC_NT_STRUCT_IP_ADAPTER_ADDRESSES_H_
#define COSMOPOLITAN_LIBC_NT_STRUCT_IP_ADAPTER_ADDRESSES_H_ #define COSMOPOLITAN_LIBC_NT_STRUCT_IP_ADAPTER_ADDRESSES_H_
#include "libc/nt/struct/guid.h"
#include "libc/nt/winsock.h" #include "libc/nt/winsock.h"
#if !(__ASSEMBLER__ + __LINKER__ + 0)
COSMOPOLITAN_C_START_
/* Constants ----------------------------------------------------------- */ /* Constants ----------------------------------------------------------- */
#define kNtMaxAdapterAddressLength 8 #define kNtMaxAdapterAddressLength 8
#define kNtMaxDnsSuffixStringLength 256 #define kNtMaxDnsSuffixStringLength 256
#define kNtMaxDhcpv6DuidLength 130 #define kNtMaxDhcpv6DuidLength 130
@ -37,245 +37,167 @@ COSMOPOLITAN_C_START_
#define kNtIfTypeTunnel 131 #define kNtIfTypeTunnel 131
#define kNtIfTypeIeee1394 144 /* firewire */ #define kNtIfTypeIeee1394 144 /* firewire */
/* Enums --------------------------------------------------------------- */ #define kNtIpAdapterDdnsEnabled 0x0001
typedef enum { #define kNtIpAdapterRegisterAdapterSuffix 0x0002
kNtIpPrefixOriginOther, #define kNtIpAdapterDhcpv4Enabled 0x0004
kNtIpPrefixOriginManual, #define kNtIpAdapterReceiveOnly 0x0008
kNtIpPrefixOriginWellKnown, #define kNtIpAdapterNoMulticast 0x0010
kNtIpPrefixOriginDhcp, #define kNtIpAdapterIpv6OtherStatefulConfig 0x0020
kNtIpPrefixOriginRouterAdvertisement, #define kNtIpAdapterNetbiosOverTcpipEnabled 0x0040
kNtIpPrefixOriginUnchanged #define kNtIpAdapterIpv4Enabled 0x0080
} NtPrefixOrigin; #define kNtIpAdapterIpv6Enabled 0x0100
#define kNtIpAdapterIpv6Managed 0x0200
typedef enum { #define kNtIpPrefixOriginOther 0
kNtNlsoOther, #define kNtIpPrefixOriginManual 1
kNtNlsoManual, #define kNtIpPrefixOriginWellKnown 2
kNtNlsoWellKnown, #define kNtIpPrefixOriginDhcp 3
kNtNlsoDhcp, #define kNtIpPrefixOriginRouterAdvertisement 4
kNtNlsoLinkLayerAddress, #define kNtIpPrefixOriginUnchanged 16
kNtNlsoRandom,
kNtIpSuffixOriginOther,
kNtIpSuffixOriginManual,
kNtIpSuffixOriginWellKnown,
kNtIpSuffixOriginDhcp,
kNtIpSuffixOriginLinkLayerAddress,
kNtIpSuffixOriginRandom,
kNtIpSuffixOriginUnchanged
} NtSuffixOrigin;
typedef enum { #define kNtIpSuffixOriginOther 0
kNtNldsInvalid, #define kNtIpSuffixOriginManual 1
kNtNldsTentative, #define kNtIpSuffixOriginWellKnown 2
kNtNldsDuplicate, #define kNtIpSuffixOriginDhcp 3
kNtNldsDeprecated, #define kNtIpSuffixOriginLinkLayerAddress 4
kNtNldsPreferred, #define kNtIpSuffixOriginRandom 5
kNtIpDadStateInvalid, #define kNtIpSuffixOriginUnchanged 16
kNtIpDadStateTentative,
kNtIpDadStateDuplicate,
kNtIpDadStateDeprecated,
kNtIpDadStatePreferred
} NtDadState;
typedef enum { #define kNtIpDadStateInvalid 0
kNtIfOperStatusUp = 1, #define kNtIpDadStateTentative 1
kNtIfOperStatusDown, #define kNtIpDadStateDuplicate 2
kNtIfOperStatusTesting, #define kNtIpDadStateDeprecated 3
kNtIfOperStatusUnknown, #define kNtIpDadStatePreferred 4
kNtIfOperStatusDormant,
kNtIfOperStatusNotPresent,
kNtIfOperStatusLowerLayerDown
} NtIfOperStatus;
typedef enum { #define kNtIfOperStatusUp 1
kNtNetIfConnectionDedicated = 1, #define kNtIfOperStatusDown 2
kNtNetIfConnectionPassive = 2, #define kNtIfOperStatusTesting 3
kNtNetIfConnectionDemand = 3, #define kNtIfOperStatusUnknown 4
kNtNetIfConnectionMaximum = 4 #define kNtIfOperStatusDormant 5
} NtNetIfConnectionType; #define kNtIfOperStatusNotPresent 6
#define kNtIfOperStatusLowerLayerDown 7
typedef enum { #define kNtNetIfConnectionDedicated 1
kNtTunnelTypeNone = 0, #define kNtNetIfConnectionPassive 2
kNtTunnelTypeOther = 1, #define kNtNetIfConnectionDemand 3
kNtTunnelTypeDirect = 2, #define kNtNetIfConnectionMaximum 4
kNtTunnelType6to4 = 11,
kNtTunnelTypeIsatap = 13, #define kNtTunnelTypeNone 0
kNtTunnelTypeTeredo = 14, #define kNtTunnelTypeOther 1
kNtTunnelTypeIphttps = 15 #define kNtTunnelTypeDirect 2
} NtTunnelType; #define kNtTunnelType6to4 11
#define kNtTunnelTypeIsatap 13
#define kNtTunnelTypeTeredo 14
#define kNtTunnelTypeIphttps 15
#if !(__ASSEMBLER__ + __LINKER__ + 0)
COSMOPOLITAN_C_START_
/* Inner Types --------------------------------------------------------- */ /* Inner Types --------------------------------------------------------- */
typedef struct _NtIpAdapterUnicastAddress {
union { struct NtIpAdapterUnicastAddress {
uint64_t Alignment; uint32_t Length;
struct { uint32_t Flags;
uint32_t Length; struct NtIpAdapterUnicastAddress *Next;
uint32_t Flags;
};
};
struct _NtIpAdapterUnicastAddress *Next;
struct NtSocketAddress Address; struct NtSocketAddress Address;
NtPrefixOrigin PrefixOrigin; uint32_t PrefixOrigin; /* kNtIpPrefixOrigin... */
NtSuffixOrigin SuffixOrigin; uint32_t SuffixOrigin; /* kNtIpSuffixOrigin... */
NtDadState DadState; uint32_t DadState; /* kNtIpDadState... */
uint32_t ValidLifetime; uint32_t ValidLifetime;
uint32_t PreferredLifetime; uint32_t PreferredLifetime;
uint32_t LeaseLifetime; uint32_t LeaseLifetime;
uint8_t OnLinkPrefixLength; uint8_t OnLinkPrefixLength;
} NtIpAdapterUnicastAddress; };
typedef struct NtIpAdapterAnycastAddress { struct NtIpAdapterAnycastAddress {
union { uint32_t Length;
uint64_t Alignment; uint32_t Flags;
struct { struct NtIpAdapterAnycastAddress *Next;
uint32_t Length;
uint32_t Flags;
};
};
struct _NtIpAdapterAnycastAddress *Next;
struct NtSocketAddress Address; struct NtSocketAddress Address;
} NtIpAdapterAnycastAddress; };
typedef struct NtIpAdapterMulticastAddress { struct NtIpAdapterMulticastAddress {
union { uint32_t Length;
uint64_t Alignment; uint32_t Flags;
struct { struct NtIpAdapterMulticastAddress *Next;
uint32_t Length;
uint32_t Flags;
};
};
struct _NtIpAdapterMulticastAddress *Next;
struct NtSocketAddress Address; struct NtSocketAddress Address;
} NtIpAdapterMulticastAddress; };
typedef struct _NtIpAdapterDnsServerAddress { struct NtIpAdapterDnsServerAddress {
union { uint32_t Length;
uint64_t Alignment; uint32_t Reserved;
struct { struct NtIpAdapterDnsServerAddress *Next;
uint32_t Length;
uint32_t Reserved;
};
};
struct _NtIpAdapterDnsServerAddress *Next;
struct NtSocketAddress Address; struct NtSocketAddress Address;
} NtIpAdapterDnsServerAddress; };
typedef struct _NtIpAdapterPrefix { struct NtIpAdapterPrefix {
union { uint32_t Length;
uint64_t Alignment; uint32_t Flags;
struct { struct NtIpAdapterPrefix *Next;
uint32_t Length;
uint32_t Flags;
};
};
struct _NtIpAdapterPrefix *Next;
struct NtSocketAddress Address; struct NtSocketAddress Address;
uint32_t PrefixLength; uint32_t PrefixLength;
} NtIpAdapterPrefix; };
typedef struct _NtIpAdapterWinsServerAddress { struct NtIpAdapterWinsServerAddress {
union { uint32_t Length;
uint64_t Alignment; uint32_t Reserved;
struct { struct NtIpAdapterWinsServerAddress *Next;
uint32_t Length;
uint32_t Reserved;
};
};
struct _NtIpAdapterWinsServerAddress *Next;
struct NtSocketAddress Address; struct NtSocketAddress Address;
} NtIpAdapterWinsServerAddress; };
typedef struct _NtIpAdapterGatewayAddress { struct NtIpAdapterGatewayAddress {
union { uint32_t Length;
uint64_t Alignment; uint32_t Reserved;
struct { struct NtIpAdapterGatewayAddress *Next;
uint32_t Length;
uint32_t Reserved;
};
};
struct _NtIpAdapterGatewayAddress *Next;
struct NtSocketAddress Address; struct NtSocketAddress Address;
} NtIpAdapterGatewayAddress; };
typedef struct _NtGUID { struct NtIpAdapterDnsSuffix {
uint32_t Data1; struct NtIpAdapterDnsSuffix *Next;
uint16_t Data2;
uint16_t Data3;
uint8_t Data4[8];
} NtGUID;
typedef union _NtNetLUID {
uint64_t Value;
struct {
uint64_t Reserved : 24;
uint64_t NetLuidIndex : 24;
uint64_t IfType : 16;
} Info;
} NtNetLUID;
typedef struct _NtIpAdapterDnsSuffix {
struct _NtIpAdapterDnsSuffix *Next;
uint16_t String[kNtMaxDnsSuffixStringLength]; uint16_t String[kNtMaxDnsSuffixStringLength];
} NtIpAdapterDnsSuffix; };
/* Top level ----------------------------------------------------------- */ /* Top level ----------------------------------------------------------- */
typedef struct _NtIpAdapterAddresses {
union { struct NtIpAdapterAddresses {
uint64_t Alignment; uint32_t Length;
struct { uint32_t IfIndex;
uint32_t Length; struct NtIpAdapterAddresses *Next;
uint32_t IfIndex;
};
};
struct _NtIpAdapterAddresses *Next;
char *AdapterName; char *AdapterName;
NtIpAdapterUnicastAddress *FirstUnicastAddress; struct NtIpAdapterUnicastAddress *FirstUnicastAddress;
NtIpAdapterAnycastAddress *FirstAnycastAddress; struct NtIpAdapterAnycastAddress *FirstAnycastAddress;
NtIpAdapterMulticastAddress *FirstMulticastAddress; struct NtIpAdapterMulticastAddress *FirstMulticastAddress;
NtIpAdapterDnsServerAddress *FirstDnsServerAddress; struct NtIpAdapterDnsServerAddress *FirstDnsServerAddress;
uint16_t *DnsSuffix; uint16_t *DnsSuffix;
uint16_t *Description; uint16_t *Description;
uint16_t *FriendlyName; uint16_t *FriendlyName;
uint8_t PhysicalAddress[kNtMaxAdapterAddressLength]; uint8_t PhysicalAddress[kNtMaxAdapterAddressLength];
uint32_t PhysicalAddressLength; uint32_t PhysicalAddressLength;
union { uint32_t Flags; /* kNtIpAdapter... */
uint32_t Flags;
struct {
uint32_t DdnsEnabled : 1;
uint32_t RegisterAdapterSuffix : 1;
uint32_t Dhcpv4Enabled : 1;
uint32_t ReceiveOnly : 1;
uint32_t NoMulticast : 1;
uint32_t Ipv6OtherStatefulConfig : 1;
uint32_t NetbiosOverTcpipEnabled : 1;
uint32_t Ipv4Enabled : 1;
uint32_t Ipv6Enabled : 1;
uint32_t Ipv6ManagedAddressConfigurationSupported : 1;
};
};
uint32_t Mtu; uint32_t Mtu;
uint32_t IfType; uint32_t IfType; /* kNtIfType... */
NtIfOperStatus OperStatus; uint32_t OperStatus; /* kNtIfOperStatus... */
uint32_t Ipv6IfIndex; uint32_t Ipv6IfIndex;
uint32_t ZoneIndices[16]; uint32_t ZoneIndices[16];
NtIpAdapterPrefix *FirstPrefix; struct NtIpAdapterPrefix *FirstPrefix;
uint64_t TransmitLinkSpeed; uint64_t TransmitLinkSpeed;
uint64_t ReceiveLinkSpeed; uint64_t ReceiveLinkSpeed;
NtIpAdapterWinsServerAddress *FirstWinsServerAddress; struct NtIpAdapterWinsServerAddress *FirstWinsServerAddress;
NtIpAdapterGatewayAddress *FirstGatewayAddress; struct NtIpAdapterGatewayAddress *FirstGatewayAddress;
uint32_t Ipv4Metric; uint32_t Ipv4Metric;
uint32_t Ipv6Metric; uint32_t Ipv6Metric;
NtNetLUID Luid; uint64_t Luid; /* reserved(24bits),NetLuidIndex(24b),IfType(16b) */
struct NtSocketAddress Dhcpv4Server; struct NtSocketAddress Dhcpv4Server;
uint32_t CompartmentId; uint32_t CompartmentId;
NtGUID NetworkGuid; struct NtGuid NetworkGuid;
NtNetIfConnectionType ConnectionType; uint32_t ConnectionType; /* kNtNetIfConnection... */
NtTunnelType TunnelType; uint32_t TunnelType; /* kNtTunnelType... */
struct NtSocketAddress Dhcpv6Server; struct NtSocketAddress Dhcpv6Server;
uint8_t Dhcpv6ClientDuid[kNtMaxDhcpv6DuidLength]; uint8_t Dhcpv6ClientDuid[kNtMaxDhcpv6DuidLength];
uint32_t Dhcpv6ClientDuidLength; uint32_t Dhcpv6ClientDuidLength;
uint32_t Dhcpv6Iaid; uint32_t Dhcpv6Iaid;
NtIpAdapterDnsSuffix *FirstDnsSuffix; struct NtIpAdapterDnsSuffix *FirstDnsSuffix;
} NtIpAdapterAddresses; };
COSMOPOLITAN_C_END_ COSMOPOLITAN_C_END_
#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */

4
libc/sock/gethostips.c
View file

@ -59,8 +59,8 @@ static uint32_t *GetUnixIps(void) {
static textwindows uint32_t *GetWindowsIps(void) { static textwindows uint32_t *GetWindowsIps(void) {
uint32_t i, z, n, rc, *a; uint32_t i, z, n, rc, *a;
NtIpAdapterUnicastAddress *u; struct NtIpAdapterUnicastAddress *u;
NtIpAdapterAddresses *p, *ifaces; struct NtIpAdapterAddresses *p, *ifaces;
i = 0; i = 0;
z = 15000; z = 15000;
do { do {

37
libc/sock/internal.h
View file

@ -53,45 +53,8 @@ struct sockaddr_un_bsd {
char sun_path[108]; char sun_path[108];
}; };
/* -----------------------------------------------------------------------------------
* ioctl SIOCGIFCONF & others:
*
* BSD has a different structure. All the ioctl will adjust to use
* the ifreq with the ifreq_bsd
*/
struct ifreq_bsd {
union {
char ifrn_name[IFNAMSIZ];
} ifr_ifrn;
union {
/* Right now we only list the structures used by the few ioctl that are
* supported by Cosmopolitan. Add your own definition here if you need
* a particular ioctl that requires polyfill for BSD
*/
struct sockaddr_bsd ifru_addr;
struct sockaddr_bsd ifru_netmask;
struct sockaddr_bsd ifru_dstaddr;
struct sockaddr_bsd ifru_broadaddr;
short ifru_flags;
char ifru_pad[16]; /* used as padding */
} ifr_ifru;
};
#pragma pack(4)
struct ifconf_bsd {
uint32_t ifc_len; /* size of buffer */
union {
char *ifcu_buf;
struct ifreq_bsd *ifcu_req;
} ifc_ifcu;
};
#pragma pack()
/* ------------------------------------------------------------------------------------*/ /* ------------------------------------------------------------------------------------*/
struct SockFd { struct SockFd {
int family; int family;
int type; int type;

4
libc/sock/sock.h
View file

@ -102,11 +102,11 @@ struct ifconf {
#define IFHWADDRLEN 6 #define IFHWADDRLEN 6
#define IF_NAMESIZE 16 #define IF_NAMESIZE 16
#define IFNAMSIZ IF_NAMESIZE #define IFNAMSIZ IF_NAMESIZE
struct ifreq { struct ifreq {
union { union {
char ifrn_name[IFNAMSIZ]; /* Interface name, e.g. "en0". */ char ifrn_name[IFNAMSIZ]; /* Interface name, e.g. "en0". */
} ifr_ifrn; } ifr_ifrn;
union { union {
struct sockaddr ifru_addr; /* SIOCGIFADDR */ struct sockaddr ifru_addr; /* SIOCGIFADDR */
struct sockaddr ifru_dstaddr; /* SIOCGIFDSTADDR */ struct sockaddr ifru_dstaddr; /* SIOCGIFDSTADDR */
@ -128,8 +128,6 @@ struct ifreq {
#define _IOT_ifreq_short _IOT(_IOTS(char), IFNAMSIZ, _IOTS(short), 1, 0, 0) #define _IOT_ifreq_short _IOT(_IOTS(char), IFNAMSIZ, _IOTS(short), 1, 0, 0)
#define _IOT_ifreq_int _IOT(_IOTS(char), IFNAMSIZ, _IOTS(int), 1, 0, 0) #define _IOT_ifreq_int _IOT(_IOTS(char), IFNAMSIZ, _IOTS(int), 1, 0, 0)
#define IFF_UP (1 << 0)
const char *inet_ntop(int, const void *, char *, uint32_t); const char *inet_ntop(int, const void *, char *, uint32_t);
int inet_aton(const char *, struct in_addr *); int inet_aton(const char *, struct in_addr *);
int inet_pton(int, const char *, void *); int inet_pton(int, const char *, void *);

20
libc/sysv/consts.sh
View file

@ -1497,14 +1497,18 @@ syscon modem TIOCMODG 0 0x40047403 0 0x4004746a 0x4004746a -1 # wut
syscon modem TIOCMODS 0 0x80047404 0 0x8004746d 0x8004746d -1 # wut syscon modem TIOCMODS 0 0x80047404 0 0x8004746d 0x8004746d -1 # wut
syscon modem TIOCMSDTRWAIT 0 0x8004745b 0x8004745b 0 0 -1 # wut syscon modem TIOCMSDTRWAIT 0 0x8004745b 0x8004745b 0 0 -1 # wut
syscon iff IFF_BROADCAST 2 2 2 2 2 2 # consensus # ioctl(SIOCGIFFLAGS) Network Interface Flags
syscon iff IFF_LOOPBACK 8 8 8 8 8 4 # unix consensus #
syscon iff IFF_MULTICAST 0x1000 0x8000 0x8000 0x8000 0x8000 0x10 # bsd consensus # group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD The New Technology Commentary
syscon iff IFF_ALLMULTI 0x0200 0x0200 0x0200 0x0200 0x0200 0 # unix consensus syscon iff IFF_UP 1 1 1 1 1 1 # unix consensus
syscon iff IFF_DEBUG 4 4 4 4 4 0 # unix consensus syscon iff IFF_BROADCAST 2 2 2 2 2 2 # valid broadcast address set; consensus
syscon iff IFF_NOARP 0x80 0x80 0x80 0x80 0x80 0 # unix consensus syscon iff IFF_DEBUG 4 4 4 4 4 4 # faked nt; consensus
syscon iff IFF_POINTOPOINT 0x10 0x10 0x10 0x10 0x10 0 # unix consensus syscon iff IFF_LOOPBACK 8 8 8 8 8 4 # is loopback device; consensus
syscon iff IFF_PROIFF 0x0100 0x0100 0x0100 0x0100 0x0100 0 # unix consensus syscon iff IFF_MULTICAST 0x1000 0x8000 0x8000 0x8000 0x8000 0x1000 # supports multicast; faked nt; bsd consensus
syscon iff IFF_ALLMULTI 0x0200 0x0200 0x0200 0x0200 0x0200 0x0200 # receive all multicast packets; faked nt; unix consensus
syscon iff IFF_NOARP 0x80 0x80 0x80 0x80 0x80 0x80 # faked nt as linux; unix consensus
syscon iff IFF_POINTOPOINT 0x10 0x10 0x10 0x10 0x10 0x10 # point-to-point; faked nt as linux; unix consensus
syscon iff IFF_PROMISC 0x100 0x100 0x100 0x100 0x100 0 # in packet capture mode; unix consensus
syscon iff IFF_RUNNING 0x40 0x40 0x40 0x40 0x40 0 # unix consensus syscon iff IFF_RUNNING 0x40 0x40 0x40 0x40 0x40 0 # unix consensus
syscon iff IFF_NOTRAILERS 0x20 0x20 0 0 0 0 syscon iff IFF_NOTRAILERS 0x20 0x20 0 0 0 0
syscon iff IFF_AUTOMEDIA 0x4000 0 0 0 0 0 syscon iff IFF_AUTOMEDIA 0x4000 0 0 0 0 0

2
libc/sysv/consts/IFF_ALLMULTI.S
View file

@ -1,2 +1,2 @@
#include "libc/sysv/consts/syscon.internal.h" #include "libc/sysv/consts/syscon.internal.h"
.syscon iff,IFF_ALLMULTI,0x0200,0x0200,0x0200,0x0200,0x0200,0 .syscon iff,IFF_ALLMULTI,0x0200,0x0200,0x0200,0x0200,0x0200,0x0200

2
libc/sysv/consts/IFF_DEBUG.S
View file

@ -1,2 +1,2 @@
#include "libc/sysv/consts/syscon.internal.h" #include "libc/sysv/consts/syscon.internal.h"
.syscon iff,IFF_DEBUG,4,4,4,4,4,0 .syscon iff,IFF_DEBUG,4,4,4,4,4,4

2
libc/sysv/consts/IFF_MULTICAST.S
View file

@ -1,2 +1,2 @@
#include "libc/sysv/consts/syscon.internal.h" #include "libc/sysv/consts/syscon.internal.h"
.syscon iff,IFF_MULTICAST,0x1000,0x8000,0x8000,0x8000,0x8000,0x10 .syscon iff,IFF_MULTICAST,0x1000,0x8000,0x8000,0x8000,0x8000,0x1000

2
libc/sysv/consts/IFF_NOARP.S
View file

@ -1,2 +1,2 @@
#include "libc/sysv/consts/syscon.internal.h" #include "libc/sysv/consts/syscon.internal.h"
.syscon iff,IFF_NOARP,0x80,0x80,0x80,0x80,0x80,0 .syscon iff,IFF_NOARP,0x80,0x80,0x80,0x80,0x80,0x80

2
libc/sysv/consts/IFF_POINTOPOINT.S
View file

@ -1,2 +1,2 @@
#include "libc/sysv/consts/syscon.internal.h" #include "libc/sysv/consts/syscon.internal.h"
.syscon iff,IFF_POINTOPOINT,0x10,0x10,0x10,0x10,0x10,0 .syscon iff,IFF_POINTOPOINT,0x10,0x10,0x10,0x10,0x10,0x10

2
libc/sysv/consts/IFF_PROIFF.S
View file

@ -1,2 +0,0 @@
#include "libc/sysv/consts/syscon.internal.h"
.syscon iff,IFF_PROIFF,0x0100,0x0100,0x0100,0x0100,0x0100,0

2
libc/sysv/consts/IFF_PROMISC.S Normal file
View file

@ -0,0 +1,2 @@
#include "libc/sysv/consts/syscon.internal.h"
.syscon iff,IFF_PROMISC,0x100,0x100,0x100,0x100,0x100,0

2
libc/sysv/consts/IFF_UP.S Normal file
View file

@ -0,0 +1,2 @@
#include "libc/sysv/consts/syscon.internal.h"
.syscon iff,IFF_UP,1,1,1,1,1,1

37
libc/sysv/consts/iff.h
View file

@ -1,26 +1,9 @@
#ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_IFF_H_ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_IFF_H_
#define COSMOPOLITAN_LIBC_SYSV_CONSTS_IFF_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_IFF_H_
#include "libc/runtime/symbolic.h"
#define IFF_ALLMULTI SYMBOLIC(IFF_ALLMULTI)
#define IFF_AUTOMEDIA SYMBOLIC(IFF_AUTOMEDIA)
#define IFF_BROADCAST SYMBOLIC(IFF_BROADCAST)
#define IFF_DEBUG SYMBOLIC(IFF_DEBUG)
#define IFF_DYNAMIC SYMBOLIC(IFF_DYNAMIC)
#define IFF_LOOPBACK SYMBOLIC(IFF_LOOPBACK)
#define IFF_MASTER SYMBOLIC(IFF_MASTER)
#define IFF_MULTICAST SYMBOLIC(IFF_MULTICAST)
#define IFF_NOARP SYMBOLIC(IFF_NOARP)
#define IFF_NOTRAILERS SYMBOLIC(IFF_NOTRAILERS)
#define IFF_POINTOPOINT SYMBOLIC(IFF_POINTOPOINT)
#define IFF_PORTSEL SYMBOLIC(IFF_PORTSEL)
#define IFF_PROMISC SYMBOLIC(IFF_PROMISC)
#define IFF_RUNNING SYMBOLIC(IFF_RUNNING)
#define IFF_SLAVE SYMBOLIC(IFF_SLAVE)
#if !(__ASSEMBLER__ + __LINKER__ + 0) #if !(__ASSEMBLER__ + __LINKER__ + 0)
COSMOPOLITAN_C_START_ COSMOPOLITAN_C_START_
extern const long IFF_UP;
extern const long IFF_ALLMULTI; extern const long IFF_ALLMULTI;
extern const long IFF_AUTOMEDIA; extern const long IFF_AUTOMEDIA;
extern const long IFF_BROADCAST; extern const long IFF_BROADCAST;
@ -39,4 +22,22 @@ extern const long IFF_SLAVE;
COSMOPOLITAN_C_END_ COSMOPOLITAN_C_END_
#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
#define IFF_UP 1
#define IFF_BROADCAST 2
#define IFF_DEBUG 4
#define IFF_LOOPBACK 8
#define IFF_ALLMULTI IFF_ALLMULTI
#define IFF_AUTOMEDIA IFF_AUTOMEDIA
#define IFF_DYNAMIC IFF_DYNAMIC
#define IFF_MASTER IFF_MASTER
#define IFF_MULTICAST IFF_MULTICAST
#define IFF_NOARP IFF_NOARP
#define IFF_NOTRAILERS IFF_NOTRAILERS
#define IFF_POINTOPOINT IFF_POINTOPOINT
#define IFF_PORTSEL IFF_PORTSEL
#define IFF_PROMISC IFF_PROMISC
#define IFF_RUNNING IFF_RUNNING
#define IFF_SLAVE IFF_SLAVE
#endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_IFF_H_ */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_IFF_H_ */

70
test/libc/calls/ioctl_siocgifconf_test.c Normal file
View file

@ -0,0 +1,70 @@
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
╞══════════════════════════════════════════════════════════════════════════════╡
│ Copyright 2021 Justine Alexandra Roberts Tunney │
│ │
│ Permission to use, copy, modify, and/or distribute this software for │
│ any purpose with or without fee is hereby granted, provided that the │
│ above copyright notice and this permission notice appear in all copies. │
│ │
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/bits/bits.h"
#include "libc/calls/calls.h"
#include "libc/calls/internal.h"
#include "libc/calls/ioctl.h"
#include "libc/log/check.h"
#include "libc/log/log.h"
#include "libc/mem/mem.h"
#include "libc/runtime/gc.internal.h"
#include "libc/sock/sock.h"
#include "libc/stdio/stdio.h"
#include "libc/sysv/consts/af.h"
#include "libc/sysv/consts/ipproto.h"
#include "libc/sysv/consts/sio.h"
#include "libc/sysv/consts/sock.h"
#include "libc/testlib/testlib.h"
TEST(ioctl_siocgifconf, test) {
size_t n;
char *data;
int socketfd;
struct ifreq *ifr;
struct ifconf conf;
char addrbuf[1024];
uint32_t ip, netmask;
bool foundloopback = false;
data = gc(malloc((n = 4096)));
ASSERT_NE(-1, (socketfd = socket(AF_INET, SOCK_DGRAM, 0)));
conf.ifc_buf = data;
conf.ifc_len = n;
ASSERT_NE(-1, ioctl(socketfd, SIOCGIFCONF, &conf));
for (ifr = (struct ifreq *)data; (char *)ifr < data + conf.ifc_len; ++ifr) {
if (ifr->ifr_addr.sa_family != AF_INET) continue;
ip = ntohl(((struct sockaddr_in *)&ifr->ifr_addr)->sin_addr.s_addr);
EXPECT_NE(-1, ioctl(socketfd, SIOCGIFNETMASK, ifr));
netmask = ntohl(((struct sockaddr_in *)&ifr->ifr_addr)->sin_addr.s_addr);
#if 0
fprintf(stderr,
"%s %x %d\n"
" ip %hhu.%hhu.%hhu.%hhu\n"
" netmask %hhu.%hhu.%hhu.%hhu\n"
"\n",
ifr->ifr_name, ip, ifr->ifr_addr.sa_family, ip >> 24, ip >> 16,
ip >> 8, ip, netmask >> 24, netmask >> 16, netmask >> 8, netmask);
#endif
if (ip == 0x7f000001) {
foundloopback = true;
EXPECT_EQ(0xFF000000, netmask);
}
}
EXPECT_TRUE(foundloopback);
ASSERT_NE(-1, close(socketfd));
}

2
test/libc/calls/test.mk
View file

@ -25,6 +25,7 @@ TEST_LIBC_CALLS_CHECKS = \
TEST_LIBC_CALLS_DIRECTDEPS = \ TEST_LIBC_CALLS_DIRECTDEPS = \
LIBC_CALLS \ LIBC_CALLS \
LIBC_SOCK \
LIBC_FMT \ LIBC_FMT \
LIBC_INTRIN \ LIBC_INTRIN \
LIBC_LOG \ LIBC_LOG \
@ -32,6 +33,7 @@ TEST_LIBC_CALLS_DIRECTDEPS = \
LIBC_NEXGEN32E \ LIBC_NEXGEN32E \
LIBC_RAND \ LIBC_RAND \
LIBC_STDIO \ LIBC_STDIO \
LIBC_SYSV_CALLS \
LIBC_RUNTIME \ LIBC_RUNTIME \
LIBC_STR \ LIBC_STR \
LIBC_STUBS \ LIBC_STUBS \

1
test/libc/release/clang.sh
View file

@ -12,6 +12,7 @@ if CLANG=$(command -v clang); then
-fno-pie \ -fno-pie \
-nostdlib \ -nostdlib \
-nostdinc \ -nostdinc \
-fuse-ld=lld \
-mno-red-zone \ -mno-red-zone \
-Wl,-T,o/$MODE/ape/ape.lds \ -Wl,-T,o/$MODE/ape/ape.lds \
-include o/cosmopolitan.h \ -include o/cosmopolitan.h \

27
test/libc/release/lld.sh Executable file
View file

@ -0,0 +1,27 @@
#!/bin/sh
#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
# TODO(jart): implement me
if CLANG=$(command -v clang); then
$CLANG \
-o o/$MODE/test/libc/release/smokeclang.com.dbg \
-Os \
-Wall \
-Werror \
-static \
-fno-pie \
-nostdlib \
-nostdinc \
-mno-red-zone \
-Wl,-T,o/$MODE/ape/ape.lds \
-include o/cosmopolitan.h \
test/libc/release/smoke.c \
o/$MODE/libc/crt/crt.o \
o/$MODE/ape/ape.o \
o/$MODE/cosmopolitan.a || exit
o/$MODE/test/libc/release/smokeclang.com.dbg || exit
fi
touch o/$MODE/test/libc/release/clang.ok

11
test/libc/release/test.mk
View file

@ -125,6 +125,16 @@ o/$(MODE)/test/libc/release/clang.ok: \
o/$(MODE)/cosmopolitan.a o/$(MODE)/cosmopolitan.a
@$(COMPILE) -ASHTEST -T$< $< @$(COMPILE) -ASHTEST -T$< $<
o/$(MODE)/test/libc/release/lld.ok: \
test/libc/release/lld.sh \
test/libc/release/smoke.c \
o/cosmopolitan.h \
o/$(MODE)/ape/ape.lds \
o/$(MODE)/libc/crt/crt.o \
o/$(MODE)/ape/ape.o \
o/$(MODE)/cosmopolitan.a
@$(COMPILE) -ASHTEST -T$< $<
o/$(MODE)/test/libc/release/metal.ok: \ o/$(MODE)/test/libc/release/metal.ok: \
test/libc/release/metal.sh \ test/libc/release/metal.sh \
o/$(MODE)/examples/hello.com \ o/$(MODE)/examples/hello.com \
@ -148,5 +158,6 @@ o/$(MODE)/test/libc/release: \
o/$(MODE)/test/libc/release/smokeansi.com \ o/$(MODE)/test/libc/release/smokeansi.com \
o/$(MODE)/test/libc/release/smokeansi.com.runs \ o/$(MODE)/test/libc/release/smokeansi.com.runs \
o/$(MODE)/test/libc/release/clang.ok \ o/$(MODE)/test/libc/release/clang.ok \
o/$(MODE)/test/libc/release/lld.ok \
o/$(MODE)/test/libc/release/emulate.ok \ o/$(MODE)/test/libc/release/emulate.ok \
o/$(MODE)/test/libc/release/metal.ok o/$(MODE)/test/libc/release/metal.ok

6
third_party/infozip/zip/zip.c vendored
View file

@ -1433,7 +1433,7 @@ local void check_zipfile(zipname, zippath)
int result; int result;
/* Tell picky compilers to shut up about unused variables */ /* Tell picky compilers to shut up about unused variables */
zippath = zippath; (void)zippath;
if (unzip_path) { if (unzip_path) {
/* user gave us a path to some unzip (may not be UnZip) */ /* user gave us a path to some unzip (may not be UnZip) */
@ -1798,7 +1798,7 @@ ZCONST char *zfn;
char *prompt; char *prompt;
/* Tell picky compilers to shut up about unused variables */ /* Tell picky compilers to shut up about unused variables */
zfn = zfn; (void)zfn;
prompt = (modeflag == ZP_PW_VERIFY) ? prompt = (modeflag == ZP_PW_VERIFY) ?
"Verify password: " : "Enter password: "; "Verify password: " : "Enter password: ";
@ -1817,7 +1817,7 @@ int size;
ZCONST char *zfn; ZCONST char *zfn;
{ {
/* Tell picky compilers to shut up about unused variables */ /* Tell picky compilers to shut up about unused variables */
modeflag = modeflag; pwbuf = pwbuf; size = size; zfn = zfn; (void)modeflag; (void)pwbuf; (void)size; (void)zfn;
return ZE_LOGIC; /* This function should never be called! */ return ZE_LOGIC; /* This function should never be called! */
} }

2
third_party/infozip/zip/zipfile.c vendored
View file

@ -29,7 +29,9 @@
#include "libc/str/str.h" #include "libc/str/str.h"
#include "libc/fmt/fmt.h" #include "libc/fmt/fmt.h"
#if defined(__GNUC__) && !defined(__llvm__)
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
#ifdef VMS #ifdef VMS
# include "vms/vms.h" # include "vms/vms.h"

2
third_party/mbedtls/getalertdescription.c vendored
View file

@ -25,7 +25,7 @@
* @see RFC5246 §7.2 * @see RFC5246 §7.2
*/ */
const char *GetAlertDescription(unsigned char x) { const char *GetAlertDescription(unsigned char x) {
static char buf[4]; static char buf[21];
switch (x) { switch (x) {
case MBEDTLS_SSL_ALERT_MSG_CLOSE_NOTIFY: /* 0 */ case MBEDTLS_SSL_ALERT_MSG_CLOSE_NOTIFY: /* 0 */
return "close_notify"; return "close_notify";

3
third_party/sqlite3/btree.c vendored
View file

@ -14,7 +14,10 @@
** Including a description of file format and an overview of operation. ** Including a description of file format and an overview of operation.
*/ */
#include "third_party/sqlite3/btreeInt.inc" #include "third_party/sqlite3/btreeInt.inc"
#if defined(__GNUC__) && !defined(__llvm__)
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
/* clang-format off */ /* clang-format off */

3
third_party/sqlite3/sqlite3session.c vendored
View file

@ -3,7 +3,10 @@
#include "libc/assert.h" #include "libc/assert.h"
#include "libc/str/str.h" #include "libc/str/str.h"
#include "third_party/sqlite3/sqlite3session.inc" #include "third_party/sqlite3/sqlite3session.inc"
#if defined(__GNUC__) && !defined(__llvm__)
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
#ifndef SQLITE_AMALGAMATION #ifndef SQLITE_AMALGAMATION
#include "third_party/sqlite3/sqliteInt.inc" #include "third_party/sqlite3/sqliteInt.inc"

5
tool/net/redbean.c
View file

@ -646,11 +646,6 @@ static long FindRedirect(const char *s, size_t n) {
return -1; return -1;
} }
static wontreturn void CrashCertificate(const char *name, const char *path) {
fprintf(stderr, "error: failed to load %s: %s\n", name, path);
exit(1);
}
static void LogCertificate(const char *msg, mbedtls_x509_crt *cert) { static void LogCertificate(const char *msg, mbedtls_x509_crt *cert) {
char *s; char *s;
size_t n; size_t n;