summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accel-pppd/accel-ppp.conf2
-rw-r--r--accel-pppd/ctrl/ipoe/ipoe.c16
-rw-r--r--accel-pppd/ctrl/pptp/pptp.c11
3 files changed, 2 insertions, 27 deletions
diff --git a/accel-pppd/accel-ppp.conf b/accel-pppd/accel-ppp.conf
index 21da3ec0..1dc7176e 100644
--- a/accel-pppd/accel-ppp.conf
+++ b/accel-pppd/accel-ppp.conf
@@ -68,7 +68,6 @@ unit-cache=1
#noauth=0
[pptp]
-#max-starting=0
verbose=1
#echo-interval=30
#ip-pool=pptp
@@ -139,7 +138,6 @@ verbose=1
#ifname=sstp%d
[ipoe]
-#max-starting=0
verbose=1
username=ifname
#password=username
diff --git a/accel-pppd/ctrl/ipoe/ipoe.c b/accel-pppd/ctrl/ipoe/ipoe.c
index b1504a2f..17e437d5 100644
--- a/accel-pppd/ctrl/ipoe/ipoe.c
+++ b/accel-pppd/ctrl/ipoe/ipoe.c
@@ -127,7 +127,6 @@ static int conf_username;
static const char *conf_password;
static int conf_unit_cache;
static int conf_noauth;
-static int conf_max_starting;
#ifdef RADIUS
static int conf_vendor;
static const char *conf_vendor_str;
@@ -1772,10 +1771,7 @@ static void __ipoe_recv_dhcpv4(struct dhcpv4_serv *dhcpv4, struct dhcpv4_packet
if (connlimit_loaded && pack->msg_type == DHCPDISCOVER && connlimit_check(serv->opt_shared ? cl_key_from_mac(pack->hdr->chaddr) : serv->ifindex))
return;
- if (conf_max_starting > 0 && pack->msg_type == DHCPDISCOVER && stat_starting > conf_max_starting) {
- log_warn("ipoe: Count of starting sessions > conf_max_starting, droping connection...\n");
- return;
- }
+
pthread_mutex_lock(&serv->lock);
if (pack->msg_type == DHCPDISCOVER) {
if (check_notify(serv, pack))
@@ -2031,10 +2027,7 @@ static struct ipoe_session *ipoe_session_create_up(struct ipoe_serv *serv, struc
if (connlimit_loaded && connlimit_check(cl_key_from_ipv4(saddr)))
return NULL;
- if (conf_max_starting > 0 && stat_starting > conf_max_starting) {
- log_warn("ipoe: Count of starting sessions > conf_max_starting, droping connection...\n");
- return NULL;
- }
+
if (conf_max_sessions && ap_session_stat.active + ap_session_stat.starting >= conf_max_sessions)
return NULL;
@@ -3745,11 +3738,6 @@ static void load_config(void)
conf_password = opt;
} else
conf_password = NULL;
- opt = conf_get_opt("ipoe", "max-starting");
- if (opt)
- conf_max_starting = atoi(opt);
- else
- conf_max_starting = 0;
opt = conf_get_opt("ipoe", "netmask");
if (opt) {
diff --git a/accel-pppd/ctrl/pptp/pptp.c b/accel-pppd/ctrl/pptp/pptp.c
index 1161da5a..fc5e83b8 100644
--- a/accel-pppd/ctrl/pptp/pptp.c
+++ b/accel-pppd/ctrl/pptp/pptp.c
@@ -55,7 +55,6 @@ struct pptp_conn_t
struct ppp_t ppp;
};
-static int conf_max_starting;
static int conf_ppp_max_mtu = PPTP_MAX_MTU;
static int conf_timeout = 5;
static int conf_echo_interval = 0;
@@ -656,11 +655,6 @@ static int pptp_connect(struct triton_md_handler_t *h)
close(sock);
continue;
}
- if (conf_max_starting > 0 && stat_starting >= conf_max_starting) {
- close(sock);
- log_warn("pptp: Count of starting sessions > conf_max_starting, droping connection...\n");
- continue;
- }
if (triton_module_loaded("connlimit") && connlimit_check(cl_key_from_ipv4(addr.sin_addr.s_addr))) {
close(sock);
@@ -789,11 +783,6 @@ static void load_config(void)
else
conf_ppp_max_mtu = PPTP_MAX_MTU;
- opt = conf_get_opt("pptp", "max-starting");
- if (opt)
- conf_max_starting = atoi(opt);
- else
- conf_max_starting = 0;
conf_mppe = MPPE_UNSET;
opt = conf_get_opt("pptp", "mppe");
if (opt) {