SuperNovaa41/http
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes recv crashing bug

Browse Source
This commit is contained in:
SuperNovaa41 2025-01-30 13:17:18 -05:00
parent 14cc5ef574
commit 986290f6de
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/tcp.h
View File

@ -16,7 +16,7 @@ typedef struct {
void setup_socket(server_conn_t* conn); void setup_socket(server_conn_t* conn);
void recv_message(char** buffer, int socket); int recv_message(char** buffer, int socket);
/// Threaded function to handle http requests /// Threaded function to handle http requests
/// takes client socket as an argument /// takes client socket as an argument

25
src/tcp.c
View File

@ -42,7 +42,7 @@ void setup_socket(server_conn_t* conn)
} }
} }
void recv_message(char** buffer, int socket) int recv_message(char** buffer, int socket)
{ {
ulong current_size, bytes_recv; ulong current_size, bytes_recv;
int status; int status;
@ -70,15 +70,22 @@ void recv_message(char** buffer, int socket)
// lets recv BUFFER_INC_LEN amount of bytes // lets recv BUFFER_INC_LEN amount of bytes
status = recv(socket, *buffer + bytes_recv, BUFFER_INC_LEN, MSG_DONTWAIT); status = recv(socket, *buffer + bytes_recv, BUFFER_INC_LEN, MSG_DONTWAIT);
if (status < 0) { if (status < 0) {
if (errno != EAGAIN && errno != EWOULDBLOCK) // these signify that that were just no data to read, dw about this // these signify that that were just no data to read, dw about this
if (errno != EAGAIN && errno != EWOULDBLOCK) {
perror("recv"); perror("recv");
break; // don't want to crash on a recv failure, lets just break }
return -1;
} }
bytes_recv += status; bytes_recv += status;
} while (status == BUFFER_INC_LEN); // break when we stop receiving, status < BUFFER_INC_LEN means no more data after this last call
// break when we stop receiving, status < BUFFER_INC_LEN
// means no more data after this last call
} while (status == BUFFER_INC_LEN);
(*buffer)[bytes_recv] = '\0'; (*buffer)[bytes_recv] = '\0';
return 0;
} }
void* connection_handler(void* arg) void* connection_handler(void* arg)
@ -86,15 +93,19 @@ void* connection_handler(void* arg)
int client_socket = *(int*) arg; int client_socket = *(int*) arg;
http_request request; http_request request;
char* buffer = NULL; char* buffer = NULL;
int err;
recv_message(&buffer, client_socket); err = recv_message(&buffer, client_socket);
if (err == -1) { // if we had a recv error lets throw away the result
free(buffer);
close(client_socket);
return NULL;
}
puts(buffer); puts(buffer);
parse_http_request(&buffer, &request); parse_http_request(&buffer, &request);
printf("%s %s %1.1f\n", http_method_to_str(request.method), request.request_uri, request.version);
/** /**
* Handle HTTP request here :) * Handle HTTP request here :)
*/ */