mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2024-05-18 03:22:40 +00:00
Code Issues Projects Releases Wiki Activity

Change accept type to struct sockaddr * (#630)

Browse source
This commit is contained in:
Gavin Hayes 2022-09-20 10:49:16 -04:00 committed by GitHub
parent 8c2bf341e9
commit 87708c5d6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/greenbean.c
View file

@ -167,7 +167,7 @@ void *Worker(void *id) {
// wait for client connection
clientaddrsize = sizeof(clientaddr);
client = accept(server, &clientaddr, &clientaddrsize);
client = accept(server, (struct sockaddr *)&clientaddr, &clientaddrsize);
// accept() can raise a very diverse number of errors but none of
// them are really true showstoppers that would necessitate us to

2
libc/sock/accept.c
View file

@ -28,6 +28,6 @@
* @asyncsignalsafe
* @restartable (unless SO_RCVTIMEO)
*/
int accept(int fd, void *out_addr, uint32_t *inout_addrsize) {
int accept(int fd, struct sockaddr *out_addr, uint32_t *inout_addrsize) {
return accept4(fd, out_addr, inout_addrsize, 0);
}

3
libc/sock/sock.h
View file

@ -1,5 +1,6 @@
#ifndef COSMOPOLITAN_LIBC_SOCK_SOCK_H_
#define COSMOPOLITAN_LIBC_SOCK_SOCK_H_
#include "libc/sock/struct/sockaddr.h"
#if !(__ASSEMBLER__ + __LINKER__ + 0)
COSMOPOLITAN_C_START_
/*───────────────────────────────────────────────────────────────────────────│─╗
@ -29,7 +30,7 @@ uint32_t *GetHostIps(void);
int nointernet(void);
int socket(int, int, int);
int accept(int, void *, uint32_t *);
int accept(int, struct sockaddr *, uint32_t *);
int accept4(int, void *, uint32_t *, int);
int bind(int, const void *, uint32_t);
int connect(int, const void *, uint32_t);

4
test/libc/sock/sendfile_test.c
View file

@ -69,7 +69,7 @@ TEST(sendfile, testSeeking) {
ASSERT_SYS(0, 0, getsockname(3, &addr, &addrsize));
ASSERT_SYS(0, 0, listen(3, 1));
if (!fork()) {
ASSERT_SYS(0, 4, accept(3, &addr, &addrsize));
ASSERT_SYS(0, 4, accept(3, (struct sockaddr *)&addr, &addrsize));
ASSERT_SYS(0, 5, open("hyperion.txt", O_RDONLY));
ASSERT_SYS(0, 12, sendfile(4, 5, &inoffset, 12));
ASSERT_EQ(0, GetFileOffset(5));
@ -116,7 +116,7 @@ TEST(sendfile, testPositioning) {
ASSERT_SYS(0, 0, listen(3, 1));
if (!fork()) {
signal(SIGPIPE, SIG_IGN);
ASSERT_SYS(0, 4, accept(3, &addr, &addrsize));
ASSERT_SYS(0, 4, accept(3, (struct sockaddr *)&addr, &addrsize));
ASSERT_SYS(0, 5, open("hyperion.txt", O_RDONLY));
ASSERT_SYS(0, 6, sendfile(4, 5, 0, 6));
ASSERT_EQ(6, GetFileOffset(5));

4
test/libc/sock/socket_test.c
View file

@ -41,7 +41,7 @@ TEST(ipv4, test) {
ASSERT_SYS(0, 0, listen(3, SOMAXCONN));
ASSERT_NE(-1, (pid = fork()));
if (!pid) {
ASSERT_SYS(0, 4, accept(3, &addr, &addrsize));
ASSERT_SYS(0, 4, accept(3, (struct sockaddr *)&addr, &addrsize));
ASSERT_SYS(0, 5, send(4, "hello", 5, 0));
ASSERT_SYS(0, 0, close(4));
ASSERT_SYS(0, 0, close(3));
@ -75,7 +75,7 @@ TEST(ipv6, test) {
ASSERT_SYS(0, 0, listen(3, SOMAXCONN));
ASSERT_NE(-1, (pid = fork()));
if (!pid) {
ASSERT_SYS(0, 4, accept(3, &addr, &addrsize));
ASSERT_SYS(0, 4, accept(3, (struct sockaddr *)&addr, &addrsize));
ASSERT_SYS(0, 5, send(4, "hello", 5, 0));
ASSERT_SYS(0, 0, close(4));
ASSERT_SYS(0, 0, close(3));

2
test/libc/sock/unix_test.c
View file

@ -89,7 +89,7 @@ void StreamServer(void) {
ASSERT_SYS(0, 0, listen(3, 10));
bzero(&addr, sizeof(addr));
len = sizeof(addr);
ASSERT_SYS(0, 4, accept(3, &addr, &len));
ASSERT_SYS(0, 4, accept(3, (struct sockaddr *)&addr, &len));
ASSERT_EQ(AF_UNIX, addr.sun_family);
EXPECT_STREQ("", addr.sun_path);
ASSERT_SYS(0, 5, read(4, buf, 256));

5
tool/net/echo.c
View file

@ -20,10 +20,10 @@
#include "libc/fmt/conv.h"
#include "libc/intrin/kprintf.h"
#include "libc/log/check.h"
#include "libc/stdio/rand.h"
#include "libc/runtime/runtime.h"
#include "libc/sock/sock.h"
#include "libc/sock/struct/sockaddr.h"
#include "libc/stdio/rand.h"
#include "libc/str/str.h"
#include "libc/sysv/consts/af.h"
#include "libc/sysv/consts/ipproto.h"
@ -89,7 +89,8 @@ void TcpServer(void) {
ip, ntohs(addr2.sin_port));
for (;;) {
addrsize2 = sizeof(struct sockaddr_in);
CHECK_NE(-1, (client = accept(sock, &addr2, &addrsize2)));
CHECK_NE(-1,
(client = accept(sock, (struct sockaddr *)&addr2, &addrsize2)));
ip = ntohl(addr2.sin_addr.s_addr);
kprintf("got client %hhu.%hhu.%hhu.%hhu %hu%n", ip >> 24, ip >> 16, ip >> 8,
ip, ntohs(addr2.sin_port));