*/
#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"
#include "ttt-socket.h"
#include "ttt-token.h"
+#define YY_DECL int yylex (yyscan_t yyscanner, ttt_token_t *token)
+#include "ttt-lex.h"
+YY_DECL;
+
struct _ttt_client {
pthread_mutex_t mutex;
pthread_t thread;
char **request_strings;
int num_request_strings;
- char *name;
+ char *username;
ttt_bool_t registered;
int num_wins;
};
typedef ttt_error_t (*ttt_command_func_t) (ttt_client_t *client,
- char **args,
- int num_args);
+ char **args,
+ int num_args);
static ttt_error_t
_ttt_client_execute_helo (ttt_client_t *client,
char **args,
int num_args);
+static ttt_error_t
+_ttt_client_execute_statistics (ttt_client_t *client,
+ char **args,
+ int num_args);
+
static ttt_error_t
_ttt_client_execute_message (ttt_client_t *client,
char **args,
static ttt_error_t
_ttt_client_execute_help (ttt_client_t *client,
- char **args,
- int num_args);
+ char **args,
+ int num_args);
static ttt_error_t
_ttt_client_execute_version (ttt_client_t *client,
- char **args,
- int num_args);
+ 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_invite (ttt_client_t *client,
+ char **args,
+ int num_args);
+
+static ttt_error_t
+_ttt_client_execute_accept (ttt_client_t *client,
+ char **args,
+ int num_args);
+
+static ttt_error_t
+_ttt_client_execute_retract (ttt_client_t *client,
+ char **args,
+ int num_args);
+
+static ttt_error_t
+_ttt_client_execute_decline (ttt_client_t *client,
+ char **args,
+ int num_args);
+
typedef struct _ttt_command_description {
const char *command;
int args_min;
{"HELP", 0, 1, _ttt_client_execute_help,
"HELP <command> ", "Display help for a command."},
+ {"INVITE", 1, 1, _ttt_client_execute_invite,
+ "INVITE <username> ", "Invite a player to play a game."},
+
+ {"ACCEPT", 1, 1, _ttt_client_execute_accept,
+ "ACCEPT <username> ", "Accept a game invitation."},
+
+ {"RETRACT", 1, 1, _ttt_client_execute_retract,
+ "RETRACT <username> ", "Retract a game invitation."},
+
+ {"DECLINE", 1, 1, _ttt_client_execute_decline,
+ "DECLINE <username> ", "Decline a game invitation."},
+
{"MESSAGE", 1, 1, _ttt_client_execute_message,
"MESSAGE <message> ", "Send a message to everyone."},
+ {"STATISTICS", 1, 1, _ttt_client_execute_statistics,
+ "STATISTICS <username> ", "Lists the statistics for the specified user."},
+
{"QUIT", 0, 0, _ttt_client_execute_quit,
"QUIT ", "Quit session."},
assert (num_args == 1);
- ttt_client_set_name (client, args[0]);
+ ttt_client_set_username (client, args[0]);
error = ttt_server_register_client (client->server, client);
if (error)
client->registered = TRUE;
xasprintf (&response, "HELO %s %s %s\r\n",
- client->name,
+ client->username,
ttt_server_get_host (client->server),
ttt_server_get_port (client->server));
ttt_client_send (client, response);
xasprintf (¬ice, "NOTICE USER %s\r\n",
- client->name);
+ client->username);
ttt_server_broadcast (client->server, notice);
free (notice);
return TTT_ERROR_NONE;
}
+static ttt_error_t
+_ttt_client_execute_statistics (ttt_client_t *client,
+ char **args,
+ int num_args)
+{
+ char *response;
+ char *username;
+ ttt_error_t error;
+
+ assert (num_args == 1);
+
+ username = args[0];
+
+ if (!client->registered)
+ return TTT_ERROR_NO_NAME_SET;
+
+ error = ttt_server_statistics (client->server, username, &response);
+ if (error)
+ return error;
+
+ ttt_client_send (client, response);
+
+ free (response);
+
+ return TTT_ERROR_NONE;
+}
+
static ttt_error_t
_ttt_client_execute_message (ttt_client_t *client,
- char **args,
- int num_args)
+ char **args,
+ int num_args)
{
char *response;
char *notice;
ttt_client_send (client, response);
xasprintf (¬ice, "NOTICE MESSAGE %s \"%s\"\r\n",
- client->name,
+ client->username,
args[0]);
ttt_server_broadcast (client->server, notice);
static ttt_error_t
_ttt_client_execute_help (ttt_client_t *client,
- char **args,
- int num_args)
+ char **args,
+ int num_args)
{
char *response;
char *command;
static ttt_error_t
_ttt_client_execute_version (ttt_client_t *client,
- char **args,
- int num_args)
+ char **args,
+ int num_args)
{
char *response;
+ char *clientversion;
+ int version;
+ int i;
assert (num_args == 1);
- /* XXX: Argument is being ignored.
- This is not completely implemented. */
+ clientversion = args[0];
+
+ /* Verify that provided version arg is a positive integer */
+ for (i = 0; i < strlen(clientversion); i++)
+ if (!isdigit (clientversion[i]))
+ return TTT_ERROR_SYNTAX;
+
+ version = atoi (clientversion);
- xasprintf (&response, "VERSION 1\r\n");
+ if (version < 1)
+ return TTT_ERROR_SYNTAX;
+
+ if (version > TTT_SERVER_PROTOCOL_VERSION)
+ version = TTT_SERVER_PROTOCOL_VERSION;
+
+ xasprintf (&response, "VERSION %d\r\n", version);
ttt_client_send (client, response);
free (response);
return TTT_ERROR_QUIT_REQUESTED;
xasprintf (¬ice, "NOTICE QUIT %s\r\n",
- client->name);
+ client->username);
ttt_server_broadcast (client->server, notice);
free (notice);
return TTT_ERROR_QUIT_REQUESTED;
}
+static ttt_error_t
+_ttt_client_execute_invite (ttt_client_t *client,
+ char **args,
+ int num_args)
+{
+ const char *username;
+ char *response;
+ char *notice;
+ ttt_error_t error;
+
+ assert (num_args == 1);
+
+ username = args[0];
+
+ if (!client->registered)
+ return TTT_ERROR_NO_NAME_SET;
+
+ error = ttt_server_verify_username (client->server, username);
+ if (error)
+ return error;
+
+ xasprintf (&response, "INVITE\r\n");
+ ttt_client_send (client, response);
+
+ xasprintf (¬ice, "NOTICE INVITE %s %s\r\n",
+ client->username,
+ username);
+ ttt_server_broadcast (client->server, notice);
+
+ /* XXX: Store invitation in state */
+
+ free (notice);
+ free (response);
+
+ return TTT_ERROR_NONE;
+}
+
+static ttt_error_t
+_ttt_client_execute_accept (ttt_client_t *client,
+ char **args,
+ int num_args)
+{
+ const char *username;
+ char *response;
+ char *notice;
+ ttt_error_t error;
+
+ assert (num_args == 1);
+
+ username = args[0];
+
+ if (!client->registered)
+ return TTT_ERROR_NO_NAME_SET;
+
+ error = ttt_server_verify_username (client->server, username);
+ if (error)
+ return error;
+
+ /* XXX: Verify invitation, else return ERROR NO_INVITE */
+
+ xasprintf (&response, "ACCEPT\r\n");
+ ttt_client_send (client, response);
+
+ xasprintf (¬ice, "NOTICE ACCEPT %s %s\r\n",
+ client->username,
+ username);
+ ttt_server_broadcast (client->server, notice);
+
+ /* XXX: Start a new game */
+
+ free (notice);
+ free (response);
+
+ return TTT_ERROR_NONE;
+}
+
+static ttt_error_t
+_ttt_client_execute_retract (ttt_client_t *client,
+ char **args,
+ int num_args)
+{
+ const char *username;
+ char *response;
+ char *notice;
+ ttt_error_t error;
+
+ assert (num_args == 1);
+
+ username = args[0];
+
+ if (!client->registered)
+ return TTT_ERROR_NO_NAME_SET;
+
+ error = ttt_server_verify_username (client->server, username);
+ if (error)
+ return error;
+
+ /* XXX: Verify invitation, else return ERROR NO_INVITE */
+
+ xasprintf (&response, "RETRACT\r\n");
+ ttt_client_send (client, response);
+
+ xasprintf (¬ice, "NOTICE RETRACT %s %s\r\n",
+ client->username,
+ username);
+ ttt_server_broadcast (client->server, notice);
+
+ /* XXX: Remove invitiation from state */
+
+ free (notice);
+ free (response);
+
+ return TTT_ERROR_NONE;
+}
+
+static ttt_error_t
+_ttt_client_execute_decline (ttt_client_t *client,
+ char **args,
+ int num_args)
+{
+ const char *username;
+ char *response;
+ char *notice;
+ ttt_error_t error;
+
+ assert (num_args == 1);
+
+ username = args[0];
+
+ if (!client->registered)
+ return TTT_ERROR_NO_NAME_SET;
+
+ error = ttt_server_verify_username (client->server, username);
+ if (error)
+ return error;
+
+ /* XXX: Verify invitation, else return ERROR NO_INVITE */
+
+ xasprintf (&response, "DECLINE\r\n");
+ ttt_client_send (client, response);
+
+ xasprintf (¬ice, "NOTICE DECLINE %s %s\r\n",
+ client->username,
+ username);
+ ttt_server_broadcast (client->server, notice);
+
+ /* XXX: Remove invitation from state */
+
+ free (notice);
+ free (response);
+
+ return TTT_ERROR_NONE;
+}
+
static void
_free_request (ttt_client_t *client);
client->request_strings = NULL;
client->num_request_strings = 0;
- client->name = NULL;
+ client->username = NULL;
client->registered = FALSE;
client->num_wins = 0;
}
if (client->registered)
ttt_server_unregister_client (client->server, client);
- free (client->name);
- client->name = NULL;
+ free (client->username);
+ client->username = NULL;
yylex_destroy (client->scanner);
shutdown (client->socket, SHUT_RDWR);
/* Exported: See ttt-client.h for documentation. */
const char*
-ttt_client_get_name (ttt_client_t *client)
+ttt_client_get_username (ttt_client_t *client)
{
- return client->name;
+ return client->username;
}
/* Exported: See ttt-client.h for documentation. */
void
-ttt_client_set_name (ttt_client_t *client, const char *name)
+ttt_client_set_username (ttt_client_t *client, const char *username)
{
- free (client->name);
- client->name = xstrdup (name);
+ free (client->username);
+ client->username = xstrdup (username);
}
/* Exported: See ttt-client.h for documentation. */
{
return client->num_wins;
}
+
+/* This is just to keep the compiler quiet about a function declared
+ * static but never defined. Just an annoying bug in flex's output. */
+static int yy_init_globals (yyscan_t yyscanner) {return 0;}
+void use_yy_init_globals (void);
+void use_yy_init_globals (void) {yyscan_t scan; yy_init_globals(scan);}
projects / ttt / blobdiff