From 6b04e5778c1c0c9686066dd44caccfd755917c25 Mon Sep 17 00:00:00 2001 From: Vladislav Grishenko Date: Sat, 7 Mar 2020 04:25:00 +0500 Subject: session: add global [common]max-starting option usually there's no need to have per-proto limitation, since the need of max starting limitation affects the whole server, not particular protocol only. --- accel-pppd/ctrl/sstp/sstp.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'accel-pppd/ctrl/sstp') diff --git a/accel-pppd/ctrl/sstp/sstp.c b/accel-pppd/ctrl/sstp/sstp.c index 5bf8fd82..29d13820 100644 --- a/accel-pppd/ctrl/sstp/sstp.c +++ b/accel-pppd/ctrl/sstp/sstp.c @@ -2196,6 +2196,11 @@ static int sstp_connect(struct triton_md_handler_t *h) continue; } + if (conf_max_starting && ap_session_stat.starting >= conf_max_starting) { + close(sock); + continue; + } + ip = conf_proxyproto ? INADDR_ANY : sockaddr_ipv4(&addr); if (ip && triton_module_loaded("connlimit") && connlimit_check(cl_key_from_ipv4(ip))) { close(sock); -- cgit v1.2.3 From 58b41703427284ca849bed7d11087b76ef16a46f Mon Sep 17 00:00:00 2001 From: Vladislav Grishenko Date: Sat, 7 Mar 2020 04:32:33 +0500 Subject: sstp: fix max-sessions limit was not applied --- accel-pppd/ctrl/sstp/sstp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'accel-pppd/ctrl/sstp') diff --git a/accel-pppd/ctrl/sstp/sstp.c b/accel-pppd/ctrl/sstp/sstp.c index 29d13820..7574a789 100644 --- a/accel-pppd/ctrl/sstp/sstp.c +++ b/accel-pppd/ctrl/sstp/sstp.c @@ -2201,10 +2201,15 @@ static int sstp_connect(struct triton_md_handler_t *h) continue; } + if (conf_max_sessions && ap_session_stat.active + ap_session_stat.starting >= conf_max_sessions) { + close(sock); + continue; + } + ip = conf_proxyproto ? INADDR_ANY : sockaddr_ipv4(&addr); if (ip && triton_module_loaded("connlimit") && connlimit_check(cl_key_from_ipv4(ip))) { close(sock); - return 0; + continue; } sockaddr_ntop(&addr, addr_buf, sizeof(addr_buf), 0); -- cgit v1.2.3