From d83c1f47f8dfaecd858e2812954c8e98d5c4d224 Mon Sep 17 00:00:00 2001 From: Vladimir Dubrovin <3proxy@3proxy.ru> Date: Sat, 17 Feb 2024 13:18:14 +0300 Subject: [PATCH] Rollback commit in the wrong branch --- src/structures.h | 64 ++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/structures.h b/src/structures.h index e5ad859..b6e2280 100644 --- a/src/structures.h +++ b/src/structures.h @@ -423,39 +423,39 @@ struct sockfuncs { void * state; void (*freefunc)(void* state); #ifdef _WIN32 - SOCKET (WINAPI *_socket)(void* state, int domain, int type, int protocol); - SOCKET (WINAPI *_accept)(void* state, SOCKET s, struct sockaddr * addr, int * addrlen); - int (WINAPI *_bind)(void* state, SOCKET s, const struct sockaddr *addr, int addrlen); - int (WINAPI *_listen)(void* state, SOCKET s, int backlog); - int (WINAPI *_connect)(void* state, SOCKET s, const struct sockaddr *name, int namelen); - int (WINAPI *_getpeername)(void* state, SOCKET s, struct sockaddr * name, int * namelen); - int (WINAPI *_getsockname)(void* state, SOCKET s, struct sockaddr * name, int * namelen); - int (WINAPI *_getsockopt)(void* state, SOCKET s, int level, int optname, char * optval, int * optlen); - int (WINAPI *_setsockopt)(void* state, SOCKET s, int level, int optname, const char *optval, int optlen); - int (WINAPI *_poll)(void* state, struct pollfd *fds, unsigned int nfds, int timeout); - int (WINAPI *_send)(void* state, SOCKET s, const char *msg, int len, int flags); - int (WINAPI *_sendto)(void* state, SOCKET s, const char *msg, int len, int flags, const struct sockaddr *to, int tolen); - int (WINAPI *_recv)(void* state, SOCKET s, char *buf, int len, int flags); - int (WINAPI *_recvfrom)(void* state, SOCKET s, char * buf, int len, int flags, struct sockaddr * from, int * fromlen); - int (WINAPI *_shutdown)(void* state, SOCKET s, int how); - int (WINAPI *_closesocket)(void* state, SOCKET s); + SOCKET (WINAPI *_socket)(int domain, int type, int protocol); + SOCKET (WINAPI *_accept)(SOCKET s, struct sockaddr * addr, int * addrlen); + int (WINAPI *_bind)(SOCKET s, const struct sockaddr *addr, int addrlen); + int (WINAPI *_listen)(SOCKET s, int backlog); + int (WINAPI *_connect)(SOCKET s, const struct sockaddr *name, int namelen); + int (WINAPI *_getpeername)(SOCKET s, struct sockaddr * name, int * namelen); + int (WINAPI *_getsockname)(SOCKET s, struct sockaddr * name, int * namelen); + int (WINAPI *_getsockopt)(SOCKET s, int level, int optname, char * optval, int * optlen); + int (WINAPI *_setsockopt)(SOCKET s, int level, int optname, const char *optval, int optlen); + int (WINAPI *_poll)(struct pollfd *fds, unsigned int nfds, int timeout); + int (WINAPI *_send)(SOCKET s, const char *msg, int len, int flags); + int (WINAPI *_sendto)(SOCKET s, const char *msg, int len, int flags, const struct sockaddr *to, int tolen); + int (WINAPI *_recv)(SOCKET s, char *buf, int len, int flags); + int (WINAPI *_recvfrom)(SOCKET s, char * buf, int len, int flags, struct sockaddr * from, int * fromlen); + int (WINAPI *_shutdown)(SOCKET s, int how); + int (WINAPI *_closesocket)(SOCKET s); #else - SOCKET (*_socket)(void* state, int domain, int type, int protocol); - SOCKET (*_accept)(void* state, SOCKET s, struct sockaddr * addr, socklen_t * addrlen); - int (*_bind)(void* state, SOCKET s, const struct sockaddr *addr, socklen_t addrlen); - int (*_listen)(void* state, SOCKET s, int backlog); - int (*_connect)(void* state, SOCKET s, const struct sockaddr *name, socklen_t namelen); - int (*_getpeername)(void* state, SOCKET s, struct sockaddr * name, socklen_t * namelen); - int (*_getsockname)(void* state, SOCKET s, struct sockaddr * name, socklen_t * namelen); - int (*_getsockopt)(void* state, SOCKET s, int level, int optname, void * optval, socklen_t * optlen); - int (*_setsockopt)(void* state, int s, int level, int optname, const void *optval, socklen_t optlen); - int (*_poll)(void* state, struct pollfd *fds, unsigned int nfds, int timeout); - ssize_t (*_send)(void* state, SOCKET s, const void *msg, size_t len, int flags); - ssize_t (*_sendto)(void* state, SOCKET s, const void *msg, size_t len, int flags, const struct sockaddr *to, SASIZETYPE tolen); - ssize_t (*_recv)(void* state, SOCKET s, void *buf, size_t len, int flags); - ssize_t (*_recvfrom)(void* state, SOCKET s, void * buf, size_t len, int flags, struct sockaddr * from, SASIZETYPE * fromlen); - int (*_shutdown)(void* state, SOCKET s, int how); - int (*_closesocket)(void* state, SOCKET s); + SOCKET (*_socket)(int domain, int type, int protocol); + SOCKET (*_accept)(SOCKET s, struct sockaddr * addr, socklen_t * addrlen); + int (*_bind)(SOCKET s, const struct sockaddr *addr, socklen_t addrlen); + int (*_listen)(SOCKET s, int backlog); + int (*_connect)(SOCKET s, const struct sockaddr *name, socklen_t namelen); + int (*_getpeername)(SOCKET s, struct sockaddr * name, socklen_t * namelen); + int (*_getsockname)(SOCKET s, struct sockaddr * name, socklen_t * namelen); + int (*_getsockopt)(SOCKET s, int level, int optname, void * optval, socklen_t * optlen); + int (*_setsockopt)(int s, int level, int optname, const void *optval, socklen_t optlen); + int (*_poll)(struct pollfd *fds, unsigned int nfds, int timeout); + ssize_t (*_send)(SOCKET s, const void *msg, size_t len, int flags); + ssize_t (*_sendto)(SOCKET s, const void *msg, size_t len, int flags, const struct sockaddr *to, SASIZETYPE tolen); + ssize_t (*_recv)(SOCKET s, void *buf, size_t len, int flags); + ssize_t (*_recvfrom)(SOCKET s, void * buf, size_t len, int flags, struct sockaddr * from, SASIZETYPE * fromlen); + int (*_shutdown)(SOCKET s, int how); + int (*_closesocket)(SOCKET s); #endif };