* TODO: checked off WHO, QUIT, ERROR SYNTAX

[ttt] / src / ttt-server.c

diff --git a/src/ttt-server.c b/src/ttt-server.c
index 2bc3a529b51efca60af87679488e248facd84b46..d98fc24e2891dafd8de6f34efe4fdffac3536edb 100644 (file)
--- a/src/ttt-server.c
+++ b/src/ttt-server.c
@@ -19,15 +19,18 @@
  * Author: Carl Worth <cworth@cworth.org>
  */
 
-#include "ttt.h"
+#include "ttt-server.h"
+
 #include "ttt-args.h"
 #include "ttt-client.h"
+#include "ttt-error.h"
 #include "ttt-socket.h"
 
 struct _ttt_server {
     pthread_mutex_t mutex;
 
-    int next_client_id;
+    const char *host;
+    const char *port;
 
     ttt_client_t **clients;
     int clients_size;
@@ -35,28 +38,43 @@ struct _ttt_server {
 };
 
 static void
-ttt_server_init (ttt_server_t *server)
+ttt_server_init (ttt_server_t *server, const char *host, const char *port)
 {
     pthread_mutex_init (&server->mutex, NULL);
 
-    server->next_client_id = 0;
+    server->host = host;
+    server->port = port;
 
     server->clients = NULL;
     server->clients_size = 0;
     server->num_clients = 0;
 }
 
-static ttt_client_t *
-ttt_server_create_client (ttt_server_t *server, int client_socket)
+/* Exported: See ttt-server.h for documentation. */
+ttt_error_t
+ttt_server_register_client (ttt_server_t *server, ttt_client_t *client)
 {
-    ttt_client_t *client;
+    int i;
+    ttt_error_t error = TTT_ERROR_NONE;
+    const char *name;
 
     pthread_mutex_lock (&server->mutex);
 
-    client = ttt_client_create (server, client_socket,
-                               server->next_client_id++);
+    name = ttt_client_get_name (client);
+
+    assert (name != NULL);
+
+    if (name[0] == '\0')
+       return TTT_ERROR_INVALID_NAME;
+
+    for (i = 0; i < server->num_clients; i++) {
+       if (strcmp (ttt_client_get_name (server->clients[i]), name) == 0) {
+           error = TTT_ERROR_INVALID_NAME;
+           goto CLEANUP_LOCK;
+       }
+    }
 
-    printf ("Client %d has joined.\n", client->id);
+    printf ("Client %s has joined.\n", name);
 
     server->num_clients++;
 
@@ -72,13 +90,15 @@ ttt_server_create_client (ttt_server_t *server, int client_socket)
 
     server->clients [server->num_clients - 1] = client;
 
+ CLEANUP_LOCK:
     pthread_mutex_unlock (&server->mutex);
 
-    return client;
+    return error;
 }
 
-static void
-ttt_server_destroy_client (ttt_server_t *server, ttt_client_t *client)
+/* Exported: See ttt-server.h for documentation. */
+void
+ttt_server_unregister_client (ttt_server_t *server, ttt_client_t *client)
 {
     int i;
 
@@ -90,68 +110,66 @@ ttt_server_destroy_client (ttt_server_t *server, ttt_client_t *client)
 
     assert (i < server->num_clients);
 
-    printf ("Client %d has left.\n", client->id);
+    printf ("Client %s has left.\n", ttt_client_get_name (client));
 
     memmove (&server->clients[i], &server->clients[i+1],
             (server->num_clients - i - 1) * sizeof (ttt_client_t *));
 
     server->num_clients--;
 
-    ttt_client_destroy (client);
-
     pthread_mutex_unlock (&server->mutex);
 }
 
-static void *
-_handle_client_requests_thread (void *closure)
+/* Exported: See ttt-server.h for documentation. */
+void
+ttt_server_broadcast (ttt_server_t *server, const char *message)
 {
-    ttt_client_t *client = closure;
-    ttt_server_t *server = client->server;
-    char *request;
-
-    while (1) {
-
-       request = ttt_client_read_line (client);
-       if (request == NULL)
-           break;
-
-       ttt_server_broadcast (client->server, request);
-    }
+    int i;
 
-    ttt_server_destroy_client (server, client);
+    pthread_mutex_lock (&server->mutex);
 
-    return (void *) 0;
-}
+    for (i = 0; i < server->num_clients; i++)
+       ttt_client_send (server->clients[i], message);
 
-static void
-_accept_client (void *closure, int client_socket)
-{
-    ttt_server_t *server = closure;
-    ttt_client_t *client;
-    int err;
-    
-    client = ttt_server_create_client (server, client_socket);
-
-    err = pthread_create (&client->thread, NULL,
-                         _handle_client_requests_thread, client);
-    if (err != 0) {
-       fprintf (stderr, "Error: pthread_create failed: %s. Aborting.\n",
-                strerror (err));
-       exit (1);
-    }
+    pthread_mutex_unlock (&server->mutex);
 }
 
-void
-ttt_server_broadcast (ttt_server_t *server, const char *message)
+/* Exported: See ttt-server.h for documentation. */
+const char*
+ttt_server_who (ttt_server_t *server)
 {
     int i;
+    char *response;
 
     pthread_mutex_lock (&server->mutex);
 
+    xasprintf (&response, "WHO");
+
     for (i = 0; i < server->num_clients; i++)
-       ttt_client_send (server->clients[i], message);
+       xasprintf (&response, "%s %s %d",
+                  response,
+                  ttt_client_get_name (server->clients[i]),
+                  ttt_client_get_num_wins (server->clients[i]));
+
+    xasprintf (&response, "%s\n", response);
 
     pthread_mutex_unlock (&server->mutex);
+
+    return response;
+}
+
+/* Exported: See ttt-server.h for documentation. */
+const char*
+ttt_server_get_host (ttt_server_t *server)
+{
+    return server->host;
+}
+
+/* Exported: See ttt-server.h for documentation. */
+const char*
+ttt_server_get_port (ttt_server_t *server)
+{
+    return server->port;
 }
 
 static const char *WELCOME_MESSAGE = 
@@ -176,6 +194,14 @@ static const char *WELCOME_MESSAGE =
 "protocol), but a custom client would still be a fine project for a\n"
 "motivated beginning programmer.\n\n";
 
+static void
+_ttt_server_accept (void *closure, int client_socket)
+{
+    ttt_server_t *server = closure;
+
+    ttt_client_new (server, client_socket);
+}
+
 int 
 main (int argc, char **argv)
 {
@@ -192,10 +218,10 @@ main (int argc, char **argv)
 
     printf (WELCOME_MESSAGE, args.host, args.port, args.host, args.port);
 
-    ttt_server_init (&server);
+    ttt_server_init (&server, args.host, args.port);
 
     while (1)
-       ttt_socket_accept (socket, _accept_client, &server);
+       ttt_socket_accept (socket, _ttt_server_accept, &server);
 
     /* We only reach here if something bad happened. */
     return 1;