X-Git-Url: https://git.cworth.org/git?p=ttt;a=blobdiff_plain;f=src%2Fttt-server.c;h=7ffbfc5f15e71a452680af33927d9221d09914d1;hp=d98fc24e2891dafd8de6f34efe4fdffac3536edb;hb=226be118d65765ba95dcd84d14b4162b5837e1a9;hpb=e26c0a51dea5e5ade3bdf081f29500a0fe3944d3 diff --git a/src/ttt-server.c b/src/ttt-server.c index d98fc24..7ffbfc5 100644 --- a/src/ttt-server.c +++ b/src/ttt-server.c @@ -74,7 +74,7 @@ ttt_server_register_client (ttt_server_t *server, ttt_client_t *client) } } - printf ("Client %s has joined.\n", name); + printf ("Client %s has joined.\r\n", name); 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_name (client)); memmove (&server->clients[i], &server->clients[i+1], (server->num_clients - i - 1) * sizeof (ttt_client_t *)); @@ -151,7 +151,7 @@ ttt_server_who (ttt_server_t *server) ttt_client_get_name (server->clients[i]), ttt_client_get_num_wins (server->clients[i])); - xasprintf (&response, "%s\n", response); + xasprintf (&response, "%s\r\n", response); pthread_mutex_unlock (&server->mutex); @@ -173,26 +173,26 @@ 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. So far, this program is still a demonstration\r\n" +"TCP/IP server, acting something like a rather braindead chat server.\r\n" +"The server is currently listening on:\r\n" +"\r\n %s:%s\r\n" +"\r\nTo 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\nOnce you have connected a client, the server will send each line of text\r\n" +"it receives to all connected clients. The server reports client joins and\r\n" +"departures on stdout.\r\n" +"\r\nNote that to terminate the telnet client you type Control-], then\r\n" +", then \"close\" (and ) at the \"telnet> \" prompt.\r\n" +"\r\nHave fun!\r\n" +"-Carl\r\n" +"\r\nPS. At this point we're ready to leave the demonstration phase and to\r\n" +"begin implementing TTTP (tic-tac-toe protocol) as well as fixing the\r\n" +"protocol specifcation. We don't need a custom client to move forward on\r\n" +"the server (that is one of the ideas behind using a telnet-compatible\r\n" +"protocol), but a custom client would still be a fine project for a\r\n" +"motivated beginning programmer.\r\n\r\n"; static void _ttt_server_accept (void *closure, int client_socket)