Skip to content
Snippets Groups Projects
Commit 5f7132ec authored by Abhisha Nirmalathas's avatar Abhisha Nirmalathas
Browse files

resolved uninitialised or conditional jump bug/error

parent 127d8cc9
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
http-parser.c
+ 7
− 6
View file @ 5f7132ec
...@@ -11,8 +11,9 @@ ...@@ -11,8 +11,9 @@
#define MAX_VERSION_SIZE 10 #define MAX_VERSION_SIZE 10
Request* parse_request(char* request_message){ Request* parse_request(char* request_message){
Request *req = malloc(sizeof *req); Request *req = calloc(1, sizeof(Request));
assert(req); assert(req);
memset(req, 0, sizeof(Request));
int n_headers = 10; int n_headers = 10;
if (strncmp(request_message, "GET ", 4) == 0){ if (strncmp(request_message, "GET ", 4) == 0){
req->method = GET; req->method = GET;
...@@ -33,12 +34,12 @@ Request* parse_request(char* request_message){ ...@@ -33,12 +34,12 @@ Request* parse_request(char* request_message){
char header_field_name[MAX_HEADER_SIZE]; char header_field_name[MAX_HEADER_SIZE];
char header_value[MAX_HEADER_SIZE]; char header_value[MAX_HEADER_SIZE];
while(*request_message != '\r' && *request_message != '\n'){ while(*request_message != '\r' && *request_message != '\n'){
printf("req message first char %d\n", *request_message); // printf("req message first char %d\n", *request_message);
strcpy(header_field_name,strtok(request_message, " ")); strcpy(header_field_name,strtok(request_message, " "));
printf("header field name: %s\n", header_field_name); // printf("header field name: %s\n", header_field_name);
request_message += strcspn(request_message, " ")+1; request_message += strcspn(request_message, " ")+1;
strcpy(header_value,strtok(request_message, "\r\n")); strcpy(header_value,strtok(request_message, "\r\n"));
printf("header value: %s\n", header_value); // printf("header value: %s\n", header_value);
request_message += strcspn(request_message, "\r\n")+2; request_message += strcspn(request_message, "\r\n")+2;
hash_table_put(req->header, header_field_name, header_value); hash_table_put(req->header, header_field_name, header_value);
} }
......
http-parser.o
+ 0
− 0
View file @ 5f7132ec
No preview for this file type
http-server.c
+ 122
− 34
View file @ 5f7132ec
...@@ -33,6 +33,37 @@ static int const HTTP_400_LENGTH = 47; ...@@ -33,6 +33,37 @@ static int const HTTP_400_LENGTH = 47;
static char const * const HTTP_404 = "HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\n\r\n"; static char const * const HTTP_404 = "HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\n\r\n";
static int const HTTP_404_LENGTH = 45; static int const HTTP_404_LENGTH = 45;
char *substring(char *string, int position, int length)
{
char *p;
int c;
p = malloc(length+1);
if( p == NULL )
exit(EXIT_FAILURE);
for( c = 0 ; c < length ; c++ )
*(p+c) = *((string+position-1)+c);
*(p+c) = '\0';
return p;
}
void insert_substring(char *a, char *b, int position)
{
char *start, *end;
int length;
length = strlen(a);
start = substring(a, 1, position);
end = substring(a, position+1, length-position);
sprintf(a, "%s%s%s", start, b, end);
free(start);
free(end);
}
bool player_session(char* buff, int sockfd, char* file_name, char* response){ bool player_session(char* buff, int sockfd, char* file_name, char* response){
// get the size of the file // get the size of the file
...@@ -96,11 +127,12 @@ bool get_request(char* buff, int sockfd, char* file_name){ ...@@ -96,11 +127,12 @@ bool get_request(char* buff, int sockfd, char* file_name){
bool post_request(char *buff, int sockfd, char* file_name){ bool post_request(char *buff, int sockfd, char* file_name){
// locate the username, it is safe to do so in this sample code, but usually the result is expected to be // locate the username, it is safe to do so in this sample code, but usually the result is expected to be
// copied to another buffer using strcpy or strncpy to ensure that it will not be overwritten. // copied to another buffer using strcpy or strncpy to ensure that it will not be overwritten.
printf("\n\n1. the bufferis: %s\n\n", buff);
char * username = strcpy(buff, "user=") + 5; char * username = strcpy(buff, "user=") + 5;
int username_length = strlen(username); int username_length = strlen(username);
// the length needs to include the ", " before the username // the length needs to include the ", " before the username
long added_length = username_length + 2; long added_length = username_length + 2;
printf("\n\n2. the bufferis: %s\n\n", buff);
// get the size of the file // get the size of the file
struct stat st; struct stat st;
stat(file_name, &st); stat(file_name, &st);
...@@ -108,6 +140,7 @@ bool post_request(char *buff, int sockfd, char* file_name){ ...@@ -108,6 +140,7 @@ bool post_request(char *buff, int sockfd, char* file_name){
long size = st.st_size + added_length; long size = st.st_size + added_length;
int n = sprintf(buff, HTTP_200_FORMAT, size); int n = sprintf(buff, HTTP_200_FORMAT, size);
// send the header first // send the header first
printf("\n\n3. the bufferis: %s\n\n", buff);
if (write(sockfd, buff, n) < 0) if (write(sockfd, buff, n) < 0)
{ {
perror("write"); perror("write");
...@@ -115,7 +148,10 @@ bool post_request(char *buff, int sockfd, char* file_name){ ...@@ -115,7 +148,10 @@ bool post_request(char *buff, int sockfd, char* file_name){
} }
// read the content of the HTML file // read the content of the HTML file
int filefd = open(file_name, O_RDONLY); int filefd = open(file_name, O_RDONLY);
n = read(filefd, buff, 2048); n = read(filefd, buff, size);
// const char needle[10] = "</html>";
// buff = strstr(buff, needle)+strlen(needle);
printf("\n\n4. the bufferis: %s\n\n", buff);
if (n < 0) if (n < 0)
{ {
perror("read"); perror("read");
...@@ -128,11 +164,6 @@ bool post_request(char *buff, int sockfd, char* file_name){ ...@@ -128,11 +164,6 @@ bool post_request(char *buff, int sockfd, char* file_name){
for (p1 = size - 1, p2 = p1 - added_length; p1 >= size - 25; --p1, --p2) for (p1 = size - 1, p2 = p1 - added_length; p1 >= size - 25; --p1, --p2)
buff[p1] = buff[p2]; buff[p1] = buff[p2];
++p2; ++p2;
// put the separator
buff[p2++] = ',';
buff[p2++] = ' ';
// copy the username
strncpy(buff + p2, username, username_length);
if (write(sockfd, buff, size) < 0) if (write(sockfd, buff, size) < 0)
{ {
perror("write"); perror("write");
...@@ -141,19 +172,84 @@ bool post_request(char *buff, int sockfd, char* file_name){ ...@@ -141,19 +172,84 @@ bool post_request(char *buff, int sockfd, char* file_name){
return true; return true;
} }
bool dynamic_post_request(char *buff, int sockfd, char* file_name, User *user){
// locate the username, it is safe to do so in this sample code, but usually the result is expected to be
// copied to another buffer using strcpy or strncpy to ensure that it will not be overwritten.
char * username = strcpy(buff, "user=") + 5;
int username_length = strlen(username);
// the length needs to include the ", " before the username
long added_length = username_length + 2;
// get the size of the file
struct stat st;
stat(file_name, &st);
// increase file size to accommodate the username
long size = st.st_size + added_length;
int n = sprintf(buff, HTTP_200_FORMAT, size);
// send the header first
if (write(sockfd, buff, n) < 0)
{
perror("write");
return false;
}
// read the content of the HTML file
int filefd = open(file_name, O_RDONLY);
n = read(filefd, buff, 2048);
// printf("%s\n", buff);
char insert[60];
strcpy(insert, "");
for(int i=0; i< user->n_keywords; i++){
strcat(insert, user->keywords[i]);
strcat(insert,",");
}
insert[strlen(insert)-1] = '\0';
// printf("the html to be inserted is %s\n", insert);
const char needle[10] = "</form>";
char *ret;
ret = strstr(buff, needle)+strlen(needle);
int position = ret - buff;
// printf("The substring is: %s\n", ret);
insert_substring(buff, insert, position);
if (n < 0)
{
perror("read");
close(filefd);
return false;
}
printf("dynamic %s\n", buff);
close(filefd);
// move the trailing part backward
// int p1, p2;
// for (p1 = size - 1, p2 = p1 - added_length; p1 >= size - 25; --p1, --p2)
// buff[p1] = buff[p2];
// ++p2;
// // put the separator
// buff[p2++] = ',';
// buff[p2++] = ' ';
// // copy the username
strncpy(buff, username, username_length);
if (write(sockfd, buff, size) < 0)
{
perror("write");
return false;
}
return true;
}
static bool handle_http_request(int sockfd, User_list *users) static bool handle_http_request(int sockfd, User_list *users)
{ {
// try to read the request // try to read the request
printf("THE NUMBER OF USERS IS (in http req) %d\n", users->n_users); // printf("THE NUMBER OF USERS IS (in http req) %d\n", users->n_users);
char buff[2049]; char buff[2049];
memset(buff, '\0', 2049);
int n = read(sockfd, buff, 2049); int n = read(sockfd, buff, 2049);
if (n <= 0) if (n <= 0)
{ {
if (n < 0) if (n < 0)
perror("read"); perror("read");
else else
printf("socket %d close the connection\n", sockfd); // printf("socket %d close the connection\n", sockfd);
return false; return false;
} }
...@@ -161,37 +257,36 @@ static bool handle_http_request(int sockfd, User_list* users) ...@@ -161,37 +257,36 @@ static bool handle_http_request(int sockfd, User_list* users)
buff[n] = 0; buff[n] = 0;
char * curr = buff; char * curr = buff;
// parse the method // parse the method
Request* req = parse_request(curr); Request* req = parse_request(curr);
printf("REQUEST BODY IS \n\n%s\n", req->body); // printf("REQUEST BODY IS \n\n%s\n", req->body);
if(strncmp(req->body, "quit=Quit", 9) == 0){ if(strncmp(req->body, "quit=Quit", 9) == 0){
change_player_status(sockfd,users, QUIT); change_player_status(sockfd,users, QUIT);
post_request(buff,sockfd, "7_gameover.html"); post_request(buff,sockfd, "7_gameover.html");
} }
if (strncmp(req->url, "/?start=Start", 24) == 0){ else if (strncmp(req->url, "/?start=Start", 24) == 0){
printf("matches start"); // printf("matches start");
if (req->method == GET){ if (req->method == GET){
change_player_status(sockfd, users, READY); change_player_status(sockfd, users, READY);
get_request(buff,sockfd, "3_first_turn.html"); get_request(buff,sockfd, "3_first_turn.html");
} }
if (req->method == POST){ if (req->method == POST){
if(strncmp(req->body, "keyword=", 8) == 0){ if(strncmp(req->body, "keyword=", 8) == 0){
printf("strncmp with keywoprds is successful"); // printf("strncmp with keywoprds is successful");
printf("the numer of users is %d\n", users->n_users); // printf("the numer of users is %d\n", users->n_users);
for(int i=0; i < users->n_users; i++){ for(int i=0; i < users->n_users; i++){
printf("USER ID %d", users->users[i]->id); // printf("USER ID %d", users->users[i]->id);
if(users->users[i]->status == READY){ if(users->users[i]->status == READY){
printf("is ready\n"); // printf("is ready\n");
} }
if(users->users[i]->status == WAIT){ if(users->users[i]->status == WAIT){
printf("is wait\n"); // printf("is wait\n");
} }
if(users->users[i]->status == QUIT){ if(users->users[i]->status == QUIT){
printf("is quit\n"); // printf("is quit\n");
} }
if(users->users[i]->status == COMPLETE){ if(users->users[i]->status == COMPLETE){
printf("is complete\n"); // printf("is complete\n");
} }
} }
if(player_won(users)){ if(player_won(users)){
...@@ -211,17 +306,14 @@ static bool handle_http_request(int sockfd, User_list* users) ...@@ -211,17 +306,14 @@ static bool handle_http_request(int sockfd, User_list* users)
change_player_status(sockfd, users, COMPLETE); change_player_status(sockfd, users, COMPLETE);
} }
else{ else{
User* user = get_current_user(users, keyword, sockfd);
post_request(buff, sockfd, "4_accepted.html"); post_request(buff, sockfd, "4_accepted.html");
// dynamic_post_request(buff,sockfd, "4_accepted.html", user);
} }
} }
} }
} }
} }
else if (strncmp(req->url, "/welcome_page", 13) == 0){
if(req->method == GET){
get_request(buff,sockfd, "2_start.html");
}
}
else if (*req->url == '/' && (strlen(req->url) == 1)){ else if (*req->url == '/' && (strlen(req->url) == 1)){
if (req->method == POST) if (req->method == POST)
{ {
...@@ -344,10 +436,6 @@ int main(int argc, char * argv[]) ...@@ -344,10 +436,6 @@ int main(int argc, char * argv[])
// print out the IP and the socket number // print out the IP and the socket number
char ip[INET_ADDRSTRLEN]; char ip[INET_ADDRSTRLEN];
// User* new_player = new_user(sockfd);
// add_user(new_player, users);
//printf(" %d \n", users->n_users);
// printf("THE NUMBER OF USERS IS %d\n", users->n_users);
printf( printf(
"new connection from %s on socket %d\n", "new connection from %s on socket %d\n",
// convert to human readable string // convert to human readable string
......
http-server.o
+ 0
− 0
View file @ 5f7132ec
No preview for this file type
image_tagger
+ 0
− 0
View file @ 5f7132ec
No preview for this file type
user.c
+ 21
− 10
View file @ 5f7132ec
...@@ -6,24 +6,27 @@ ...@@ -6,24 +6,27 @@
#include "user.h" #include "user.h"
#define INITIAL_KEYWORDS 5
#define INITAL_N_USERS 5
#define INITIAL_KEYWORD_LENGTH 30
User* new_user(int id){ User* new_user(int id){
User *user = malloc(sizeof *user); User *user = calloc(1, sizeof *user);
assert(user); assert(user);
user->id = id; user->id = id;
user->n_capacity = 5; user->n_capacity = INITIAL_KEYWORDS;
user->n_keywords = 0; user->n_keywords = 0;
user->status = WAIT; user->status = WAIT;
user->keywords = malloc(sizeof(char*)*user->n_capacity); user->keywords = calloc(user->n_capacity,sizeof(char*));
assert(user->keywords); assert(user->keywords);
return user; return user;
} }
User_list* initialise_player_list(){ User_list* initialise_player_list(){
User_list *users = malloc(sizeof(User_list)); User_list *users = calloc(1, sizeof(User_list));
assert(users); assert(users);
users->n_users = 0; users->n_users = 0;
users->users = malloc(sizeof(User*)*5); users->users = calloc(INITAL_N_USERS, sizeof(User*));
assert(users->users); assert(users->users);
return users; return users;
} }
...@@ -44,10 +47,11 @@ void resize_keywords(User* user, char* keyword){ ...@@ -44,10 +47,11 @@ void resize_keywords(User* user, char* keyword){
char* add_keyword(int id, User_list* users, char* query){ char* add_keyword(int id, User_list* users, char* query){
const char s[2] = "&"; const char s[2] = "&";
char * curr = query; char * curr = query;
char * token = malloc(sizeof(char)*20); char * token = calloc(INITIAL_KEYWORD_LENGTH, sizeof(char));
token[0] = '\0';
assert(token); assert(token);
curr += 8; curr += 8;
memcpy(token, strtok(curr, s), strlen(strtok(curr, s))); strcat(token, strtok(curr, s));
printf("the keywod is %s\n", token); printf("the keywod is %s\n", token);
for(int i=0; i < users->n_users; i++){ for(int i=0; i < users->n_users; i++){
if(users->users[i]->id == id){ if(users->users[i]->id == id){
...@@ -117,9 +121,6 @@ bool keyword_match(User* user, char* keyword){ ...@@ -117,9 +121,6 @@ bool keyword_match(User* user, char* keyword){
void reset_players(User_list *users){ void reset_players(User_list *users){
for(int i=0; i< users->n_users;i++){ for(int i=0; i< users->n_users;i++){
for(int j=0; j< users->users[i]->n_keywords; j++){
free(users->users[i]->keywords[j]);
}
users->users[i]->n_keywords = 0; users->users[i]->n_keywords = 0;
} }
} }
...@@ -144,3 +145,13 @@ bool player_won(User_list *users){ ...@@ -144,3 +145,13 @@ bool player_won(User_list *users){
} }
return false; return false;
} }
User* get_current_user(User_list* users, char* keyword, int id){
User *user = NULL;
for(int i=0; i < users->n_users; i++){
if (users->users[i]->id == id){
user = users->users[i];
}
}
return user;
}
\ No newline at end of file
user.h
+ 3
− 1
View file @ 5f7132ec
...@@ -49,3 +49,5 @@ void reset_players(User_list *users); ...@@ -49,3 +49,5 @@ void reset_players(User_list *users);
bool has_match_ended(User_list* users, char* keyword, int id); bool has_match_ended(User_list* users, char* keyword, int id);
bool player_won(User_list *users); bool player_won(User_list *users);
User* get_current_user(User_list* users, char* keyword, int id);
\ No newline at end of file
user.o
+ 0
− 0
View file @ 5f7132ec
No preview for this file type
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment