1 files changed, 18 insertions, 16 deletions

diff --git a/src/server.c b/src/server.c
index 87cf6b7..7583e9c 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1,5 +1,6 @@
 #include "server.h"
 #include "login.h"
+#include "log.h"
 #include <netinet/in.h>
 #include <stdio.h>
 #include <string.h>
@@ -12,7 +13,7 @@ static int socket_fd;
 
 void closeServer(int dummy) {
     close(socket_fd);
-    printf("Caught SIGINT\n");
+    info("Caught SIGINT\n");
 }
 
 int server_listen(server_t *server) {
@@ -29,30 +30,31 @@ int server_listen(server_t *server) {
 
   if (err == -1) {
     perror("socket");
-    printf("Failed to create socket");
+    error("Failed to create socket");
     return err;
   }
 
   struct sockaddr_in server_addr = {0};
-
-  if (signal(SIGINT, closeServer) == SIG_ERR) {
-      printf("Could not set signal handler\n");
-      return -1;
-  }
-
+/* 
+ *   if (signal(SIGINT, closeServer) == SIG_ERR) {
+ *       error("Could not set signal handler\n");
+ *       return -1;
+ *   }
+ * 
+ */
   server_addr.sin_family = AF_INET;
   server_addr.sin_addr.s_addr = htonl(INADDR_ANY);
   server_addr.sin_port = htons(8000);
 
-  if (setsockopt(server->listen_fd, SOL_SOCKET, SO_REUSEADDR,1,sizeof(1))) {
-      printf("Could not set SO_REUSEADDR on server socket, continuing\n");
+  if (setsockopt(server->listen_fd, SOL_SOCKET, SO_REUSEADDR,(int*)1,1)) {
+      debug("Could not set SO_REUSEADDR on server socket, continuing");
   }
 
   err = bind(server->listen_fd, (struct sockaddr *)&server_addr,
              sizeof(server_addr));
   if (err == -1) {
     perror("bind");
-    printf("Failed to bind socket\n");
+    error("Failed to bind socket\n");
     return err;
   }
 
@@ -61,10 +63,10 @@ int server_listen(server_t *server) {
   err = listen(server->listen_fd, 100);
   if (err == -1) {
     perror("listen");
-    printf("Failed to listen on socket\n");
+    error("Failed to listen on socket\n");
     return err;
   }
-  printf("Bound to port 8000\n");
+  info("Bound to port 8000");
 
   return 0;
 }
@@ -81,15 +83,15 @@ int server_accept(server_t *server) {
   for (;;) {
     err = (conn_fd = accept(server->listen_fd, (struct sockaddr *)&client_addr,
                             &client_len));
-    printf("Accepting a new connection\n");
+    debug("Accepting a new connection");
     if (err == -1) {
       perror("Accept");
-      printf("failed accepting connection\n");
+      error("failed accepting connection\n");
       return err;
     }
 
     if (!fork()) {
-      printf("Forking, let's go handle them!\n");
+      debug("Forking, let's go handle them!\n");
       handle_player(conn_fd);
     }
   }