Refactor connection polling

This commit is contained in:
2023-02-02 01:14:29 -06:00
parent 6eb0d092e6
commit a283cad9ed
4 changed files with 63 additions and 53 deletions
+3 -47
View File
@@ -5,11 +5,7 @@
#include "connection.h"
#include <stdlib.h>
#include <sys/socket.h>
#include <sys/select.h>
#include <netinet/in.h>
#include <string.h>
#include <stdio.h>
Client client_new() {
struct Client* client = malloc(sizeof(struct Client));
@@ -30,48 +26,8 @@ void poll_message(Client client, union Message* resp) {
memset(resp, 0, sizeof(union Message));
// Poll for messages
static struct timeval timeout = {0, 0};
fd_set read_fds;
FD_ZERO(&read_fds);
FD_SET(client->sdk_conn->sockfd, &read_fds);
FD_SET(client->dev_conn->sockfd, &read_fds);
int result = select(max_fd + 1, &read_fds, NULL, NULL, NULL);
// Check for socket polling errors
if(result < 0) {
perror("message polling failed");
exit(EXIT_FAILURE);
}
// Skip if nothing was received yet
// TODO: Make a static "empty" message or something
if (result == 0)
return;
// Read a message from the sockets
for(int i = 0; i < 2; i++)
{
if(!FD_ISSET(client->conns[i]->sockfd, &read_fds))
continue;
int recvb = recvfrom(client->sdk_conn->sockfd, resp, sizeof(union Message), 0, (struct sockaddr*)&client->sdk_conn->remote_addr, &client->sdk_conn->addrlen);
// Check for socket read errors
if(recvb < 0) {
perror("reading socket failed");
exit(EXIT_FAILURE);
}
// Check for message errors
if(message_validate(resp) != MESSAGEERR_NONE) {
perror("invalid message");
exit(EXIT_FAILURE);
}
return;
}
struct Connection* conn = connection_poll_ready(client);
if(conn)
connection_read(conn, resp);
}