X-Git-Url: https://git.cworth.org/git?p=ttt;a=blobdiff_plain;f=src%2Fttt-server.c;h=23fd138cb375d24f611eb85b45bc7d0460267f1e;hp=316a27021ec6919a7985e80df95fafde2c3b5fc3;hb=f2187ebd49f78b84bd2dca6172abc81e54dda199;hpb=5d56d3cd8b4685e905ed604277ac9cb32c876127 diff --git a/src/ttt-server.c b/src/ttt-server.c index 316a270..23fd138 100644 --- a/src/ttt-server.c +++ b/src/ttt-server.c @@ -19,71 +19,180 @@ * Author: Carl Worth */ -#include "ttt.h" +#include "ttt-server.h" + +#include "ttt-args.h" #include "ttt-client.h" +#include "ttt-error.h" #include "ttt-socket.h" struct _ttt_server { pthread_mutex_t mutex; + const char *host; + const char *port; + ttt_client_t **clients; + int clients_size; int num_clients; }; static void -ttt_server_init (ttt_server_t *server) +ttt_server_init (ttt_server_t *server, const char *host, const char *port) { pthread_mutex_init (&server->mutex, NULL); + server->host = host; + server->port = port; + server->clients = NULL; + server->clients_size = 0; server->num_clients = 0; } -static void -ttt_server_add_client (ttt_server_t *server, ttt_client_t *client) +/* Exported: See ttt-server.h for documentation. */ +ttt_error_t +ttt_server_register_client (ttt_server_t *server, ttt_client_t *client) { + int i; + ttt_error_t error = TTT_ERROR_NONE; + const char *name; + pthread_mutex_lock (&server->mutex); + name = ttt_client_get_name (client); + + assert (name != NULL); + + if (name[0] == '\0') + 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_INVALID_NAME; + goto CLEANUP_LOCK; + } + } + + printf ("Client %s has joined.\r\n", name); + server->num_clients++; - server->clients = xrealloc (server->clients, - server->num_clients * sizeof (ttt_client_t *)); + + if (server->num_clients > server->clients_size) { + if (server->clients_size == 0) + server->clients_size = 1; + else + server->clients_size *= 2; + + server->clients = xrealloc (server->clients, + server->clients_size * sizeof (ttt_client_t *)); + } server->clients [server->num_clients - 1] = client; + CLEANUP_LOCK: pthread_mutex_unlock (&server->mutex); + + return error; } -static void -_accept_client (void *closure, int client_socket) +/* Exported: See ttt-server.h for documentation. */ +void +ttt_server_unregister_client (ttt_server_t *server, ttt_client_t *client) { - ttt_server_t *server = closure; - ttt_client_t *client; - - client = ttt_client_create (server, client_socket); + int i; + + pthread_mutex_lock (&server->mutex); + + for (i = 0; i < server->num_clients; i++) + if (server->clients[i] == client) + break; + + assert (i < server->num_clients); + + printf ("Client %s has left.\r\n", ttt_client_get_name (client)); + + memmove (&server->clients[i], &server->clients[i+1], + (server->num_clients - i - 1) * sizeof (ttt_client_t *)); - ttt_server_add_client (server, client); + server->num_clients--; - ttt_client_handle_requests (client); + pthread_mutex_unlock (&server->mutex); +} + +/* Exported: See ttt-server.h for documentation. */ +void +ttt_server_broadcast (ttt_server_t *server, const char *message) +{ + int i; + + pthread_mutex_lock (&server->mutex); + + for (i = 0; i < server->num_clients; i++) + ttt_client_send (server->clients[i], message); + + pthread_mutex_unlock (&server->mutex); +} + +/* Exported: See ttt-server.h for documentation. */ +const char* +ttt_server_who (ttt_server_t *server) +{ + int i; + char *response; + + pthread_mutex_lock (&server->mutex); + + xasprintf (&response, "WHO"); + + for (i = 0; i < server->num_clients; i++) + xasprintf (&response, "%s %s %d", + response, + ttt_client_get_name (server->clients[i]), + ttt_client_get_num_wins (server->clients[i])); + + xasprintf (&response, "%s\r\n", response); + + pthread_mutex_unlock (&server->mutex); + + return response; +} + +/* Exported: See ttt-server.h for documentation. */ +const char* +ttt_server_get_host (ttt_server_t *server) +{ + return server->host; +} + +/* Exported: See ttt-server.h for documentation. */ +const char* +ttt_server_get_port (ttt_server_t *server) +{ + return server->port; } static const char *WELCOME_MESSAGE = -"Welcome to ttt-server. So far, this program is simply a demonstration\n" -"of a TCP/IP server capable of handling multiple simultaneous clients.\n" -"The server is currently listening on:\n" -"\n %s:%s\n" -"\nTo test this program, simply connect a client to that host and port.\n" -"For example:\n" -"\n telnet %s %s\n" -"\nOnce you have connected a client, the server will echo any characters\n" -"it receives back to the client as well as to stdout.\n" -"\nNote that to terminate the telnet client you type Control-], then\n" -", then \"close\" (and ) at the \"telnet> \" prompt.\n" -"\nHave fun!\n" -"-Carl\n" -"\nPS. The server does support multiple clients, but there is not yet any\n" -"interaction between the clients. The next step is probably to turn the\n" -"server into a simple chat server. After that, we should have the necessary\n" -"structure in place to start implementing the real tic-tac-toe protocol.\n\n"; +"Welcome to ttt-server. The server is currently listening on:\r\n" +"\r\n" +" %s:%s\r\n" +"\r\n" +"To test this, simply connect one or more clients to that host and port.\r\n" +"For example:\r\n" +"\r\n" +" telnet %s %s\r\n" +"\r\n" +"The TTTP (tic-tac-toe protocol) has been partially implemented.\r\n" +"The following commands should work: HELO, HELP, MESSAGE, VERSION, QUIT, WHO.\r\n" +"\r\n"; + +static void +_ttt_server_accept (void *closure, int client_socket) +{ + ttt_server_t *server = closure; + + ttt_client_new (server, client_socket); +} int main (int argc, char **argv) @@ -101,10 +210,10 @@ main (int argc, char **argv) printf (WELCOME_MESSAGE, args.host, args.port, args.host, args.port); - ttt_server_init (&server); + ttt_server_init (&server, args.host, args.port); while (1) - ttt_socket_accept (socket, _accept_client, &server); + ttt_socket_accept (socket, _ttt_server_accept, &server); /* We only reach here if something bad happened. */ return 1;