initial commit

Jigsaw-Code · Apr 8, 2024 · 04696dd · 04696dd
1 parent 7901d73
commit 04696dd
Show file tree

Hide file tree

Showing 28 changed files with 14 additions and 14 deletions.
diff --git a/Makefile → client/Makefile b/Makefile → client/Makefile
@@ -11,7 +11,7 @@ IMPORT_PATH=$(IMPORT_HOST)/Jigsaw-Code/outline-apps
 
 all: android apple linux windows
 
-ROOT_PKG=client/src/tun2socks
+ROOT_PKG=client/src/backend
 
 android: $(BUILDDIR)/android/tun2socks.aar
 

diff --git a/client/src/tun2socks/build.action.mjs → client/src/backend/build.action.mjs b/client/src/tun2socks/build.action.mjs → client/src/backend/build.action.mjs
@@ -37,7 +37,7 @@ export async function main(...parameters) {
       'build',
       '-o',
       `output/build/${targetPlatform}/tun2socks${targetPlatform === 'windows' ? '.exe' : ''}`,
-      'github.com/Jigsaw-Code/outline-apps/client/src/tun2socks/outline/electron'
+      'github.com/Jigsaw-Code/outline-apps/client/src/backend/outline/electron'
     );
   }
 

diff --git a/client/src/tun2socks/outline/client.go → client/src/backend/outline/client.go b/client/src/tun2socks/outline/client.go → client/src/backend/outline/client.go
diff --git a/...ocks/outline/connectivity/connectivity.go → ...kend/outline/connectivity/connectivity.go b/...ocks/outline/connectivity/connectivity.go → ...kend/outline/connectivity/connectivity.go
@@ -21,8 +21,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/Jigsaw-Code/outline-apps/client/src/tun2socks/outline"
-	"github.com/Jigsaw-Code/outline-apps/client/src/tun2socks/outline/neterrors"
+	"github.com/Jigsaw-Code/outline-apps/client/src/backend/outline"
+	"github.com/Jigsaw-Code/outline-apps/client/src/backend/outline/neterrors"
 	"github.com/Jigsaw-Code/outline-sdk/transport"
 )
 

diff --git a/...outline/connectivity/connectivity_test.go → ...outline/connectivity/connectivity_test.go b/...outline/connectivity/connectivity_test.go → ...outline/connectivity/connectivity_test.go
diff --git a/outline/device/config.go → client/src/backend/outline/device/config.go b/outline/device/config.go → client/src/backend/outline/device/config.go
diff --git a/outline/device/config_test.go → ...src/backend/outline/device/config_test.go b/outline/device/config_test.go → ...src/backend/outline/device/config_test.go
diff --git a/outline/device/device.go → client/src/backend/outline/device/device.go b/outline/device/device.go → client/src/backend/outline/device/device.go
diff --git a/outline/device/device_test.go → ...src/backend/outline/device/device_test.go b/outline/device/device_test.go → ...src/backend/outline/device/device_test.go
diff --git a/outline/device/packet_listener.go → ...backend/outline/device/packet_listener.go b/outline/device/packet_listener.go → ...backend/outline/device/packet_listener.go
diff --git a/outline/device/packet_proxy.go → ...rc/backend/outline/device/packet_proxy.go b/outline/device/packet_proxy.go → ...rc/backend/outline/device/packet_proxy.go
diff --git a/outline/device/stream_dialer.go → ...c/backend/outline/device/stream_dialer.go b/outline/device/stream_dialer.go → ...c/backend/outline/device/stream_dialer.go
diff --git a/...nt/src/tun2socks/outline/electron/main.go → client/src/backend/outline/electron/main.go b/...nt/src/tun2socks/outline/electron/main.go → client/src/backend/outline/electron/main.go
@@ -24,10 +24,10 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/Jigsaw-Code/outline-apps/client/src/tun2socks/outline/internal/utf8"
-	"github.com/Jigsaw-Code/outline-apps/client/src/tun2socks/outline/neterrors"
-	"github.com/Jigsaw-Code/outline-apps/client/src/tun2socks/outline/shadowsocks"
-	"github.com/Jigsaw-Code/outline-apps/client/src/tun2socks/outline/tun2socks"
+	"github.com/Jigsaw-Code/outline-apps/client/src/backend/outline/internal/utf8"
+	"github.com/Jigsaw-Code/outline-apps/client/src/backend/outline/neterrors"
+	"github.com/Jigsaw-Code/outline-apps/client/src/backend/outline/shadowsocks"
+	"github.com/Jigsaw-Code/outline-apps/client/src/backend/outline/tun2socks"
 	"github.com/eycorsican/go-tun2socks/common/log"
 	_ "github.com/eycorsican/go-tun2socks/common/log/simple" // Register a simple logger.
 	"github.com/eycorsican/go-tun2socks/core"

diff --git a/...c/tun2socks/outline/internal/utf8/utf8.go → ...src/backend/outline/internal/utf8/utf8.go b/...c/tun2socks/outline/internal/utf8/utf8.go → ...src/backend/outline/internal/utf8/utf8.go
diff --git a/...2socks/outline/internal/utf8/utf8_test.go → ...ackend/outline/internal/utf8/utf8_test.go b/...2socks/outline/internal/utf8/utf8_test.go → ...ackend/outline/internal/utf8/utf8_test.go
diff --git a/.../tun2socks/outline/neterrors/neterrors.go → ...rc/backend/outline/neterrors/neterrors.go b/.../tun2socks/outline/neterrors/neterrors.go → ...rc/backend/outline/neterrors/neterrors.go
diff --git a/...c/tun2socks/outline/shadowsocks/client.go → ...src/backend/outline/shadowsocks/client.go b/...c/tun2socks/outline/shadowsocks/client.go → ...src/backend/outline/shadowsocks/client.go
@@ -25,9 +25,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/Jigsaw-Code/outline-apps/client/src/tun2socks/outline"
-	"github.com/Jigsaw-Code/outline-apps/client/src/tun2socks/outline/connectivity"
-	"github.com/Jigsaw-Code/outline-apps/client/src/tun2socks/outline/internal/utf8"
+	"github.com/Jigsaw-Code/outline-apps/client/src/backend/outline"
+	"github.com/Jigsaw-Code/outline-apps/client/src/backend/outline/connectivity"
+	"github.com/Jigsaw-Code/outline-apps/client/src/backend/outline/internal/utf8"
 	"github.com/Jigsaw-Code/outline-sdk/transport"
 	"github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"
 	"github.com/eycorsican/go-tun2socks/common/log"

diff --git a/...2socks/outline/shadowsocks/client_test.go → ...ackend/outline/shadowsocks/client_test.go b/...2socks/outline/shadowsocks/client_test.go → ...ackend/outline/shadowsocks/client_test.go
diff --git a/...c/tun2socks/outline/shadowsocks/config.go → ...src/backend/outline/shadowsocks/config.go b/...c/tun2socks/outline/shadowsocks/config.go → ...src/backend/outline/shadowsocks/config.go
diff --git a/...2socks/outline/shadowsocks/config_test.go → ...ackend/outline/shadowsocks/config_test.go b/...2socks/outline/shadowsocks/config_test.go → ...ackend/outline/shadowsocks/config_test.go
diff --git a/...nt/src/tun2socks/outline/tun2socks/tcp.go → client/src/backend/outline/tun2socks/tcp.go b/...nt/src/tun2socks/outline/tun2socks/tcp.go → client/src/backend/outline/tun2socks/tcp.go
diff --git a/...src/tun2socks/outline/tun2socks/tunnel.go → ...t/src/backend/outline/tun2socks/tunnel.go b/...src/tun2socks/outline/tun2socks/tunnel.go → ...t/src/backend/outline/tun2socks/tunnel.go
@@ -25,8 +25,8 @@ import (
 
 	"github.com/Jigsaw-Code/outline-sdk/transport"
 
-	"github.com/Jigsaw-Code/outline-apps/client/src/tun2socks/outline/connectivity"
-	"github.com/Jigsaw-Code/outline-apps/client/src/tun2socks/tunnel"
+	"github.com/Jigsaw-Code/outline-apps/client/src/backend/outline/connectivity"
+	"github.com/Jigsaw-Code/outline-apps/client/src/backend/tunnel"
 )
 
 // Tunnel represents a tunnel from a TUN device to a server.

diff --git a/...socks/outline/tun2socks/tunnel_android.go → ...ckend/outline/tun2socks/tunnel_android.go b/...socks/outline/tun2socks/tunnel_android.go → ...ckend/outline/tun2socks/tunnel_android.go
diff --git a/...2socks/outline/tun2socks/tunnel_darwin.go → ...ackend/outline/tun2socks/tunnel_darwin.go b/...2socks/outline/tun2socks/tunnel_darwin.go → ...ackend/outline/tun2socks/tunnel_darwin.go
@@ -20,7 +20,7 @@ import (
 	"runtime/debug"
 	"time"
 
-	"github.com/Jigsaw-Code/outline-apps/client/src/tun2socks/outline/shadowsocks"
+	"github.com/Jigsaw-Code/outline-apps/client/src/backend/outline/shadowsocks"
 )
 
 // TunWriter is an interface that allows for outputting packets to the TUN (VPN).

diff --git a/...nt/src/tun2socks/outline/tun2socks/udp.go → client/src/backend/outline/tun2socks/udp.go b/...nt/src/tun2socks/outline/tun2socks/udp.go → client/src/backend/outline/tun2socks/udp.go
diff --git a/client/src/tun2socks/tunnel/tun.go → client/src/backend/tunnel/tun.go b/client/src/tun2socks/tunnel/tun.go → client/src/backend/tunnel/tun.go
diff --git a/client/src/tun2socks/tunnel/tun_android.go → client/src/backend/tunnel/tun_android.go b/client/src/tun2socks/tunnel/tun_android.go → client/src/backend/tunnel/tun_android.go
diff --git a/client/src/tun2socks/tunnel/tunnel.go → client/src/backend/tunnel/tunnel.go b/client/src/tun2socks/tunnel/tunnel.go → client/src/backend/tunnel/tunnel.go