From 93815ec3cce930d38faff141aecd7f55f2bd7f12 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 20 May 2021 08:30:12 +0200 Subject: [PATCH 1/2] mxshadowsrv: Fix error check for listen socket --- mxshadowsrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mxshadowsrv.c b/mxshadowsrv.c index d8a5910..fc5044c 100644 --- a/mxshadowsrv.c +++ b/mxshadowsrv.c @@ -249,7 +249,7 @@ int main(int argc, char **argv) { if (SSL_CTX_use_certificate_file(ssl_ctx, cert_file, SSL_FILETYPE_PEM) <= 0) { psslerror("SSL_CTX_use_certificate_file"); return 1; } int listen_socket = socket(AF_INET, SOCK_STREAM, 0); - if (listen_socket == 0) { perror("socket"); return 1; } + if (listen_socket == -1) { perror("socket"); return 1; } static int true = 1; int status = setsockopt(listen_socket, SOL_SOCKET, SO_REUSEADDR, &true, sizeof(true)); From ab01622553553e2ff90dc854f86337c603edc3e4 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 20 May 2021 08:46:42 +0200 Subject: [PATCH 2/2] mxshadowsrv: Declare statics as static Declare statics as static to avoind symbol namespace pollution and allow more compiler optimizations. --- mxshadowsrv.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mxshadowsrv.c b/mxshadowsrv.c index fc5044c..9d1b423 100644 --- a/mxshadowsrv.c +++ b/mxshadowsrv.c @@ -69,11 +69,11 @@ static void unmap_shadow(char *shadow_buf, struct stat *statbuf) { #define MAX_THREADS 8 #define TIMEOUT 30000 // client timeout in msec -pthread_mutex_t shadow_mutex = PTHREAD_MUTEX_INITIALIZER ; -char *shadow_buf = NULL; // protected by shadow_mutex -struct stat statbuf; // protected by shadow_mutex -SSL_CTX *ssl_ctx; -sem_t free_worker; +static pthread_mutex_t shadow_mutex = PTHREAD_MUTEX_INITIALIZER ; +static char *shadow_buf = NULL; // protected by shadow_mutex +static struct stat statbuf; // protected by shadow_mutex +static SSL_CTX *ssl_ctx; +static sem_t free_worker; #ifdef DEBUG_MAX_CONNECTS static int debug_remaining_connects = DEBUG_MAX_CONNECTS; #endif