Feature/plugins

build_exec.sh

@@ -9,5 +9,6 @@ GOOS=linux go build -o bin/gtun/gtun-linux_amd64 cmd/gtun/*.go
 GOARCH=arm GOOS=linux go build -o bin/gtun/gtun-linux_arm  cmd/gtun/*.go
 echo "builded gtun...."
 
-cp before_script.sh bin/
-cp after_script.sh bin/
+cp -r etc/gtun.yaml bin/gtun/
+cp -r etc/gtund.yaml bin/gtund/
+cp install.sh bin/gtun/

build_image.sh

@@ -7,9 +7,8 @@ cp $WORKSPACE/bin/gtund/gtund .
 docker build . -t gtund
 echo "builded gtund docker image"
 
-
 echo "building gtun docker image"
 cd $WORKSPACE/docker-build/gtun
 cp $WORKSPACE/bin/gtun/gtun-linux_amd64 .
 docker build . -t gtun
-echo "builded gtun docker image"
+echo "builded gtun docker image"

docker-build/docker-compose.yaml

@@ -0,0 +1,65 @@
+version: '3'
+services:
+  gtun:
+    build: ./gtun
+    container_name: gtun
+    restart: always
+    network_mode: host
+    privileged: true
+    volumes:
+      - /opt/apps/logs:/opt/logs
+    environment:
+      TIME_ZONE: Asia/Shanghai
+      settings: |
+        settings:
+          CN:
+            proxy_file: "https://www.ipdeny.com/ipblocks/data/countries/us.zone"
+            route:
+              - trace_addr: ${CN_SERVER_IP}:${CN_SERVER_TRACE_PORT}
+                scheme: "kcp"
+                addr: ${CN_SERVER_IP}:${CN_SERVER_PORT}
+                auth_key: ""
+            proxy:
+              "tproxy_tcp": |
+                {
+                  "read_timeout": 30,
+                  "write_timeout": 30,
+                  "listen_addr": ":8524",
+                  "rate_limit": 50,
+                  "region": "CN"
+                }
+              "tproxy_udp": |
+                {
+                  "read_timeout": 30,
+                  "write_timeout": 30,
+                  "session_timeout": 30,
+                  "listen_addr": ":8524",
+                  "rate_limit": 50,
+                  "region": "CN"
+                }
+        log:
+          days: 5
+          level: Debug
+          path: gtun.log
+
+        http_server:
+          listen_addr: ":9001"
+  gtund:
+    build: ./gtund
+    container_name: gtund
+    restart: always
+    network_mode: host
+    volumes:
+      - /opt/apps/logs:/logs
+    environment:
+      TIME_ZONE: Asia/Shanghai
+      settings: |
+        server:
+          - listen: ":3002"
+            authKey: "rewrite with your auth key"
+            scheme: "kcp"
+            trace: ":3003"
+        log:
+          days: 5
+          level: "debug"
+          path: "gtund.log"

docker-build/gtun/Dockerfile

@@ -3,4 +3,4 @@ COPY gtun-linux_amd64 /gtun
 COPY start.sh /
 RUN chmod +x start.sh && chmod +x gtun
 RUN mkdir /opt/logs
-CMD /start.sh
+CMD /start.sh

docker-build/gtun/start.sh

@@ -8,4 +8,4 @@ if [ "$settings" != "" ]; then
     echo "$settings" > /gtun.yaml
 fi
 
-/gtun -c /gtun.yaml
+/gtun -c /gtun.yaml

docker-build/gtund/start.sh

@@ -8,4 +8,4 @@ if [ "$settings" != "" ]; then
     echo "$settings" > /gtund.yaml
 fi
 
-/gtund -c /gtund.yaml
+/gtund -c /gtund.yaml

etc/gtun.yaml

@@ -1,21 +1,33 @@
-forwards:
-  - region: US
-    tcp:
-      listen: ":2012"
-    udp:
-      listen: ":2012"
-    transport:
-      - server: "ip:port"
-        authKey: "rewrite with your auth key"
-        scheme: kcp
-        traceAddr: ""
-      - server: "ip:port"
-        auth_key: "rewrite with your auth key"
-        scheme: mux
-        traceAddr: ""
-    rateLimit: 1000
-
+settings:
+  CN:
+    proxy_file: "https://www.ipdeny.com/ipblocks/data/countries/us.zone"
+    route:
+      - trace_addr: ${CN_SERVER_IP}:${CN_SERVER_TRACE_PORT}
+        scheme: "kcp"
+        addr: ${CN_SERVER_IP}:${CN_SERVER_PORT}
+        auth_key: ""
+    proxy:
+      "tproxy_tcp": |
+        {
+          "read_timeout": 30,
+          "write_timeout": 30,
+          "listen_addr": ":8524",
+          "rate_limit": 50,
+          "region": "CN"
+        }
+      "tproxy_udp": |
+        {
+          "read_timeout": 30,
+          "write_timeout": 30,
+          "session_timeout": 30,
+          "listen_addr": ":8524",
+          "rate_limit": 50,
+          "region": "CN"
+        }
 log:
   days: 5
-  level: "info"
-  path: "gtun.log"
+  level: Debug
+  path: gtun.log
+
+http_server:
+  listen_addr: ":9001""

go.mod

@@ -4,9 +4,12 @@ go 1.16
 
 require (
 	github.com/ICKelin/optw v0.0.0-20211219021958-28f4d1f075ef
+	github.com/agiledragon/gomonkey/v2 v2.10.1
 	github.com/astaxie/beego v1.12.3
 	github.com/belogik/goes v0.0.0-20151229125003-e54d722c3aff
 	github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58
-	github.com/gogo/protobuf v1.3.1
+	github.com/gogo/protobuf v1.3.2
+	github.com/smartystreets/goconvey v1.8.1
+	github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
 	gopkg.in/yaml.v2 v2.4.0
 )