From ff0b9042a8e350f7fbbc2357fd69c06b2f98922d Mon Sep 17 00:00:00 2001
From: xabbok255 <105869156+xabbok255@users.noreply.github.com>
Date: Mon, 13 May 2024 10:05:30 +0300
Subject: [PATCH] Shadowsocks plugin tcp_and_udp mode (#3868)

---
 net/shadowsocks/Makefile                              |  3 +--
 .../OPNsense/Shadowsocks/forms/general.xml            |  6 ++++++
 .../mvc/app/models/OPNsense/Shadowsocks/General.xml   | 11 ++++++++++-
 .../templates/OPNsense/Shadowsocks/shadowsocks.conf   |  1 +
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/net/shadowsocks/Makefile b/net/shadowsocks/Makefile
index 478086ece..bd4abead2 100644
--- a/net/shadowsocks/Makefile
+++ b/net/shadowsocks/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		shadowsocks
-PLUGIN_VERSION=		1.0
-PLUGIN_REVISION=	2
+PLUGIN_VERSION=		1.1
 PLUGIN_COMMENT=		Secure socks5 proxy
 PLUGIN_DEPENDS=		shadowsocks-libev
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/forms/general.xml b/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/forms/general.xml
index a2936b0f4..b87f8e838 100644
--- a/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/forms/general.xml
+++ b/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/forms/general.xml
@@ -35,4 +35,10 @@
         <type>dropdown</type>
         <help>Choose the cipher to use for encryption.</help>
     </field>
+    <field>
+        <id>general.tcpudpmode</id>
+        <label>Mode</label>
+        <type>dropdown</type>
+        <help>Choose TCP, UDP or both relay mode</help>
+    </field>
 </form>
diff --git a/net/shadowsocks/src/opnsense/mvc/app/models/OPNsense/Shadowsocks/General.xml b/net/shadowsocks/src/opnsense/mvc/app/models/OPNsense/Shadowsocks/General.xml
index 4a9319706..b255c0734 100644
--- a/net/shadowsocks/src/opnsense/mvc/app/models/OPNsense/Shadowsocks/General.xml
+++ b/net/shadowsocks/src/opnsense/mvc/app/models/OPNsense/Shadowsocks/General.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/shadowsocks/general</mount>
     <description>Shadowsocks configuration</description>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -46,5 +46,14 @@
                 <chacha20-ietf-poly1305>ChaCha20-IETF-Poly1305</chacha20-ietf-poly1305>
             </OptionValues>
         </cipher>
+        <tcpudpmode type="OptionField">
+            <default>tcp_only</default>
+            <Required>Y</Required>
+            <OptionValues>
+                <tcp_only>TCP only</tcp_only>
+                <udp_only>UDP only</udp_only>
+                <tcp_and_udp>TCP and UDP</tcp_and_udp>
+            </OptionValues>
+        </tcpudpmode>
     </items>
 </model>
diff --git a/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/shadowsocks.conf b/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/shadowsocks.conf
index ebe3fccc5..b4337ea4a 100644
--- a/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/shadowsocks.conf
+++ b/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/shadowsocks.conf
@@ -5,6 +5,7 @@
     "local_port":{{ OPNsense.shadowsocks.general.localport }},
     "password":"{{ OPNsense.shadowsocks.general.password }}",
     "timeout":60,
+    "mode":"{{ OPNsense.shadowsocks.general.tcpudpmode }}",
     "method":"{{ OPNsense.shadowsocks.general.cipher }}"
 }
 {% endif %}