diff --git a/.vscode/ipch/fdb79519b2d24d8/http-server.ipch b/.vscode/ipch/fdb79519b2d24d8/http-server.ipch index ab9d104dc7db68cd0b9e7e394d722910618f222a..d8d0f3abdab9bc8c18fe2dd7c4a0cf8137e5d30e 100644 Binary files a/.vscode/ipch/fdb79519b2d24d8/http-server.ipch and b/.vscode/ipch/fdb79519b2d24d8/http-server.ipch differ diff --git a/http-server.c b/http-server.c index 8cad1476d9d501a395751386e7aef846d450c6e1..d9ee97b49455e3f125783a6cc15a1344247f6dbb 100644 --- a/http-server.c +++ b/http-server.c @@ -56,6 +56,8 @@ static char *user2_name = ""; static int user2_start = 0; char user2_guesses[100][100]; int user2_guess_number = 0; +char user1_current_guesses[10100]; +char user2_current_guesses[10100]; int gameover = 0; @@ -209,8 +211,6 @@ static bool handle_http_request(int sockfd) } else if(strstr(buff, "user=") != NULL){ stat(webpage, &st); username = strstr(buff, "user=") + 5; - - //set_user(sockfd); username_length = strlen(username); added_length = username_length + 2; @@ -230,7 +230,7 @@ static bool handle_http_request(int sockfd) strcpy(user1_guesses[user1_guess_number], keyword); user1_guess_number++; check_win(1, keyword); - } else if( gameover == 1 ){ + } else if( gameover == 1 ){ webpage = "html/6_endgame.html"; } else { webpage = "html/5_discarded.html"; @@ -241,13 +241,12 @@ static bool handle_http_request(int sockfd) strcpy(user2_guesses[user2_guess_number], keyword); user2_guess_number++; check_win(2, keyword); - } else if( gameover == 1){ + } else if( gameover == 1){ webpage = "html/6_endgame.html"; } else { webpage = "html/5_discarded.html"; } } else { - printf("user1: %d, user2: %d\n", user1, user2); webpage = "html/6_endgame.html"; } @@ -276,11 +275,8 @@ static bool handle_http_request(int sockfd) } close(filefd); + if( strcmp(webpage, "html/4_accepted.html") == 0 ){ - - char user1_current_guesses[10100]; - char user2_current_guesses[10100]; - if(sockfd == user1){ memset(user1_current_guesses, '\0', 10100); for(int i=0; i<100; i++){ @@ -300,9 +296,10 @@ static bool handle_http_request(int sockfd) } } - printf("\nUser1 guesses: %s\n User2 guesses: %s\n", user1_current_guesses, user2_current_guesses); - + printf("User1 guesses: %s, User2 guesses: %s\n", user1_current_guesses, user2_current_guesses); + } + if((strlen(username) > 0) && (strstr(buff, "user=") != NULL) ){ // move the trailing part backward diff --git a/image_tagger b/image_tagger index 0aa5fe412b641e665f09e4c7369979a42166b1b9..2287ea3f927d89952185630747eb603cacb866a2 100755 Binary files a/image_tagger and b/image_tagger differ