X-Git-Url: https://git.cworth.org/git?p=ttt;a=blobdiff_plain;f=src%2Fttt-client.c;h=8139ada1de03cb04a2e7c7c986ebd0aa1d136983;hp=e6c97a1c6ad9c2f16ba1f07d9bbc0336e68daa93;hb=c6398c6a1b59f6eddefc9f9ce577017b15677251;hpb=15672ac8305a1c5ba0d9bf6edabb0a194c30628e

diff --git a/src/ttt-client.c b/src/ttt-client.c
index e6c97a1..8139ada 100644
--- a/src/ttt-client.c
+++ b/src/ttt-client.c
@@ -20,124 +20,197 @@
  */
 
 #include "ttt-client.h"
+
+#include "ttt-error.h"
+#include "ttt-lex.h"
+#include "ttt-server.h"
 #include "ttt-socket.h"
+#include "ttt-token.h"
+
+struct _ttt_client {
+    pthread_mutex_t mutex;
+    pthread_t thread;
+
+    ttt_server_t *server;
+    int socket;
+    yyscan_t scanner;
+
+    int id;
+
+    char **request_strings;
+    int num_request_strings;
+};
+
+static void
+_free_request (ttt_client_t *client);
 
-ttt_client_t *
-ttt_client_create (ttt_server_t *server, int socket, int id)
+static void
+_ttt_client_init (ttt_client_t	*client,
+		  ttt_server_t	*server,
+		  int		 socket)
 {
-    ttt_client_t *client;
+    FILE *file;
 
-    client = xmalloc (sizeof (ttt_client_t));
+    pthread_mutex_init (&client->mutex, NULL);
 
     client->server = server;
     client->socket = socket;
 
-    client->id = id;
+    file = xfdopen (socket, "r");
+    yylex_init(&client->scanner);
+    yyset_in (file, client->scanner);
 
-    client->buf_head = client->buf;
-    client->buf_tail = client->buf;
+    client->request_strings = NULL;
+    client->num_request_strings = 0;
 
-    client->request = NULL;
-    client->request_size = 0;
-    client->request_len = 0;
-
-    return client;
+    /* XXX: Probably want to register only as the result of the HELO
+       command.  Not only will that match the protocol correctly, but
+       it will also eliminate a race condition here. */
+    client->id = ttt_server_register_client (server, client);
 }
 
-void
-ttt_client_destroy (ttt_client_t *client)
+static void
+_ttt_client_fini (ttt_client_t *client)
 {
+    pthread_mutex_lock (&client->mutex);
+
+    ttt_server_unregister_client (client->server, client);
+
+    yylex_destroy (client->scanner);
     shutdown (client->socket, SHUT_RDWR);
 
-    free (client->request);
+    _free_request (client);
 
-    free (client);
+    pthread_mutex_unlock (&client->mutex);
+
+    pthread_mutex_destroy (&client->mutex);
 }
 
+/* XXX: The memory management for the request strings is pretty cheesy. */
 static void
 _append_to_request (ttt_client_t	*client,
-		    const char		*buf,
-		    int			 size)
+		    const char		*string)
 {
-    int size_needed = client->request_len + size;
-
-    if (size_needed > client->request_size) {
-	if (client->request_size == 0) {
-	    client->request_size = size_needed;
-	} else {
-	    while (size_needed > client->request_size)
-		client->request_size *= 2;
-	}
+    client->num_request_strings++;
+    client->request_strings =
+	xrealloc (client->request_strings,
+		  client->num_request_strings * sizeof (char *));
 
-	client->request = xrealloc (client->request, client->request_size);
-    }
+    client->request_strings[client->num_request_strings - 1] = xstrdup (string);
+}
+
+static void
+_free_request (ttt_client_t *client)
+{
+    int i;
+
+    for (i = 0; i < client->num_request_strings; i++)
+	free (client->request_strings[i]);
 
-    memcpy (client->request + client->request_len,
-	    buf, size);
+    free (client->request_strings);
 
-    client->request_len += size;
+    client->request_strings = NULL;
+    client->num_request_strings = 0;
 }
 
 static ttt_status_t
-ttt_client_read_into_request_until (ttt_client_t *client, char delimeter)
+_read_request (ttt_client_t *client)
 {
-    ttt_bool_t found_delimeter = FALSE;
-    int bytes_read;
-    char *s;
+    ttt_token_t token;
 
-    client->request_len = 0;
+    _free_request (client);
 
     while (1) {
-
-	if (client->buf_tail >= client->buf_head) {
-	    bytes_read = xread (client->socket,
-				client->buf,
-				TTT_CLIENT_BUF_SIZE);
-	    if (bytes_read == 0)
-		return TTT_STATUS_EOF;
-	    client->buf_head = client->buf;
-	    client->buf_tail = client->buf_head + bytes_read;
+	token = yylex (client->scanner);
+	/* Yes, EOF in two different enums is pretty ugly. */
+	if (token == TTT_TOKEN_EOF)
+	    return TTT_STATUS_EOF;
+
+	if (token == TTT_TOKEN_NEWLINE) {
+	    if (client->num_request_strings)
+		return TTT_STATUS_SUCCESS;
+	    else
+		continue;
 	}
 
-	for (s = client->buf_head; s < client->buf_tail; s++) {
-	    if (*s == delimeter) {
-		found_delimeter = TRUE;
-		s++;
-		break;
-	    }
-	}
-
-	_append_to_request (client,
-			    client->buf_head,
-			    s - client->buf_head);
-	client->buf_head = s;
+	assert (token == TTT_TOKEN_STRING);
 
-	if (found_delimeter)
-	    return TTT_STATUS_SUCCESS;
+	_append_to_request (client, yyget_text (client->scanner));
     }
 }
 
-char *
-ttt_client_read_line (ttt_client_t *client)
+static ttt_error_t
+_execute_request (ttt_client_t *client)
+{
+    int i;
+
+    for (i=0; i < client->num_request_strings; i++)
+	ttt_server_broadcast (client->server, client->request_strings[i]);
+
+    return TTT_ERROR_NONE;
+}
+
+static void *
+_handle_requests_thread (void *closure)
 {
     ttt_status_t status;
-    static const char null_terminator = '\0';
+    ttt_error_t error;
+    ttt_client_t *client = closure;
+
+    while (1) {
 
-    status = ttt_client_read_into_request_until (client, '\n');
-    if (status) {
-	assert (status == TTT_STATUS_EOF);
-	return NULL;
+	status = _read_request (client);
+	if (status == TTT_STATUS_EOF)
+	    break;
+	if (status)
+	    ASSERT_NOT_REACHED;
+
+	error = _execute_request (client);
+	if (error)
+	    ttt_client_send (client, ttt_error_string (error));
     }
 
-    _append_to_request (client, &null_terminator, 1);
+    _ttt_client_fini (client);
+    free (client);
+
+    return (void *) 0;
+}
+
+/* Exported: See ttt-client.h for documentation. */
+void
+ttt_client_new (void *closure, int client_socket)
+{
+    ttt_server_t *server = closure;
+    ttt_client_t *client;
+    int err;
 
-    return client->request;
+    client = xmalloc (sizeof (ttt_client_t));
+    
+    _ttt_client_init (client, server, client_socket);
+
+    err = pthread_create (&client->thread, NULL,
+			  _handle_requests_thread, client);
+    if (err != 0) {
+	fprintf (stderr, "Error: pthread_create failed: %s. Aborting.\n",
+		 strerror (err));
+	exit (1);
+    }
 }
 
+/* Exported: See ttt-client.h for documentation. */
 void
 ttt_client_send (ttt_client_t *client, const char *message)
 {
+    pthread_mutex_lock (&client->mutex);
+
     ttt_socket_write (client->socket, message, strlen (message));
-}
 
+    pthread_mutex_unlock (&client->mutex);
+}
 
+/* Exported: See ttt-client.h for documentation. */
+int
+ttt_client_get_id (ttt_client_t *client)
+{
+    return client->id;
+}