diff options
| author | Vladislav Grishenko <themiron@mail.ru> | 2020-03-07 03:56:42 +0500 |
|---|---|---|
| committer | Vladislav Grishenko <themiron@mail.ru> | 2020-03-07 03:56:42 +0500 |
| commit | 20600ea832aef9fb03841f22d0ce37452915fa64 (patch) | |
| tree | 47220d8d810530692b99a3229aaece8635d3e12d | |
| parent | c6496ef1bc9b305f7821f20183a8d99dc432950f (diff) | |
| download | accel-ppp-20600ea832aef9fb03841f22d0ce37452915fa64.tar.gz accel-ppp-20600ea832aef9fb03841f22d0ce37452915fa64.zip | |
Revert "pppoe: introduced max-starting option (limit number of starting sessions)"
This reverts commit 61862862a9fa24db4f16c24db1aed1f1a5f0be19.
| -rw-r--r-- | accel-pppd/accel-ppp.conf | 1 | ||||
| -rw-r--r-- | accel-pppd/ctrl/pppoe/pppoe.c | 14 |
2 files changed, 0 insertions, 15 deletions
diff --git a/accel-pppd/accel-ppp.conf b/accel-pppd/accel-ppp.conf index 7e9bb40d..21da3ec0 100644 --- a/accel-pppd/accel-ppp.conf +++ b/accel-pppd/accel-ppp.conf @@ -78,7 +78,6 @@ verbose=1 [pppoe] verbose=1 -#max-starting=0 #ac-name=xxx #service-name=yyy #pado-delay=0 diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c index 32dee77a..120e161f 100644 --- a/accel-pppd/ctrl/pppoe/pppoe.c +++ b/accel-pppd/ctrl/pppoe/pppoe.c @@ -87,7 +87,6 @@ struct iplink_arg { long *arg1; }; -static int conf_max_starting; int conf_verbose; char *conf_service_name[255]; int conf_accept_any_service; @@ -969,13 +968,6 @@ static void pppoe_recv_PADI(struct pppoe_serv_t *serv, uint8_t *pack, int size) if (conf_max_sessions && ap_session_stat.active + ap_session_stat.starting >= conf_max_sessions) return; - if (conf_max_starting > 0 && stat_starting >= conf_max_starting) { - log_warn("pppoe: Count of starting sessions > conf_max_starting, droping connection...\n"); - return; - - } - - if (check_padi_limit(serv, ethhdr->h_source)) { __sync_add_and_fetch(&stat_PADI_drop, 1); @@ -1936,12 +1928,6 @@ static void load_config(void) char *opt; struct conf_sect_t *s = conf_get_section("pppoe"); - opt = conf_get_opt("pppoe", "max-starting"); - if (opt) - conf_max_starting = atoi(opt); - else - conf_max_starting = 0; - opt = conf_get_opt("pppoe", "verbose"); if (opt) conf_verbose = atoi(opt); |