Module: Mesa Branch: main Commit: 3e56968984ac216b35ad73ba2485053d78f00ac5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3e56968984ac216b35ad73ba2485053d78f00ac5
Author: António Monteiro <[email protected]> Date: Sun Oct 30 14:37:33 2022 +0000 gallium/util: remove network class Signed-off-by: António Monteiro <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19403> --- src/gallium/auxiliary/meson.build | 2 - src/gallium/auxiliary/util/u_network.c | 198 --------------------------------- src/gallium/auxiliary/util/u_network.h | 22 ---- 3 files changed, 222 deletions(-) diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index 10a9542f813..8745ee6f303 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -242,8 +242,6 @@ files_libgallium = files( 'util/u_live_shader_cache.h', 'util/u_log.c', 'util/u_log.h', - 'util/u_network.c', - 'util/u_network.h', 'util/u_pack_color.h', 'util/u_prim.h', 'util/u_prim.c', diff --git a/src/gallium/auxiliary/util/u_network.c b/src/gallium/auxiliary/util/u_network.c deleted file mode 100644 index 31139f2983f..00000000000 --- a/src/gallium/auxiliary/util/u_network.c +++ /dev/null @@ -1,198 +0,0 @@ - -#include "pipe/p_compiler.h" -#include "util/u_network.h" -#include "util/u_debug.h" -#include "util/u_string.h" - -#include <stdio.h> -#if defined(PIPE_OS_WINDOWS) -# include <winsock2.h> -# include <windows.h> -# include <ws2tcpip.h> -#elif defined(PIPE_OS_UNIX) -# include <sys/socket.h> -# include <netinet/in.h> -# include <unistd.h> -# include <fcntl.h> -# include <netdb.h> -#else -# warning "No socket implementation" -#endif - -boolean -u_socket_init(void) -{ -#if defined(PIPE_OS_WINDOWS) - WORD wVersionRequested; - WSADATA wsaData; - int err; - - /* Use the MAKEWORD(lowbyte, highbyte) macro declared in Windef.h */ - wVersionRequested = MAKEWORD(1, 1); - - err = WSAStartup(wVersionRequested, &wsaData); - if (err != 0) { - debug_printf("WSAStartup failed with error: %d\n", err); - return FALSE; - } - return TRUE; -#elif defined(PIPE_HAVE_SOCKETS) - return TRUE; -#else - return FALSE; -#endif -} - -void -u_socket_stop(void) -{ -#if defined(PIPE_OS_WINDOWS) - WSACleanup(); -#endif -} - -void -u_socket_close(int s) -{ - if (s < 0) - return; - -#if defined(PIPE_OS_UNIX) - shutdown(s, SHUT_RDWR); - close(s); -#elif defined(PIPE_OS_WINDOWS) - shutdown(s, SD_BOTH); - closesocket(s); -#else - assert(0); -#endif -} - -int u_socket_accept(int s) -{ -#if defined(PIPE_HAVE_SOCKETS) - return accept(s, NULL, NULL); -#else - return -1; -#endif -} - -int -u_socket_send(int s, void *data, size_t size) -{ -#if defined(PIPE_HAVE_SOCKETS) - return send(s, data, size, 0); -#else - return -1; -#endif -} - -int -u_socket_peek(int s, void *data, size_t size) -{ -#if defined(PIPE_HAVE_SOCKETS) - return recv(s, data, size, MSG_PEEK); -#else - return -1; -#endif -} - -int -u_socket_recv(int s, void *data, size_t size) -{ -#if defined(PIPE_HAVE_SOCKETS) - return recv(s, data, size, 0); -#else - return -1; -#endif -} - -int -u_socket_connect(const char *hostname, uint16_t port) -{ -#if defined(PIPE_HAVE_SOCKETS) - int s, r; - struct addrinfo hints, *addr; - char portString[20]; - - memset(&hints, 0, sizeof hints); - hints.ai_family = AF_UNSPEC; // AF_INET or AF_INET6 to force version - hints.ai_socktype = SOCK_STREAM; - - snprintf(portString, sizeof(portString), "%d", port); - - r = getaddrinfo(hostname, portString, NULL, &addr); - if (r != 0) { - return -1; - } - - s = socket(addr->ai_family, SOCK_STREAM, IPPROTO_TCP); - if (s < 0) { - freeaddrinfo(addr); - return -1; - } - - if (connect(s, addr->ai_addr, (int) addr->ai_addrlen)) { - u_socket_close(s); - freeaddrinfo(addr); - return -1; - } - - freeaddrinfo(addr); - - return s; -#else - assert(0); - return -1; -#endif -} - -int -u_socket_listen_on_port(uint16_t portnum) -{ -#if defined(PIPE_HAVE_SOCKETS) - int s; - struct sockaddr_in sa; - memset(&sa, 0, sizeof(struct sockaddr_in)); - - sa.sin_family = AF_INET; - sa.sin_port = htons(portnum); - - s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - if (s < 0) - return -1; - - if (bind(s, (struct sockaddr *)&sa, sizeof(struct sockaddr_in)) == -1) { - u_socket_close(s); - return -1; - } - - listen(s, 1); - - return s; -#else - assert(0); - return -1; -#endif -} - -void -u_socket_block(int s, boolean block) -{ -#if defined(PIPE_OS_UNIX) - int old = fcntl(s, F_GETFL, 0); - if (old == -1) - return; - - /* TODO obey block */ - if (block) - fcntl(s, F_SETFL, old & ~O_NONBLOCK); - else - fcntl(s, F_SETFL, old | O_NONBLOCK); -#elif defined(PIPE_OS_WINDOWS) - u_long iMode = block ? 0 : 1; - ioctlsocket(s, FIONBIO, &iMode); -#else - assert(0); -#endif -} diff --git a/src/gallium/auxiliary/util/u_network.h b/src/gallium/auxiliary/util/u_network.h deleted file mode 100644 index be1fa00dcb4..00000000000 --- a/src/gallium/auxiliary/util/u_network.h +++ /dev/null @@ -1,22 +0,0 @@ - -#ifndef _U_NETWORK_H_ -#define _U_NETWORK_H_ - -#include "pipe/p_compiler.h" - -#if defined(PIPE_OS_WINDOWS) || defined(PIPE_OS_UNIX) -# define PIPE_HAVE_SOCKETS -#endif - -boolean u_socket_init(void); -void u_socket_stop(void); -void u_socket_close(int s); -int u_socket_listen_on_port(uint16_t portnum); -int u_socket_accept(int s); -int u_socket_connect(const char *host, uint16_t port); -int u_socket_send(int s, void *data, size_t size); -int u_socket_peek(int s, void *data, size_t size); -int u_socket_recv(int s, void *data, size_t size); -void u_socket_block(int s, boolean block); - -#endif
