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_required;
} 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}
+ {"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
client->registered = TRUE;
- xasprintf (&response, "HELO %s %s %s\n",
+ 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);
+
free (response);
return TTT_ERROR_NONE;
char **args,
int num_args)
{
- const char *response;
+ char *response;
assert (num_args == 0);
}
static ttt_error_t
-_ttt_client_execute_quit (ttt_client_t *client,
- char **args,
- int num_args)
+_ttt_client_execute_quit (ttt_client_t *client,
+ char **args,
+ int num_args)
{
- assert (num_args == 0);
+ char *notice;
+ assert (num_args == 0);
+ xasprintf (¬ice,"NOTICE QUIT %s\r\n",client->name);
+ ttt_server_broadcast(client->server,notice);
+ free (notice);
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\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]);
+
+ }
+ xasprintf(&response, "%s\r\n",response);
+ ttt_server_broadcast (client->server,response);
+
+ free (response);
+ return TTT_ERROR_NONE;
+
+
+}
+
static void
_free_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_required)
+ if (num_args < desc->args_required)
return TTT_ERROR_SYNTAX;
return (desc->execute) (client, &client->request_strings[1], num_args);
}
err = pthread_create (&client->thread, NULL,
_handle_requests_thread, client);
if (err != 0) {
- fprintf (stderr, "Error: pthread_create failed: %s. Aborting.\n",
+ fprintf (stderr, "Error: pthread_create failed: %s. Aborting.\r\n",
strerror (err));
exit (1);
}