* PROTOCOL: Removed unused servername

[ttt] / src / ttt-server.c

diff --git a/src/ttt-server.c b/src/ttt-server.c
index c50a797b259ec8bf1dbb6b74886bba2468ca4131..e9043b4e2cb25309e65e68ee202af9a617e2a90f 100644 (file)
--- a/src/ttt-server.c
+++ b/src/ttt-server.c
@@ -23,11 +23,15 @@
 
 #include "ttt-args.h"
 #include "ttt-client.h"
 
 #include "ttt-args.h"
 #include "ttt-client.h"

+#include "ttt-error.h"

 #include "ttt-socket.h"
 
 struct _ttt_server {
     pthread_mutex_t mutex;
 
 #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;
     int next_client_id;
 
     ttt_client_t **clients;


@@ -36,10 +40,13 @@ struct _ttt_server {
 };
 
 static void
 };
 
 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);
 
 {
     pthread_mutex_init (&server->mutex, NULL);
 

+    server->host = host;
+    server->port = port;
+

     server->next_client_id = 0;
 
     server->clients = NULL;
     server->next_client_id = 0;
 
     server->clients = NULL;


@@ -48,16 +55,33 @@ ttt_server_init (ttt_server_t *server)
 }
 
 /* Exported: See ttt-server.h for documentation. */
 }
 
 /* Exported: See ttt-server.h for documentation. */

-int
+ttt_error_t

 ttt_server_register_client (ttt_server_t *server, ttt_client_t *client)
 {
 ttt_server_register_client (ttt_server_t *server, ttt_client_t *client)
 {

-    int id;
+    int i;
+    ttt_error_t error = TTT_ERROR_NONE;
+    char *name;

 
     pthread_mutex_lock (&server->mutex);
 
 
     pthread_mutex_lock (&server->mutex);
 

-    id = 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", id);
+    printf ("Client %s has joined.\n", name);
+    free (name);

 
     server->num_clients++;
 
 
     server->num_clients++;
 


@@ -73,9 +97,10 @@ ttt_server_register_client (ttt_server_t *server, ttt_client_t *client)
 
     server->clients [server->num_clients - 1] = client;
 
 
     server->clients [server->num_clients - 1] = client;
 

+ CLEANUP_LOCK:

     pthread_mutex_unlock (&server->mutex);
 
     pthread_mutex_unlock (&server->mutex);
 

-    return id;
+    return error;

 }
 
 /* Exported: See ttt-server.h for documentation. */
 }
 
 /* Exported: See ttt-server.h for documentation. */


@@ -92,7 +117,7 @@ ttt_server_unregister_client (ttt_server_t *server, ttt_client_t *client)
 
     assert (i < server->num_clients);
 
 
     assert (i < server->num_clients);
 

-    printf ("Client %d has left.\n", ttt_client_get_id (client));
+    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 *));
 
     memmove (&server->clients[i], &server->clients[i+1],
             (server->num_clients - i - 1) * sizeof (ttt_client_t *));


@@ -115,6 +140,20 @@ ttt_server_broadcast (ttt_server_t *server, const char *message)
     pthread_mutex_unlock (&server->mutex);
 }
 
     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"
 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"


@@ -161,7 +200,7 @@ main (int argc, char **argv)
 
     printf (WELCOME_MESSAGE, args.host, args.port, args.host, args.port);
 
 
     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, _ttt_server_accept, &server);
 
     while (1)
        ttt_socket_accept (socket, _ttt_server_accept, &server);