Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Achou.Wang
accel-ppp
提交
f22c441f
A
accel-ppp
项目概览
Achou.Wang
/
accel-ppp
通知
6
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
accel-ppp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
f22c441f
编写于
4月 18, 2017
作者:
D
Dmitry Kozlov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "implemented session count limiting"
This reverts commit
e3fc927e
.
上级
d1c33d02
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
1 addition
and
43 deletion
+1
-43
accel-pppd/accel-ppp.conf
accel-pppd/accel-ppp.conf
+0
-1
accel-pppd/ctrl/ipoe/ipoe.c
accel-pppd/ctrl/ipoe/ipoe.c
+0
-9
accel-pppd/ctrl/l2tp/l2tp.c
accel-pppd/ctrl/l2tp/l2tp.c
+0
-9
accel-pppd/ctrl/pppoe/pppoe.c
accel-pppd/ctrl/pppoe/pppoe.c
+0
-6
accel-pppd/ctrl/pptp/pptp.c
accel-pppd/ctrl/pptp/pptp.c
+1
-6
accel-pppd/include/ap_session.h
accel-pppd/include/ap_session.h
+0
-1
accel-pppd/session.c
accel-pppd/session.c
+0
-11
未找到文件。
accel-pppd/accel-ppp.conf
浏览文件 @
f22c441f
...
...
@@ -40,7 +40,6 @@ thread-count=4
#single-session=replace
#sid-case=upper
#sid-source=seq
#max-sessions=1000
[
ppp
]
verbose
=
1
...
...
accel-pppd/ctrl/ipoe/ipoe.c
浏览文件 @
f22c441f
...
...
@@ -1190,12 +1190,6 @@ static struct ipoe_session *ipoe_session_create_dhcpv4(struct ipoe_serv *serv, s
int
dlen
=
0
;
uint8_t
*
ptr
=
NULL
;
if
(
ap_shutdown
)
return
NULL
;
if
(
conf_max_sessions
&&
ap_session_stat
.
active
+
ap_session_stat
.
starting
>
conf_max_sessions
)
return
NULL
;
ses
=
ipoe_session_alloc
(
serv
->
ifname
);
if
(
!
ses
)
return
NULL
;
...
...
@@ -1796,9 +1790,6 @@ static struct ipoe_session *ipoe_session_create_up(struct ipoe_serv *serv, struc
if
(
ap_shutdown
)
return
NULL
;
if
(
conf_max_sessions
&&
ap_session_stat
.
active
+
ap_session_stat
.
starting
>
conf_max_sessions
)
return
NULL
;
if
(
l4_redirect_list_check
(
saddr
))
return
NULL
;
...
...
accel-pppd/ctrl/l2tp/l2tp.c
浏览文件 @
f22c441f
...
...
@@ -2731,9 +2731,6 @@ static int l2tp_recv_SCCRQ(const struct l2tp_serv_t *serv,
return
0
;
}
if
(
conf_max_sessions
&&
ap_session_stat
.
active
+
ap_session_stat
.
starting
>
conf_max_sessions
)
return
0
;
if
(
triton_module_loaded
(
"connlimit"
)
&&
connlimit_check
(
cl_key_from_ipv4
(
pack
->
addr
.
sin_addr
.
s_addr
)))
{
log_warn
(
"l2tp: connection limits reached,"
...
...
@@ -3260,9 +3257,6 @@ static int l2tp_recv_ICRQ(struct l2tp_conn_t *conn,
return
0
;
}
if
(
conf_max_sessions
&&
ap_session_stat
.
active
+
ap_session_stat
.
starting
>
conf_max_sessions
)
return
0
;
if
(
triton_module_loaded
(
"connlimit"
)
&&
connlimit_check
(
cl_key_from_ipv4
(
conn
->
peer_addr
.
sin_addr
.
s_addr
)))
{
log_tunnel
(
log_warn
,
conn
,
"connection limits reached,"
...
...
@@ -3563,9 +3557,6 @@ static int l2tp_recv_OCRQ(struct l2tp_conn_t *conn,
return
0
;
}
if
(
conf_max_sessions
&&
ap_session_stat
.
active
+
ap_session_stat
.
starting
>
conf_max_sessions
)
return
0
;
if
(
triton_module_loaded
(
"connlimit"
)
&&
connlimit_check
(
cl_key_from_ipv4
(
conn
->
peer_addr
.
sin_addr
.
s_addr
)))
{
log_tunnel
(
log_warn
,
conn
,
"connection limits reached,"
...
...
accel-pppd/ctrl/pppoe/pppoe.c
浏览文件 @
f22c441f
...
...
@@ -949,9 +949,6 @@ 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_sessions
&&
ap_session_stat
.
active
+
ap_session_stat
.
starting
>
conf_max_sessions
)
return
;
if
(
check_padi_limit
(
serv
,
ethhdr
->
h_source
))
{
__sync_add_and_fetch
(
&
stat_PADI_drop
,
1
);
if
(
conf_verbose
)
{
...
...
@@ -1071,9 +1068,6 @@ static void pppoe_recv_PADR(struct pppoe_serv_t *serv, uint8_t *pack, int size)
if
(
ap_shutdown
)
return
;
if
(
conf_max_sessions
&&
ap_session_stat
.
active
+
ap_session_stat
.
starting
>
conf_max_sessions
)
return
;
if
(
!
memcmp
(
ethhdr
->
h_dest
,
bc_addr
,
ETH_ALEN
))
{
if
(
conf_verbose
)
log_warn
(
"pppoe: discard PADR (destination address is broadcast)
\n
"
);
...
...
accel-pppd/ctrl/pptp/pptp.c
浏览文件 @
f22c441f
...
...
@@ -644,14 +644,9 @@ static int pptp_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
;
}
if
(
triton_module_loaded
(
"connlimit"
)
&&
connlimit_check
(
cl_key_from_ipv4
(
addr
.
sin_addr
.
s_addr
)))
{
close
(
sock
);
continue
;
return
0
;
}
log_info2
(
"pptp: new connection from %s
\n
"
,
inet_ntoa
(
addr
.
sin_addr
));
...
...
accel-pppd/include/ap_session.h
浏览文件 @
f22c441f
...
...
@@ -129,7 +129,6 @@ extern int sock_fd; // internet socket for ioctls
extern
int
sock6_fd
;
// internet socket for ioctls
extern
int
urandom_fd
;
extern
struct
ap_session_stat
ap_session_stat
;
extern
int
conf_max_sessions
;
extern
__thread
const
struct
ap_net
*
net
;
extern
const
struct
ap_net
def_net
;
...
...
accel-pppd/session.c
浏览文件 @
f22c441f
...
...
@@ -34,7 +34,6 @@ static int conf_single_session = -1;
static
int
conf_sid_source
;
static
int
conf_seq_save_timeout
=
10
;
static
const
char
*
conf_seq_file
;
int
conf_max_sessions
;
pthread_rwlock_t
__export
ses_lock
=
PTHREAD_RWLOCK_INITIALIZER
;
__export
LIST_HEAD
(
ses_list
);
...
...
@@ -76,10 +75,6 @@ void __export ap_session_set_ifindex(struct ap_session *ses)
ses
->
acct_tx_packets_i
=
stats
.
tx_packets
;
ses
->
acct_rx_bytes_i
=
stats
.
rx_bytes
;
ses
->
acct_tx_bytes_i
=
stats
.
tx_bytes
;
ses
->
acct_rx_bytes
=
0
;
ses
->
acct_tx_bytes
=
0
;
ses
->
acct_input_gigawords
=
0
;
ses
->
acct_output_gigawords
=
0
;
}
}
...
...
@@ -512,12 +507,6 @@ static void load_config(void)
conf_seq_file
=
conf_get_opt
(
"common"
,
"seq-file"
);
if
(
!
conf_seq_file
)
conf_seq_file
=
"/var/lib/accel-ppp/seq"
;
opt
=
conf_get_opt
(
"common"
,
"max-sessions"
);
if
(
opt
)
conf_max_sessions
=
atoi
(
opt
);
else
conf_max_sessions
=
0
;
}
static
void
init
(
void
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录