Synchronet now requires the libarchive development package (e.g. libarchive-dev on Debian-based Linux distros, libarchive.org for more info) to build successfully.

Commit 82b99558 authored by Rob Swindell's avatar Rob Swindell 💬

Merge branch 'master' of gitlab.synchro.net:main/sbbs

parents 6616ff69 452e65d8
Pipeline #1409 passed with stage
in 9 minutes and 35 seconds
...@@ -1167,7 +1167,7 @@ static void js_service_thread(void* arg) ...@@ -1167,7 +1167,7 @@ static void js_service_thread(void* arg)
} }
FREE_AND_NULL(service_client.subscan); FREE_AND_NULL(service_client.subscan);
protected_uint32_adjust(&service->clients, -1); ulong remain = protected_uint32_adjust(&service->clients, -1);
update_clients(); update_clients();
#ifdef _WIN32 #ifdef _WIN32
...@@ -1178,8 +1178,8 @@ static void js_service_thread(void* arg) ...@@ -1178,8 +1178,8 @@ static void js_service_thread(void* arg)
thread_down(); thread_down();
if(service->log_level >= LOG_INFO) if(service->log_level >= LOG_INFO)
lprintf(LOG_INFO,"%04d %s service thread terminated (%u clients remain, %lu total, %lu served)" lprintf(LOG_INFO,"%04d %s service thread terminated (%lu clients remain, %lu total, %lu served)"
,socket, service->protocol, service->clients, active_clients(), service->served); ,socket, service->protocol, remain, active_clients(), service->served);
client_off(socket); client_off(socket);
close_socket(socket); close_socket(socket);
...@@ -1486,7 +1486,7 @@ static void native_service_thread(void* arg) ...@@ -1486,7 +1486,7 @@ static void native_service_thread(void* arg)
system(fullcmd); system(fullcmd);
protected_uint32_adjust(&service->clients, -1); ulong remain = protected_uint32_adjust(&service->clients, -1);
update_clients(); update_clients();
#ifdef _WIN32 #ifdef _WIN32
...@@ -1497,8 +1497,8 @@ static void native_service_thread(void* arg) ...@@ -1497,8 +1497,8 @@ static void native_service_thread(void* arg)
thread_down(); thread_down();
if(service->log_level >= LOG_INFO) if(service->log_level >= LOG_INFO)
lprintf(LOG_INFO,"%04d %s service thread terminated (%u clients remain, %lu total, %lu served)" lprintf(LOG_INFO,"%04d %s service thread terminated (%lu clients remain, %lu total, %lu served)"
,socket, service->protocol, service->clients, active_clients(), service->served); ,socket, service->protocol, remain, active_clients(), service->served);
client_off(socket); client_off(socket);
close_socket(socket); close_socket(socket);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment