X-Git-Url: https://git.cworth.org/git?p=ttt;a=blobdiff_plain;f=src%2Fttt-server.c;h=2cac1177209caf16d7cafb6b2394e384490352e0;hp=d10d442e621f4b024c9e5cc31f6e8ed4f10d77ce;hb=152ea9285ef3804783540d46263a7fc9802bc7db;hpb=49f7f9e3dc198c3593021bff5514f19090a4834c

diff --git a/src/ttt-server.c b/src/ttt-server.c
index d10d442..2cac117 100644
--- a/src/ttt-server.c
+++ b/src/ttt-server.c
@@ -20,96 +20,28 @@
  */
 
 #include "ttt.h"
+#include "ttt-socket.h"
 
-static ttt_status_t
-_sockaddr_init (struct sockaddr_in	*addr,
-		const char 		*host,
-		const char		*port)
+static void
+ttt_dispatch (int connected_socket)
 {
-    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;
-    }
-
-    return TTT_STATUS_SUCCESS;
-}
-
-static int
-_wait_for_connection (int listen_socket)
-{
-    fd_set read_set;
-    int num_selected;
-    int flags, err;
-    int connected_socket;
-
-    FD_ZERO (&read_set);
-    FD_SET (listen_socket, &read_set);
+#define BUF_SIZE 1024
 
     while (1) {
-	num_selected = select (listen_socket + 1,
-			       &read_set, NULL, NULL,
-			       NULL);
-
-	flags = fcntl (listen_socket, F_GETFL);
-	flags |= O_NONBLOCK;
-	xfcntl (listen_socket, F_SETFL, flags);
-
-	connected_socket = accept (listen_socket, 0, 0);
-	err = errno;
-
-	flags &= ~O_NONBLOCK;
-	xfcntl (listen_socket, F_SETFL, flags);
-
-	if (connected_socket != -1)
-	    return connected_socket;
-
-	if (err == EWOULDBLOCK || err == EAGAIN)
-	    continue;
-
-	fprintf (stderr, "Error: accept failed: %s. Aborting.\n",
-		 strerror (err));
-	exit (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);
     }
 }
 
 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"
+"of a TCP/IP server that handles one client at a time. The server is\n"
+"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"
@@ -120,56 +52,30 @@ static const char *WELCOME_MESSAGE =
 "<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";
+"\nPS. The server handles only one client at a time, but multiple clients\n"
+"may be able to connect simultaneously. Subsequent clients will see no\n"
+"output from the server until all previous clients exit.\n"
+"\nExtending the server to fork a new process for each client would be a fun\n"
+"project for a motivated student (as would writing a custom client program).\n\n";
 
 int 
 main (int argc, char **argv)
 {
     ttt_args_t args;
-    int listen_socket, connected_socket;
-    struct sockaddr_in addr;
+    int socket;
 
     ttt_args_parse (&args, argc, argv);
 
     if (args.log_file)
 	stderr = xfreopen (args.log_file, "a", stderr);
 
-    listen_socket = xsocket (PF_INET, SOCK_STREAM, 0);
-
-    _sockaddr_init (&addr, args.host, args.port);
-
-#ifdef SO_REUSEADDR
-    {
-	int one = 1;
-	setsockopt (listen_socket, SOL_SOCKET,
-		    SO_REUSEADDR, (char *) &one, sizeof (int));
-    }
-#endif
-
-    xbind (listen_socket, (struct sockaddr *) &addr, sizeof (addr));
-
-    xlisten (listen_socket, SOMAXCONN);
+    socket = ttt_socket_create_server (args.host, args.port);
 
     printf (WELCOME_MESSAGE, args.host, args.port, args.host, args.port);
 
-    connected_socket = _wait_for_connection (listen_socket);
-
-#define BUF_SIZE 1024
-
-    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);
-    }
+    while (1)
+	ttt_socket_accept (socket, ttt_dispatch);
 
-    return 0;
+    /* We only reach here if something bad happened. */
+    return 1;
 }