2005-11-25 Bryan Worth <bryan@theworths.org>

[ttt] / src / ttt-client.c

diff --git a/src/ttt-client.c b/src/ttt-client.c
index 3fdcf83afea53e444c14fa521cc8b6d60f97ced2..53cc4ff3556ce728669a8833919a85c19d197a01 100644 (file)
--- a/src/ttt-client.c
+++ b/src/ttt-client.c
@@ -21,7 +21,6 @@
 
 #include "ttt-client.h"
 
-#include "ttt-command.h"
 #include "ttt-error.h"
 #include "ttt-lex.h"
 #include "ttt-server.h"
@@ -30,16 +29,18 @@
 
 struct _ttt_client {
     pthread_mutex_t mutex;
-    pthread_t thread;
+    pthread_t       thread;
 
-    ttt_server_t *server;
-    int socket;
-    yyscan_t scanner;
+    ttt_server_t    *server;
+    int             socket;
+    yyscan_t        scanner;
 
-    char *name;
+    char            **request_strings;
+    int             num_request_strings;
 
-    char **request_strings;
-    int num_request_strings;
+    char            *name;
+    ttt_bool_t      registered;
+    int             num_wins;
 };
 
 typedef ttt_error_t (*ttt_command_func_t) (ttt_client_t *client,
@@ -51,17 +52,38 @@ _ttt_client_execute_helo (ttt_client_t *client,
                          char         **args,
                          int          num_args);
 
+static ttt_error_t
+_ttt_client_execute_who (ttt_client_t *client,
+                        char         **args,
+                        int          num_args);
+
+static ttt_error_t
+_ttt_client_execute_quit (ttt_client_t *client,
+                         char         **args,
+                         int          num_args);
+
+static ttt_error_t
+_ttt_client_execute_message (ttt_client_t *client,
+                            char         **args,
+                            int          num_args);
+
+
+
 typedef struct _ttt_command_description {
-    const char *command;
-    int args_min;
-    int args_max;
+    const char         *command;
+    int                args_required;
     ttt_command_func_t execute;
 } ttt_command_description_t;
 
 ttt_command_description_t command_descriptions[] = {
-    {"HELO", 0, 1, _ttt_client_execute_helo}
+    {"HELO",    1, _ttt_client_execute_helo},
+    {"WHO",     0, _ttt_client_execute_who },
+    {"QUIT",    0, _ttt_client_execute_quit},
+    {"MESSAGE", 1, _ttt_client_execute_message}
 };
 
+#define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
+
 static ttt_error_t
 _ttt_client_execute_helo (ttt_client_t *client,
                          char         **args,
@@ -70,14 +92,18 @@ _ttt_client_execute_helo (ttt_client_t *client,
     ttt_error_t error;
     char *response;
 
-    if (num_args == 1)
-       ttt_client_set_name (client, args[0]);
+    assert (num_args == 1);
+
+    ttt_client_set_name (client, args[0]);
 
     error = ttt_server_register_client (client->server, client);
     if (error)
        return error;
 
-    xasprintf (&response, "HELO %s %s %s\n", client->name,
+    client->registered = TRUE;
+
+    xasprintf (&response, "HELO %s %s %s\n",
+              client->name,
               ttt_server_get_host (client->server),
               ttt_server_get_port (client->server));
 
@@ -88,7 +114,60 @@ _ttt_client_execute_helo (ttt_client_t *client,
     return TTT_ERROR_NONE;
 }
 
-#define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
+static ttt_error_t
+_ttt_client_execute_who (ttt_client_t *client,
+                        char         **args,
+                        int          num_args)
+{
+    char *response;
+
+    assert (num_args == 0);
+
+    response = ttt_server_who (client->server);
+
+    ttt_client_send (client, response);
+
+    free (response);
+
+    return TTT_ERROR_NONE;
+}
+
+static ttt_error_t
+_ttt_client_execute_quit (ttt_client_t *client,
+                         char         **args,
+                         int          num_args)
+{
+    assert (num_args == 0);
+
+    return TTT_ERROR_QUIT_REQUESTED;
+}
+
+static ttt_error_t
+_ttt_client_execute_message (ttt_client_t  *client,
+                            char          **args,
+                            int           num_args)
+{
+    char *response;
+    int i;
+
+    assert (num_args > 0);
+
+    xasprintf(&response, "MESSAGE\n");
+    ttt_client_send (client, response);
+    
+    xasprintf(&response, "NOTICE MESSAGE %s", client->name);
+    for (i=0; i<num_args; i++){
+       xasprintf(&response, "%s %s",response,args[i]);
+
+    }
+    xasprintf(&response, "%s\n",response);
+    ttt_server_broadcast (client->server,response);
+
+    free (response);
+    return TTT_ERROR_NONE;
+
+
+}
 
 static void
 _free_request (ttt_client_t *client);
@@ -113,6 +192,8 @@ _ttt_client_init (ttt_client_t      *client,
     client->num_request_strings = 0;
 
     client->name = NULL;
+    client->registered = FALSE;
+    client->num_wins = 0;
 }
 
 static void
@@ -120,7 +201,8 @@ _ttt_client_fini (ttt_client_t *client)
 {
     pthread_mutex_lock (&client->mutex);
 
-    ttt_server_unregister_client (client->server, client);
+    if (client->registered)
+       ttt_server_unregister_client (client->server, client);
 
     free (client->name);
     client->name = NULL;
@@ -203,7 +285,7 @@ _execute_request (ttt_client_t *client)
     for (i=0; i < ARRAY_SIZE(command_descriptions); i++) {
        desc = &command_descriptions[i];
        if (strcmp(command, desc->command) == 0) {
-           if ((num_args < desc->args_min) || (num_args > desc->args_max))
+           if (num_args < desc->args_required)
                return TTT_ERROR_SYNTAX;
            return (desc->execute) (client, &client->request_strings[1], num_args);
            }
@@ -228,6 +310,8 @@ _handle_requests_thread (void *closure)
            ASSERT_NOT_REACHED;
 
        error = _execute_request (client);
+       if (error == TTT_ERROR_QUIT_REQUESTED)
+           break;
        if (error)
            ttt_client_send (client, ttt_error_string (error));
     }
@@ -284,3 +368,10 @@ ttt_client_set_name (ttt_client_t *client, const char *name)
     free (client->name);
     client->name = xstrdup (name);
 }
+
+/* Exported: See ttt-client.h for documentation. */
+int
+ttt_client_get_num_wins (ttt_client_t *client)
+{
+    return client->num_wins;
+}