VFS select: Correct reseting of socket FDs
When using multiple sockets, some of them could be incorrectly removed from the fd_sets before passing these fd_sets forward to the socket select function. Closes https://github.com/espressif/esp-idf/issues/1987
This commit is contained in:
parent
5b88d90a6c
commit
e6ae121f41
2 changed files with 33 additions and 9 deletions
|
@ -33,6 +33,24 @@ typedef struct {
|
||||||
|
|
||||||
static const char message[] = "Hello world!";
|
static const char message[] = "Hello world!";
|
||||||
|
|
||||||
|
static int open_dummy_socket()
|
||||||
|
{
|
||||||
|
const struct addrinfo hints = {
|
||||||
|
.ai_family = AF_INET,
|
||||||
|
.ai_socktype = SOCK_DGRAM,
|
||||||
|
};
|
||||||
|
struct addrinfo *res = NULL;
|
||||||
|
|
||||||
|
const int err = getaddrinfo("localhost", "80", &hints, &res);
|
||||||
|
TEST_ASSERT_EQUAL(0, err);
|
||||||
|
TEST_ASSERT_NOT_NULL(res);
|
||||||
|
|
||||||
|
const int dummy_socket_fd = socket(res->ai_family, res->ai_socktype, 0);
|
||||||
|
TEST_ASSERT(dummy_socket_fd >= 0);
|
||||||
|
|
||||||
|
return dummy_socket_fd;
|
||||||
|
}
|
||||||
|
|
||||||
static int socket_init()
|
static int socket_init()
|
||||||
{
|
{
|
||||||
const struct addrinfo hints = {
|
const struct addrinfo hints = {
|
||||||
|
@ -185,11 +203,13 @@ TEST_CASE("socket can do select()", "[vfs]")
|
||||||
char recv_message[sizeof(message)];
|
char recv_message[sizeof(message)];
|
||||||
|
|
||||||
init(&uart_fd, &socket_fd);
|
init(&uart_fd, &socket_fd);
|
||||||
|
const int dummy_socket_fd = open_dummy_socket();
|
||||||
|
|
||||||
fd_set rfds;
|
fd_set rfds;
|
||||||
FD_ZERO(&rfds);
|
FD_ZERO(&rfds);
|
||||||
FD_SET(uart_fd, &rfds);
|
FD_SET(uart_fd, &rfds);
|
||||||
FD_SET(socket_fd, &rfds);
|
FD_SET(socket_fd, &rfds);
|
||||||
|
FD_SET(dummy_socket_fd, &rfds);
|
||||||
|
|
||||||
const test_task_param_t test_task_param = {
|
const test_task_param_t test_task_param = {
|
||||||
.fd = socket_fd,
|
.fd = socket_fd,
|
||||||
|
@ -199,9 +219,10 @@ TEST_CASE("socket can do select()", "[vfs]")
|
||||||
TEST_ASSERT_NOT_NULL(test_task_param.sem);
|
TEST_ASSERT_NOT_NULL(test_task_param.sem);
|
||||||
start_task(&test_task_param);
|
start_task(&test_task_param);
|
||||||
|
|
||||||
const int s = select(MAX(uart_fd, socket_fd) + 1, &rfds, NULL, NULL, &tv);
|
const int s = select(MAX(MAX(uart_fd, socket_fd), dummy_socket_fd) + 1, &rfds, NULL, NULL, &tv);
|
||||||
TEST_ASSERT_EQUAL(s, 1);
|
TEST_ASSERT_EQUAL(1, s);
|
||||||
TEST_ASSERT_UNLESS(FD_ISSET(uart_fd, &rfds));
|
TEST_ASSERT_UNLESS(FD_ISSET(uart_fd, &rfds));
|
||||||
|
TEST_ASSERT_UNLESS(FD_ISSET(dummy_socket_fd, &rfds));
|
||||||
TEST_ASSERT(FD_ISSET(socket_fd, &rfds));
|
TEST_ASSERT(FD_ISSET(socket_fd, &rfds));
|
||||||
|
|
||||||
int read_bytes = read(socket_fd, recv_message, sizeof(message));
|
int read_bytes = read(socket_fd, recv_message, sizeof(message));
|
||||||
|
@ -212,6 +233,7 @@ TEST_CASE("socket can do select()", "[vfs]")
|
||||||
vSemaphoreDelete(test_task_param.sem);
|
vSemaphoreDelete(test_task_param.sem);
|
||||||
|
|
||||||
deinit(uart_fd, socket_fd);
|
deinit(uart_fd, socket_fd);
|
||||||
|
close(dummy_socket_fd);
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_CASE("select() timeout", "[vfs]")
|
TEST_CASE("select() timeout", "[vfs]")
|
||||||
|
|
|
@ -782,14 +782,16 @@ int esp_vfs_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *errorfds
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!socket_select && is_socket_fd) {
|
if (is_socket_fd) {
|
||||||
// no socket_select found yet and the fd is for a socket so take a look
|
if (!socket_select) {
|
||||||
|
// no socket_select found yet so take a look
|
||||||
if ((readfds && FD_ISSET(fd, readfds)) ||
|
if ((readfds && FD_ISSET(fd, readfds)) ||
|
||||||
(writefds && FD_ISSET(fd, writefds)) ||
|
(writefds && FD_ISSET(fd, writefds)) ||
|
||||||
(errorfds && FD_ISSET(fd, errorfds))) {
|
(errorfds && FD_ISSET(fd, errorfds))) {
|
||||||
const vfs_entry_t *vfs = s_vfs[vfs_index];
|
const vfs_entry_t *vfs = s_vfs[vfs_index];
|
||||||
socket_select = vfs->vfs.socket_select;
|
socket_select = vfs->vfs.socket_select;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue