#include "ttt-client.h"
-#include "ttt-command.h"
#include "ttt-error.h"
#include "ttt-lex.h"
#include "ttt-server.h"
yyscan_t scanner;
char *name;
+ ttt_bool_t registered;
char **request_strings;
int num_request_strings;
char **args,
int num_args);
+static ttt_error_t
+_ttt_client_execute_quit (ttt_client_t *client,
+ char **args,
+ int num_args);
+
typedef struct _ttt_command_description {
const char *command;
- int args_min;
- int args_max;
+ 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},
+ {"QUIT", 0, _ttt_client_execute_quit}
};
+#define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
static ttt_error_t
_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;
+ client->registered = TRUE;
+
xasprintf (&response, "HELO %s %s %s\n", client->name,
ttt_server_get_host (client->server),
ttt_server_get_port (client->server));
return TTT_ERROR_NONE;
}
-#define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
+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 void
_free_request (ttt_client_t *client);
client->num_request_strings = 0;
client->name = NULL;
+ client->registered = FALSE;
}
static void
{
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;
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);
}
ASSERT_NOT_REACHED;
error = _execute_request (client);
+ if (error == TTT_ERROR_QUIT_REQUESTED)
+ break;
if (error)
ttt_client_send (client, ttt_error_string (error));
}