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

diff --git a/src/ttt-server.c b/src/ttt-server.c
index e9043b4..d98fc24 100644
--- a/src/ttt-server.c
+++ b/src/ttt-server.c
@@ -32,8 +32,6 @@ struct _ttt_server {
     const char *host;
     const char *port;
 
-    int next_client_id;
-
     ttt_client_t **clients;
     int clients_size;
     int num_clients;
@@ -47,8 +45,6 @@ ttt_server_init (ttt_server_t *server, const char *host, const char *port)
     server->host = host;
     server->port = port;
 
-    server->next_client_id = 0;
-
     server->clients = NULL;
     server->clients_size = 0;
     server->num_clients = 0;
@@ -60,28 +56,25 @@ ttt_server_register_client (ttt_server_t *server, ttt_client_t *client)
 {
     int i;
     ttt_error_t error = TTT_ERROR_NONE;
-    char *name;
+    const char *name;
 
     pthread_mutex_lock (&server->mutex);
 
-    name = xstrdup (ttt_client_get_name (client));
+    name = ttt_client_get_name (client);
 
-    if (name == NULL) {
-	xasprintf(&name, "user%03d", server->next_client_id++);
-	ttt_client_set_name (client, name);
-    }
+    assert (name != NULL);
+
+    if (name[0] == '\0')
+	return TTT_ERROR_INVALID_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;
+	    error = TTT_ERROR_INVALID_NAME;
 	    goto CLEANUP_LOCK;
 	}
     }
 
     printf ("Client %s has joined.\n", name);
-    free (name);
 
     server->num_clients++;
 
@@ -127,6 +120,7 @@ ttt_server_unregister_client (ttt_server_t *server, ttt_client_t *client)
     pthread_mutex_unlock (&server->mutex);
 }
 
+/* Exported: See ttt-server.h for documentation. */
 void
 ttt_server_broadcast (ttt_server_t *server, const char *message)
 {
@@ -140,6 +134,30 @@ 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_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++)
+	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)