lorenz.stechauner/sesimos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Activity

Added Client timeout

Browse Source
This commit is contained in:
Lorenz Stechauner
2020-12-11 23:16:30 +01:00
parent 3ba1848e40
commit 49f1a5f429
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/client.c
View File

@ -18,6 +18,8 @@ int keep_alive = 1;
char *client_addr_str, *client_addr_str_ptr, *server_addr_str, *server_addr_str_ptr, char *client_addr_str, *client_addr_str_ptr, *server_addr_str, *server_addr_str_ptr,
*log_conn_prefix, *log_req_prefix; *log_conn_prefix, *log_req_prefix;
struct timeval timeout = {.tv_sec = CLIENT_TIMEOUT, .tv_usec = 0};
char *format_duration(unsigned long micros, char *buf) { char *format_duration(unsigned long micros, char *buf) {
if (micros < 10000) { if (micros < 10000) {
@ -48,14 +50,19 @@ int client_request_handler(sock *client, int req_num) {
struct timespec begin, end; struct timespec begin, end;
int ret; int ret;
char buf[16]; char buf[16];
char *msg = "HTTP/1.1 501 Not Implemented\r\nConnection: keep-alive\r\nContent-Length: 116\r\n\r\n<!DOCTYPE html><html><head><title>501 Not Implemented</title></head><body><h1>501 Not Implemented</h1></body></html>"; char *msg = "HTTP/1.1 501 Not Implemented\r\n"
"Connection: keep-alive\r\n"
"Content-Length: 116\r\n"
"\r\n"
"<!DOCTYPE html><html><head><title>501 Not Implemented</title></head><body><h1>501 Not Implemented</h1></body></html>";
fd_set socket_fds; fd_set socket_fds;
FD_ZERO(&socket_fds); FD_ZERO(&socket_fds);
FD_SET(client->socket, &socket_fds); FD_SET(client->socket, &socket_fds);
timeout.tv_sec = CLIENT_TIMEOUT;
ret = select(client->socket + 1, &socket_fds, NULL, NULL, NULL); timeout.tv_usec = 0;
if (ret < 0) { ret = select(client->socket + 1, &socket_fds, NULL, NULL, &timeout);
if (ret <= 0) {
return 1; return 1;
} }
clock_gettime(CLOCK_MONOTONIC, &begin); clock_gettime(CLOCK_MONOTONIC, &begin);
@ -87,7 +94,8 @@ int client_connection_handler(sock *client) {
clock_gettime(CLOCK_MONOTONIC, &begin); clock_gettime(CLOCK_MONOTONIC, &begin);
print("Connection accepted from %s (%s) [%s]", client_addr_str, client_addr_str, "N/A"); print("Connection accepted from %s (%s) [%s]", client_addr_str, client_addr_str, "N/A");
struct timeval timeout = {.tv_sec = 3600, .tv_usec = 0}; timeout.tv_sec = CLIENT_TIMEOUT;
timeout.tv_usec = 0;
if (setsockopt(client->socket, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout)) < 0) goto set_timeout_err; if (setsockopt(client->socket, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout)) < 0) goto set_timeout_err;
if (setsockopt(client->socket, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(timeout)) < 0) { if (setsockopt(client->socket, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(timeout)) < 0) {
set_timeout_err: set_timeout_err:

1
src/necronda-server.h
View File

@ -22,6 +22,7 @@
#define MAX_CHILDREN 1024 #define MAX_CHILDREN 1024
#define LISTEN_BACKLOG 16 #define LISTEN_BACKLOG 16
#define REQ_PER_CONNECTION 100 #define REQ_PER_CONNECTION 100
#define CLIENT_TIMEOUT 3600
#define CLIENT_MAX_HEADER_SIZE 8192 #define CLIENT_MAX_HEADER_SIZE 8192