moved communication to separate thread

This commit is contained in:
Václav Šmejkal 2023-02-20 18:32:39 +01:00
parent daf6258222
commit 73a7be454b
Signed by: ENGO150
GPG Key ID: 4A57E86482968843

View File

@ -19,12 +19,14 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include <why2/chat/common.h> #include <why2/chat/common.h>
char *read_socket(int socket); char *read_socket(int socket);
void *communicate_thread(void *arg);
int main(void) int main(void)
{ {
int listen_socket = socket(AF_INET, SOCK_STREAM, 0); //CREATE SERVER SOCKET int listen_socket = socket(AF_INET, SOCK_STREAM, 0); //CREATE SERVER SOCKET
int accepted; int accepted;
char *received = NULL; char *received = NULL;
pthread_t thread;
if (listen_socket < 0) why2_die("Failed creating socket."); if (listen_socket < 0) why2_die("Failed creating socket.");
@ -45,15 +47,9 @@ int main(void)
{ {
accepted = accept(listen_socket, (SA *) NULL, NULL); //ACCEPT NEW SOCKET //TODO: CLOSE (not only this one) accepted = accept(listen_socket, (SA *) NULL, NULL); //ACCEPT NEW SOCKET //TODO: CLOSE (not only this one)
if (accepted == -1) why2_die("Accepting socket failed!"); if (accepted == -1) continue;
received = read_socket(accepted); //TODO: Add multithreading pthread_create(&thread, NULL, communicate_thread, &accepted);
if (received == NULL) continue; //FAILED
printf("Received:\n%s\n\n", received);
why2_deallocate(received);
} }
//DEALLOCATION //DEALLOCATION
@ -62,6 +58,22 @@ int main(void)
return 0; return 0;
} }
void *communicate_thread(void *arg)
{
for (;;)
{
char *received = read_socket(*((int*) arg)); //READ
if (received == NULL) return NULL; //FAILED; EXIT THREAD
printf("Received:\n%s\n\n", received);
why2_deallocate(received);
}
return NULL;
}
char *read_socket(int socket) char *read_socket(int socket)
{ {
if (socket == -1) if (socket == -1)
@ -74,7 +86,7 @@ char *read_socket(int socket)
char *content_buffer = why2_calloc(2, sizeof(char)); char *content_buffer = why2_calloc(2, sizeof(char));
//GET LENGTH //GET LENGTH
if (recv(socket, content_buffer, 2, 0) != 2) why2_die("Reading socket failed!"); if (recv(socket, content_buffer, 2, 0) != 2) return NULL;
content_size = (unsigned short) (((unsigned) content_buffer[1] << 8) | content_buffer[0]); content_size = (unsigned short) (((unsigned) content_buffer[1] << 8) | content_buffer[0]);