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>

diff --git a/package/shadowsocks-libev/Config.in b/package/shadowsocks-libev/Config.in
index f58abdbcb139153ea4e014a35681fae04af5afc6..5ad79ad9cf7cc216e83702ac2a64efca9f2c66db 100644 (file)
--- 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 2280a45a9c0454102228b0657a64512c144fa811..368cb24a9a82da5762a014e3aec557802dc853d9 100644 (file)
--- 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))