mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-07-07 11:48:30 +00:00
Perform fine-tuning of socketpair and pipe
- removed unneeded share parameter from pipe on nt - socktpair(type | SOCK_CLOEXEC) is now polyfilled - use textwindows for linker micro-optimization - apologies for auto clang-format diff noise :( - improve socketpair docstring See #122
This commit is contained in:
Justine Tunney
parent
4e93750afd
commit
4177489762
11 changed files with 172 additions and 133 deletions
|
|
@ -70,6 +70,7 @@ int32_t __sys_connect(int32_t, const void *, uint32_t) hidden;
|
|||
int32_t __sys_socket(int32_t, int32_t, int32_t) hidden;
|
||||
int32_t __sys_getsockname(int32_t, void *, uint32_t *) hidden;
|
||||
int32_t __sys_getpeername(int32_t, void *, uint32_t *) hidden;
|
||||
int32_t __sys_socketpair(int32_t, int32_t, int32_t, int32_t[2]) hidden;
|
||||
|
||||
int32_t sys_accept4(int32_t, void *, uint32_t *, int) nodiscard hidden;
|
||||
int32_t sys_accept(int32_t, void *, uint32_t *) hidden;
|
||||
|
|
|
|||
|
|
@ -16,96 +16,77 @@
|
|||
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
||||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/calls/internal.h"
|
||||
#include "libc/errno.h"
|
||||
#include "libc/mem/mem.h"
|
||||
#include "libc/sock/internal.h"
|
||||
#include "libc/sock/yoink.inc"
|
||||
#include "libc/sysv/consts/fio.h"
|
||||
#include "libc/sysv/consts/o.h"
|
||||
#include "libc/sysv/consts/sock.h"
|
||||
#include "libc/sysv/consts/af.h"
|
||||
|
||||
#include "libc/alg/reverse.internal.h"
|
||||
#include "libc/nt/createfile.h"
|
||||
#include "libc/nt/enum/accessmask.h"
|
||||
#include "libc/nt/enum/creationdisposition.h"
|
||||
#include "libc/nt/enum/filesharemode.h"
|
||||
#include "libc/nt/ipc.h"
|
||||
#include "libc/nt/process.h"
|
||||
#include "libc/nt/runtime.h"
|
||||
|
||||
#include "libc/sock/internal.h"
|
||||
#include "libc/sysv/consts/af.h"
|
||||
#include "libc/sysv/consts/o.h"
|
||||
#include "libc/sysv/consts/sock.h"
|
||||
#include "libc/sysv/errfuns.h"
|
||||
|
||||
// {{{ sys_socketpair_nt
|
||||
int sys_socketpair_nt(int family, int type, int proto, int sv[2]) {
|
||||
int64_t hpipe, h1, h2;
|
||||
int reader, writer;
|
||||
char16_t pipename[64];
|
||||
uint32_t mode;
|
||||
textwindows int sys_socketpair_nt(int family, int type, int proto, int sv[2]) {
|
||||
int64_t hpipe, h1, h2;
|
||||
int reader, writer, oflags;
|
||||
char16_t pipename[64];
|
||||
uint32_t mode;
|
||||
|
||||
// Supports only AF_UNIX
|
||||
if (family != AF_UNIX) {
|
||||
errno = EAFNOSUPPORT;
|
||||
return -1;
|
||||
}
|
||||
// Supports only AF_UNIX
|
||||
if (family != AF_UNIX) {
|
||||
return eafnosupport();
|
||||
}
|
||||
|
||||
mode = kNtPipeWait;
|
||||
if (type == SOCK_STREAM) {
|
||||
mode |= kNtPipeReadmodeByte | kNtPipeTypeByte;
|
||||
} else if ((type == SOCK_DGRAM) || (type == SOCK_SEQPACKET)) {
|
||||
mode |= kNtPipeReadmodeMessage | kNtPipeTypeMessage;
|
||||
} else {
|
||||
errno = EOPNOTSUPP;
|
||||
return -1;
|
||||
}
|
||||
oflags = 0;
|
||||
if (type & SOCK_CLOEXEC) oflags |= O_CLOEXEC;
|
||||
type &= ~SOCK_CLOEXEC;
|
||||
|
||||
CreatePipeName(pipename);
|
||||
if ((reader = __reservefd()) == -1) return -1;
|
||||
if ((writer = __reservefd()) == -1) {
|
||||
__releasefd(reader);
|
||||
return -1;
|
||||
}
|
||||
if ((hpipe = CreateNamedPipe(pipename,
|
||||
kNtPipeAccessDuplex,
|
||||
mode,
|
||||
1,
|
||||
65536,
|
||||
65536,
|
||||
0,
|
||||
&kNtIsInheritable)) == -1) {
|
||||
__winerr();
|
||||
__releasefd(writer);
|
||||
__releasefd(reader);
|
||||
return -1;
|
||||
}
|
||||
mode = kNtPipeWait;
|
||||
if (type == SOCK_STREAM) {
|
||||
mode |= kNtPipeReadmodeByte | kNtPipeTypeByte;
|
||||
} else if ((type == SOCK_DGRAM) || (type == SOCK_SEQPACKET)) {
|
||||
mode |= kNtPipeReadmodeMessage | kNtPipeTypeMessage;
|
||||
} else {
|
||||
return eopnotsupp();
|
||||
}
|
||||
|
||||
h1 = CreateFile(pipename,
|
||||
kNtGenericWrite | kNtGenericRead,
|
||||
0, // Not shared
|
||||
&kNtIsInheritable,
|
||||
kNtOpenExisting, 0, 0);
|
||||
if (h1 == -1) {
|
||||
CloseHandle(hpipe);
|
||||
__winerr();
|
||||
__releasefd(writer);
|
||||
__releasefd(reader);
|
||||
return -1;
|
||||
}
|
||||
CreatePipeName(pipename);
|
||||
if ((reader = __reservefd()) == -1) return -1;
|
||||
if ((writer = __reservefd()) == -1) {
|
||||
__releasefd(reader);
|
||||
return -1;
|
||||
}
|
||||
if ((hpipe = CreateNamedPipe(pipename, kNtPipeAccessDuplex, mode, 1, 65536,
|
||||
65536, 0, &kNtIsInheritable)) == -1) {
|
||||
__winerr();
|
||||
__releasefd(writer);
|
||||
__releasefd(reader);
|
||||
return -1;
|
||||
}
|
||||
|
||||
g_fds.p[reader].kind = kFdFile;
|
||||
g_fds.p[reader].flags = 0; // TODO
|
||||
g_fds.p[reader].handle = hpipe;
|
||||
h1 = CreateFile(pipename, kNtGenericWrite | kNtGenericRead,
|
||||
0, // Not shared
|
||||
&kNtIsInheritable, kNtOpenExisting, 0, 0);
|
||||
if (h1 == -1) {
|
||||
CloseHandle(hpipe);
|
||||
__winerr();
|
||||
__releasefd(writer);
|
||||
__releasefd(reader);
|
||||
return -1;
|
||||
}
|
||||
|
||||
g_fds.p[writer].kind = kFdFile;
|
||||
g_fds.p[writer].flags = 0; // TODO
|
||||
g_fds.p[writer].handle = h1;
|
||||
g_fds.p[reader].kind = kFdFile;
|
||||
g_fds.p[reader].flags = oflags;
|
||||
g_fds.p[reader].handle = hpipe;
|
||||
|
||||
sv[0] = reader;
|
||||
sv[1] = writer;
|
||||
return 0;
|
||||
g_fds.p[writer].kind = kFdFile;
|
||||
g_fds.p[writer].flags = oflags;
|
||||
g_fds.p[writer].handle = h1;
|
||||
|
||||
sv[0] = reader;
|
||||
sv[1] = writer;
|
||||
return 0;
|
||||
}
|
||||
// }}}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
38
libc/sock/socketpair-sysv.c
Normal file
38
libc/sock/socketpair-sysv.c
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
/*-*- 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 2020 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/dce.h"
|
||||
#include "libc/errno.h"
|
||||
#include "libc/sock/internal.h"
|
||||
#include "libc/sysv/consts/sock.h"
|
||||
|
||||
int sys_socketpair(int family, int type, int protocol, int sv[2]) {
|
||||
int e = errno;
|
||||
if (__sys_socketpair(family, type, protocol, sv) != -1) return 0;
|
||||
if ((type & (SOCK_CLOEXEC | SOCK_NONBLOCK)) &&
|
||||
(errno == EINVAL || errno == EPROTOTYPE || errno == EPROTONOSUPPORT)) {
|
||||
errno = e;
|
||||
if (__sys_socketpair(family, type & ~(SOCK_CLOEXEC | SOCK_NONBLOCK),
|
||||
protocol, sv) != -1) {
|
||||
__fixupnewsockfd(sv[0], type);
|
||||
__fixupnewsockfd(sv[1], type);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -20,35 +20,23 @@
|
|||
#include "libc/sock/internal.h"
|
||||
#include "libc/sock/sock.h"
|
||||
#include "libc/sysv/consts/af.h"
|
||||
#include "libc/sysv/consts/sock.h"
|
||||
#include "libc/sysv/errfuns.h"
|
||||
|
||||
/**
|
||||
* Creates a pair of connected sockets
|
||||
* Creates bidirectional pipe.
|
||||
*
|
||||
* @param family can be AF_UNIX, AF_INET, etc.
|
||||
* @param type can be SOCK_STREAM (for TCP), SOCK_DGRAM (e.g. UDP), or
|
||||
* SOCK_RAW (IP) so long as IP_HDRINCL was passed to setsockopt();
|
||||
* and additionally, may be or'd with SOCK_NONBLOCK, SOCK_CLOEXEC
|
||||
* @param protocol can be IPPROTO_TCP, IPPROTO_UDP, or IPPROTO_ICMP
|
||||
* @param sv a vector of 2 integers to store the created sockets.
|
||||
* @param family should be AF_UNIX or synonymously AF_LOCAL
|
||||
* @param type may be or'd with SOCK_CLOEXEC
|
||||
* @param sv a vector of 2 integers to store the created sockets
|
||||
* @return 0 if success, -1 in case of error
|
||||
* @error EFAULT, EPFNOSUPPORT, etc.
|
||||
* @see libc/sysv/consts.sh
|
||||
* @asyncsignalsafe
|
||||
*/
|
||||
int socketpair(int family, int type, int protocol, int sv[2]) {
|
||||
if (family == AF_UNSPEC) {
|
||||
family = AF_UNIX;
|
||||
} else if (family == AF_INET6) {
|
||||
/* Recommend IPv6 on frontend serving infrastructure only. That's
|
||||
what Google Cloud does. It's more secure. It also means poll()
|
||||
will work on Windows, which doesn't allow mixing third layers. */
|
||||
errno = EAFNOSUPPORT;
|
||||
return epfnosupport();
|
||||
}
|
||||
if (family == AF_UNSPEC) family = AF_UNIX;
|
||||
if (!IsWindows()) {
|
||||
return sys_socketpair(family, type, protocol, sv);
|
||||
} else {
|
||||
return sys_socketpair_nt(family, type, protocol, sv);
|
||||
}
|
||||
return sys_socketpair_nt(family, type, protocol, sv);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue