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/accel-ppp.conf | 1 + accel-pppd/accel-ppp.conf.5 | 5 ++++- accel-pppd/ctrl/ipoe/ipoe.c | 8 +++++++- accel-pppd/ctrl/l2tp/l2tp.c | 9 +++++++++ accel-pppd/ctrl/pppoe/pppoe.c | 6 ++++++ accel-pppd/ctrl/pptp/pptp.c | 5 +++++ accel-pppd/ctrl/sstp/sstp.c | 5 +++++ accel-pppd/include/ap_session.h | 1 + accel-pppd/session.c | 7 +++++++ 9 files changed, 45 insertions(+), 2 deletions(-) diff --git a/accel-pppd/accel-ppp.conf b/accel-pppd/accel-ppp.conf index 1dc7176..290a19c 100644 --- a/accel-pppd/accel-ppp.conf +++ b/accel-pppd/accel-ppp.conf @@ -41,6 +41,7 @@ thread-count=4 #sid-case=upper #sid-source=seq #max-sessions=1000 +#max-starting=0 #check-ip=0 [ppp] diff --git a/accel-pppd/accel-ppp.conf.5 b/accel-pppd/accel-ppp.conf.5 index 41ee09c..af85d04 100644 --- a/accel-pppd/accel-ppp.conf.5 +++ b/accel-pppd/accel-ppp.conf.5 @@ -124,7 +124,10 @@ Assign session id by sequence method Path to file for sessions sequence number. Start sequence number may be set there (default /var/lib/accel-ppp/seq). .TP .BI "max-sessions=" n -Specifies maximum sessions which server may processed (default 0, disabled) +Specifies maximum concurrent sessions which server may processed (default 0, disabled) +.TP +.BI "max-starting=" n +Specifies maximum concurrent session attempts which server may processed (default 0, disabled) .TP .BI "check-ip=" 0|1 Specifies whether accel-ppp should check if IP already assigned to other client interface (default 0). diff --git a/accel-pppd/ctrl/ipoe/ipoe.c b/accel-pppd/ctrl/ipoe/ipoe.c index 17e437d..87261cb 100644 --- a/accel-pppd/ctrl/ipoe/ipoe.c +++ b/accel-pppd/ctrl/ipoe/ipoe.c @@ -1302,6 +1302,9 @@ static struct ipoe_session *ipoe_session_create_dhcpv4(struct ipoe_serv *serv, s if (ap_shutdown) return NULL; + if (conf_max_starting && ap_session_stat.starting >= conf_max_starting) + return NULL; + if (conf_max_sessions && ap_session_stat.active + ap_session_stat.starting >= conf_max_sessions) return NULL; @@ -2025,12 +2028,15 @@ static struct ipoe_session *ipoe_session_create_up(struct ipoe_serv *serv, struc if (ap_shutdown) return NULL; - if (connlimit_loaded && connlimit_check(cl_key_from_ipv4(saddr))) + if (conf_max_starting && ap_session_stat.starting >= conf_max_starting) return NULL; if (conf_max_sessions && ap_session_stat.active + ap_session_stat.starting >= conf_max_sessions) return NULL; + if (connlimit_loaded && connlimit_check(cl_key_from_ipv4(saddr))) + return NULL; + if (l4_redirect_list_check(saddr)) return NULL; diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c index 0d1ca21..2467189 100644 --- a/accel-pppd/ctrl/l2tp/l2tp.c +++ b/accel-pppd/ctrl/l2tp/l2tp.c @@ -2761,6 +2761,9 @@ static int l2tp_recv_SCCRQ(const struct l2tp_serv_t *serv, return 0; } + if (conf_max_starting && ap_session_stat.starting >= conf_max_starting) + return 0; + if (conf_max_sessions && ap_session_stat.active + ap_session_stat.starting >= conf_max_sessions) return 0; @@ -3300,6 +3303,9 @@ static int l2tp_recv_ICRQ(struct l2tp_conn_t *conn, return 0; } + if (conf_max_starting && ap_session_stat.starting >= conf_max_starting) + return 0; + if (conf_max_sessions && ap_session_stat.active + ap_session_stat.starting >= conf_max_sessions) return 0; @@ -3603,6 +3609,9 @@ static int l2tp_recv_OCRQ(struct l2tp_conn_t *conn, return 0; } + if (conf_max_starting && ap_session_stat.starting >= conf_max_starting) + return 0; + if (conf_max_sessions && ap_session_stat.active + ap_session_stat.starting >= conf_max_sessions) return 0; diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c index 120e161..718ebc5 100644 --- a/accel-pppd/ctrl/pppoe/pppoe.c +++ b/accel-pppd/ctrl/pppoe/pppoe.c @@ -966,6 +966,9 @@ static void pppoe_recv_PADI(struct pppoe_serv_t *serv, uint8_t *pack, int size) if (ap_shutdown || pado_delay == -1) return; + if (conf_max_starting && ap_session_stat.starting >= conf_max_starting) + return; + if (conf_max_sessions && ap_session_stat.active + ap_session_stat.starting >= conf_max_sessions) return; @@ -1093,6 +1096,9 @@ static void pppoe_recv_PADR(struct pppoe_serv_t *serv, uint8_t *pack, int size) if (ap_shutdown) return; + if (conf_max_starting && ap_session_stat.starting >= conf_max_starting) + return; + if (conf_max_sessions && ap_session_stat.active + ap_session_stat.starting >= conf_max_sessions) return; diff --git a/accel-pppd/ctrl/pptp/pptp.c b/accel-pppd/ctrl/pptp/pptp.c index fc5e83b..3b90139 100644 --- a/accel-pppd/ctrl/pptp/pptp.c +++ b/accel-pppd/ctrl/pptp/pptp.c @@ -651,6 +651,11 @@ static int pptp_connect(struct triton_md_handler_t *h) continue; } + if (conf_max_starting && ap_session_stat.starting >= conf_max_starting) { + close(sock); + continue; + } + if (conf_max_sessions && ap_session_stat.active + ap_session_stat.starting >= conf_max_sessions) { close(sock); continue; diff --git a/accel-pppd/ctrl/sstp/sstp.c b/accel-pppd/ctrl/sstp/sstp.c index 5bf8fd8..29d1382 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); diff --git a/accel-pppd/include/ap_session.h b/accel-pppd/include/ap_session.h index 6a6b950..8c79d31 100644 --- a/accel-pppd/include/ap_session.h +++ b/accel-pppd/include/ap_session.h @@ -135,6 +135,7 @@ extern int sock6_fd; extern int urandom_fd; extern struct ap_session_stat ap_session_stat; extern int conf_max_sessions; +extern int conf_max_starting; void ap_session_init(struct ap_session *ses); void ap_session_set_ifindex(struct ap_session *ses); diff --git a/accel-pppd/session.c b/accel-pppd/session.c index 81247d1..8ef569e 100644 --- a/accel-pppd/session.c +++ b/accel-pppd/session.c @@ -36,6 +36,7 @@ static int conf_sid_source; static int conf_seq_save_timeout = 10; static const char *conf_seq_file; int __export conf_max_sessions; +int __export conf_max_starting; pthread_rwlock_t __export ses_lock = PTHREAD_RWLOCK_INITIALIZER; __export LIST_HEAD(ses_list); @@ -542,6 +543,12 @@ static void load_config(void) conf_max_sessions = atoi(opt); else conf_max_sessions = 0; + + opt = conf_get_opt("common", "max-starting"); + if (opt) + conf_max_starting = atoi(opt); + else + conf_max_starting = 0; } static void init(void) -- cgit v1.2.3