From 3cc825134af542fa08072f57fe35b481f935c39c Mon Sep 17 00:00:00 2001
From: Rob Swindell <rob@synchro.net>
Date: Mon, 9 Jan 2023 15:36:49 -0800
Subject: [PATCH] Log client IP address along with MAXIMUM CLIENTS reached log
message
---
src/sbbs3/ftpsrvr.c | 4 ++--
src/sbbs3/mailsrvr.c | 4 ++--
src/sbbs3/services.c | 4 ++--
src/sbbs3/websrvr.c | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/sbbs3/ftpsrvr.c b/src/sbbs3/ftpsrvr.c
index 992445f50e..85fcbb3950 100644
--- a/src/sbbs3/ftpsrvr.c
+++ b/src/sbbs3/ftpsrvr.c
@@ -5160,8 +5160,8 @@ void ftp_server(void* arg)
}
if(protected_uint32_value(active_clients)>=startup->max_clients) {
- lprintf(LOG_WARNING,"%04d !MAXIMUM CLIENTS (%d) reached, access denied"
- ,client_socket, startup->max_clients);
+ lprintf(LOG_WARNING,"%04d [%s] !MAXIMUM CLIENTS (%d) reached, access denied"
+ ,client_socket, client_ip, startup->max_clients);
sockprintf(client_socket,-1,"421 Maximum active clients reached, please try again later.");
ftp_close_socket(&client_socket,&none,__LINE__);
continue;
diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index b066a26bdd..fda29f9df0 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -6337,8 +6337,8 @@ void mail_server(void* arg)
}
if(protected_uint32_value(active_clients)>=startup->max_clients) {
- lprintf(LOG_WARNING,"%04d %s !MAXIMUM CLIENTS (%u) reached, access denied (%lu total)"
- ,client_socket, servprot, startup->max_clients, ++stats.connections_refused);
+ lprintf(LOG_WARNING,"%04d %s [%s] !MAXIMUM CLIENTS (%u) reached, access denied (%lu total)"
+ ,client_socket, servprot, host_ip, startup->max_clients, ++stats.connections_refused);
sockprintf(client_socket, servprot, session, is_smtp ? smtp_error : pop_error, "Maximum active clients reached");
mswait(3000);
mail_close_socket(&client_socket, &session);
diff --git a/src/sbbs3/services.c b/src/sbbs3/services.c
index 1abbd3a520..8bebcc905f 100644
--- a/src/sbbs3/services.c
+++ b/src/sbbs3/services.c
@@ -2292,8 +2292,8 @@ void services_thread(void* arg)
if(service[i].max_clients && protected_uint32_value(service[i].clients) + 1 > service[i].max_clients) {
FREE_AND_NULL(udp_buf);
- lprintf(LOG_WARNING,"%04d %s !MAXIMUM CLIENTS (%u) reached, access denied"
- ,client_socket, service[i].protocol, service[i].max_clients);
+ lprintf(LOG_WARNING,"%04d %s [%s] !MAXIMUM CLIENTS (%u) reached, access denied"
+ ,client_socket, service[i].protocol, host_ip, service[i].max_clients);
close_socket(client_socket);
continue;
}
diff --git a/src/sbbs3/websrvr.c b/src/sbbs3/websrvr.c
index 17cabae197..9d7a6c6326 100644
--- a/src/sbbs3/websrvr.c
+++ b/src/sbbs3/websrvr.c
@@ -7293,8 +7293,8 @@ void web_server(void* arg)
,client_socket, client_highwater);
}
if(startup->max_clients && protected_uint32_value(active_clients)>=startup->max_clients) {
- lprintf(LOG_WARNING,"%04d !MAXIMUM CLIENTS (%d) reached, access denied"
- ,client_socket, startup->max_clients);
+ lprintf(LOG_WARNING,"%04d [%s] !MAXIMUM CLIENTS (%d) reached, access denied"
+ ,client_socket, host_ip, startup->max_clients);
if (!len_503)
len_503 = strlen(error_503);
sendsocket(client_socket, error_503, len_503);
--
GitLab