merge

Author: teddy-zhng

game_dispatcher.c

@@ -37,9 +37,10 @@ pkt_handler handlers[] = {
 
     /* high scores */
     handle_add_winner, 
-    handle_set_intro, 
-    handle_set_outro, 
-    handle_report_winners
+
+    handle_reset_winner_data, 
+    handle_set_outro_message, 
+    handle_report_winners,
 };
 
 void handle_client(int client_fd, char* client_str) {

high_score.c

@@ -4,99 +4,46 @@
 #include <unistd.h>
 #include <arpa/inet.h>
 
-#include "tictactoe.h"
 #include "high_score.h"
+#include "helper.h"
 
-//void add_winner(int client_fd, enum Player winner) {
-//    //TODO
-//}
+#define MAX_BUF_SIZE (0x100)
+char winners_list[MAX_BUF_SIZE] = {0};
+char outro_message[MAX_BUF_SIZE] = {0};
 
-#define MAX_BUF_SIZE 0x100
-char winners_list[MAX_BUF_SIZE];
-char intro[MAX_BUF_SIZE];
-char outro[MAX_BUF_SIZE];
-
-void init_msgs()
+bool handle_reset_winner_data(int client_fd, char* client_str)
 {
     memset(winners_list, sizeof(winners_list), 0);
-    memset(intro, sizeof(winners_list), 0);
-    memset(outro, sizeof(winners_list), 0);
-    
-    strcpy(intro, "Special Congratulations to our Winners:\n" );
-    strcpy(outro, "And Better Luck to our other participants:\n" );
-}
-
-char * handle_read(int client_fd, int * num_read)
-{
-    char * dst_buf = malloc(MAX_BUF_SIZE);
-    int bytes_read = recv(client_fd, dst_buf, MAX_BUF_SIZE, 0);
-    if (bytes_read == -1) {
-        perror("recv from get_str_from_client in len");
-    }   
-    if (bytes_read == 0) {
-        printf("client disconnected in str len in get_str_from_client\n");
-        return false;
-    }   
-    if (bytes_read != sizeof(dst_buf)) {
-        printf("client didn't send enough bytes for string length in get_str_from_client\n");
-        return false;
-    }   
-    
-    *num_read = bytes_read;
-    return dst_buf;
-}
-
-int display_to_user(int client_fd, char * msg_buf)
-{
-    int err = send(client_fd, msg_buf, strlen(msg_buf), 0); 
-    if (err < 0) {
-        perror("send len in respond_str_to_client");
-    }   
-    err = send(client_fd, msg_buf, strlen(msg_buf), 0); 
-    if (err < 0) {
-        perror("send str in respond_str_to_client");
-    }   
-    return err;
-}
-
-bool handle_add_winner(int client_fd, char* client_str) {
-    char buff[MAX_BUF_SIZE];
-    int num_read = 0;
-    char * user_str = handle_read(client_fd, &num_read);
-    int bytes_written = snprintf(buff, num_read, "%s\n", user_str);
-    free(user_str);
-   
-    bytes_written = snprintf(winners_list, MAX_BUF_SIZE, "%s", buff);
+    memset(outro_message, sizeof(outro_message), 0);
+    strcpy(outro_message, "\nBetter Luck to our other participants next time!\n" );
     return true;
 }
 
-bool handle_set_intro(int client_fd, char* client_str) {
-    int num_read = 0;
-    char * user_str = handle_read(client_fd, &num_read);
-    strncpy(intro, user_str, num_read);
-    free(user_str);
+bool handle_add_winner(int client_fd, char* client_str) {
+    char winner_name[0x80];
+    if (!get_buffer_from_client(client_fd, winner_name, sizeof(winner_name))) {
+        printf("handle_add_winner error: get_buffer_from_client failed\n");
+        return false;
+    }
+    strncpy(winners_list, winner_name, sizeof(winners_list));
+    printf("handle_add_winner success!\n");
     return true;
 }
 
-bool handle_set_outro(int client_fd, char* client_str) {
-    int num_read = 0;
-    char * user_str = handle_read(client_fd, &num_read);
-    strncpy(intro, user_str, num_read);
-    free(user_str);
+bool handle_set_outro_message(int client_fd, char* client_str) {
+    if (!get_buffer_from_client(client_fd, outro_message, sizeof(outro_message))) {
+        printf("handle_set_outro_message error: get_buffer_from_client failed\n");
+        return false;
+    }
+    printf("handle_set_outro_message success!\n");
     return true;
 }
 
 bool handle_report_winners(int client_fd, char* client_str) {
-    char msg_to_user[MAX_BUF_SIZE * 3];
-    int bytes_written  = snprintf(msg_to_user, sizeof(msg_to_user),  "%s\n", intro);
-    bytes_written   = snprintf(msg_to_user + bytes_written, sizeof(msg_to_user),  "%s\n", winners_list);
-    bytes_written      = snprintf(msg_to_user + bytes_written, sizeof(msg_to_user), "%s\n", outro);
-    
-    display_to_user(client_fd, msg_to_user);
+    char msg_to_user[MAX_BUF_SIZE];
+
+    int bytes_written = snprintf(msg_to_user, sizeof(msg_to_user),  "**WINNER LIST**\n%s\n*** :) ***", winners_list);
+    snprintf(msg_to_user + bytes_written, sizeof(msg_to_user) - bytes_written, "%s", outro_message);
+    respond_str_to_client(client_fd, msg_to_user);
     return true;
 }
-
-//bool handle_get_score(int client_fd, char* client_str) {
-//
-//}
-

high_score.h

@@ -4,12 +4,10 @@
 #include <stdbool.h>
 #include "tictactoe.h"
 
-//void add_winner(int client_fd, enum Player winner); //use a username or cookie or session id instead?
-void init_msgs();
+bool handle_reset_winner_data(int client_fd, char* client_str);
 
 bool handle_add_winner(int client_fd, char* client_str); // Collect information about the winner from the user
-bool handle_set_intro(int client_fd, char* client_str);
-bool handle_set_outro(int client_fd, char* client_str);
+bool handle_set_outro_message(int client_fd, char* client_str);
 bool handle_report_winners(int client_fd, char* client_str);
 
 #endif

main_game_server.c

@@ -16,7 +16,7 @@
 
 int main (int argc, char *argv[]) {
     uses_assumed_sizes();
-    init_msgs();
+    handle_reset_winner_data(0, NULL);
     set_random_admin_password();
 
     int server_fd, client_fd, err;