close connection at game end i guess

uttt.c

@@ -13,6 +13,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <stdarg.h>
 
 struct ut_state
 {
@@ -20,14 +21,33 @@ struct ut_state
 	char boards[3][3];
 	int playBoard;
 	char player;
+	char host_player;
 };
 const struct ut_state ut_initial = {
 		.boards = {0},
 		.tiles = {0},
 		.playBoard = -1,
-		.player = 'X'
-	};
+		.player = 'X',
+		.host_player = '\0',
+};
 
+struct ut_socket_buffer {
+	int fd;
+	char *buf;
+	size_t len;
+	size_t start;
+	size_t stop;
+};
+
+const char *HELP_TEXT = "\
+Usage: uttt (--local | --host | --join)\n\
+\n\
+  --local  play non-network game\n\
+  --host   host game at 127.0.0.1:6669\n\
+  --join   join game at 127.0.0.1:6669\n\
+";
+
+const char *arg_local = "--local";
 const char *arg_host = "--host";
 const char *arg_join = "--join";
 
@@ -41,6 +61,14 @@ char ut_turn(char player)
 	}
 }
 
+int ut_random_player(char *player) {
+	int random = open("/dev/urandom", O_RDONLY);
+	if (read(random, player, 1) < 0) {return errno;}
+	*player = *player % 2 == 0 ? 'X' : 'O';
+	*player = 'X'; // testing
+	return 0;
+}
+
 #define T(r, c) (tiles[offset + stride * r + c])
 char ut_winner(const char *tiles, int offset, int stride) {
 
@@ -236,64 +264,17 @@ int ut_click(const struct ut_state *state, int *r, int *c)
 #undef P
 }
 
-void ut_show(const struct ut_state *state, FILE *file, bool as_comment) {
-	#define tiles state->tiles
-	printf("Turn: %c\nPlay board: %d\n", (int)state->player, state->playBoard);
-	int play_board_row = -1;
-	int play_board_col = -1;
-	if (state->playBoard != -1) {
-		play_board_row = state->playBoard / 3;
-		play_board_col = state->playBoard % 3;
-	}
-	fprintf(file, "%s  012 345 678\n", as_comment ? "| " : "");
-	for(int y = 0; y < 9; y++)
-	{
-		if (y == 3 || y == 6) {
-			fprintf(file, "%s  ---+---+---\n", as_comment ? "| " : "");
-		}
-		fprintf(file, "%s%d ", as_comment ? "| " : "", y);
-		for(int x = 0; x < 9; x++)
-		{
-			if (x == 3 || x == 6) {
-				fputc('|', file);
-			}
-			fputc(tiles[y][x] ? tiles[y][x] : ' ', file);
-		}
-		if (y / 3 == play_board_row || play_board_row == -1) {
-			fputc('<', file);
-		}
-	fputc('\n', file);
-	}
-	if (play_board_col == -1) {
-		fprintf(file, "%s  ^^^ ^^^ ^^^", as_comment ? "| " : "");
-	} else {
-		fprintf(file, "%s  ", as_comment ? "| " : "");
-		for (int i = 0; i < play_board_col; i++) {
-			fprintf(file, "    ");
-		}
-		fprintf(file, "^^^");
-	}
-	fputc('\n', file);
-	#undef tiles
-}
-
-void ut_show_boards(const struct ut_state *state) {
-	for (int j = 0; j < 3; j++) {
-		for (int i = 0; i < 3; i++) {
-			putchar(state->boards[j][i] ? state->boards[j][i] : ' ');
-		}
-		putchar('\n');
-	}
-}
-
 int info_line; // set this to 21 and reset it on erase TODO
-void ut_info(const char *str)
+void ut_info(const char *str, int n)
 {
-	mvaddstr(info_line, 0, str);
-	info_line++;
+	mvaddnstr(info_line, 0, str, n);
+//	info_line++; // depends on str not containing newlines
+	int y, x;
+	getyx(stdscr, y, x);
+	info_line = y + 1;
 }
 
-int readfill(int fd, char *x, size_t l)
+int ut_readfill(int fd, char *x, size_t l)
 {
 	while(l > 0)
 	{
@@ -308,6 +289,159 @@ int readfill(int fd, char *x, size_t l)
 	}
 	return 0;
 }
+int ut_writefill(int fd, const char *x, size_t l)
+{
+	while(l > 0)
+	{
+		int r = write(fd, x, l);
+		if(r < 0)
+		{
+			if(errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {continue;}
+			else {return 1;}
+		}
+		x += r; l -= r;
+	}
+	return 0;
+}
+
+int ut_socket_buffer_size(struct ut_socket_buffer *sockbuf) {
+	int size = sockbuf->stop - sockbuf->start;
+	if (size < 0) {size += sockbuf->len;}
+	return size;
+}
+
+/* Copies up to (and including) first '\n' in socket buffer, otherwise whole buffer */
+int ut_readline_buffer(struct ut_socket_buffer *sockbuf, char *line, size_t len) {
+	int size = ut_socket_buffer_size(sockbuf);
+	printf("sockbuf size: %d\n", size);
+	for (int i = 0; i < size; i++) {
+		if (i > len) {return -2;}
+		line[i] = sockbuf->buf[(sockbuf->start + i) % sockbuf->len];
+		if (line[i] == '\n') {
+			sockbuf->start = (sockbuf->start + i + 1) % sockbuf->len;
+			printf("new start: %d\n", sockbuf->start);
+			return i + 1;
+		}
+	}
+	sockbuf->start = (sockbuf->start + size) % sockbuf->len;
+	printf("new start from size: %d\n", sockbuf->start);
+	return size;
+}
+
+int ut_readline_socket(struct ut_socket_buffer *sockbuf, char *line, size_t len) {
+	while (len > 0) {
+		int r = read(sockbuf->fd, line, len);
+		line[r] = 0;
+		printf("read %d from fd %d\n", r, sockbuf->fd);
+		printf(">>socket data: '%s'\n", line);
+		if (r < 0) {
+			if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {continue;}
+			else {return -1;}
+		}
+		else if (r == 0) {return -1;}
+		for (int i = 0; i < r; i++) {
+			if (line[i] == '\n') {
+				int size = ut_socket_buffer_size(sockbuf);
+				if (r - (i + 1) >= sockbuf->len - size) {return -2;}
+				for (int j = 0; j < r - (i + 1); j++) {
+					sockbuf->buf[(sockbuf->stop + j) % sockbuf->len] = line[i + 1 + j];
+				}
+				sockbuf->stop = (sockbuf->stop + r - (i + 1)) % sockbuf->len;
+				return i;
+			}
+		}
+		line += r;
+		len -= r;
+	}
+}
+
+int ut_readline(struct ut_socket_buffer *sockbuf, char *line, size_t len) {
+	int nb = ut_readline_buffer(sockbuf, line, len);
+	if (nb < 0) {return nb;}
+	line[nb] = 0;
+	printf("got partial line from buffer %d bytes: '%s'\n", nb, line);
+	if (nb >= 1 && line[nb - 1] == '\n') {return nb - 1;}
+	int ns = ut_readline_socket(sockbuf, line + nb, len - nb);
+	if (ns < 0) {return ns;}
+	line[nb+ns] = 0;
+	printf("got end of line from socket %d bytes: '%s'\n", ns, line+nb);
+	return nb + ns;
+}
+
+#define MAX_LINE 128
+
+int ut_dprintf(int fd, const char *restrict format, ...)
+{
+	char line[MAX_LINE];
+	va_list ap;
+	va_start(ap, format);
+	int n = vsnprintf(line, MAX_LINE, format, ap);
+	va_end(ap);
+	if(n < 0 || n > MAX_LINE - 1) {return -1;}
+	if(ut_writefill(fd, line, n)) {return -1;}
+	return n;
+}
+int ut_cursprintf(const char *restrict format, ...)
+{
+	char line[MAX_LINE];
+	va_list ap;
+	va_start(ap, format);
+	int n = vsnprintf(line, MAX_LINE, format, ap);
+	va_end(ap);
+	if(n < 0 || n > MAX_LINE - 1) {return -1;}
+	ut_info(line, n);
+	return n;
+}
+
+void ut_show(const struct ut_state *state, int fd, bool as_comment) {
+	#define tiles state->tiles
+	ut_dprintf(fd, "%sTurn: %c\n%sPlay board: %d\n", as_comment ? "| " : "", (int)state->player, as_comment ? "| " : "", state->playBoard);
+	int play_board_row = -1;
+	int play_board_col = -1;
+	if (state->playBoard != -1) {
+		play_board_row = state->playBoard / 3;
+		play_board_col = state->playBoard % 3;
+	}
+	ut_dprintf(fd, "%s  012 345 678\n", as_comment ? "| " : "");
+	for(int y = 0; y < 9; y++)
+	{
+		if (y == 3 || y == 6) {
+			ut_dprintf(fd, "%s  ---+---+---\n", as_comment ? "| " : "");
+		}
+		ut_dprintf(fd, "%s%d ", as_comment ? "| " : "", y);
+		for(int x = 0; x < 9; x++)
+		{
+			if (x == 3 || x == 6) {
+				ut_writefill(fd, "|", 1);
+			}
+			ut_writefill(fd, tiles[y][x] ? &tiles[y][x] : " ", 1);
+		}
+		if (y / 3 == play_board_row || play_board_row == -1) {
+			ut_writefill(fd, "<", 1);
+		}
+	ut_writefill(fd, "\n", 1);
+	}
+	if (play_board_col == -1) {
+		ut_dprintf(fd, "%s  ^^^ ^^^ ^^^", as_comment ? "| " : "");
+	} else {
+		ut_dprintf(fd, "%s  ", as_comment ? "| " : "");
+		for (int i = 0; i < play_board_col; i++) {
+			ut_dprintf(fd, "    ");
+		}
+		ut_dprintf(fd, "^^^");
+	}
+	ut_writefill(fd, "\n", 1);
+	#undef tiles
+}
+
+void ut_show_boards(const struct ut_state *state) {
+	for (int j = 0; j < 3; j++) {
+		for (int i = 0; i < 3; i++) {
+			putchar(state->boards[j][i] ? state->boards[j][i] : ' ');
+		}
+		putchar('\n');
+	}
+}
 
 bool getpos(const struct ut_state *state, int *x, int *y) {
 	while (true) {
@@ -340,78 +474,27 @@ bool getpos(const struct ut_state *state, int *x, int *y) {
 	return true;
 }
 
-void getpos_net(const struct ut_state *state, int conn, FILE* conn_file, int *x, int *y) {
-	const int MAX_LINE_LEN = 120;
+int getpos_net(const struct ut_state *state, struct ut_socket_buffer *sockbuf, int *x, int *y) { // TODO
+	const int MAX_LINE_LEN = 128;
 	char byte;
 	int n;
 	while (true) {
-		n = recv(conn, &byte, 1, 0);
-		if (n == 0) {goto conn_closed;}
-		if (byte == '|') {
-			// ignore this line
-			for (int i = 0; i < MAX_LINE_LEN; i++) {
-				n = recv(conn, &byte, 1, 0);
-				if (n == 0) {goto conn_closed;}
-				if (byte == '\n') {break;}
-			}
-			if (byte != '\n') {
-				printf("Partner sent too much data in one comment line - exiting\n");
-				close(conn);
-				exit(1);
-			}
-		} else {
-			if (byte == '\n') {
-				printf("Partner ended line before coords were complete - retrying\n");
-				fprintf(conn_file, "| Invalid coordinates. Try again: ");
-				fflush(conn_file);
-				continue;
-			}
-			*x = byte - 0x30;
-			n = recv(conn, &byte, 1, 0);
-			if (n == 0) {goto conn_closed;}
-			if (byte == '\n') {
-				printf("Partner ended line before coords were complete - retrying\n");
-				fprintf(conn_file, "| Invalid coordinates. Try again: ");
-				fflush(conn_file);
-				continue;
-			}
-			n = recv(conn, &byte, 1, 0);
-			if (n == 0) {goto conn_closed;}
-			if (byte == '\n') {
-				printf("Partner ended line before coords were complete - retrying\n");
-				fprintf(conn_file, "| Invalid coordinates. Try again: ");
-				fflush(conn_file);
-				continue;
-			}
-			*y = byte - 0x30;
-			n = recv(conn, &byte, 1, 0);
-			if (n == 0) {goto conn_closed;}
-			if (byte != '\n') {
-				printf("Partner sent extra data after coords were complete - ignoring and retrying\n");
-				fprintf(conn_file, "| Invalid coordinates. Try again: ");
-				fflush(conn_file);
-				// ignore the rest of this line
-				for (int i = 0; i < MAX_LINE_LEN; i++) {
-					n = recv(conn, &byte, 1, 0);
-					if (n == 0) {goto conn_closed;}
-					if (byte == '\n') {break;}
-				}
-				if (byte != '\n') {
-					printf("Partner sent too much extra data - exiting\n");
-					close(conn);
-					exit(1);
-				}
-				continue;
-			}
-			break;
-		}
+		char line[MAX_LINE_LEN];
+		int len = ut_readline(sockbuf, line, MAX_LINE_LEN);
+		if (len < 0) {return len;}
+		if (len == 0) {printf("sex\n");return -1;}
+		line[len] = 0;
+		printf("got >>>>>> line: '%s'\n", line);
+		if (line[0] == '|') {continue;}
+		if (len != 3) {return -3;}
+		if (line[1] != ',') {return -3;}
+		*x = line[0] - 0x30;
+		*y = line[2] - 0x30;
+		break;
 	}
 	printf("x=%d y=%d\n", *x, *y);
-	return;
+	return 0;
 
-	conn_closed:
-	printf("Connection closed.\n");
-	exit(1);
 }
 
 void finish(int sig)
@@ -463,10 +546,10 @@ void finish(int sig)
 	return 0;
 }*/
 
-void ut_local_game(struct ut_state *state) { // TODO replace with from ncurses main
+int ut_local_game(struct ut_state *state) { // TODO replace with from ncurses main
 	int x, y;
 	while (true) {
-		ut_show(state, stdout, false);
+		ut_show(state, 1, false);
 		ut_show_boards(state);
 		bool ok = getpos(state, &x, &y);
 		if (!ok) {continue;}
@@ -483,112 +566,161 @@ void ut_local_game(struct ut_state *state) { // TODO replace with from ncurses m
 			{
 				printf("\n%c wins!\n", (int)w);
 			}
+			break;
 		}
 	}
+	return 0;
 }
 
-void ut_network_game(struct ut_state *state, int conn, FILE* conn_file, char player) {
+int ut_network_game(struct ut_state *state, struct ut_socket_buffer *sockbuf, char player) { // TODO
 	int x, y;
+	bool host = player == state->host_player;
 	printf("You play as %c.\n", player);
 	while (true) {
-		ut_show(state, stdout, false);
+		ut_show(state, 1, false);
 		ut_show_boards(state);
-		ut_show(state, conn_file, true);
+		ut_show(state, sockbuf->fd, true);
 		if (state->player == player) {
-			fprintf(conn_file, "| Waiting for game partner ...\n");
-			fflush(conn_file);
+			if (host) {ut_dprintf(sockbuf->fd, "| Waiting for game partner ...\n");}
 			bool ok = getpos(state, &x, &y);
 			if (!ok) {continue;}
-			fprintf(conn_file, "%d,%d\n", x, y);
+			ut_dprintf(sockbuf->fd, "%d,%d\n", x, y);
 		} else {
 			printf("Waiting for game partner ...\n");
-			fprintf(conn_file, "| Place token %c in position x,y: ", ut_turn(player));
-			fflush(conn_file);
-			getpos_net(state, conn, conn_file, &x, &y);
+			if (host) {
+				ut_dprintf(sockbuf->fd, "|\n"); // aligns game board each turn
+				ut_dprintf(sockbuf->fd, "| Place token %c in position x,y: ", ut_turn(player));
+			}
+			int err = getpos_net(state, sockbuf, &x, &y);
+			if (err == -1) {
+				printf("Connection closed.\n");
+				return 1;
+			} else if (err == -2) {
+				printf("Partner sent too much data - exiting\n");
+				return 1;
+			} else if (err == -3) {
+				printf("Partner sent malformed data - retrying ...\n");
+				continue;
+			}
 		}
 		int err = ut_move(state, state, y, x);
 		if (err) {continue;}
-		fprintf(conn_file, "|\n");
+		ut_dprintf(sockbuf->fd, "|\n");
 		char w = ut_winner((char *)state->boards, 0, 3);
 		if(w)
 		{
 			if(w == ' ')
 			{
 				printf("\nDraw!\n");
+				if (host) {ut_dprintf(sockbuf->fd, "|\n|Draw!\n");}
+				close(sockbuf->fd);
 			}
 			else
 			{
 				printf("\n%c wins!\n", (int)w);
+				if (host) {ut_dprintf(sockbuf->fd, "|\n|%c wins!\n", (int)w);}
+				close(sockbuf->fd);
 			}
+			break;
 		}
 	}
+	return 0;
+}
+
+int ut_host_game(struct ut_state *state) {
+	int sock = socket(AF_INET, SOCK_STREAM, 0);
+	if (sock == -1) {
+		int errsv = errno;
+		printf("error %d\n", errsv);
+		return 1;
+	}
+	const struct sockaddr_in addr = {
+		.sin_family = AF_INET,
+		.sin_port = htons(6669),
+		.sin_addr = { .s_addr = htonl(0x7f000001) },
+	};
+	setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &(int){1}, sizeof(int));
+	if (bind(sock, (struct sockaddr*)&addr, sizeof(addr)) == -1) {
+		int errsv = errno;
+		printf("error %d\n", errsv);
+		return 1;
+	}
+	if (listen(sock, 128) == -1) {
+		int errsv = errno;
+		printf("error %d\n", errsv);
+		return 1;
+	}
+	printf("Waiting for game partner at 127.0.0.1:6669 ...\n");
+	int conn = accept(sock, NULL, NULL);
+	if (conn == -1) {
+		int errsv = errno;
+		printf("error %d\n", errsv);
+		return 1;
+	}
+
+	// decide X or O
+	if (ut_random_player(&state->host_player) != 0) {return 1;}
+
+	// tell partner X or O
+	ut_dprintf(conn, "%c\n", ut_turn(state->host_player)); // TODO
+
+	struct ut_socket_buffer connbuf = {
+		.fd = conn,
+		.buf = (char[128]){0},
+		.len = 128,
+		.start = 0,
+		.stop = 0,
+	};
+	return ut_network_game(state, &connbuf, state->host_player);
+}
+
+int ut_join_game(struct ut_state *state) {
+	int sock = socket(AF_INET, SOCK_STREAM, 0);
+	if (sock == -1) {
+		int errsv = errno;
+		printf("error %d\n", errsv);
+		return 1;
+	}
+	const struct sockaddr_in addr = {
+		.sin_family = AF_INET,
+		.sin_port = htons(6669),
+		.sin_addr = { .s_addr = htonl(0x7f000001) },
+	};
+	printf("Connecting to game host at 127.0.0.1:6669 ...\n");
+	connect(sock, (struct sockaddr*)&addr, sizeof(addr));
+
+	// host decides X or O
+	char player_buf[2];
+	char *player = (char*)&player_buf;
+	int r = ut_readfill(sock, player_buf, 2);
+	if (r == 2) {printf("Connection closed.\n");}
+	if (r != 0) {return 1;}
+	state->host_player = ut_turn(*player);
+
+	struct ut_socket_buffer sockbuf = {
+		.fd = sock,
+		.buf = (char[128]){0},
+		.len = 128,
+		.start = 0,
+		.stop = 0,
+	};
+	return ut_network_game(state, &sockbuf, *player);
 }
 
 int main(int argc, char **argv) {
 	signal(SIGINT, finish);
 	struct ut_state state = ut_initial;
-	if (argc < 2) {
-		ut_local_game(&state);
+	if (argc != 2) {
+		printf(HELP_TEXT);
+		return 1;
+	} else if (strncmp(argv[1], arg_local, strlen(arg_local)) == 0) {
+		return ut_local_game(&state);
 	} else if (strncmp(argv[1], arg_host, strlen(arg_host)) == 0) {
-		int sock = socket(AF_INET, SOCK_STREAM, 0);
-		if (sock == -1) {
-			int errsv = errno;
-			printf("error %d\n", errsv);
-			return 1;
-		}
-		const struct sockaddr_in addr = {
-			.sin_family = AF_INET,
-			.sin_port = htons(6669),
-			.sin_addr = { .s_addr = htonl(0x7f000001) },
-		};
-		setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &(int){1}, sizeof(int));
-		if (bind(sock, (struct sockaddr*)&addr, sizeof(addr)) == -1) {
-			int errsv = errno;
-			printf("error %d\n", errsv);
-			return 1;
-		}
-		if (listen(sock, 128) == -1) {
-			int errsv = errno;
-			printf("error %d\n", errsv);
-			return 1;
-		}
-		printf("Waiting for game partner at 127.0.0.1:6669 ...\n");
-		int conn = accept(sock, NULL, NULL);
-		if (conn == -1) {
-			int errsv = errno;
-			printf("error %d\n", errsv);
-			return 1;
-		}
-		FILE* conn_file = fdopen(conn, "w");
-		// decide X or O
-		int random = open("/dev/urandom", O_RDONLY);
-		int byte;
-		read(random, &byte, 1);
-		char player = byte % 2 == 0 ? 'X' : 'O';
-		// tell partner X or O
-		fprintf(conn_file, "%c\n", ut_turn(player));
-		ut_network_game(&state, conn, conn_file, player);
+		return ut_host_game(&state);
 	} else if (strncmp(argv[1], arg_join, strlen(arg_join)) == 0) {
-		int sock = socket(AF_INET, SOCK_STREAM, 0);
-		if (sock == -1) {
-			int errsv = errno;
-			printf("error %d\n", errsv);
-			return 1;
-		}
-		const struct sockaddr_in addr = {
-			.sin_family = AF_INET,
-			.sin_port = htons(6669),
-			.sin_addr = { .s_addr = htonl(0x7f000001) },
-		};
-		printf("Connecting to game host at 127.0.0.1:6669 ...\n");
-		connect(sock, (struct sockaddr*)&addr, sizeof(addr));
-		FILE* sock_file = fdopen(sock, "w");
-		char player_buf[2];
-		if (recv(sock, &player_buf, 2, 0) != 2) {return 1;}
-		ut_network_game(&state, sock, sock_file, player_buf[0]);
+		return ut_join_game(&state);
 	} else {
-		printf("%s\n", argv[1]);
+		printf(HELP_TEXT, argv[1]);
+		return 1;
 	}
-	return 0;
-
 }