mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-08-06 01:40:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix nt connect not initializing with SO_UPDATE_CONNECT_CONTEXT

Browse source
This commit is contained in:
Gavin Hayes 2024-05-08 01:07:55 -04:00
parent cf672d29c8
commit a8cee0e3e2
2 changed files with 72 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libc/sock/connect-nt.c
View file

@ -35,11 +35,14 @@
#include "libc/sock/syscall_fd.internal.h" #include "libc/sock/syscall_fd.internal.h"
#include "libc/sock/wsaid.internal.h" #include "libc/sock/wsaid.internal.h"
#include "libc/sysv/consts/o.h" #include "libc/sysv/consts/o.h"
#include "libc/sysv/consts/sol.h"
#include "libc/sysv/errfuns.h" #include "libc/sysv/errfuns.h"
#ifdef __x86_64__ #ifdef __x86_64__
#include "libc/sock/yoink.inc" #include "libc/sock/yoink.inc"
__msabi extern typeof(__sys_setsockopt_nt) *const __imp_setsockopt;
struct ConnectArgs { struct ConnectArgs {
const void *addr; const void *addr;
uint32_t addrsize; uint32_t addrsize;
@ -113,6 +116,8 @@ static textwindows int sys_connect_nt_impl(struct Fd *f, const void *addr,
// return ETIMEDOUT if SO_SNDTIMEO elapsed // return ETIMEDOUT if SO_SNDTIMEO elapsed
// note that Linux will return EINPROGRESS // note that Linux will return EINPROGRESS
errno = etimedout(); errno = etimedout();
} else if (!rc) {
__imp_setsockopt(f->handle, SOL_SOCKET, kNtSoUpdateConnectContext, 0, 0);
} }
return rc; return rc;
} }
@ -131,7 +136,11 @@ static textwindows int sys_connect_nt_impl(struct Fd *f, const void *addr,
ok = WSAGetOverlappedResult(f->handle, overlap, &dwBytes, false, &dwFlags); ok = WSAGetOverlappedResult(f->handle, overlap, &dwBytes, false, &dwFlags);
WSACloseEvent(overlap->hEvent); WSACloseEvent(overlap->hEvent);
free(overlap); free(overlap);
return ok ? 0 : __winsockerr(); if (!ok) {
return __winsockerr();
}
__imp_setsockopt(f->handle, SOL_SOCKET, kNtSoUpdateConnectContext, 0, 0);
return 0;
} else if (WSAGetLastError() == kNtErrorIoPending) { } else if (WSAGetLastError() == kNtErrorIoPending) {
f->connect_op = overlap; f->connect_op = overlap;
return einprogress(); return einprogress();

62
test/libc/sock/getpeername_test.c
View file

@ -90,3 +90,65 @@ TEST(getpeername, worksAfterAcceptingOnParent) {
ASSERT_SYS(0, 0, close(3)); ASSERT_SYS(0, 0, close(3));
WAIT(exit, 0); WAIT(exit, 0);
} }
TEST(getpeername, worksAfterConnectingOnFork) {
char buf[16] = {0};
uint32_t addrsize = sizeof(struct sockaddr_in);
struct sockaddr_in addr = {
.sin_family = AF_INET,
.sin_addr.s_addr = htonl(0x7f000001),
};
ASSERT_SYS(0, 3, socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
ASSERT_SYS(0, 0, bind(3, (struct sockaddr *)&addr, sizeof(addr)));
ASSERT_SYS(0, 0, getsockname(3, (struct sockaddr *)&addr, &addrsize));
ASSERT_SYS(0, 0, listen(3, SOMAXCONN));
ASSERT_SYS(0, 4, socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
SPAWN(fork);
ASSERT_SYS(0, 0, close(3));
ASSERT_SYS(0, 0, connect(4, (struct sockaddr *)&addr, sizeof(addr)));
struct sockaddr_storage out = {0};
uint32_t out_size = sizeof(out);
ASSERT_SYS(0, 0, getpeername(4, (struct sockaddr *)&out, &out_size));
EXPECT_GE(sizeof(struct sockaddr_in), out_size);
EXPECT_EQ(AF_INET, ((struct sockaddr_in *)&out)->sin_family);
EXPECT_EQ(htonl(0x7f000001), ((struct sockaddr_in *)&out)->sin_addr.s_addr);
ASSERT_SYS(0, 5, send(4, "hello", 5, 0));
PARENT();
ASSERT_SYS(0, 0, close(4));
ASSERT_SYS(0, 4, accept(3, (struct sockaddr *)&addr, &addrsize));
ASSERT_SYS(0, 5, read(4, buf, 16));
ASSERT_STREQ("hello", buf);
ASSERT_SYS(0, 0, close(4));
ASSERT_SYS(0, 0, close(3));
WAIT(exit, 0);
}
TEST(getpeername, worksAfterConnectingOnParent) {
char buf[16] = {0};
uint32_t addrsize = sizeof(struct sockaddr_in);
struct sockaddr_in addr = {
.sin_family = AF_INET,
.sin_addr.s_addr = htonl(0x7f000001),
};
ASSERT_SYS(0, 3, socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
ASSERT_SYS(0, 0, bind(3, (struct sockaddr *)&addr, sizeof(addr)));
ASSERT_SYS(0, 0, getsockname(3, (struct sockaddr *)&addr, &addrsize));
ASSERT_SYS(0, 0, listen(3, SOMAXCONN));
SPAWN(fork);
ASSERT_SYS(0, 4, accept(3, (struct sockaddr *)&addr, &addrsize));
ASSERT_SYS(0, 5, read(4, buf, 16));
ASSERT_STREQ("hello", buf);
PARENT();
ASSERT_SYS(0, 0, close(3));
ASSERT_SYS(0, 3, socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
ASSERT_SYS(0, 0, connect(3, (struct sockaddr *)&addr, sizeof(addr)));
struct sockaddr_storage out = {0};
uint32_t out_size = sizeof(out);
ASSERT_SYS(0, 0, getpeername(3, (struct sockaddr *)&out, &out_size));
EXPECT_GE(sizeof(struct sockaddr_in), out_size);
EXPECT_EQ(AF_INET, ((struct sockaddr_in *)&out)->sin_family);
EXPECT_EQ(htonl(0x7f000001), ((struct sockaddr_in *)&out)->sin_addr.s_addr);
ASSERT_SYS(0, 5, send(3, "hello", 5, 0));
ASSERT_SYS(0, 0, close(3));
WAIT(exit, 0);
}