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

Child process management

Browse Source
This commit is contained in:
Lorenz Stechauner
2020-12-10 22:45:45 +01:00
parent e6760cf665
commit f98ffc7077
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/client.c
View File

@ -26,6 +26,10 @@
char *client_addr_str, *client_addr_str_ptr, *server_addr_str, *server_addr_str_ptr, *log_base_prefix, *log_req_prefix;
void client_terminate() {
// TODO prevent processing of further requests in connection
}
int client_websocket_handler() {
// TODO implement client_websocket_handler
return 0;
@ -43,7 +47,10 @@ int client_connection_handler(int client) {
sprintf(buf1, "Hello World!\nYour address is: %s\n", client_addr_str);
send(client, buf1, strlen(buf1), 0);
int len = recv(client, &buf1, sizeof(buf1), 0);
int len = -1;
while (len == -1) {
len = recv(client, &buf1, sizeof(buf1), 0);
}
sprintf(buf2, "Thank you, %.*s!\nGood bye!\n", len, buf1);
send(client, buf2, strlen(buf2), 0);
@ -59,6 +66,9 @@ int client_handler(int client, long client_num, struct sockaddr_in6 *client_addr
char *color_table[] = {"\x1B[31m", "\x1B[32m", "\x1B[33m", "\x1B[34m", "\x1B[35m", "\x1B[36m"};
signal(SIGINT, client_terminate);
signal(SIGTERM, client_terminate);
client_addr_str_ptr = malloc(INET6_ADDRSTRLEN);
inet_ntop(client_addr->sin6_family, (void *) &client_addr->sin6_addr, client_addr_str_ptr, INET6_ADDRSTRLEN);
if (strncmp(client_addr_str_ptr, "::ffff:", 7) == 0) {

15
src/necronda-server.c
View File

@ -52,8 +52,8 @@ void terminate() {
fprintf(stderr, "\nTerminating gracefully...\n");
active = 0;
signal(SIGTERM, destroy);
signal(SIGINT, destroy);
signal(SIGTERM, destroy);
for (int i = 0; i < NUM_SOCKETS; i++) {
shutdown(SOCKETS[i], SHUT_RDWR);
@ -62,6 +62,19 @@ void terminate() {
int status = 0;
int ret;
for (int i = 0; i < MAX_CHILDREN; i++) {
if (CHILDREN[i] != 0) {
ret = waitpid(CHILDREN[i], &status, WNOHANG);
if (ret < 0) {
fprintf(stderr, ERR_STR "Unable to wait for child process (PID %i): %s" CLR_STR "\n", CHILDREN[i], strerror(errno));
} else if (ret == CHILDREN[i]) {
CHILDREN[i] = 0;
} else {
kill(CHILDREN[i], SIGTERM);
}
}
}
for (int i = 0; i < MAX_CHILDREN; i++) {
if (CHILDREN[i] != 0) {
ret = waitpid(CHILDREN[i], &status, 0);