refactoring

[dragonblocks_alpha.git] / src / client / client_auth.c

diff --git a/src/client/client_auth.c b/src/client/client_auth.c
index d2db7e042b4ac04b4470d30300b43482e5b7d746..4782d32a5f7f7043e17c963a62399b3ccba0aaf9 100644 (file)
--- a/src/client/client_auth.c
+++ b/src/client/client_auth.c
@@ -6,48 +6,58 @@
 #include "interrupt.h"
 #include "types.h"
 
-volatile struct ClientAuth client_auth;
+struct ClientAuth client_auth;
 
-static bool name_prompt()
+static void auth_loop()
 {
-       if (! (client_auth.name = linenoise("Enter name: ")))
-               return false;
+       while (!interrupt.set) switch (client_auth.state) {
+               case AUTH_INIT:
+                       if (client_auth.name)
+                               linenoiseFree(client_auth.name);
 
-       printf("Authenticating as %s...\n", client_auth.name);
-       client_auth.state = AUTH_WAIT;
+                       if (!(client_auth.name = linenoise("Enter name: ")))
+                               return;
 
-       dragonnet_peer_send_ToServerAuth(client, &(ToServerAuth) {
-               .name = client_auth.name,
-       });
+                       printf("[access] authenticating as %s...\n", client_auth.name);
+                       client_auth.state = AUTH_WAIT;
 
-       return true;
+                       dragonnet_peer_send_ToServerAuth(client, &(ToServerAuth) {
+                               .name = client_auth.name,
+                       });
+
+                       __attribute__((fallthrough));
+
+               case AUTH_WAIT:
+                       pthread_cond_wait(&client_auth.cv, &client_auth.mtx);
+                       break;
+
+               case AUTH_SUCCESS:
+                       return;
+       }
 }
 
 bool client_auth_init()
 {
+       client_auth.name = NULL;
+       pthread_cond_init(&client_auth.cv, NULL);
+       pthread_mutex_init(&client_auth.mtx, NULL);
+
+       pthread_mutex_lock(&client_auth.mtx);
        client_auth.state = AUTH_INIT;
+       flag_sub(&interrupt, &client_auth.cv); // make sure Ctrl+C will work during AUTH_WAIT
 
-       while (! interrupt->done) {
-               switch (client_auth.state) {
-                       case AUTH_INIT:
-                               if (name_prompt())
-                                       break;
-                               else
-                                       return false;
-
-                       case AUTH_WAIT:
-                               sched_yield();
-                               break;
-
-                       case AUTH_SUCCESS:
-                               return true;
-               }
-       }
+       auth_loop();
+
+       flag_uns(&interrupt, &client_auth.cv);
+       bool success = client_auth.state == AUTH_SUCCESS;
+       pthread_mutex_unlock(&client_auth.mtx);
 
-       return false;
+       return success;
 }
 
 void client_auth_deinit()
 {
+       pthread_cond_destroy(&client_auth.cv);
+       pthread_mutex_destroy(&client_auth.mtx);
        linenoiseFree(client_auth.name);
 }