log: Logging, but make it :sparkles: pretty :sparkles:

1 files changed, 11 insertions, 13 deletions

diff --git a/src/login.c b/src/login.c
index 8214234..5c08c70 100644
--- a/src/login.c
+++ b/src/login.c
@@ -11,20 +11,20 @@
 #include <argon2.h>
 
 void handle_player(int conn_fd) {
-  printf("Let's make a new player object\n");
+  debug("Let's make a new player object\n");
   playerc_t plrc = {0};
   plrc.state = LoggedOut;
   plrc.conn = conn_fd;
   player_t plr = {0};
   plrc.plr = plr;
 
-  printf("No sense in having a player if they can't log in!\n");
+  debug("No sense in having a player if they can't log in!\n");
 
   int err = step_login(&plrc, conn_fd);
   if (err) {
     err = send_to_fd(conn_fd, "Error in login process, exiting");
     if (err) {
-      printf("Could not send error message");
+      error("Could not send error message");
     }
     close(conn_fd);
     return;
@@ -40,16 +40,16 @@ int step_login(playerc_t *player, int conn_fd) {
     switch (player->state) {
     case LoggedOut: ; /* the player has yet to log in, this is a fresh connection!
                      */
-      printf("The player is logged out\n");
+      debug("The player is logged out\n");
       send_to_fd(player->conn,
                  "Welcome! Please enter your **username** below\n");
       char *buf = (char *)malloc(1 << 10);
-      printf("Waiting to receive...\n");
+      debug("Waiting to receive...\n");
       recv(player->conn, buf, 1024, 0);
-      printf("Received!\n");
+      debug("Received!\n");
       char* playername = trimwhitespace(buf);
       err = try_load_plr(playername, player);
-      printf("Finished trying to load the player\n");
+      debug("Finished trying to load the player\n");
       if (err) {
         // File doesn't exist, let's create a player!
 	player->plr.name = (char *)malloc(32);
@@ -75,8 +75,7 @@ int step_login(playerc_t *player, int conn_fd) {
       memset(buf, '\0', 1 << 9);
       recv(player->conn, buf, sizeof(buf), 0); 
       char* pw = trimwhitespace(buf);
-      int res = argon2i_verify(player->plr.pw_hash, pw, strlen(pw)); 
-      printf("%d\n", res);
+      int res = argon2i_verify(player->plr.pw_hash, pw, strlen(pw));  
       if (res == ARGON2_OK) {
         // The password is good!
         send_to_fd(player->conn, "That looks good to me! Let's get you loaded in\n");
@@ -101,8 +100,7 @@ int step_login(playerc_t *player, int conn_fd) {
             err = argon2i_hash_encoded(32, 512, 1, pw, strlen(pw), "adSAaVWIueBwP2jHfAl7diRJ9ijC1Ysb9e920d6d9+I=", strlen("adSAaVWIueBwP2jHfAl7diRJ9ijC1Ysb9e920d6d9+I="), 32, player->plr.pw_hash, 512);
             
             if (err != ARGON2_OK) {
-                send_to_fd(player->conn, "Uhhh, something happened. Try again.");
-                printf("%d\n", err);
+                send_to_fd(player->conn, "Uhhh, something happened. Try again."); 
                 player->state = LoggedOut;
                 break;
             } else {
@@ -112,9 +110,9 @@ int step_login(playerc_t *player, int conn_fd) {
                 player->plr.level = 1;
                 player->plr.xp = 0;
                 player->plr.location_id = 0;
-                printf("Trying to write player\n");
+                debug("Trying to write player\n");
                 try_write_plr(&player->plr);
-                printf("Done\n");
+                debug("Done\n");
                 player->state = Complete; 
             }
         }