Bump license

Author: codepr

LICENSE

@@ -1,6 +1,6 @@
 BSD 2-Clause License
 
-Copyright (c) 2020, Andrea Giacomo Baldan
+Copyright (c) 2023, Andrea Giacomo Baldan
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile

@@ -1,22 +1,22 @@
 .POSIX:
-CFLAGS=-std=c99 -Wall -Wextra -Werror -pedantic -D_DEFAULT_SOURCE=200809L
+CFLAGS=-std=c99 -Wall -Wextra -Werror -pedantic -D_DEFAULT_SOURCE=200809L -lpthread
 
 echo-server: examples/echo_server.c ev.h
-	$(CC) $(CFLAGS) examples/echo_server.c -o echo_server
+    $(CC) $(CFLAGS) examples/echo_server.c -o echo_server
 
 ping-pong: examples/ping_pong.c ev.h
-	$(CC) $(CFLAGS) examples/ping_pong.c -o ping_pong
+    $(CC) $(CFLAGS) examples/ping_pong.c -o ping_pong
 
 ev-tcp-server: examples/ev_tcp_server.c ev.h
-	$(CC) $(CFLAGS) examples/ev_tcp_server.c -o ev_tcp_server
+    $(CC) $(CFLAGS) examples/ev_tcp_server.c -o ev_tcp_server
 
 ev-tcp-server-stats: examples/ev_tcp_server_stats.c ev.h
-	$(CC) $(CFLAGS) examples/ev_tcp_server_stats.c -o ev_tcp_server_stats
+    $(CC) $(CFLAGS) examples/ev_tcp_server_stats.c -o ev_tcp_server_stats
 
 ev-tls-tcp-server: examples/ev_tls_tcp_server.c ev.h
-	$(CC) $(CFLAGS) -DHAVE_OPENSSL=1 -lssl -lcrypto examples/ev_tls_tcp_server.c -o ev_tls_tcp_server
+    $(CC) $(CFLAGS) -DHAVE_OPENSSL=1 -lssl -lcrypto examples/ev_tls_tcp_server.c -o ev_tls_tcp_server
 
 all: echo-server ping-pong ev-tcp-server ev-tcp-server-stats ev-tls-tcp-server
 
 clean:
-	@rm echo_server ping_pong ev_tcp_server ev_tcp_server_stats ev_tls_tcp_server
+    @rm echo_server ping_pong ev_tcp_server ev_tcp_server_stats ev_tls_tcp_server

ev.h

@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2020, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

ev_tcp.h

@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2020, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -534,8 +534,8 @@ static int client_certificate_verify(int preverify_ok, X509_STORE_CTX *ctx) {
 
     (void) ctx;  // Unused
 
-	/* Preverify should check expiry, revocation. */
-	return preverify_ok;
+    /* Preverify should check expiry, revocation. */
+    return preverify_ok;
 }
 
 static void load_certificates(SSL_CTX *ctx, const char *ca,
@@ -547,10 +547,10 @@ static void load_certificates(SSL_CTX *ctx, const char *ca,
     }
 
     SSL_CTX_set_mode(ctx, SSL_MODE_ENABLE_PARTIAL_WRITE|SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
-	SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, client_certificate_verify);
+    SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, client_certificate_verify);
     SSL_CTX_set_ecdh_auto(ctx, 1);
 
-	if (SSL_CTX_use_certificate_chain_file(ctx, cert) <= 0) {
+    if (SSL_CTX_use_certificate_chain_file(ctx, cert) <= 0) {
         ERR_print_errors_fp(stderr);
         exit(EXIT_FAILURE);
     }

examples/echo_server.c

@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/socket.h>
+#include <pthread.h>
 #define EV_SOURCE // add before ev.h
 #include "../ev.h"
 
@@ -130,7 +131,7 @@ static void on_data(ev_context *ctx, void *data) {
         return;
     }
 
-    printf("Received %lu bytes\n", conn->bufsize);
+    /* printf("Received %lu bytes\n", conn->bufsize); */
 
     /* Fire an event to schedule a response */
     ev_fire_event(ctx, conn->fd, EV_WRITE, on_response, conn);
@@ -168,6 +169,29 @@ static void on_response(ev_context *ctx, void *data) {
     fprintf(stderr, "write(2) - error sending data: %s\n", strerror(errno));
 }
 
+static void *worker(void *data) {
+    int listen_fd = *((int *) data);
+    ev_context ctx;
+    int err = ev_init(&ctx, 1024);
+    if (err < EV_OK) {
+        fprintf(stderr, "Ev context init failed: Out of memory");
+        exit(EXIT_FAILURE);
+    }
+
+    /* Register a callback on the listening socket for incoming connections */
+    ev_register_event(&ctx, listen_fd, EV_READ, on_connection, &listen_fd);
+
+    printf("Listening on %s:%i\n", HOST, PORT);
+
+    /* Start the loop */
+    ev_run(&ctx);
+
+    /* Release resources after the loop has been stopped */
+    ev_destroy(&ctx);
+
+    return NULL;
+}
+
 int main(void) {
 
     ev_context ctx;
@@ -210,10 +234,14 @@ int main(void) {
     if (listen(listen_fd, 32) != 0)
         goto err;
 
-    int err = ev_init(&ctx, 32);
+    pthread_t handle[4];
+    for (int i = 0; i < 4; i++) {
+        pthread_create(&handle[i], NULL, (void * (*) (void *)) &worker, &listen_fd);
+    }
+    int err = ev_init(&ctx, 1024);
     if (err < EV_OK) {
-        fprintf(stderr, "Ev context init failed: Out of memory");
-        exit(EXIT_FAILURE);
+       fprintf(stderr, "Ev context init failed: Out of memory");
+       exit(EXIT_FAILURE);
     }
 
     /* Register a callback on the listening socket for incoming connections */