From 52b90a302f8eda42c98293bfd2c661c54f542468 Mon Sep 17 00:00:00 2001
From: Abhisha Nirmalathas <a.nirmalathas1@student.unimelb.edu.au>
Date: Sun, 21 Apr 2019 20:09:58 +1000
Subject: [PATCH] memory managed
---
http-parser.c | 2 --
http-server.c | 9 +++++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/http-parser.c b/http-parser.c
index ec84873..1d80197 100644
--- a/http-parser.c
+++ b/http-parser.c
@@ -54,7 +54,6 @@ Request* parse_request(char* request_message){
}
request_message += strcspn(request_message, "\r\n")+2;
- printf("request header %s\n", print_hash_map(req->header));
// parses the body
if(*request_message != '\r'||*request_message != '\n'){
req->body = request_message;
@@ -75,7 +74,6 @@ char* insert_headers(char* request_message, Request * req){
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);
return request_message;
diff --git a/http-server.c b/http-server.c
index b8db42e..2f127b7 100644
--- a/http-server.c
+++ b/http-server.c
@@ -264,7 +264,7 @@ static bool handle_http_request(int sockfd, User_list *user_list){
// user starting game
else if (strncmp(req->url, "/?start=Start", 24) == 0){
- // printf("THE COOKIE IS %s\n", hash_table_get(req->header, "Cookie: "));
+ printf("THE COOKIE ID IS %d\n", id);
// user on first turn
if (user != NULL){
if (req->method == GET){
@@ -352,13 +352,13 @@ static bool handle_http_request(int sockfd, User_list *user_list){
Response* resp = initialise_session(req);
char* resp_string = parse_response(resp);
// printf("COOKIE CREATING RESP %s\n", resp_string);
- char* cookie = hash_table_get(resp->header, "Set-cookie: ")+3;
+ char* cookie = hash_table_get(resp->header, "Set-cookie: ");
// printf("the cookie token is %s*****\n", cookie);
- User* new_player = new_user(atoi(cookie));
+ User* new_player = new_user(atoi(cookie+3));
add_user(new_player, user_list);
// printf("before player sesh");
player_session(buff, sockfd, "1_welcome.html", resp_string);
- // free(cookie);
+ free(cookie);
free(resp_string);
free_response(resp);
@@ -409,6 +409,7 @@ static bool handle_http_request(int sockfd, User_list *user_list){
printf("is restart\n");
}
}
+ free(cookie);
free_request(req);
return true;
}
--
GitLab