diff --git a/.vscode/ipch/fdb79519b2d24d8/http-server.ipch b/.vscode/ipch/fdb79519b2d24d8/http-server.ipch new file mode 100644 index 0000000000000000000000000000000000000000..ab9d104dc7db68cd0b9e7e394d722910618f222a Binary files /dev/null and b/.vscode/ipch/fdb79519b2d24d8/http-server.ipch differ diff --git a/.vscode/ipch/fdb79519b2d24d8/mmap_address.bin b/.vscode/ipch/fdb79519b2d24d8/mmap_address.bin new file mode 100644 index 0000000000000000000000000000000000000000..750e835e6a95600e5ffe46616738b4532badb618 Binary files /dev/null and b/.vscode/ipch/fdb79519b2d24d8/mmap_address.bin differ diff --git a/http-server.c b/http-server.c index 58c05c017e2cc456f9a58aea41944cbab7f2ac89..8cad1476d9d501a395751386e7aef846d450c6e1 100644 --- a/http-server.c +++ b/http-server.c @@ -122,7 +122,6 @@ static bool handle_http_request(int sockfd) } /* Handle resetting users when starting a new game */ - printf("gameover: %d\n", gameover); if(gameover == 0){ set_user(sockfd); } else { @@ -133,7 +132,6 @@ static bool handle_http_request(int sockfd) } else if( strstr(buff, "Cookie:") != NULL ) { webpage = "html/1_intro.html"; } else { - webpage = "html/1_intro.html"; } @@ -255,13 +253,6 @@ static bool handle_http_request(int sockfd) stat(webpage, &st); n = sprintf(buff, HTTP_200_FORMAT, st.st_size); - - if(sockfd == user1){ - printf("I AM USER1"); - } else if( sockfd == user2 ){ - printf("I AM USER2"); - } - print_details(); } else { printf("\n\n\nerror reading html...\n\n\n"); @@ -287,27 +278,30 @@ static bool handle_http_request(int sockfd) if( strcmp(webpage, "html/4_accepted.html") == 0 ){ - char *user1_current_guesses; - char *user2_current_guesses; - + 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++){ if( strlen(user1_guesses[i]) > 0 ){ - //strncat(user1_current_guesses, user1_guesses[i], strlen(user1_guesses[i])); + strncat(user1_current_guesses, user1_guesses[i], strlen(user1_guesses[i])+2); + strncat(user1_current_guesses, ", ", 3); } } + } else if(sockfd == user2){ + memset(user2_current_guesses, '\0', 10100); for(int i=0; i<100; i++){ if( strlen(user2_guesses[i]) > 0 ){ - //strncat(user2_current_guesses, user2_guesses[i], strlen(user2_guesses[i])); + strncat(user2_current_guesses, user2_guesses[i], strlen(user2_guesses[i])+1); + strncat(user2_current_guesses, ", ", 3); } } } - printf("User1 guesses: %s, User2 guesses: %s\n", user1_current_guesses, user2_current_guesses); - - - + printf("\nUser1 guesses: %s\n User2 guesses: %s\n", user1_current_guesses, user2_current_guesses); + } if((strlen(username) > 0) && (strstr(buff, "user=") != NULL) ){ diff --git a/image_tagger b/image_tagger index e0265fcbde3ae78a35ec70556318ccfdd04dfe5a..0aa5fe412b641e665f09e4c7369979a42166b1b9 100755 Binary files a/image_tagger and b/image_tagger differ