2 files changed, 4 insertions, 6 deletions
diff --git a/src/client.c b/src/client.c
index ad7b861..3a6c617 100755
--- a/src/client.c
+++ b/src/client.c
@@ -6,7 +6,6 @@
 #include <poll.h>
 #include <pthread.h>
 #include <string.h>
-#include "launch-socket.c"
 
 #define SA(ptr) ((struct sockaddr *)(ptr))
 
diff --git a/src/main.c b/src/main.c
index eb9569e..9bc10c4 100755
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,4 @@
-#include <Server.h>
-#include <launch-socket.h>
+#include <socket_server.h>
 #include <pthread.h>
 #include <signal.h>
 #include <stdio.h>
@@ -13,11 +12,11 @@ void sig_int_handler(int num)
     running = 0;
 }
 
-void on_message(struct Server* server, char message[], ssize_t amountRecv, int socketFD)
+void on_message(struct Server* server, struct AcceptedSocket* cur_socket, char message[], ssize_t amountRecv)
 {
     if (amountRecv > 0) {
         printf("%s\n", message);
-        broadcast(server,socketFD,message); //this calls mutex lock and unlock on server->list_lock
+        soc_broadcast(server,cur_socket,message);
     }
 }
 
@@ -35,7 +34,7 @@ int main(int argc, char* argv[])
 
     struct Server server = server_constructor(AF_INET, SOCK_STREAM, 0, INADDR_ANY, port, 10);
     server.on_message = on_message;
-    launch_socket(&server);
+    init_socket_server(&server);
 
     struct sigaction act = { 0 };
     act.sa_handler = &sig_int_handler;