summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDUPONCHEEL Sébastien <sebastien.duponcheel@corp.ovh.com>2018-11-21 16:12:38 +0100
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-11-21 22:29:15 +0100
commit73962d34498f8570a465a8fe5771c05daa4414d5 (patch)
tree2fe2526dbcf69c9fef9c4ec425a2680fed29b4cd
parent7ec56c1e12b9e79ab55aad63dab377f15bc8d248 (diff)
downloadbuildroot-73962d34498f8570a465a8fe5771c05daa4414d5.tar.gz
buildroot-73962d34498f8570a465a8fe5771c05daa4414d5.zip
shadowsocks-libev: add connmarktos build option
Signed-off-by: DUPONCHEEL Sébastien <sebastien.duponcheel@corp.ovh.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/shadowsocks-libev/Config.in12
-rw-r--r--package/shadowsocks-libev/shadowsocks-libev.mk6
2 files changed, 18 insertions, 0 deletions
diff --git a/package/shadowsocks-libev/Config.in b/package/shadowsocks-libev/Config.in
index f58abdbcb1..5ad79ad9cf 100644
--- a/package/shadowsocks-libev/Config.in
+++ b/package/shadowsocks-libev/Config.in
@@ -15,6 +15,18 @@ config BR2_PACKAGE_SHADOWSOCKS_LIBEV
https://github.com/shadowsocks/shadowsocks-libev
+config BR2_PACKAGE_SHADOWSOCKS_LIBEV_CONNMARKTOS
+ bool "conmarktos support in ss-server"
+ depends on BR2_PACKAGE_SHADOWSOCKS_LIBEV
+ select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
+ help
+ Build ss-server with the connmark to TOS feature.
+
+ This feature requires advanced tc, iptables and conntrack
+ rules to perform QoS on the server side.
+
+ If unsure, don't enable this option
+
comment "shadowsocks-libev needs a toolchain w/ threads"
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on BR2_TOOLCHAIN_HAS_SYNC_8 || !BR2_ARCH_IS_64
diff --git a/package/shadowsocks-libev/shadowsocks-libev.mk b/package/shadowsocks-libev/shadowsocks-libev.mk
index 2280a45a9c..368cb24a9a 100644
--- a/package/shadowsocks-libev/shadowsocks-libev.mk
+++ b/package/shadowsocks-libev/shadowsocks-libev.mk
@@ -14,4 +14,10 @@ SHADOWSOCKS_LIBEV_CONF_OPTS = \
--with-pcre=$(STAGING_DIR)/usr \
--disable-ssp
+# --disable option was broken in 3.2.1, it will be fixed in 3.2.2
+ifeq ($(BR2_PACKAGE_SHADOWSOCKS_LIBEV_CONNMARKTOS),y)
+SHADOWSOCKS_LIBEV_DEPENDENCIES += libnetfilter_conntrack
+SHADOWSOCKS_LIBEV_CONF_OPTS += --enable-connmarktos
+endif
+
$(eval $(autotools-package))
OpenPOWER on IntegriCloud