From d117281291403823aa9e5e6197a24a504e1fc44f Mon Sep 17 00:00:00 2001 From: Emma Reuter Date: Thu, 3 Jul 2025 07:09:15 -0600 Subject: [PATCH] Fixed Fuzzilli macOS swift build Renamed `socket_t` to `libsocket_t` to resolve swift build issue --- Sources/Fuzzilli/Modules/NetworkSync.swift | 10 +++++----- Sources/libsocket/include/libsocket.h | 16 ++++++++-------- Sources/libsocket/socket-posix.c | 20 ++++++++++---------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Sources/Fuzzilli/Modules/NetworkSync.swift b/Sources/Fuzzilli/Modules/NetworkSync.swift index 55e1a43ec..807a11e21 100644 --- a/Sources/Fuzzilli/Modules/NetworkSync.swift +++ b/Sources/Fuzzilli/Modules/NetworkSync.swift @@ -48,7 +48,7 @@ fileprivate protocol MessageHandler { /// A connection to a network peer that speaks the above protocol. fileprivate class Connection { /// The file descriptor on POSIX or SOCKET handle on Windows of the socket. - let socket: libsocket.socket_t + let socket: libsocket.libsocket_t /// The UUID of the remote end. let localId: UUID @@ -78,7 +78,7 @@ fileprivate class Connection { /// Pending outgoing data. Must only be accessed on this connection's dispatch queue. private var sendQueue: [Data] = [] - init?(socket: libsocket.socket_t, localId: UUID, handler: MessageHandler) { + init?(socket: libsocket.libsocket_t, localId: UUID, handler: MessageHandler) { self.socket = socket self.localId = localId self.handler = handler @@ -331,7 +331,7 @@ public class NetworkParent: DistributedFuzzingParentNode { unowned let fuzzer: Fuzzer /// File descriptor or SOCKET handle of the server socket. - private var serverFd: libsocket.socket_t = INVALID_SOCKET + private var serverFd: libsocket.libsocket_t = INVALID_SOCKET /// Address and port on which to listen for connections. private let address: String @@ -346,7 +346,7 @@ public class NetworkParent: DistributedFuzzingParentNode { private var serverQueue: DispatchQueue? = nil /// Active workers indexed by the socket used to communicate with them. - private var clientsBySocket = [libsocket.socket_t: Client]() + private var clientsBySocket = [libsocket.libsocket_t: Client]() /// Active workers indexed by their id. private var clientsById = [UUID: Client]() @@ -445,7 +445,7 @@ public class NetworkParent: DistributedFuzzingParentNode { onChildDisconnectedCallback = callback } - private func handleNewConnection(_ socket: libsocket.socket_t) { + private func handleNewConnection(_ socket: libsocket.libsocket_t) { guard socket > 0 else { return logger.error("Failed to accept client connection") } diff --git a/Sources/libsocket/include/libsocket.h b/Sources/libsocket/include/libsocket.h index e3a3be3b3..681a9506a 100644 --- a/Sources/libsocket/include/libsocket.h +++ b/Sources/libsocket/include/libsocket.h @@ -36,18 +36,18 @@ typedef __typeof__(_Generic((size_t)0, \ unsigned char : (char)0)) ssize_t; #endif #else -typedef int socket_t; +typedef int libsocket_t; #define INVALID_SOCKET (-1) #endif -socket_t socket_listen(const char* address, uint16_t port); -socket_t socket_accept(socket_t socket); -socket_t socket_connect(const char* address, uint16_t port); +libsocket_t socket_listen(const char* address, uint16_t port); +libsocket_t socket_accept(libsocket_t socket); +libsocket_t socket_connect(const char* address, uint16_t port); -ssize_t socket_send(socket_t socket, const uint8_t* data, size_t length); -ssize_t socket_recv(socket_t socket, uint8_t* buffer, size_t length); +ssize_t socket_send(libsocket_t socket, const uint8_t* data, size_t length); +ssize_t socket_recv(libsocket_t socket, uint8_t* buffer, size_t length); -int socket_shutdown(socket_t socket); -int socket_close(socket_t socket); +int socket_shutdown(libsocket_t socket); +int socket_close(libsocket_t socket); #endif diff --git a/Sources/libsocket/socket-posix.c b/Sources/libsocket/socket-posix.c index 15b52a57a..bb64d3999 100644 --- a/Sources/libsocket/socket-posix.c +++ b/Sources/libsocket/socket-posix.c @@ -24,8 +24,8 @@ #include #include -socket_t socket_listen(const char* address, uint16_t port) { - socket_t fd = socket(AF_INET, SOCK_STREAM, 0); +libsocket_t socket_listen(const char* address, uint16_t port) { + libsocket_t fd = socket(AF_INET, SOCK_STREAM, 0); if (fd < 0) { return INVALID_SOCKET; } @@ -54,8 +54,8 @@ socket_t socket_listen(const char* address, uint16_t port) { return fd; } -socket_t socket_accept(socket_t fd) { - socket_t client_fd = accept(fd, NULL, 0); +libsocket_t socket_accept(libsocket_t fd) { + libsocket_t client_fd = accept(fd, NULL, 0); if (client_fd < 0) { return INVALID_SOCKET; } @@ -78,7 +78,7 @@ socket_t socket_accept(socket_t fd) { return client_fd; } -socket_t socket_connect(const char* address, uint16_t port) { +libsocket_t socket_connect(const char* address, uint16_t port) { struct addrinfo hint; memset(&hint, 0, sizeof(hint)); hint.ai_family = AF_UNSPEC; @@ -93,7 +93,7 @@ socket_t socket_connect(const char* address, uint16_t port) { return INVALID_SOCKET; } - socket_t fd; + libsocket_t fd; struct addrinfo* addr; for (addr = result; addr != NULL; addr = addr->ai_next) { fd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol); @@ -133,7 +133,7 @@ socket_t socket_connect(const char* address, uint16_t port) { return fd; } -ssize_t socket_send(socket_t fd, const uint8_t* data, size_t length) { +ssize_t socket_send(libsocket_t fd, const uint8_t* data, size_t length) { ssize_t remaining = length; while (remaining > 0) { #ifdef __APPLE__ @@ -154,15 +154,15 @@ ssize_t socket_send(socket_t fd, const uint8_t* data, size_t length) { return length; } -ssize_t socket_recv(socket_t fd, uint8_t* data, size_t length) { +ssize_t socket_recv(libsocket_t fd, uint8_t* data, size_t length) { return read(fd, data, length); } -int socket_shutdown(socket_t socket) { +int socket_shutdown(libsocket_t socket) { return shutdown(socket, SHUT_RDWR); } -int socket_close(socket_t fd) { +int socket_close(libsocket_t fd) { return close(fd); }