From 04696dd1d6c5c12195942503c1494ea139ec29ea Mon Sep 17 00:00:00 2001 From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com> Date: Mon, 8 Apr 2024 15:31:41 -0400 Subject: [PATCH] initial commit --- Makefile => client/Makefile | 2 +- client/src/{tun2socks => backend}/build.action.mjs | 2 +- client/src/{tun2socks => backend}/outline/client.go | 0 .../outline/connectivity/connectivity.go | 4 ++-- .../outline/connectivity/connectivity_test.go | 0 {outline => client/src/backend/outline}/device/config.go | 0 .../src/backend/outline}/device/config_test.go | 0 {outline => client/src/backend/outline}/device/device.go | 0 .../src/backend/outline}/device/device_test.go | 0 .../src/backend/outline}/device/packet_listener.go | 0 .../src/backend/outline}/device/packet_proxy.go | 0 .../src/backend/outline}/device/stream_dialer.go | 0 .../src/{tun2socks => backend}/outline/electron/main.go | 8 ++++---- .../{tun2socks => backend}/outline/internal/utf8/utf8.go | 0 .../outline/internal/utf8/utf8_test.go | 0 .../{tun2socks => backend}/outline/neterrors/neterrors.go | 0 .../{tun2socks => backend}/outline/shadowsocks/client.go | 6 +++--- .../outline/shadowsocks/client_test.go | 0 .../{tun2socks => backend}/outline/shadowsocks/config.go | 0 .../outline/shadowsocks/config_test.go | 0 .../src/{tun2socks => backend}/outline/tun2socks/tcp.go | 0 .../{tun2socks => backend}/outline/tun2socks/tunnel.go | 4 ++-- .../outline/tun2socks/tunnel_android.go | 0 .../outline/tun2socks/tunnel_darwin.go | 2 +- .../src/{tun2socks => backend}/outline/tun2socks/udp.go | 0 client/src/{tun2socks => backend}/tunnel/tun.go | 0 client/src/{tun2socks => backend}/tunnel/tun_android.go | 0 client/src/{tun2socks => backend}/tunnel/tunnel.go | 0 28 files changed, 14 insertions(+), 14 deletions(-) rename Makefile => client/Makefile (98%) rename client/src/{tun2socks => backend}/build.action.mjs (95%) rename client/src/{tun2socks => backend}/outline/client.go (100%) rename client/src/{tun2socks => backend}/outline/connectivity/connectivity.go (97%) rename client/src/{tun2socks => backend}/outline/connectivity/connectivity_test.go (100%) rename {outline => client/src/backend/outline}/device/config.go (100%) rename {outline => client/src/backend/outline}/device/config_test.go (100%) rename {outline => client/src/backend/outline}/device/device.go (100%) rename {outline => client/src/backend/outline}/device/device_test.go (100%) rename {outline => client/src/backend/outline}/device/packet_listener.go (100%) rename {outline => client/src/backend/outline}/device/packet_proxy.go (100%) rename {outline => client/src/backend/outline}/device/stream_dialer.go (100%) rename client/src/{tun2socks => backend}/outline/electron/main.go (95%) rename client/src/{tun2socks => backend}/outline/internal/utf8/utf8.go (100%) rename client/src/{tun2socks => backend}/outline/internal/utf8/utf8_test.go (100%) rename client/src/{tun2socks => backend}/outline/neterrors/neterrors.go (100%) rename client/src/{tun2socks => backend}/outline/shadowsocks/client.go (95%) rename client/src/{tun2socks => backend}/outline/shadowsocks/client_test.go (100%) rename client/src/{tun2socks => backend}/outline/shadowsocks/config.go (100%) rename client/src/{tun2socks => backend}/outline/shadowsocks/config_test.go (100%) rename client/src/{tun2socks => backend}/outline/tun2socks/tcp.go (100%) rename client/src/{tun2socks => backend}/outline/tun2socks/tunnel.go (95%) rename client/src/{tun2socks => backend}/outline/tun2socks/tunnel_android.go (100%) rename client/src/{tun2socks => backend}/outline/tun2socks/tunnel_darwin.go (96%) rename client/src/{tun2socks => backend}/outline/tun2socks/udp.go (100%) rename client/src/{tun2socks => backend}/tunnel/tun.go (100%) rename client/src/{tun2socks => backend}/tunnel/tun_android.go (100%) rename client/src/{tun2socks => backend}/tunnel/tunnel.go (100%) diff --git a/Makefile b/client/Makefile similarity index 98% rename from Makefile rename to client/Makefile index d19085aaf1..41b6ce68ae 100644 --- a/Makefile +++ b/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 b/client/src/backend/build.action.mjs similarity index 95% rename from client/src/tun2socks/build.action.mjs rename to client/src/backend/build.action.mjs index 0dba906286..a46bc8593f 100644 --- a/client/src/tun2socks/build.action.mjs +++ b/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 b/client/src/backend/outline/client.go similarity index 100% rename from client/src/tun2socks/outline/client.go rename to client/src/backend/outline/client.go diff --git a/client/src/tun2socks/outline/connectivity/connectivity.go b/client/src/backend/outline/connectivity/connectivity.go similarity index 97% rename from client/src/tun2socks/outline/connectivity/connectivity.go rename to client/src/backend/outline/connectivity/connectivity.go index b6e9175bec..39673fcb99 100644 --- a/client/src/tun2socks/outline/connectivity/connectivity.go +++ b/client/src/backend/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/client/src/tun2socks/outline/connectivity/connectivity_test.go b/client/src/backend/outline/connectivity/connectivity_test.go similarity index 100% rename from client/src/tun2socks/outline/connectivity/connectivity_test.go rename to client/src/backend/outline/connectivity/connectivity_test.go diff --git a/outline/device/config.go b/client/src/backend/outline/device/config.go similarity index 100% rename from outline/device/config.go rename to client/src/backend/outline/device/config.go diff --git a/outline/device/config_test.go b/client/src/backend/outline/device/config_test.go similarity index 100% rename from outline/device/config_test.go rename to client/src/backend/outline/device/config_test.go diff --git a/outline/device/device.go b/client/src/backend/outline/device/device.go similarity index 100% rename from outline/device/device.go rename to client/src/backend/outline/device/device.go diff --git a/outline/device/device_test.go b/client/src/backend/outline/device/device_test.go similarity index 100% rename from outline/device/device_test.go rename to client/src/backend/outline/device/device_test.go diff --git a/outline/device/packet_listener.go b/client/src/backend/outline/device/packet_listener.go similarity index 100% rename from outline/device/packet_listener.go rename to client/src/backend/outline/device/packet_listener.go diff --git a/outline/device/packet_proxy.go b/client/src/backend/outline/device/packet_proxy.go similarity index 100% rename from outline/device/packet_proxy.go rename to client/src/backend/outline/device/packet_proxy.go diff --git a/outline/device/stream_dialer.go b/client/src/backend/outline/device/stream_dialer.go similarity index 100% rename from outline/device/stream_dialer.go rename to client/src/backend/outline/device/stream_dialer.go diff --git a/client/src/tun2socks/outline/electron/main.go b/client/src/backend/outline/electron/main.go similarity index 95% rename from client/src/tun2socks/outline/electron/main.go rename to client/src/backend/outline/electron/main.go index e2864c46fc..8ce81cb333 100644 --- a/client/src/tun2socks/outline/electron/main.go +++ b/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/client/src/tun2socks/outline/internal/utf8/utf8.go b/client/src/backend/outline/internal/utf8/utf8.go similarity index 100% rename from client/src/tun2socks/outline/internal/utf8/utf8.go rename to client/src/backend/outline/internal/utf8/utf8.go diff --git a/client/src/tun2socks/outline/internal/utf8/utf8_test.go b/client/src/backend/outline/internal/utf8/utf8_test.go similarity index 100% rename from client/src/tun2socks/outline/internal/utf8/utf8_test.go rename to client/src/backend/outline/internal/utf8/utf8_test.go diff --git a/client/src/tun2socks/outline/neterrors/neterrors.go b/client/src/backend/outline/neterrors/neterrors.go similarity index 100% rename from client/src/tun2socks/outline/neterrors/neterrors.go rename to client/src/backend/outline/neterrors/neterrors.go diff --git a/client/src/tun2socks/outline/shadowsocks/client.go b/client/src/backend/outline/shadowsocks/client.go similarity index 95% rename from client/src/tun2socks/outline/shadowsocks/client.go rename to client/src/backend/outline/shadowsocks/client.go index bacbc2c82b..1785346b7d 100644 --- a/client/src/tun2socks/outline/shadowsocks/client.go +++ b/client/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/client/src/tun2socks/outline/shadowsocks/client_test.go b/client/src/backend/outline/shadowsocks/client_test.go similarity index 100% rename from client/src/tun2socks/outline/shadowsocks/client_test.go rename to client/src/backend/outline/shadowsocks/client_test.go diff --git a/client/src/tun2socks/outline/shadowsocks/config.go b/client/src/backend/outline/shadowsocks/config.go similarity index 100% rename from client/src/tun2socks/outline/shadowsocks/config.go rename to client/src/backend/outline/shadowsocks/config.go diff --git a/client/src/tun2socks/outline/shadowsocks/config_test.go b/client/src/backend/outline/shadowsocks/config_test.go similarity index 100% rename from client/src/tun2socks/outline/shadowsocks/config_test.go rename to client/src/backend/outline/shadowsocks/config_test.go diff --git a/client/src/tun2socks/outline/tun2socks/tcp.go b/client/src/backend/outline/tun2socks/tcp.go similarity index 100% rename from client/src/tun2socks/outline/tun2socks/tcp.go rename to client/src/backend/outline/tun2socks/tcp.go diff --git a/client/src/tun2socks/outline/tun2socks/tunnel.go b/client/src/backend/outline/tun2socks/tunnel.go similarity index 95% rename from client/src/tun2socks/outline/tun2socks/tunnel.go rename to client/src/backend/outline/tun2socks/tunnel.go index 17fc0d522b..110dd9d540 100644 --- a/client/src/tun2socks/outline/tun2socks/tunnel.go +++ b/client/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/client/src/tun2socks/outline/tun2socks/tunnel_android.go b/client/src/backend/outline/tun2socks/tunnel_android.go similarity index 100% rename from client/src/tun2socks/outline/tun2socks/tunnel_android.go rename to client/src/backend/outline/tun2socks/tunnel_android.go diff --git a/client/src/tun2socks/outline/tun2socks/tunnel_darwin.go b/client/src/backend/outline/tun2socks/tunnel_darwin.go similarity index 96% rename from client/src/tun2socks/outline/tun2socks/tunnel_darwin.go rename to client/src/backend/outline/tun2socks/tunnel_darwin.go index a0ab3b3cad..1d7bcf3b30 100644 --- a/client/src/tun2socks/outline/tun2socks/tunnel_darwin.go +++ b/client/src/backend/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/client/src/tun2socks/outline/tun2socks/udp.go b/client/src/backend/outline/tun2socks/udp.go similarity index 100% rename from client/src/tun2socks/outline/tun2socks/udp.go rename to client/src/backend/outline/tun2socks/udp.go diff --git a/client/src/tun2socks/tunnel/tun.go b/client/src/backend/tunnel/tun.go similarity index 100% rename from client/src/tun2socks/tunnel/tun.go rename to client/src/backend/tunnel/tun.go diff --git a/client/src/tun2socks/tunnel/tun_android.go b/client/src/backend/tunnel/tun_android.go similarity index 100% rename from client/src/tun2socks/tunnel/tun_android.go rename to client/src/backend/tunnel/tun_android.go diff --git a/client/src/tun2socks/tunnel/tunnel.go b/client/src/backend/tunnel/tunnel.go similarity index 100% rename from client/src/tun2socks/tunnel/tunnel.go rename to client/src/backend/tunnel/tunnel.go