added sending/receiving gameplay packets

Author: teddy-zhng

client.py

@@ -17,7 +17,7 @@ def __init__(self, connect_tuple, debug = True):
 		self.server_conn = None
 		self.debug = debug
 
-	def read_resposne(self):
+	def read_response(self):
 		resp_len = self.server_conn.recv(4)
 		if len(resp_len) != 4:
 			client_error_wrapper("unable to read resposne length")
@@ -39,7 +39,7 @@ def connect(self):
 
 	def get_version(self):
 		self.server_conn.sendall(TicTacToe.GET_VERSION_PKT)
-		return self.read_resposne()
+		return self.read_response()
 
 def play(connect_tuple):
 	game = TicTacToe(connect_tuple)

helper.c

@@ -52,6 +52,27 @@ bool get_str_from_client(int client_fd, char* str) {
     return true;
 }
 
+int get_int_from_client(int client_fd) {
+    int number;
+    int bytes_read = recv(client_fd, &number, sizeof(int), 0);
+    if (bytes_read == -1) {
+        perror("recv from get_int_from_client in len");
+    }
+    if (bytes_read == 0) {
+        printf("client disconnected in number in get_int_from_client\n");
+        return -1;
+    }
+    if (bytes_read != sizeof(int)) {
+    	printf("client didn't send exactly 4 bytes for int length in get_int_from_client\n");
+    	return -1;
+    }
+
+    number = ntohl(number);
+    log_verbose("will read number %d\n", number);
+
+    return number;
+}
+
 void uses_assumed_sizes() {
 	if (sizeof(int) != 4) {
 		printf("oh no! expected sizeof(int) to be size 4\n");

helper.h

@@ -9,6 +9,7 @@
 bool handle_get_version(int client_fd, char* client_str);
 void respond_str_to_client(int fd, char* str);
 
+int get_int_from_client(int fd);
 bool get_str_from_client(int fd, char* str);
 
 // C heleprs

tictactoe.c

@@ -16,48 +16,52 @@
 enum Player board[__BOARD_SIZE__][__BOARD_SIZE__] = { //(0, 0) top left, (2, 2) bottom right
     {E, E, E}, 
     {E, E, E}, 
-    {E, E, E}  
+    {E, E, E} 
 };
 
 bool handle_place(int client_fd, char* client_str) {
-    enum Player player = (int)(*client_str); //first four bytes of packet are the player
-    int x_coord = (int)( *( client_str + sizeof(int)) );
-    int y_coord = (int)( *( client_str + sizeof(int) * 2) );
+    enum Player player; //first four bytes of packet are the player
+    while ( (player = get_int_from_client(client_fd)) == -1) { }
+    int x_coord; //next four bytes are the x
+    while ( (x_coord = get_int_from_client(client_fd)) == -1) { }
+    int y_coord; //last 4 are the y
+    while ( (y_coord = get_int_from_client(client_fd)) == -1) { }
+
     board[x_coord][y_coord] = player;
 
-    return 0;
+    return true;
 }
 
 //should we send the whole board as a (9 * 4) byte string instead? modify client/how we send this
-bool handle_read_board(int client_fd, char* client_str) {
-    for (int x = 0; x < __BOARD_SIZE__; x++) {
-        for (int y = 0; y < __BOARD_SIZE__; y++) {
-            //send the info at each location to client
-        }
-    }
-
-    return 0;
-}
-
-//commented function sends the board as a 36-byte (9 ints) 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];
-//             i++;
+//             //send the info at each location to client
 //         }
 //     }
 
-//     //send the board_pkt string to client
-
 //     return 0;
 // }
 
+// sends the board as a 36-byte (9 ints) 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];
+            i++;
+        }
+    }
+
+    respond_str_to_client(client_fd, board_pkt);
+
+    return true;
+}
+
 
 
-bool handle_get_winner(int client_fd) {
+bool handle_get_winner(int client_fd, char* client_str) {
     //implement a more effecient check if needed 
 
     enum Player winner = E;
@@ -78,9 +82,9 @@ bool handle_get_winner(int client_fd) {
     if ((board[2][0] != E) && (board[2][0] == board[1][1]) && (board[0][0] == board[0][2]))
         winner = board[2][0];
 
-    //send winner to db stub code
-    add_winner(client_fd, winner);
+    //send winner to client
+    respond_str_to_client(client_fd, (char*)winner);
 
-    return 0;//what to return for status?
+    return true;//what to return for status?
 
 }

tictactoe.h

@@ -12,6 +12,6 @@ bool handle_place(int client_fd, char* client_str);
 
 bool handle_read_board(int client_fd, char* client_str);
 
-bool handle_get_winner(int client_fd);
+bool handle_get_winner(int client_fd, char* client_str);
 
 #endif