X-Git-Url: https://git.cworth.org/git?p=ttt;a=blobdiff_plain;f=src%2Fttt-server.c;h=e9043b4e2cb25309e65e68ee202af9a617e2a90f;hp=2bc3a529b51efca60af87679488e248facd84b46;hb=84db9bf52aa25c19f7d547ea2dbec69ca4452300;hpb=15672ac8305a1c5ba0d9bf6edabb0a194c30628e

diff --git a/src/ttt-server.c b/src/ttt-server.c
index 2bc3a52..e9043b4 100644
--- a/src/ttt-server.c
+++ b/src/ttt-server.c
@@ -19,14 +19,19 @@
  * 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;
 
+    const char *host;
+    const char *port;
+
     int next_client_id;
 
     ttt_client_t **clients;
@@ -35,10 +40,13 @@ 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->host = host;
+    server->port = port;
+
     server->next_client_id = 0;
 
     server->clients = NULL;
@@ -46,17 +54,34 @@ ttt_server_init (ttt_server_t *server)
     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;
+    char *name;
 
     pthread_mutex_lock (&server->mutex);
 
-    client = ttt_client_create (server, client_socket,
-				server->next_client_id++);
+    name = xstrdup (ttt_client_get_name (client));
+
+    if (name == NULL) {
+	xasprintf(&name, "user%03d", server->next_client_id++);
+	ttt_client_set_name (client, name);
+    }
+
+    /* XXX: If generated name is not unique, this will return an error,
+       which violates the protocol. */
+    for (i = 0; i < server->num_clients; i++) {
+	if (strcmp (ttt_client_get_name (server->clients[i]), name) == 0) {
+	    error = TTT_ERROR_INVALIDNAME;
+	    goto CLEANUP_LOCK;
+	}
+    }
 
-    printf ("Client %d has joined.\n", client->id);
+    printf ("Client %s has joined.\n", name);
+    free (name);
 
     server->num_clients++;
 
@@ -72,13 +97,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,57 +117,16 @@ 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)
-{
-    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);
-    }
-
-    ttt_server_destroy_client (server, client);
-
-    return (void *) 0;
-}
-
-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);
-    }
-}
-
 void
 ttt_server_broadcast (ttt_server_t *server, const char *message)
 {
@@ -154,6 +140,20 @@ ttt_server_broadcast (ttt_server_t *server, const char *message)
     pthread_mutex_unlock (&server->mutex);
 }
 
+/* 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 = 
 "Welcome to ttt-server. So far, this program is still a demonstration\n"
 "TCP/IP server, acting something like a rather braindead chat server.\n"
@@ -176,6 +176,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 +200,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;