* PROTOCOL: Document QUIT.
* src/ttt-client.c: (_ttt_client_execute_helo),
(_ttt_client_execute_quit), (_ttt_client_init), (_ttt_client_fini),
(_execute_request), (_handle_requests_thread): Implement QUIT. Add
client->registered flag and unregister only if registered. Change
from args_min and args_max to args_required.
* src/ttt-error.h:
* src/ttt-error.c: (ttt_error_string):
* src/ttt-server.c: (ttt_server_register_client): Put underscores
in TTT_ERRROR names for better readability.
+2005-11-24 Carl Worth <cworth@cworth.org>
+
+ * PROTOCOL: Document QUIT.
+
+ * src/ttt-client.c: (_ttt_client_execute_helo),
+ (_ttt_client_execute_quit), (_ttt_client_init), (_ttt_client_fini),
+ (_execute_request), (_handle_requests_thread): Implement QUIT. Add
+ client->registered flag and unregister only if registered. Change
+ from args_min and args_max to args_required.
+
+ * src/ttt-error.h:
+ * src/ttt-error.c: (ttt_error_string):
+ * src/ttt-server.c: (ttt_server_register_client): Put underscores
+ in TTT_ERRROR names for better readability.
+
2005-11-24 Carl Worth <cworth@cworth.org>
* PROTOCOL:
QUIT
+ Disconnects the client from the server.
+
1.2.5. Version
VERSION <client-version-number>
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", 1, 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));
}
switch (error) {
case TTT_ERROR_NONE:
return "ERROT NONE\n";
- case TTT_ERROR_NONAMESET:
+ case TTT_ERROR_NO_NAME_SET:
return "ERROR NONAMESET\n";
- case TTT_ERROR_INVALIDNAME:
+ case TTT_ERROR_INVALID_NAME:
return "ERROR INVALIDNAME\n";
case TTT_ERROR_COMMAND:
return "ERROR COMMAND\n";
case TTT_ERROR_SYNTAX:
return "ERROR SYNTAX\n";
- case TTT_ERROR_NOTNUMBER:
+ case TTT_ERROR_NOT_NUMBER:
return "ERROR NOTNUMBER\n";
- case TTT_ERROR_NOTGRID:
+ case TTT_ERROR_NOT_GRID:
return "ERROR NOTGRID\n";
- case TTT_ERROR_NOUSER:
+ case TTT_ERROR_NO_USER:
return "ERROR NOUSER\n";
- case TTT_ERROR_NOTINGAME:
+ case TTT_ERROR_NOT_IN_GAME:
return "ERROR_NOTINGAME\n";
- case TTT_ERROR_NOTPLAYING:
+ case TTT_ERROR_NOT_PLAYING:
return "ERROR_NOTPLAYING\n";
- case TTT_ERROR_NOTYOURTURN:
+ case TTT_ERROR_NOT_YOUR_TURN:
return "ERROR NOTYOURTURN\n";
+ /* Not an actual protocol errror, so this should never happen. */
+ case TTT_ERROR_QUIT_REQUESTED:
+ ASSERT_NOT_REACHED;
+ break;
}
ASSERT_NOT_REACHED;
typedef enum {
TTT_ERROR_NONE,
- TTT_ERROR_NONAMESET,
- TTT_ERROR_INVALIDNAME,
+ TTT_ERROR_NO_NAME_SET,
+ TTT_ERROR_INVALID_NAME,
TTT_ERROR_COMMAND,
TTT_ERROR_SYNTAX,
- TTT_ERROR_NOTNUMBER,
- TTT_ERROR_NOTGRID,
- TTT_ERROR_NOUSER,
- TTT_ERROR_NOTINGAME,
- TTT_ERROR_NOTPLAYING,
- TTT_ERROR_NOTYOURTURN
+ TTT_ERROR_NOT_NUMBER,
+ TTT_ERROR_NOT_GRID,
+ TTT_ERROR_NO_USER,
+ TTT_ERROR_NOT_IN_GAME,
+ TTT_ERROR_NOT_PLAYING,
+ TTT_ERROR_NOT_YOUR_TURN,
+
+ /* Here's a non-protocol pseudo-error used to implement QUIT. */
+ TTT_ERROR_QUIT_REQUESTED
} ttt_error_t;
const char *
assert (name != NULL);
if (name[0] == '\0')
- return TTT_ERROR_INVALIDNAME;
+ return TTT_ERROR_INVALID_NAME;
for (i = 0; i < server->num_clients; i++) {
if (strcmp (ttt_client_get_name (server->clients[i]), name) == 0) {
- error = TTT_ERROR_INVALIDNAME;
+ error = TTT_ERROR_INVALID_NAME;
goto CLEANUP_LOCK;
}
}