From d82ea2ba8f9486d338b3aefe161afd4f77ce7a86 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 27 Feb 2018 13:03:44 +0100 Subject: tcpudp: shrink per-host rate-limiting code function old new delta tcpudpsvd_main 1775 1780 +5 ipsvd_perhost_add 108 107 -1 cclen 4 - -4 cc 4 - -4 ipsvd_perhost_init 30 25 -5 ipsvd_perhost_remove 80 44 -36 ------------------------------------------------------------------------------ (add/remove: 0/2 grow/shrink: 1/3 up/down: 5/-50) Total: -45 bytes text data bss dec hex filename 933358 473 6852 940683 e5a8b busybox_old 933326 473 6844 940643 e5a63 busybox_unstripped Signed-off-by: Denys Vlasenko --- networking/tcpudp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'networking/tcpudp.c') diff --git a/networking/tcpudp.c b/networking/tcpudp.c index 2feb63a01..a90e3f80a 100644 --- a/networking/tcpudp.c +++ b/networking/tcpudp.c @@ -127,6 +127,7 @@ struct globals { unsigned cur_per_host; unsigned cnum; unsigned cmax; + struct hcc *cc; char **env_cur; char *env_var[1]; /* actually bigger */ } FIX_ALIASING; @@ -229,7 +230,7 @@ static void sig_child_handler(int sig UNUSED_PARAM) while ((pid = wait_any_nohang(&wstat)) > 0) { if (max_per_host) - ipsvd_perhost_remove(pid); + ipsvd_perhost_remove(G.cc, pid); if (cnum) cnum--; if (verbose) @@ -347,7 +348,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv) signal(SIGPIPE, SIG_IGN); if (max_per_host) - ipsvd_perhost_init(cmax); + G.cc = ipsvd_perhost_init(cmax); local_port = bb_lookup_port(argv[1], tcp ? "tcp" : "udp", 0); lsa = xhost2sockaddr(argv[0], local_port); @@ -422,7 +423,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv) /* Drop connection immediately if cur_per_host > max_per_host * (minimizing load under SYN flood) */ remote_addr = xmalloc_sockaddr2dotted_noport(&remote.u.sa); - cur_per_host = ipsvd_perhost_add(remote_addr, max_per_host, &hccp); + cur_per_host = ipsvd_perhost_add(G.cc, remote_addr, max_per_host, &hccp); if (cur_per_host > max_per_host) { /* ipsvd_perhost_add detected that max is exceeded * (and did not store ip in connection table) */ -- cgit v1.2.3