efrei/projet-multitaches
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add disconnect_client function

Browse source
This commit is contained in:
flyingscorpio@clevo 2022-10-24 23:15:34 +02:00
parent acbdd0ed18
commit d80cc79e8f
1 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/server.c
View file

@ -108,11 +108,8 @@ int main(int argc, char *argv[]) {
close(client_sockid); close(client_sockid);
continue; continue;
} }
clients[client_id].id = client_id;
clients[client_id].sockid = client_sockid;
clients[client_id].pipe[0] = message_pipe[0];
clients[client_id].pipe[1] = message_pipe[1];
/* Start client threads */
if (pthread_create(&clientsender, NULL, ClientSender, &clients[client_id]) != 0) { if (pthread_create(&clientsender, NULL, ClientSender, &clients[client_id]) != 0) {
fprintf(stderr, "pthread_create: error for ClientSender\n"); fprintf(stderr, "pthread_create: error for ClientSender\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -122,12 +119,13 @@ int main(int argc, char *argv[]) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
/* Register client */
clients[client_id].id = client_id;
clients[client_id].sockid = client_sockid;
clients[client_id].pipe[0] = message_pipe[0];
clients[client_id].pipe[1] = message_pipe[1];
clients[client_id].listener_thread = clientlistener; clients[client_id].listener_thread = clientlistener;
clients[client_id].sender_thread = clientsender; clients[client_id].sender_thread = clientsender;
// TODO: joining here prevents creating other clients, need to move the joins to some client_disconnect function
(void) pthread_join(clientsender, &retval);
(void) pthread_join(clientlistener, &retval);
} }
} }
@ -175,6 +173,33 @@ int get_next_free_client_id(void) {
return -1; // Error: reached end of array return -1; // Error: reached end of array
} }
int disconnect_client(int client_id) {
void *retval;
if ((clients[client_id].id == -1) ||
(clients[client_id].sockid == -1) ||
(clients[client_id].pipe[0] == -1) ||
(clients[client_id].pipe[1] == -1)) {
fprintf(stderr, "disconnect_client: couldn't find client #%d, already disconnected?\n", client_id);
return -1;
}
clients[client_id].id = -1;
close(clients[client_id].sockid);
clients[client_id].sockid = -1;
close(clients[client_id].pipe[0]);
clients[client_id].pipe[0] = -1;
close(clients[client_id].pipe[1]);
clients[client_id].pipe[1] = -1;
(void) pthread_join(clients[client_id].sender_thread, &retval);
clients[client_id].sender_thread = -1;
(void) pthread_join(clients[client_id].listener_thread, &retval);
clients[client_id].listener_thread = -1;
return 0;
}
/* Thread, parses and handles messages */ /* Thread, parses and handles messages */
void *Dispatcher(void *arg) { void *Dispatcher(void *arg) {
pthread_exit(0); pthread_exit(0);