mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-07-18 00:20:30 +00:00
Add /statusz page to redbean plus other enhancements
redbean improvements: - Explicitly disable corking - Simulate Python regex API for Lua - Send warmup requests in main process on startup - Add Class-A granular IPv4 network classification - Add /statusz page so you can monitor your redbean's health - Fix regressions on OpenBSD/NetBSD caused by recent changes - Plug Authorization header into Lua GetUser and GetPass APIs - Recognize X-Forwarded-{For,Host} from local reverse proxies - Add many additional functions to redbean Lua server page API - Report resource usage of child processes on `/` listing page - Introduce `-a` flag for logging child process resource usage - Introduce `-t MILLIS` flag and `ProgramTimeout(ms)` init API - Introduce `-H "Header: value"` flag and `ProgramHeader(k,v)` API Cosmopolitan Libc improvements: - Make strerror() simpler - Make inet_pton() not depend on sscanf() - Fix OpenExecutable() which broke .data section earlier - Fix stdio in cases where it overflows kernel tty buffer - Fix bugs in crash reporting w/o .com.dbg binary present - Add polyfills for SO_LINGER, SO_RCVTIMEO, and SO_SNDTIMEO - Polyfill TCP_CORK on BSD and XNU using TCP_NOPUSH magnums New netcat clone in examples/nc.c: While testing some of the failure conditions for redbean, I noticed that BusyBox's `nc` command is pretty busted, if you use it as an interactive tool, rather than having it be part of a pipeline. Unfortunately this'll only work on UNIX since Windows doesn't let us poll on stdio and sockets at the same time because I don't think they want tools like this running on their platform. So if you want forbidden fruit, it's here so enjoy it
This commit is contained in:
parent
4effa23528
commit
b107d2709f
163 changed files with 4425 additions and 2104 deletions
|
@ -19,9 +19,9 @@
|
|||
#include "libc/fmt/fmt.h"
|
||||
#include "libc/sock/internal.h"
|
||||
#include "libc/sock/sock.h"
|
||||
#include "libc/sysv/errfuns.h"
|
||||
#include "libc/sysv/consts/af.h"
|
||||
#include "libc/sysv/consts/inaddr.h"
|
||||
#include "libc/sysv/errfuns.h"
|
||||
|
||||
/**
|
||||
* Converts internet address string to binary.
|
||||
|
@ -32,16 +32,23 @@
|
|||
* @return 1 on success, 0 on src malformed, or -1 w/ errno
|
||||
*/
|
||||
int inet_pton(int af, const char *src, void *dst) {
|
||||
if (af == AF_INET) {
|
||||
unsigned char *p = (unsigned char *)dst;
|
||||
if (sscanf(src, "%hhu.%hhu.%hhu.%hhu", &p[0], &p[1], &p[2], &p[3]) == 4) {
|
||||
return 1;
|
||||
uint8_t *p;
|
||||
int b, c, j;
|
||||
if (af != AF_INET) return eafnosupport();
|
||||
j = 0;
|
||||
p = dst;
|
||||
p[0] = 0;
|
||||
while ((c = *src++)) {
|
||||
if (isdigit(c)) {
|
||||
b = c - '0' + p[j] * 10;
|
||||
p[j] = MIN(255, b);
|
||||
if (b > 255) return 0;
|
||||
} else if (c == '.') {
|
||||
if (++j == 4) return 0;
|
||||
p[j] = 0;
|
||||
} else {
|
||||
*(uint32_t *)dst = htonl(INADDR_TESTNET3);
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
*(uint32_t *)dst = htonl(INADDR_TESTNET3);
|
||||
return eafnosupport();
|
||||
}
|
||||
return j == 3 ? 1 : 0;
|
||||
}
|
||||
|
|
|
@ -47,9 +47,10 @@ struct msghdr_bsd {
|
|||
};
|
||||
|
||||
struct sockaddr_un_bsd {
|
||||
uint8_t sun_len; /* sockaddr len including NUL on freebsd but excluding it on openbsd/xnu */
|
||||
uint8_t sun_len; /* sockaddr len including NUL on freebsd but excluding it on
|
||||
openbsd/xnu */
|
||||
uint8_t sun_family;
|
||||
char sun_path[108];
|
||||
char sun_path[108];
|
||||
};
|
||||
|
||||
struct SockFd {
|
||||
|
@ -121,6 +122,7 @@ int sys_socketpair_nt_dgram(int, int, int, int[2]) hidden;
|
|||
int sys_socketpair_nt(int, int, int, int[2]) hidden;
|
||||
int sys_select_nt(int, fd_set *, fd_set *, fd_set *, struct timeval *) hidden;
|
||||
int sys_shutdown_nt(struct Fd *, int) hidden;
|
||||
int sys_setsockopt_nt(struct Fd *, int, int, const void *, uint32_t) hidden;
|
||||
|
||||
size_t __iovec2nt(struct NtIovec[hasatleast 16], const struct iovec *,
|
||||
size_t) hidden;
|
||||
|
|
60
libc/sock/setsockopt-nt.c
Normal file
60
libc/sock/setsockopt-nt.c
Normal file
|
@ -0,0 +1,60 @@
|
|||
/*-*- 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/calls/struct/timeval.h"
|
||||
#include "libc/macros.internal.h"
|
||||
#include "libc/sock/internal.h"
|
||||
#include "libc/sysv/consts/so.h"
|
||||
#include "libc/sysv/errfuns.h"
|
||||
|
||||
struct linger_nt { /* Linux+XNU+BSD ABI */
|
||||
uint16_t l_onoff; /* on/off */
|
||||
uint16_t l_linger; /* seconds */
|
||||
};
|
||||
|
||||
textwindows int sys_setsockopt_nt(struct Fd *fd, int level, int optname,
|
||||
const void *optval, uint32_t optlen) {
|
||||
struct timeval *tv;
|
||||
struct linger *linger;
|
||||
union {
|
||||
uint32_t millis;
|
||||
struct linger_nt linger;
|
||||
} nt;
|
||||
|
||||
if (optname == SO_LINGER && optval && optlen == sizeof(struct linger)) {
|
||||
linger = optval;
|
||||
nt.linger.l_onoff = linger->l_onoff;
|
||||
nt.linger.l_linger = MIN(0xFFFF, MAX(0, linger->l_linger));
|
||||
optval = &nt.linger;
|
||||
optlen = sizeof(nt.linger);
|
||||
}
|
||||
|
||||
if ((optname == SO_RCVTIMEO || optname == SO_SNDTIMEO) && optval &&
|
||||
optlen == sizeof(struct timeval)) {
|
||||
tv = optval;
|
||||
nt.millis = MIN(0xFFFFFFFF, MAX(0, tv->tv_sec * 1000 + tv->tv_usec / 1000));
|
||||
optval = &nt.millis;
|
||||
optlen = sizeof(nt.millis);
|
||||
}
|
||||
|
||||
if (__sys_setsockopt_nt(fd->handle, level, optname, optval, optlen) != -1) {
|
||||
return 0;
|
||||
} else {
|
||||
return __winsockerr();
|
||||
}
|
||||
}
|
|
@ -33,15 +33,6 @@ static bool setsockopt_polyfill(int *optname) {
|
|||
return false;
|
||||
}
|
||||
|
||||
static textwindows int sys_setsockopt_nt(struct Fd *fd, int level, int optname,
|
||||
const void *optval, uint32_t optlen) {
|
||||
if (__sys_setsockopt_nt(fd->handle, level, optname, optval, optlen) != -1) {
|
||||
return 0;
|
||||
} else {
|
||||
return __winsockerr();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Modifies socket settings.
|
||||
*
|
||||
|
|
|
@ -41,8 +41,8 @@ struct sockaddr_in { /* Linux+NT ABI */
|
|||
};
|
||||
|
||||
struct sockaddr_un {
|
||||
uint16_t sun_family; /* AF_UNIX */
|
||||
char sun_path[108];/* path */
|
||||
uint16_t sun_family; /* AF_UNIX */
|
||||
char sun_path[108]; /* path */
|
||||
};
|
||||
|
||||
struct sockaddr_storage {
|
||||
|
@ -53,11 +53,15 @@ struct sockaddr_storage {
|
|||
};
|
||||
};
|
||||
|
||||
struct ip_mreq {
|
||||
struct in_addr imr_multiaddr; /* IP multicast address of group */
|
||||
struct in_addr imr_interface; /* local IP address of interface */
|
||||
struct ip_mreq {
|
||||
struct in_addr imr_multiaddr; /* IP multicast address of group */
|
||||
struct in_addr imr_interface; /* local IP address of interface */
|
||||
};
|
||||
|
||||
struct linger { /* Linux+XNU+BSD ABI */
|
||||
int32_t l_onoff; /* on/off */
|
||||
int32_t l_linger; /* seconds */
|
||||
};
|
||||
|
||||
struct pollfd {
|
||||
int32_t fd;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue