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

Fix getpeername() bug on Windows

Browse source 
The WIN32 getpeername() function returns ENOTCONN when it uses connect()
the SOCK_NONBLOCK way. So we simply store the address, provided earlier.
This commit is contained in:
Justine Tunney 2024-08-25 11:26:21 -07:00
parent 908b7a82ca
commit f3ce684aef
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
4 changed files with 71 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

53
test/libc/sock/connect_test.c
View file

@ -34,6 +34,55 @@
#include "libc/testlib/testlib.h"
#include "libc/thread/thread.h"
TEST(connect, blocking) {
char buf[16] = {0};
atomic_uint *sem = _mapshared(sizeof(unsigned));
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);
while (!*sem)
pthread_yield();
ASSERT_SYS(0, 4, accept(3, (struct sockaddr *)&addr, &addrsize));
ASSERT_SYS(0, 2, read(4, buf, 16)); // hi
ASSERT_SYS(0, 5, write(4, "hello", 5));
ASSERT_SYS(0, 3, read(4, buf, 16)); // bye
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)));
*sem = 1;
{ // wait until connected
struct pollfd pfd = {3, POLLOUT};
ASSERT_SYS(0, 1, poll(&pfd, 1, -1));
ASSERT_TRUE(!!(POLLOUT & pfd.revents));
}
struct sockaddr_in peer;
uint32_t sz = sizeof(peer);
ASSERT_SYS(0, 0, getsockname(3, (struct sockaddr *)&peer, &sz));
ASSERT_EQ(htonl(0x7f000001), peer.sin_addr.s_addr);
ASSERT_SYS(0, 0, getpeername(3, (struct sockaddr *)&peer, &sz));
ASSERT_EQ(htonl(0x7f000001), peer.sin_addr.s_addr);
ASSERT_SYS(0, 2, write(3, "hi", 2));
{ // wait for other process to send us stuff
struct pollfd pfd = {3, POLLIN};
ASSERT_SYS(0, 1, poll(&pfd, 1, -1));
ASSERT_TRUE(!!(POLLIN & pfd.revents));
}
ASSERT_SYS(0, 5, read(3, buf, 16));
ASSERT_STREQ("hello", buf);
ASSERT_SYS(0, 3, write(3, "bye", 3));
ASSERT_SYS(0, 0, close(3));
WAIT(exit, 0);
munmap(sem, sizeof(unsigned));
}
TEST(connect, nonblocking) {
if (IsFreebsd())
return; // TODO(jart): why did this start flaking?
@ -74,6 +123,10 @@ TEST(connect, nonblocking) {
ASSERT_SYS(0, 1, poll(&pfd, 1, -1));
ASSERT_TRUE(!!(POLLOUT & pfd.revents));
}
struct sockaddr_in peer;
uint32_t sz = sizeof(peer);
ASSERT_SYS(0, 0, getpeername(3, (struct sockaddr *)&peer, &sz));
ASSERT_EQ(htonl(0x7f000001), peer.sin_addr.s_addr);
ASSERT_SYS(0, 2, write(3, "hi", 2));
{ // wait for other process to send us stuff
struct pollfd pfd = {3, POLLIN};