X-Git-Url: https://git.cworth.org/git?p=ttt;a=blobdiff_plain;f=src%2Fttt-server.c;h=4f647ee04f69c8b6e0044c325109cedd4b3b4ceb;hp=60276d39ccf691bed7b86e90822e02d3fb90abd7;hb=3dfae8f4b1127a62f3acc299683a8fbd63b908df;hpb=980a478f042f8cf48f4484bb117fab8dafd8b450 diff --git a/src/ttt-server.c b/src/ttt-server.c index 60276d3..4f647ee 100644 --- a/src/ttt-server.c +++ b/src/ttt-server.c @@ -56,25 +56,25 @@ ttt_server_register_client (ttt_server_t *server, ttt_client_t *client) { int i; ttt_error_t error = TTT_ERROR_NONE; - const char *name; + const char *username; pthread_mutex_lock (&server->mutex); - name = ttt_client_get_name (client); + username = ttt_client_get_username (client); - assert (name != NULL); + assert (username != NULL); - if (name[0] == '\0') + if (username[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) { + if (strcmp (ttt_client_get_username (server->clients[i]), username) == 0) { error = TTT_ERROR_INVALID_NAME; goto CLEANUP_LOCK; } } - printf ("Client %s has joined.\n", name); + fprintf (stderr, "Client %s has joined.\r\n", username); server->num_clients++; @@ -110,7 +110,7 @@ ttt_server_unregister_client (ttt_server_t *server, ttt_client_t *client) assert (i < server->num_clients); - printf ("Client %s has left.\n", ttt_client_get_name (client)); + printf ("Client %s has left.\r\n", ttt_client_get_username (client)); memmove (&server->clients[i], &server->clients[i+1], (server->num_clients - i - 1) * sizeof (ttt_client_t *)); @@ -146,15 +146,72 @@ ttt_server_who (ttt_server_t *server) xasprintf (&response, "WHO"); for (i = 0; i < server->num_clients; i++) - xasprintf (&response, "%s %s", response, ttt_client_get_name(server->clients[i])); + xasprintf (&response, "%s %s", + response, + ttt_client_get_username (server->clients[i])); - xasprintf (&response, "%s\n", response); + xasprintf (&response, "%s\r\n", response); pthread_mutex_unlock (&server->mutex); return response; } +/* Exported: See ttt-server.h for documentation. */ +ttt_error_t +ttt_server_statistics (ttt_server_t *server, const char *username, char **response) +{ + ttt_bool_t usernamefound = FALSE; + const char *client_username; + int client_num_wins; + 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; + client_num_wins = ttt_client_get_num_wins (server->clients[i]); + xasprintf (response, "STATISTICS %s \"\r\n" + "TICTACTOE WINS %d\r\n\"\r\n", + client_username, + client_num_wins); + } + } + + pthread_mutex_unlock (&server->mutex); + + if (!usernamefound) + return TTT_ERROR_NO_USER; + + 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) @@ -170,26 +227,18 @@ ttt_server_get_port (ttt_server_t *server) } static const char *WELCOME_MESSAGE = -"Welcome to ttt-server. So far, this program is still a demonstration\n" -"TCP/IP server, acting something like a rather braindead chat server.\n" -"The server is currently listening on:\n" -"\n %s:%s\n" -"\nTo test this, simply connect one or more clients to that host and port.\n" -"For example:\n" -"\n telnet %s %s\n" -"\nOnce you have connected a client, the server will send each line of text\n" -"it receives to all connected clients. The server reports client joins and\n" -"departures on 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. At this point we're ready to leave the demonstration phase and to\n" -"begin implementing TTTP (tic-tac-toe protocol) as well as fixing the\n" -"protocol specifcation. We don't need a custom client to move forward on\n" -"the server (that is one of the ideas behind using a telnet-compatible\n" -"protocol), but a custom client would still be a fine project for a\n" -"motivated beginning programmer.\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) @@ -199,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) { @@ -208,12 +286,55 @@ 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); + + /* Now that we've setup logging and the pid file, drop any special + * permissions we might have if we were asked to do that. */ + if (args.user) { + int ret; + struct passwd *pwd; + errno = 0; + pwd = getpwnam (args.user); + if (pwd == NULL) { + fprintf (stderr, "Error: Failed to lookup uid for %s: %s. Aborting.\n", + args.user, + errno == 0 ? "User not found" : strerror (errno)); + exit (1); + } + ret = setuid (pwd->pw_uid); + if (ret == -1) { + fprintf (stderr, "Error: Failed to setuid to %d (%s): %s. Aborting.\n", + pwd->pw_uid, args.user, strerror (errno)); + exit (1); + } + } socket = ttt_socket_create_server (args.host, args.port); - printf (WELCOME_MESSAGE, args.host, args.port, args.host, args.port); + if (args.detach) + 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);