Skip to content

Various fixes #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JamesDunne wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Various fixes #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 25 additions & 22 deletions generic poll server/generic_poll_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,17 +278,14 @@ static void send_error(SOCKET fd, emulator_network_access_error_type type, const
if (type == emulator_network_access_error_type_strings[i].error_type)
error_type = emulator_network_access_error_type_strings[i].string;
}
size_t to_send_size = 1
+ strlen("error") + 1 + strlen(error_type) + 1
+ strlen("reason") + 1 + strlen(error_string) + 1
+ 1;
char* tosend = (char*) malloc(to_send_size);
int towrite = snprintf(tosend, to_send_size,
size_t to_send_size = strlen("\nerror:\nreason:\n\n") + strlen(error_type) + strlen(error_string);
char* tosend = (char*) malloc(to_send_size + 1);
int towrite = snprintf(tosend, to_send_size + 1,
"\nerror:%s\nreason:%s\n\n",
error_type,
error_string);
s_debug("Sending error :%s\n", tosend);
write(fd, tosend, towrite);
write(fd, tosend, to_send_size);
free(tosend);
}

Expand Down Expand Up @@ -415,8 +412,12 @@ static void process_command(generic_poll_server_client* client)
static bool preprocess_data(generic_poll_server_client* client)
{
unsigned int read_pos = 0;
#ifdef SKARSNIK_DEBUG
char* hexdump = hexString(client->readed_data, client->readed_size);
s_debug("Pre:Read size : %d\n", client->readed_size);
s_debug("Data : %s\n", hexString(client->readed_data, client->readed_size));
s_debug("Data : %s\n", hexdump);
free(hexdump);
#endif
while (read_pos == 0 || read_pos < client->readed_size)
{
s_debug("Client in state : %d\n", client->state);
Expand Down Expand Up @@ -712,6 +713,22 @@ static bool generic_poll_server_start(int poll_timeout)

for (unsigned int i = 1; i < poll_fds_count; i++)
{
// This is when the socket is not closed nicely
// Check if POLLIN and POLLERR can happen at the same time
if (poll_fds[i].revents & POLLERR || poll_fds[i].revents & POLLHUP)
{
s_debug("Disconnecting client err(%X)/hup(%X) : %X\n", POLLERR, POLLHUP, poll_fds[i].revents);
remove_client(poll_fds[i].fd);
if (poll_fds[i].fd != poll_fds[poll_fds_count - 1].fd)
{
// We are not removing the last one
poll_fds[i] = poll_fds[poll_fds_count - 1];
i--;
}
poll_fds_count--;
continue;
}

if (poll_fds[i].revents & POLLIN)
{
s_debug("New data on client : %d\n", i);
Expand All @@ -728,20 +745,6 @@ static bool generic_poll_server_start(int poll_timeout)
poll_fds_count--;
}
}
// This is when the socket is not closed nicely
// Check if POLLIN and POLLERR can happen at the same time
if (poll_fds[i].revents & POLLERR || poll_fds[i].revents & POLLHUP)
{
s_debug("Disconnecting client err(%X)/hup(%X) : %X\n", POLLERR, POLLHUP, poll_fds[i].revents);
remove_client(poll_fds[i].fd);
if (poll_fds[i].fd != poll_fds[poll_fds_count - 1].fd)
{
// We are not removing the last one
poll_fds[i] = poll_fds[poll_fds_count - 1];
i--;
}
poll_fds_count--;
}
}
}
return true;
Expand Down