Merge branch 'main' of github.com:teddy-zhng/buffer-overflow-exercises into main

Author: mavlevin

client.py

@@ -41,6 +41,34 @@ def get_version(self):
 		self.server_conn.sendall(TicTacToe.GET_VERSION_PKT)
 		return self.read_response()
 
+    #caller guarantees turn is a single char, X or O
+	def place(self, turn):
+		user_coords = input("Please enter the coordinates you want to mark, eg: 0 0").split()
+		while len(user_coords) != 2:
+			input = ("You made me almost seg fault! Give me two coordinates!")
+
+		packet = turn + user_coords[0] + user_coords[1]
+		self.server_conn.send(packet) #send which player, and coordinates
+
+	#expects a response that is a 9 byte string representing the board
+	def read_board(self):
+		response = self.read_response(self)
+
+		#print the board
+		print('     0     1     2')
+		print('0    %s  |  %s  |  %s', response[0], response[1], response[2])
+		print('     ----------------')
+		print('1    %s  |  %s  |  %s', response[4], response[5], response[6])
+		print('     ----------------')
+		print('2    %s  |  %s  |  %s', response[7], response[8], response[9])
+		
+	#expects 4 bytes repr. winner, 0 = no one, 1 = X, 2 = O
+	def get_winner(self):
+		response = self.read_response(self)
+		return int.from_bytes(response) == 0
+
+        
+
 def play(connect_tuple):
 	game = TicTacToe(connect_tuple)
 	print("connecting")
@@ -49,7 +77,6 @@ def play(connect_tuple):
 	print(game.get_version())
 
 
-
 def main():
 	if len(sys.argv) != 3:
 		print("Need <tictactoe host ip> <tictactoe host port>")

tictactoe.c

@@ -19,6 +19,7 @@ enum Player board[__BOARD_SIZE__][__BOARD_SIZE__] = { //(0, 0) top left, (2, 2)
     {E, E, E} 
 };
 
+//expects 3 * 4 bytes = 12
 bool handle_place(int client_fd, char* client_str) {
     enum Player player; //first four bytes of packet are the player
     while ( (player = get_int_from_client(client_fd)) == -1) { }
@@ -43,13 +44,14 @@ bool handle_place(int client_fd, char* client_str) {
 //     return 0;
 // }
 
-// sends the board as a 36-byte (9 ints) char*
+// sends the board as a 9-byte char*
 bool handle_read_board(int client_fd, char* client_str) {
     char board_pkt[9];
     int i = 0;
     for (int x = 0; x < __BOARD_SIZE__; x++) {
         for (int y = 0; y < __BOARD_SIZE__; y++) {
-            board_pkt[i] = board[x][y];
+			char player = 'X' ? board[x][y] == X : 'O' ? board[x][y] == O : 'E';
+            board_pkt[i] = player;
             i++;
         }
     }
@@ -60,7 +62,7 @@ bool handle_read_board(int client_fd, char* client_str) {
 }
 
 
-
+//sends 4 bytes
 bool handle_get_winner(int client_fd, char* client_str) {
     //implement a more effecient check if needed