From 8f0d1aca2d4d57e7ca1319aa98bd05a3dcdc6e67 Mon Sep 17 00:00:00 2001
From: Abhisha Nirmalathas <a.nirmalathas1@student.unimelb.edu.au>
Date: Sun, 21 Apr 2019 17:56:38 +1000
Subject: [PATCH] resetcookie return new webpage
---
http-parser.c | 12 +-----------
http-server.c | 5 ++---
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/http-parser.c b/http-parser.c
index 4be000b..ec84873 100644
--- a/http-parser.c
+++ b/http-parser.c
@@ -51,17 +51,7 @@ Request* parse_request(char* request_message){
// char *header_value = calloc(MAX_HEADER_SIZE, sizeof(char));
while(*request_message != '\r' && *request_message != '\n'){
request_message = insert_headers(request_message, req);
- // printf("req message first char %d\n", *request_message);
- // memset(header_field_name,0,strlen(header_field_name));
- // memset(header_value,0,strlen(header_value));
- // size_t field_len = strcspn(request_message, " ");
- // memcpy(header_field_name, request_message,field_len);
- // request_message += field_len+1;
- // size_t value_len = strcspn(request_message, "\r\n");
- // memcpy(header_value,request_message, value_len);
- // printf("header key: %s\n", header_field_name);
- // request_message += value_len+2;
- // hash_table_put(req->header, header_field_name, header_value);
+
}
request_message += strcspn(request_message, "\r\n")+2;
printf("request header %s\n", print_hash_map(req->header));
diff --git a/http-server.c b/http-server.c
index 4912375..b8db42e 100644
--- a/http-server.c
+++ b/http-server.c
@@ -249,7 +249,7 @@ static bool handle_http_request(int sockfd, User_list *user_list){
// parse the method
// printf("REQUEST IS \n\n%s\n", buff);
req = parse_request(curr);
- char* cookie = hash_table_get(req->header, "Cookie:")+3;
+ char* cookie = hash_table_get(req->header, "Cookie:");
int id = atoi(cookie+3);
User* user = get_current_user(user_list, id);
// user should quit game
@@ -375,6 +375,7 @@ static bool handle_http_request(int sockfd, User_list *user_list){
else if (req->method == GET){
if (user != NULL){
printf("name of user is %s\n", user->name);
+ // Resets returning user to round 1
text_render_response(buff,sockfd, "2_start.html", user->name);
}
}
@@ -386,7 +387,6 @@ static bool handle_http_request(int sockfd, User_list *user_list){
else if (write(sockfd, HTTP_404, HTTP_404_LENGTH) < 0)
{
free_request(req);
- free(cookie);
perror("write");
return false;
}
@@ -409,7 +409,6 @@ static bool handle_http_request(int sockfd, User_list *user_list){
printf("is restart\n");
}
}
- free(cookie);
free_request(req);
return true;
}
--
GitLab