misc: rename project to warp-plus

Also mark termux script as broken until it's fixed. Signed-off-by: Mark Pashmfouroush <[email protected]>
bepass-org · Mar 14, 2024 · 8d8e5bf · 8d8e5bf
1 parent 8bcd11f
commit 8d8e5bf
Show file tree

Hide file tree

Showing 53 changed files with 108 additions and 114 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
-wireguard-go
+warp-plus
+warp-plus.exe
 .idea
 stuff/
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# Warp-Plus-Go
+# Warp-Plus
 
-Warp-Plus-Go is an open-source implementation of Cloudflare's Warp, enhanced with Psiphon integration for circumventing censorship. This project aims to provide a robust and cross-platform VPN solution that can use psiphon on top of warp and warp-in-warp for changing the user virtual nat location.
+Warp-Plus is an open-source implementation of Cloudflare's Warp, enhanced with Psiphon integration for circumventing censorship. This project aims to provide a robust and cross-platform VPN solution that can use psiphon on top of warp and warp-in-warp for changing the user virtual nat location.
 
 ## Features
 
@@ -15,15 +15,15 @@ Warp-Plus-Go is an open-source implementation of Cloudflare's Warp, enhanced wit
 
 ### Prerequisites
 
-- You can download prebuilt binaries or compile it with Go (You MUST use go 1.20)
+- You can download prebuilt binaries or compile it with Go (You MUST use go 1.21)
 - Basic understanding of VPN and proxy configurations
 
 ### Installation
 
 1. Clone the repository:
    ```bash
-   git clone https://github.com/bepass-org/wireguard-go.git
-   cd warp-plus-go
+   git clone https://github.com/bepass-org/warp-plus.git
+   cd warp-plus
    ```
 
 2. Build the project:
@@ -36,7 +36,7 @@ Warp-Plus-Go is an open-source implementation of Cloudflare's Warp, enhanced wit
 Run the application with the following command:
 
 ```bash
-./warp-plus-go [-v] [-b addr:port] [-c config-file-path] [-e warp-ip] [-k license-key] [-country country-code] [-cfon] [-gool]
+./warp-plus [-v] [-b addr:port] [-c config-file-path] [-e warp-ip] [-k license-key] [-country country-code] [-cfon] [-gool]
 ```
 
 - `-v`: Enable verbose logging.
@@ -82,7 +82,7 @@ Run the application with the following command:
 - Ukraine (UA)
 - United States (US)
 
-### Termux
+### Termux (BROKEN)
 
 ```
 bash <(curl -fsSL https://raw.githubusercontent.com/Ptechgithub/wireguard-go/master/termux.sh)
@@ -99,34 +99,8 @@ bash <(curl -fsSL https://raw.githubusercontent.com/Ptechgithub/wireguard-go/mas
 - برای اسکن ای پی سالم وارپ از دستور `warp -scan` استفاده کنید. 
 - برای ترکیب (chain) دو کانفیگ برای تغییر لوکیشن از دستور `warp -gool` استفاده کنید. 
 
-## Contributing
-
-Contributions to Warp-Plus-Go are welcome. Please read our [contributing guidelines](CONTRIBUTING.md) for more information.
-
 ## Acknowledgements
 
 - Cloudflare Warp
 - Psiphon
 - All contributors and supporters of this project
-
-## License
-
-    Copyright (C) 2017-2023 WireGuard LLC. All Rights Reserved.
-    
-    Permission is hereby granted, free of charge, to any person obtaining a copy of
-    this software and associated documentation files (the "Software"), to deal in
-    the Software without restriction, including without limitation the rights to
-    use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is furnished to do
-    so, subject to the following conditions:
-    
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-    
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
diff --git a/app/app.go b/app/app.go
@@ -11,9 +11,9 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/psiphon"
-	"github.com/bepass-org/wireguard-go/warp"
-	"github.com/bepass-org/wireguard-go/wiresocks"
+	"github.com/bepass-org/warp-plus/psiphon"
+	"github.com/bepass-org/warp-plus/warp"
+	"github.com/bepass-org/warp-plus/wiresocks"
 )
 
 const singleMTU = 1400

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/bepass-org/wireguard-go
+module github.com/bepass-org/warp-plus
 
 go 1.21.1
 

diff --git a/ipscanner/README.md b/ipscanner/README.md
@@ -12,7 +12,7 @@ IPScanner is a Go package designed for scanning and analyzing IP addresses. It u
 To use IPScanner, simply import the package and initialize a new scanner with your desired options.
 
 ```go
-import "github.com/bepass-org/wireguard-go/ipscanner"
+import "github.com/bepass-org/warp-plus/ipscanner"
 
 func main() {
     scanner := ipscanner.NewScanner(

diff --git a/ipscanner/example/cfscanner/main.go b/ipscanner/example/cfscanner/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"context"
 
-	"github.com/bepass-org/wireguard-go/ipscanner"
+	"github.com/bepass-org/warp-plus/ipscanner"
 )
 
 func main() {

diff --git a/ipscanner/example/warpscanner/main.go b/ipscanner/example/warpscanner/main.go
@@ -8,9 +8,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/ipscanner"
-	"github.com/bepass-org/wireguard-go/ipscanner/internal/statute"
-	"github.com/bepass-org/wireguard-go/warp"
+	"github.com/bepass-org/warp-plus/ipscanner"
+	"github.com/bepass-org/warp-plus/ipscanner/internal/statute"
+	"github.com/bepass-org/warp-plus/warp"
 	"github.com/fatih/color"
 	"github.com/rodaine/table"
 )

diff --git a/ipscanner/internal/engine/engine.go b/ipscanner/internal/engine/engine.go
@@ -6,9 +6,9 @@ import (
 	"net/netip"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/ipscanner/internal/iterator"
-	"github.com/bepass-org/wireguard-go/ipscanner/internal/ping"
-	"github.com/bepass-org/wireguard-go/ipscanner/internal/statute"
+	"github.com/bepass-org/warp-plus/ipscanner/internal/iterator"
+	"github.com/bepass-org/warp-plus/ipscanner/internal/ping"
+	"github.com/bepass-org/warp-plus/ipscanner/internal/statute"
 )
 
 type Engine struct {

diff --git a/ipscanner/internal/engine/queue.go b/ipscanner/internal/engine/queue.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/ipscanner/internal/statute"
+	"github.com/bepass-org/warp-plus/ipscanner/internal/statute"
 )
 
 type IPQueue struct {

diff --git a/ipscanner/internal/iterator/iterator.go b/ipscanner/internal/iterator/iterator.go
@@ -9,8 +9,8 @@ import (
 	"net"
 	"net/netip"
 
-	"github.com/bepass-org/wireguard-go/ipscanner/internal/cache"
-	"github.com/bepass-org/wireguard-go/ipscanner/internal/statute"
+	"github.com/bepass-org/warp-plus/ipscanner/internal/cache"
+	"github.com/bepass-org/warp-plus/ipscanner/internal/statute"
 )
 
 // LCG represents a linear congruential generator with full period.

diff --git a/ipscanner/internal/ping/http.go b/ipscanner/internal/ping/http.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/ipscanner/internal/statute"
+	"github.com/bepass-org/warp-plus/ipscanner/internal/statute"
 )
 
 type HttpPingResult struct {

diff --git a/ipscanner/internal/ping/ping.go b/ipscanner/internal/ping/ping.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/netip"
 
-	"github.com/bepass-org/wireguard-go/ipscanner/internal/statute"
+	"github.com/bepass-org/warp-plus/ipscanner/internal/statute"
 )
 
 type Ping struct {

diff --git a/ipscanner/internal/ping/quic.go b/ipscanner/internal/ping/quic.go
@@ -7,7 +7,7 @@ import (
 	"net/netip"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/ipscanner/internal/statute"
+	"github.com/bepass-org/warp-plus/ipscanner/internal/statute"
 
 	"github.com/quic-go/quic-go"
 	"github.com/quic-go/quic-go/http3"

diff --git a/ipscanner/internal/ping/tcp.go b/ipscanner/internal/ping/tcp.go
@@ -7,7 +7,7 @@ import (
 	"net/netip"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/ipscanner/internal/statute"
+	"github.com/bepass-org/warp-plus/ipscanner/internal/statute"
 )
 
 type TcpPingResult struct {

diff --git a/ipscanner/internal/ping/tls.go b/ipscanner/internal/ping/tls.go
@@ -7,7 +7,7 @@ import (
 	"net/netip"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/ipscanner/internal/statute"
+	"github.com/bepass-org/warp-plus/ipscanner/internal/statute"
 )
 
 type TlsPingResult struct {

diff --git a/ipscanner/internal/ping/warp.go b/ipscanner/internal/ping/warp.go
@@ -13,8 +13,8 @@ import (
 	"net/netip"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/ipscanner/internal/statute"
-	"github.com/bepass-org/wireguard-go/warp"
+	"github.com/bepass-org/warp-plus/ipscanner/internal/statute"
+	"github.com/bepass-org/warp-plus/warp"
 	"github.com/flynn/noise"
 	"golang.org/x/crypto/blake2s"
 	"golang.org/x/crypto/curve25519"

diff --git a/ipscanner/scanner.go b/ipscanner/scanner.go
@@ -7,8 +7,8 @@ import (
 	"net/netip"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/ipscanner/internal/engine"
-	"github.com/bepass-org/wireguard-go/ipscanner/internal/statute"
+	"github.com/bepass-org/warp-plus/ipscanner/internal/engine"
+	"github.com/bepass-org/warp-plus/ipscanner/internal/statute"
 )
 
 type IPScanner struct {

diff --git a/main.go b/main.go
@@ -11,8 +11,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/app"
-	"github.com/bepass-org/wireguard-go/warp"
+	"github.com/bepass-org/warp-plus/app"
+	"github.com/bepass-org/warp-plus/warp"
 
 	"github.com/peterbourgon/ff/v4"
 	"github.com/peterbourgon/ff/v4/ffhelp"

diff --git a/termux.sh → termux.sh.broken b/termux.sh → termux.sh.broken
diff --git a/warp/endpoint.go b/warp/endpoint.go
@@ -5,7 +5,7 @@ import (
 	"net/netip"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/iputils"
+	"github.com/bepass-org/warp-plus/iputils"
 )
 
 func WarpPrefixes() []netip.Prefix {

diff --git a/warp/tls.go b/warp/tls.go
@@ -6,7 +6,7 @@ import (
 	"net"
 	"net/netip"
 
-	"github.com/bepass-org/wireguard-go/iputils"
+	"github.com/bepass-org/warp-plus/iputils"
 
 	tls "github.com/refraction-networking/utls"
 )

diff --git a/wireguard/LICENSE.md b/wireguard/LICENSE.md
@@ -0,0 +1,19 @@
+Copyright (C) 2017-2023 WireGuard LLC. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/wireguard/conn/bind_windows.go b/wireguard/conn/bind_windows.go
@@ -17,7 +17,7 @@ import (
 
 	"golang.org/x/sys/windows"
 
-	"github.com/bepass-org/wireguard-go/wireguard/conn/winrio"
+	"github.com/bepass-org/warp-plus/wireguard/conn/winrio"
 )
 
 const (

diff --git a/wireguard/conn/bindtest/bindtest.go b/wireguard/conn/bindtest/bindtest.go
@@ -12,7 +12,7 @@ import (
 	"net/netip"
 	"os"
 
-	"github.com/bepass-org/wireguard-go/wireguard/conn"
+	"github.com/bepass-org/warp-plus/wireguard/conn"
 )
 
 type ChannelBind struct {

diff --git a/wireguard/device/bind_test.go b/wireguard/device/bind_test.go
@@ -8,7 +8,7 @@ package device
 import (
 	"errors"
 
-	"github.com/bepass-org/wireguard-go/wireguard/conn"
+	"github.com/bepass-org/warp-plus/wireguard/conn"
 )
 
 type DummyDatagram struct {

diff --git a/wireguard/device/device.go b/wireguard/device/device.go
@@ -11,10 +11,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/wireguard/conn"
-	"github.com/bepass-org/wireguard-go/wireguard/ratelimiter"
-	"github.com/bepass-org/wireguard-go/wireguard/rwcancel"
-	"github.com/bepass-org/wireguard-go/wireguard/tun"
+	"github.com/bepass-org/warp-plus/wireguard/conn"
+	"github.com/bepass-org/warp-plus/wireguard/ratelimiter"
+	"github.com/bepass-org/warp-plus/wireguard/rwcancel"
+	"github.com/bepass-org/warp-plus/wireguard/tun"
 )
 
 type Device struct {

diff --git a/wireguard/device/device_test.go b/wireguard/device/device_test.go
@@ -20,10 +20,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/wireguard/conn"
-	"github.com/bepass-org/wireguard-go/wireguard/conn/bindtest"
-	"github.com/bepass-org/wireguard-go/wireguard/tun"
-	"github.com/bepass-org/wireguard-go/wireguard/tun/tuntest"
+	"github.com/bepass-org/warp-plus/wireguard/conn"
+	"github.com/bepass-org/warp-plus/wireguard/conn/bindtest"
+	"github.com/bepass-org/warp-plus/wireguard/tun"
+	"github.com/bepass-org/warp-plus/wireguard/tun/tuntest"
 )
 
 // uapiCfg returns a string that contains cfg formatted use with IpcSet.

diff --git a/wireguard/device/keypair.go b/wireguard/device/keypair.go
@@ -11,7 +11,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/wireguard/replay"
+	"github.com/bepass-org/warp-plus/wireguard/replay"
 )
 
 /* Due to limitations in Go and /x/crypto there is currently

diff --git a/wireguard/device/noise-protocol.go b/wireguard/device/noise-protocol.go
@@ -15,7 +15,7 @@ import (
 	"golang.org/x/crypto/chacha20poly1305"
 	"golang.org/x/crypto/poly1305"
 
-	"github.com/bepass-org/wireguard-go/wireguard/tai64n"
+	"github.com/bepass-org/warp-plus/wireguard/tai64n"
 )
 
 type handshakeState int

diff --git a/wireguard/device/noise_test.go b/wireguard/device/noise_test.go
@@ -10,8 +10,8 @@ import (
 	"encoding/binary"
 	"testing"
 
-	"github.com/bepass-org/wireguard-go/wireguard/conn"
-	"github.com/bepass-org/wireguard-go/wireguard/tun/tuntest"
+	"github.com/bepass-org/warp-plus/wireguard/conn"
+	"github.com/bepass-org/warp-plus/wireguard/tun/tuntest"
 )
 
 func TestCurveWrappers(t *testing.T) {

diff --git a/wireguard/device/peer.go b/wireguard/device/peer.go
@@ -12,7 +12,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/wireguard/conn"
+	"github.com/bepass-org/warp-plus/wireguard/conn"
 )
 
 type Peer struct {

diff --git a/wireguard/device/queueconstants_android.go b/wireguard/device/queueconstants_android.go
@@ -5,7 +5,7 @@
 
 package device
 
-import "github.com/bepass-org/wireguard-go/wireguard/conn"
+import "github.com/bepass-org/warp-plus/wireguard/conn"
 
 /* Reduce memory consumption for Android */
 

diff --git a/wireguard/device/queueconstants_default.go b/wireguard/device/queueconstants_default.go
@@ -7,7 +7,7 @@
 
 package device
 
-import "github.com/bepass-org/wireguard-go/wireguard/conn"
+import "github.com/bepass-org/warp-plus/wireguard/conn"
 
 const (
 	QueueStagedSize            = conn.IdealBatchSize