X-Git-Url: https://git.cworth.org/git?p=ttt;a=blobdiff_plain;f=src%2Fttt-server.c;h=23fd138cb375d24f611eb85b45bc7d0460267f1e;hp=a248fa1a789b0a22f20db04551f0f531aaf472d5;hb=f2187ebd49f78b84bd2dca6172abc81e54dda199;hpb=2cd70db8433cc9d02a4ca784190260889c835198

diff --git a/src/ttt-server.c b/src/ttt-server.c
index a248fa1..23fd138 100644
--- a/src/ttt-server.c
+++ b/src/ttt-server.c
@@ -1,4 +1,4 @@
-/* ttt.c - client-server tic-tac-toe game
+/* ttt-server.c - tic-tac-toe game server
  *
  * Copyright © 2005 Carl Worth
  *
@@ -19,158 +19,202 @@
  * Author: Carl Worth <cworth@cworth.org>
  */
 
-#include "ttt.h"
+#include "ttt-server.h"
 
-static ttt_status_t
-_sockaddr_init (struct sockaddr_in	*addr,
-		const char 		*host,
-		const char		*port)
+#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, const char *host, const char *port)
 {
-    struct hostent *hostent;
-    struct servent *servent;
-    char *endptr;
-    long port_long;
-    uint16_t port_short;
-
-    addr->sin_family = AF_INET;
-
-    hostent = gethostbyname (host);
-    if (hostent == NULL)
-    {
-	fprintf (stderr, "Error: Lookup failed for host %s: %s\n",
-		 host, hstrerror (h_errno));
-	return TTT_STATUS_FAILURE;
-    }
-    memcpy (&addr->sin_addr.s_addr, hostent->h_addr_list[0], 
-	    sizeof (addr->sin_addr.s_addr));
-
-    assert (*port != '\0');
-    port_long = strtol (port, &endptr, 10);
-    if (*endptr == '\0')
-    {
-	/* Numeric port*/
-	if (port_long <= 0 || port_long >= (1 << 16)) {
-	    fprintf (stderr, "Error: Port %ld out of range.\n", port_long);
-	    return TTT_STATUS_FAILURE;
-	}
-	port_short = port_long;
-	addr->sin_port = htons (port_short);
-    } else {
-	/* Named port */
-	servent = getservbyname (port, "tcp");
-	if (port == NULL) {
-	    fprintf (stderr, "Error: Lookup failed for port %s: %s\n",
-		     port, hstrerror (h_errno));
-	    return TTT_STATUS_FAILURE;
-	}
-	addr->sin_port = servent->s_port;
-    }
+    pthread_mutex_init (&server->mutex, NULL);
+
+    server->host = host;
+    server->port = port;
 
-    return TTT_STATUS_SUCCESS;
+    server->clients = NULL;
+    server->clients_size = 0;
+    server->num_clients = 0;
 }
 
-static int
-_wait_for_connection (int listen_socket)
+/* Exported: See ttt-server.h for documentation. */
+ttt_error_t
+ttt_server_register_client (ttt_server_t *server, ttt_client_t *client)
 {
-    fd_set read_set;
-    int num_selected;
-    int flags, err;
-    int connected_socket;
+    int i;
+    ttt_error_t error = TTT_ERROR_NONE;
+    const char *name;
 
-    FD_ZERO (&read_set);
-    FD_SET (listen_socket, &read_set);
+    pthread_mutex_lock (&server->mutex);
 
-    while (1) {
-	num_selected = select (listen_socket + 1,
-			       &read_set, NULL, NULL,
-			       NULL);
+    name = ttt_client_get_name (client);
 
-	flags = fcntl (listen_socket, F_GETFL);
-	flags |= O_NONBLOCK;
-	xfcntl (listen_socket, F_SETFL, flags);
+    assert (name != NULL);
 
-	connected_socket = accept (listen_socket, 0, 0);
-	err = errno;
+    if (name[0] == '\0')
+	return TTT_ERROR_INVALID_NAME;
 
-	flags &= ~O_NONBLOCK;
-	xfcntl (listen_socket, F_SETFL, flags);
+    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;
+	}
+    }
 
-	if (connected_socket != -1)
-	    return connected_socket;
+    printf ("Client %s has joined.\r\n", name);
 
-	if (err == EWOULDBLOCK || err == EAGAIN)
-	    continue;
+    server->num_clients++;
 
-	fprintf (stderr, "Error: accept failed: %s. Aborting.\n",
-		 strerror (err));
-	exit (1);
+    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 const char *WELCOME_MESSAGE = 
-"Welcome to ttt-server. So far, this program is simply a demonstration\n"
-"of a one-shot TCP/IP server. 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"
-"<Enter>, then \"close\" (and <Enter>) at the \"telnet> \" prompt.\n"
-"\nHave fun!\n"
-"-Carl\n"
-"\nPS. By one-shot, I mean that the server will only accept a connection\n"
-"from a single client, and the server will exit when that client disconnects\n"
-"To test the server again, you will need to manually restart it again.\n"
-"Extending the server to start listening again, or to handle multiple\n"
-"clients simultaneously would both be fun projects for a motivated\n"
-"student (as would writing a custom client program).\n\n";
+/* Exported: See ttt-server.h for documentation. */
+void
+ttt_server_unregister_client (ttt_server_t *server, ttt_client_t *client)
+{
+    int i;
 
-int 
-main (int argc, char **argv)
+    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 *));
+
+    server->num_clients--;
+
+    pthread_mutex_unlock (&server->mutex);
+}
+
+/* Exported: See ttt-server.h for documentation. */
+void
+ttt_server_broadcast (ttt_server_t *server, const char *message)
 {
-    ttt_args_t args;
-    int args_first;
-    int listen_socket, connected_socket;
-    struct sockaddr_in addr;
+    int i;
 
-    ttt_args_parse (&args, argc, argv, &args_first);
+    pthread_mutex_lock (&server->mutex);
 
-    listen_socket = xsocket (PF_INET, SOCK_STREAM, 0);
+    for (i = 0; i < server->num_clients; i++)
+	ttt_client_send (server->clients[i], message);
 
-#define HOST "localhost"
-#define PORT "5534"
+    pthread_mutex_unlock (&server->mutex);
+}
 
-    _sockaddr_init (&addr, HOST, PORT);
+/* Exported: See ttt-server.h for documentation. */
+const char*
+ttt_server_who (ttt_server_t *server)
+{
+    int i;
+    char *response;
 
-#ifdef SO_REUSEADDR
-    {
-	int one = 1;
-	setsockopt (listen_socket, SOL_SOCKET,
-		    SO_REUSEADDR, (char *) &one, sizeof (int));
-    }
-#endif
+    pthread_mutex_lock (&server->mutex);
 
-    xbind (listen_socket, (struct sockaddr *) &addr, sizeof (addr));
+    xasprintf (&response, "WHO");
 
-    xlisten (listen_socket, SOMAXCONN);
+    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]));
 
-    printf (WELCOME_MESSAGE, HOST, PORT, HOST, PORT);
+    xasprintf (&response, "%s\r\n", response);
 
-    connected_socket = _wait_for_connection (listen_socket);
+    pthread_mutex_unlock (&server->mutex);
 
-#define BUF_SIZE 1024
+    return response;
+}
 
-    while (1) {
-	char buf[BUF_SIZE];
-	int cnt;
-	cnt = read (connected_socket, buf, BUF_SIZE);
-	if (cnt == 0)
-	    break;
-	write (0, buf, cnt);
-	write (connected_socket, buf, cnt);
-    }
+/* 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. 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)
+{
+    ttt_args_t args;
+    ttt_server_t server;
+    int socket;
+
+    ttt_args_parse (&args, argc, argv);
+
+    if (args.log_file)
+	xfreopen (args.log_file, "a", stderr);
+
+    socket = ttt_socket_create_server (args.host, args.port);
+
+    printf (WELCOME_MESSAGE, args.host, args.port, args.host, args.port);
+
+    ttt_server_init (&server, args.host, args.port);
+
+    while (1)
+	ttt_socket_accept (socket, _ttt_server_accept, &server);
 
-    return 0;
+    /* We only reach here if something bad happened. */
+    return 1;
 }