transport: reality-релей idle-timeout (конфиг, дефолт 5с) + warn при >64 релеях; убрать лимит FD_SETSIZE; проверка socket_id в stcp_server
This commit is contained in:
1 parent
cc269e810c
commit
fb4343fca6
7 files changed
+51
-13
No files matched your search
+1
-9
@@ -138,10 +138,6 @@ static int socket_array_add_internal(struct socket_array* sa, int fd, socket_t s
|
||||
socket_t_callback_t read_cbk_sock, socket_t_callback_t write_cbk_sock,
|
||||
socket_callback_t except_cbk, const char* name, void* user_data) {
|
||||
if (!sa || fd < 0) return -1;
|
||||
// FD_SETSIZE check only for POSIX systems - Windows sockets can have any value
|
||||
#ifndef _WIN32
|
||||
if (fd >= FD_SETSIZE) return -1;
|
||||
#endif
|
||||
if (fd >= sa->capacity) {
|
||||
// Need to resize - double the capacity
|
||||
int new_capacity = sa->capacity * 2;
|
||||
@@ -234,7 +230,7 @@ static int socket_array_add_socket_t(struct socket_array* sa, socket_t sock, soc
|
||||
if (fd < 0) return -1; // Windows sockets can have any value, only check negative
|
||||
#else
|
||||
int fd = sock; // On POSIX, socket_t is int
|
||||
if (fd < 0 || fd >= FD_SETSIZE) return -1;
|
||||
if (fd < 0) return -1;
|
||||
#endif
|
||||
return socket_array_add_internal(sa, fd, sock, SOCKET_NODE_TYPE_SOCK,
|
||||
NULL, NULL, read_cbk, write_cbk, except_cbk, name, user_data);
|
||||
@@ -690,10 +686,6 @@ err_t uasync_cancel_timeout(struct UASYNC* ua, void* t_id) {
|
||||
// Instance version
|
||||
void* uasync_add_socket(struct UASYNC* ua, int fd, socket_callback_t read_cbk, socket_callback_t write_cbk, socket_callback_t except_cbk, const char* name, void* user_data) {
|
||||
if (!ua || fd < 0) return NULL;
|
||||
// FD_SETSIZE check only for POSIX systems - Windows sockets can have any value
|
||||
#ifndef _WIN32
|
||||
if (fd >= FD_SETSIZE) return NULL;
|
||||
#endif
|
||||
|
||||
int index = socket_array_add(ua->sockets, fd, read_cbk, write_cbk, except_cbk, name, user_data);
|
||||
if (index < 0) return NULL;
|
||||
|
||||
Reference in new issue
Block a user