X-Git-Url: https://git.cworth.org/git?p=ttt;a=blobdiff_plain;f=src%2Fttt-server.c;h=5d951fd40d5843430d89937687285c431ff90223;hp=813042044873fa20b03d9ff571dfb3ab0a7f3b9f;hb=5e8532a5e248965f2ff3cfc01e9dcc307fe5825a;hpb=47ff725ff3b109b94a23ea7c8c07c8b1417e31ef

diff --git a/src/ttt-server.c b/src/ttt-server.c
index 8130420..5d951fd 100644
--- a/src/ttt-server.c
+++ b/src/ttt-server.c
@@ -162,7 +162,7 @@ ttt_error_t
 ttt_server_statistics (ttt_server_t *server, const char *username, char **response)
 {
     ttt_bool_t usernamefound = FALSE;
-    char *client_username;
+    const char *client_username;
     int client_num_wins;
     int i;
 
@@ -188,6 +188,30 @@ ttt_server_statistics (ttt_server_t *server, const char *username, char **respon
     return TTT_ERROR_NONE;
 }
 
+/* Exported: See ttt-server.h for documentation. */
+ttt_error_t
+ttt_server_verify_username (ttt_server_t *server, const char *username)
+{
+    ttt_bool_t usernamefound = FALSE;
+    const char *client_username;
+    int i;
+
+    pthread_mutex_lock (&server->mutex);
+
+    for (i = 0; i < server->num_clients; i++) {
+	client_username = ttt_client_get_username (server->clients[i]);
+	if (strcasecmp (username, client_username) == 0)
+	    usernamefound = TRUE;
+    }
+
+    pthread_mutex_unlock (&server->mutex);
+
+    if (!usernamefound)
+	return TTT_ERROR_NO_USER;
+
+    return TTT_ERROR_NONE;
+}
+
 /* Exported: See ttt-server.h for documentation. */
 const char*
 ttt_server_get_host (ttt_server_t *server)
@@ -224,6 +248,35 @@ _ttt_server_accept (void *closure, int client_socket)
     ttt_client_new (server, client_socket);
 }
 
+static void
+_detach_and_write_child_pid_to (const char *filename)
+{
+    pid_t pid;
+
+    /* Use the Unix double-fork trick to detach completely. See
+     * setsid(2) for some details as to why two forks are
+     * needed. */
+    pid = xfork ();
+    if (pid) {
+	/* First parent just exits */
+	exit (0);
+    }
+    
+    chdir ("/");
+    setsid ();
+    
+    pid = xfork ();
+    if (pid) {
+	/* Second parent exits after writing pid */
+	FILE *file = xfopen (filename, "w");
+	fprintf (file, "%d\n", pid);
+	fclose (file);
+	exit (0);
+    }
+    
+    /* Final, detached child returns. */
+}
+
 int 
 main (int argc, char **argv)
 {
@@ -233,12 +286,36 @@ main (int argc, char **argv)
 
     ttt_args_parse (&args, argc, argv);
 
-    if (args.log_file)
-	xfreopen (args.log_file, "a", stderr);
+    if (args.log_file || args.detach) {
+	FILE *log_file;
+	/* In the detach case, we force redirection to a log file. */
+	if (args.log_file == NULL)
+	    args.log_file = "/var/log/ttt-server.log";
+	log_file = fopen (args.log_file, "a");
+	if (log_file == NULL) {
+	    printf ("Warning: Failed to open log file %s: %s.\n",
+		    args.log_file, strerror (errno));
+	    printf ("Logging will be disabled.\n");
+	    xdup2 (1, 2);
+	} else {
+	    xdup2 (fileno (log_file), 2);
+	}
+    }
+
+    if (args.detach)
+	_detach_and_write_child_pid_to (args.pid_file);
 
     socket = ttt_socket_create_server (args.host, args.port);
 
-    printf (WELCOME_MESSAGE, args.host, args.port, args.host, args.port);
+    if (args.detach) {
+	xdup2 (2, 1);
+	printf ("Server started listening on %s:%s\n", args.host, args.port);
+    } else {
+	printf (WELCOME_MESSAGE, args.host, args.port, args.host, args.port);
+    }
+
+    fclose (stdout);
+    fclose (stdin);
 
     ttt_server_init (&server, args.host, args.port);