Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
tbblgm119
lede
提交
543a4a41
L
lede
项目概览
tbblgm119
/
lede
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
lede
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
543a4a41
编写于
12月 16, 2020
作者:
M
Mattraks
提交者:
GitHub
12月 16, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix unable to start SFE with IPv4 only (#5914)
上级
eed26dc4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
10 deletion
+13
-10
package/lean/fast-classifier/Makefile
package/lean/fast-classifier/Makefile
+3
-2
package/lean/fast-classifier/src/fast-classifier.c
package/lean/fast-classifier/src/fast-classifier.c
+4
-2
package/lean/luci-app-sfe/luasrc/model/cbi/sfe.lua
package/lean/luci-app-sfe/luasrc/model/cbi/sfe.lua
+2
-0
package/lean/shortcut-fe/Makefile
package/lean/shortcut-fe/Makefile
+4
-6
未找到文件。
package/lean/fast-classifier/Makefile
浏览文件 @
543a4a41
...
...
@@ -3,6 +3,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME
:=
fast-classifier
PKG_RELEASE
:=
1
PKG_CONFIG_DEPENDS
:=
CONFIG_IPV6
include
$(INCLUDE_DIR)/package.mk
...
...
@@ -49,10 +50,10 @@ Example user space program that communicates with fast
classifier
kernel
module
endef
SFE_MAKE_OPTS
:=
SFE_SUPPORT_IPV6
=
y
SFE_MAKE_OPTS
:=
SFE_SUPPORT_IPV6
=
$(
if
$(CONFIG_IPV6)
,y,n
)
define
Build/Compile/kmod
+$(MAKE)
$(PKG_JOBS)
-C
"$(LINUX_DIR)"
$(
strip
$(SFE_MAKE_OPTS)
)
\
+$(MAKE)
$(PKG_JOBS)
-C
"$(LINUX_DIR)"
$(
SFE_MAKE_OPTS
)
\
$(KERNEL_MAKE_FLAGS)
\
$(PKG_MAKE_FLAGS)
\
M
=
"
$(PKG_BUILD_DIR)
"
\
...
...
package/lean/fast-classifier/src/fast-classifier.c
浏览文件 @
543a4a41
...
...
@@ -345,7 +345,9 @@ static bool fast_classifier_find_dev_and_mac_addr(struct sk_buff *skb, sfe_ip_ad
}
dst
=
(
struct
dst_entry
*
)
rt
;
}
else
{
}
#ifdef SFE_SUPPORT_IPV6
else
{
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0))
rt6
=
rt6_lookup
(
&
init_net
,
(
struct
in6_addr
*
)
addr
->
ip6
,
0
,
0
,
NULL
,
0
);
#else
...
...
@@ -357,6 +359,7 @@ static bool fast_classifier_find_dev_and_mac_addr(struct sk_buff *skb, sfe_ip_ad
dst
=
(
struct
dst_entry
*
)
rt6
;
}
#endif
skip_dst_lookup:
rcu_read_lock
();
...
...
@@ -1971,4 +1974,3 @@ module_exit(fast_classifier_exit)
MODULE_DESCRIPTION
(
"Shortcut Forwarding Engine - Connection Manager"
);
MODULE_LICENSE
(
"Dual BSD/GPL"
);
package/lean/luci-app-sfe/luasrc/model/cbi/sfe.lua
浏览文件 @
543a4a41
...
...
@@ -21,11 +21,13 @@ wifi.rmempty = false
wifi
.
description
=
translate
(
"Enable Bridge Acceleration (may be functional conflict with bridge-mode VPN Server)"
)
wifi
:
depends
(
"enabled"
,
1
)
if
nixio
.
fs
.
access
(
"/proc/sys/net/ipv6"
)
then
ipv6
=
s
:
option
(
Flag
,
"ipv6"
,
translate
(
"IPv6 Acceleration"
))
ipv6
.
default
=
0
ipv6
.
rmempty
=
false
ipv6
.
description
=
translate
(
"Enable IPv6 Acceleration"
)
ipv6
:
depends
(
"enabled"
,
1
)
end
bbr
=
s
:
option
(
Flag
,
"bbr"
,
translate
(
"Enable BBR"
))
bbr
.
default
=
0
...
...
package/lean/shortcut-fe/Makefile
浏览文件 @
543a4a41
...
...
@@ -16,6 +16,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME
:=
shortcut-fe
PKG_RELEASE
:=
2
PKG_CONFIG_DEPENDS
:=
CONFIG_IPV6
include
$(INCLUDE_DIR)/package.mk
...
...
@@ -25,7 +26,7 @@ define KernelPackage/shortcut-fe
SUBMENU
:=
Network Support
DEPENDS
:=
TITLE
:=
Kernel driver
for
SFE
FILES
:=
$(PKG_BUILD_DIR)
/shortcut-fe.ko
$(
PKG_BUILD_DIR)
/shortcut-fe-ipv6.ko
FILES
:=
$(PKG_BUILD_DIR)
/shortcut-fe.ko
$(
if
$(CONFIG_IPV6)
,
$(PKG_BUILD_DIR)
/shortcut-fe-ipv6.ko,
)
KCONFIG
:=
CONFIG_NF_CONNTRACK_EVENTS
=
y
\
CONFIG_NF_CONNTRACK_TIMEOUT
=
y
\
CONFIG_SHORTCUT_FE
=
y
\
...
...
@@ -56,16 +57,13 @@ define KernelPackage/shortcut-fe-cm/Description
Simple
connection
manager
for
the
Shortcut
forwarding
engine.
endef
EXTRA_CFLAGS
+=
-DSFE_SUPPORT_IPV6
define
Build/Compile
+$(MAKE)
$(PKG_JOBS)
-C
"$(LINUX_DIR)"
\
$(KERNEL_MAKE_FLAGS)
\
$(PKG_MAKE_FLAGS)
\
M
=
"
$(PKG_BUILD_DIR)
"
\
EXTRA_CFLAGS
=
"
$(EXTRA_CFLAGS)
"
\
SFE_SUPPORT_IPV6
=
1
\
modules
modules
\
$(
if
$(CONFIG_IPV6)
,EXTRA_CFLAGS
=
"-DSFE_SUPPORT_IPV6"
SFE_SUPPORT_IPV6
=
y,
)
endef
ifneq
($(CONFIG_PACKAGE_kmod-shortcut-fe)$(CONFIG_PACKAGE_kmod-shortcut-fe-cm),)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录