From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 5 Aug 2016 03:51:47 +0000 (-0400)
Subject: core/socket: include remote address in the message when dropping connection
X-Git-Tag: v232~323^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea8f50f8085ce9385676385006030e8886cabaa6;p=thirdparty%2Fsystemd.git

core/socket: include remote address in the message when dropping connection

Without the address the message is not very useful.

Aug 04 23:52:21 rawhide systemd[1]: testlimit.socket: Too many incoming connections (4) from source ::1, dropping connection.
---

diff --git a/src/core/socket.c b/src/core/socket.c
index 0d776942519..b8a2f7fff81 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -2187,7 +2187,7 @@ static void socket_enter_running(Socket *s, int cfd) {
                 Service *service;
 
                 if (s->n_connections >= s->max_connections) {
-                        log_unit_warning(UNIT(s), "Too many incoming connections (%u), refusing connection attempt.",
+                        log_unit_warning(UNIT(s), "Too many incoming connections (%u), dropping connection.",
                                          s->n_connections);
                         safe_close(cfd);
                         return;
@@ -2199,9 +2199,13 @@ static void socket_enter_running(Socket *s, int cfd) {
                                 safe_close(cfd);
                                 return;
                         } else if (r > 0 && p->n_ref > s->max_connections_per_source) {
+                                _cleanup_free_ char *t = NULL;
+
+                                sockaddr_pretty(&p->peer.sa, FAMILY_ADDRESS_SIZE(p->peer.sa.sa_family), true, false, &t);
+
                                 log_unit_warning(UNIT(s),
-                                                 "Too many incoming connections (%u) from source, refusing connection attempt.",
-                                                 p->n_ref);
+                                                 "Too many incoming connections (%u) from source %s, dropping connection.",
+                                                 p->n_ref, strnull(t));
                                 safe_close(cfd);
                                 return;
                         }