#include "ttt-client.h"
+#define YY_DECL int yylex (yyscan_t yyscanner, ttt_token_t *token)
+
#include "ttt-error.h"
#include "ttt-lex.h"
#include "ttt-server.h"
struct _ttt_client {
pthread_mutex_t mutex;
pthread_t thread;
-
+
ttt_server_t *server;
int socket;
yyscan_t scanner;
-
+
char **request_strings;
int num_request_strings;
-
+
char *name;
ttt_bool_t registered;
int num_wins;
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);
+static ttt_error_t
+_ttt_client_execute_help (ttt_client_t *client,
+ char **args,
+ int num_args);
+
+static ttt_error_t
+_ttt_client_execute_version (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);
typedef struct _ttt_command_description {
const char *command;
- int args_required;
+ int args_min;
+ int args_max;
ttt_command_func_t execute;
} ttt_command_description_t;
ttt_command_description_t command_descriptions[] = {
- {"HELO", 1, _ttt_client_execute_helo},
- {"WHO", 0, _ttt_client_execute_who },
- {"QUIT", 0, _ttt_client_execute_quit},
- {"MESSAGE", 1, _ttt_client_execute_message}
+ {"HELO", 1, 1, _ttt_client_execute_helo },
+ {"WHO", 0, 0, _ttt_client_execute_who },
+ {"MESSAGE", 1, 1, _ttt_client_execute_message},
+ {"HELP", 0, 1, _ttt_client_execute_help },
+ {"VERSION", 1, 1, _ttt_client_execute_version},
+ {"QUIT", 0, 0, _ttt_client_execute_quit }
};
#define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
{
ttt_error_t error;
char *response;
+ char *notice;
assert (num_args == 1);
error = ttt_server_register_client (client->server, client);
if (error)
return error;
-
client->registered = TRUE;
xasprintf (&response, "HELO %s %s %s\r\n",
client->name,
ttt_server_get_host (client->server),
ttt_server_get_port (client->server));
-
ttt_client_send (client, response);
- xasprintf (&response, "NOTICE USER %s\r\n",client->name);
- ttt_server_broadcast(client->server,response);
+ xasprintf (¬ice, "NOTICE USER %s\r\n",
+ client->name);
+ ttt_server_broadcast (client->server, notice);
+ free (notice);
free (response);
return TTT_ERROR_NONE;
assert (num_args == 0);
- response = ttt_server_who (client->server);
+ if (!client->registered)
+ return TTT_ERROR_NO_NAME_SET;
+ response = xstrdup (ttt_server_who (client->server));
ttt_client_send (client, response);
free (response);
}
static ttt_error_t
-_ttt_client_execute_quit (ttt_client_t *client,
- char **args,
- int num_args)
+_ttt_client_execute_message (ttt_client_t *client,
+ char **args,
+ int num_args)
{
+ char *response;
char *notice;
- assert (num_args == 0);
- xasprintf (¬ice,"NOTICE QUIT %s\r\n",client->name);
- ttt_server_broadcast(client->server,notice);
+ assert (num_args == 1);
+
+ if (!client->registered)
+ return TTT_ERROR_NO_NAME_SET;
+
+ xasprintf(&response, "MESSAGE\r\n");
+ ttt_client_send (client, response);
+
+ xasprintf(¬ice, "NOTICE MESSAGE %s \"%s\"\r\n",
+ client->name,
+ args[0]);
+ ttt_server_broadcast (client->server, notice);
+
free (notice);
- return TTT_ERROR_QUIT_REQUESTED;
+ free (response);
+
+ return TTT_ERROR_NONE;
}
static ttt_error_t
-_ttt_client_execute_message (ttt_client_t *client,
+_ttt_client_execute_help (ttt_client_t *client,
+ char **args,
+ int num_args)
+{
+ char *response;
+
+ /* XXX: NYI */
+
+ xasprintf(&response, "HELP - NYI\r\n");
+ ttt_client_send (client, response);
+
+ free (response);
+ return TTT_ERROR_NONE;
+}
+
+static ttt_error_t
+_ttt_client_execute_version (ttt_client_t *client,
char **args,
int num_args)
{
char *response;
- int i;
- assert (num_args > 0);
+ assert (num_args == 1);
- xasprintf(&response, "MESSAGE\r\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]);
+ /* XXX: Argument is being ignored.
+ This is not completely implemented. */
- }
- xasprintf(&response, "%s\r\n",response);
- ttt_server_broadcast (client->server,response);
+ xasprintf (&response, "VERSION 1\r\n");
+ 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)
+{
+ char *notice;
+ assert (num_args == 0);
+
+ if (!client->registered)
+ return TTT_ERROR_QUIT_REQUESTED;
+
+ xasprintf (¬ice, "NOTICE QUIT %s\r\n",
+ client->name);
+ ttt_server_broadcast (client->server, notice);
+
+ free (notice);
+
+ return TTT_ERROR_QUIT_REQUESTED;
}
static void
client->socket = socket;
file = xfdopen (socket, "r");
- yylex_init(&client->scanner);
+ yylex_init (&client->scanner);
yyset_in (file, client->scanner);
client->request_strings = NULL;
_read_request (ttt_client_t *client)
{
ttt_token_t token;
+ ttt_token_type_t token_type;
_free_request (client);
while (1) {
- token = yylex (client->scanner);
+ token_type = yylex (client->scanner, &token);
/* Yes, EOF in two different enums is pretty ugly. */
- if (token == TTT_TOKEN_EOF)
+ if (token_type == TTT_TOKEN_TYPE_EOF)
return TTT_STATUS_EOF;
- if (token == TTT_TOKEN_NEWLINE) {
+ if (token_type == TTT_TOKEN_TYPE_NEWLINE) {
if (client->num_request_strings)
return TTT_STATUS_SUCCESS;
else
continue;
}
- assert (token == TTT_TOKEN_STRING);
-
- _append_to_request (client, yyget_text (client->scanner));
+ assert (token_type == TTT_TOKEN_TYPE_STRING);
+
+ _append_to_request (client, token.u.string);
+
+ free (token.u.string);
}
}
for (i=0; i < ARRAY_SIZE(command_descriptions); i++) {
desc = &command_descriptions[i];
if (strcmp(command, desc->command) == 0) {
- if (num_args < desc->args_required)
+ if ((num_args < desc->args_min) || (num_args > desc->args_max))
return TTT_ERROR_SYNTAX;
return (desc->execute) (client, &client->request_strings[1], num_args);
- }
}
+ }
return TTT_ERROR_COMMAND;
}
projects / ttt / blobdiff