diff --git a/config.go b/config.go index 7ceab35..6d0dd7b 100755 --- a/config.go +++ b/config.go @@ -13,17 +13,17 @@ import ( "runtime/pprof" "time" - sdk "bitbucket.org/snail/proxy/sdk/android-ios" - services "bitbucket.org/snail/proxy/services" - httpx "bitbucket.org/snail/proxy/services/http" - "bitbucket.org/snail/proxy/services/kcpcfg" - keygenx "bitbucket.org/snail/proxy/services/keygen" - mux "bitbucket.org/snail/proxy/services/mux" - socksx "bitbucket.org/snail/proxy/services/socks" - spsx "bitbucket.org/snail/proxy/services/sps" - tcpx "bitbucket.org/snail/proxy/services/tcp" - tunnelx "bitbucket.org/snail/proxy/services/tunnel" - udpx "bitbucket.org/snail/proxy/services/udp" + sdk "github.com/snail007/goproxy/sdk/android-ios" + services "github.com/snail007/goproxy/services" + httpx "github.com/snail007/goproxy/services/http" + "github.com/snail007/goproxy/services/kcpcfg" + keygenx "github.com/snail007/goproxy/services/keygen" + mux "github.com/snail007/goproxy/services/mux" + socksx "github.com/snail007/goproxy/services/socks" + spsx "github.com/snail007/goproxy/services/sps" + tcpx "github.com/snail007/goproxy/services/tcp" + tunnelx "github.com/snail007/goproxy/services/tunnel" + udpx "github.com/snail007/goproxy/services/udp" kcp "github.com/xtaci/kcp-go" "golang.org/x/crypto/pbkdf2" diff --git a/main.go b/main.go index 6df5fac..d2e2610 100644 --- a/main.go +++ b/main.go @@ -6,22 +6,12 @@ import ( "os/signal" "syscall" - "bitbucket.org/snail/certverify/check" - "bitbucket.org/snail/proxy/services" + "github.com/snail007/goproxy/services" ) const APP_VERSION = "6.0" func main() { - isForever := false - for _, v := range os.Args[1:] { - if v == "--forever" { - isForever = true - } - } - if !isForever { - check.Init("proxy") - } err := initConfig() if err != nil { log.Fatalf("err : %s", err) diff --git a/sdk/android-ios/dns.go b/sdk/android-ios/dns.go index b7cb2f7..721dfe4 100644 --- a/sdk/android-ios/dns.go +++ b/sdk/android-ios/dns.go @@ -11,8 +11,8 @@ import ( "golang.org/x/net/proxy" - services "bitbucket.org/snail/proxy/services" - "bitbucket.org/snail/proxy/services/kcpcfg" + services "github.com/snail007/goproxy/services" + "github.com/snail007/goproxy/services/kcpcfg" "github.com/miekg/dns" gocache "github.com/pmylund/go-cache" ) diff --git a/sdk/android-ios/sdk.go b/sdk/android-ios/sdk.go index 91b4c22..c0a6d58 100644 --- a/sdk/android-ios/sdk.go +++ b/sdk/android-ios/sdk.go @@ -10,16 +10,16 @@ import ( "path/filepath" "strings" - "bitbucket.org/snail/proxy/services" - httpx "bitbucket.org/snail/proxy/services/http" - "bitbucket.org/snail/proxy/services/kcpcfg" - keygenx "bitbucket.org/snail/proxy/services/keygen" - mux "bitbucket.org/snail/proxy/services/mux" - socksx "bitbucket.org/snail/proxy/services/socks" - spsx "bitbucket.org/snail/proxy/services/sps" - tcpx "bitbucket.org/snail/proxy/services/tcp" - tunnelx "bitbucket.org/snail/proxy/services/tunnel" - udpx "bitbucket.org/snail/proxy/services/udp" + "github.com/snail007/goproxy/services" + httpx "github.com/snail007/goproxy/services/http" + "github.com/snail007/goproxy/services/kcpcfg" + keygenx "github.com/snail007/goproxy/services/keygen" + mux "github.com/snail007/goproxy/services/mux" + socksx "github.com/snail007/goproxy/services/socks" + spsx "github.com/snail007/goproxy/services/sps" + tcpx "github.com/snail007/goproxy/services/tcp" + tunnelx "github.com/snail007/goproxy/services/tunnel" + udpx "github.com/snail007/goproxy/services/udp" kcp "github.com/xtaci/kcp-go" "golang.org/x/crypto/pbkdf2" diff --git a/sdk/windows-linux/sdk.go b/sdk/windows-linux/sdk.go index 7b77366..f3a5ce3 100644 --- a/sdk/windows-linux/sdk.go +++ b/sdk/windows-linux/sdk.go @@ -3,7 +3,7 @@ package main import ( "C" - sdk "bitbucket.org/snail/proxy/sdk/android-ios" + sdk "github.com/snail007/goproxy/sdk/android-ios" ) //export Start diff --git a/services/http/http.go b/services/http/http.go index 673efc5..ea4006a 100644 --- a/services/http/http.go +++ b/services/http/http.go @@ -12,16 +12,16 @@ import ( "strings" "time" - "bitbucket.org/snail/proxy/services" - "bitbucket.org/snail/proxy/services/kcpcfg" - "bitbucket.org/snail/proxy/utils/datasize" - "bitbucket.org/snail/proxy/utils/dnsx" - "bitbucket.org/snail/proxy/utils/iolimiter" - "bitbucket.org/snail/proxy/utils/lb" - "bitbucket.org/snail/proxy/utils/mapx" + "github.com/snail007/goproxy/services" + "github.com/snail007/goproxy/services/kcpcfg" + "github.com/snail007/goproxy/utils/datasize" + "github.com/snail007/goproxy/utils/dnsx" + "github.com/snail007/goproxy/utils/iolimiter" + "github.com/snail007/goproxy/utils/lb" + "github.com/snail007/goproxy/utils/mapx" - "bitbucket.org/snail/proxy/utils" - "bitbucket.org/snail/proxy/utils/conncrypt" + "github.com/snail007/goproxy/utils" + "github.com/snail007/goproxy/utils/conncrypt" "golang.org/x/crypto/ssh" ) diff --git a/services/keygen/keygen.go b/services/keygen/keygen.go index 7fed826..d3fbd2f 100644 --- a/services/keygen/keygen.go +++ b/services/keygen/keygen.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "bitbucket.org/snail/proxy/services" - "bitbucket.org/snail/proxy/utils" - "bitbucket.org/snail/proxy/utils/cert" + "github.com/snail007/goproxy/services" + "github.com/snail007/goproxy/utils" + "github.com/snail007/goproxy/utils/cert" ) type KeygenArgs struct { diff --git a/services/mux/mux_bridge.go b/services/mux/mux_bridge.go index df8f702..05e6f3b 100644 --- a/services/mux/mux_bridge.go +++ b/services/mux/mux_bridge.go @@ -12,10 +12,10 @@ import ( "sync" "time" - "bitbucket.org/snail/proxy/services" - "bitbucket.org/snail/proxy/services/kcpcfg" - "bitbucket.org/snail/proxy/utils" - "bitbucket.org/snail/proxy/utils/mapx" + "github.com/snail007/goproxy/services" + "github.com/snail007/goproxy/services/kcpcfg" + "github.com/snail007/goproxy/utils" + "github.com/snail007/goproxy/utils/mapx" //"github.com/xtaci/smux" smux "github.com/hashicorp/yamux" diff --git a/services/mux/mux_client.go b/services/mux/mux_client.go index a21ff93..b34e77b 100644 --- a/services/mux/mux_client.go +++ b/services/mux/mux_client.go @@ -9,11 +9,11 @@ import ( "strings" "time" - "bitbucket.org/snail/proxy/services" - "bitbucket.org/snail/proxy/services/kcpcfg" - "bitbucket.org/snail/proxy/utils" - "bitbucket.org/snail/proxy/utils/jumper" - "bitbucket.org/snail/proxy/utils/mapx" + "github.com/snail007/goproxy/services" + "github.com/snail007/goproxy/services/kcpcfg" + "github.com/snail007/goproxy/utils" + "github.com/snail007/goproxy/utils/jumper" + "github.com/snail007/goproxy/utils/mapx" "github.com/golang/snappy" //"github.com/xtaci/smux" diff --git a/services/mux/mux_server.go b/services/mux/mux_server.go index 5319fb8..aab3c24 100644 --- a/services/mux/mux_server.go +++ b/services/mux/mux_server.go @@ -12,11 +12,11 @@ import ( "strings" "time" - "bitbucket.org/snail/proxy/services" - "bitbucket.org/snail/proxy/services/kcpcfg" - "bitbucket.org/snail/proxy/utils" - "bitbucket.org/snail/proxy/utils/jumper" - "bitbucket.org/snail/proxy/utils/mapx" + "github.com/snail007/goproxy/services" + "github.com/snail007/goproxy/services/kcpcfg" + "github.com/snail007/goproxy/utils" + "github.com/snail007/goproxy/utils/jumper" + "github.com/snail007/goproxy/utils/mapx" "github.com/golang/snappy" //"github.com/xtaci/smux" diff --git a/services/socks/socks.go b/services/socks/socks.go index 434551e..fdbc752 100644 --- a/services/socks/socks.go +++ b/services/socks/socks.go @@ -12,16 +12,16 @@ import ( "strings" "time" - "bitbucket.org/snail/proxy/services" - "bitbucket.org/snail/proxy/services/kcpcfg" - "bitbucket.org/snail/proxy/utils" - "bitbucket.org/snail/proxy/utils/conncrypt" - "bitbucket.org/snail/proxy/utils/datasize" - "bitbucket.org/snail/proxy/utils/dnsx" - "bitbucket.org/snail/proxy/utils/iolimiter" - "bitbucket.org/snail/proxy/utils/lb" - "bitbucket.org/snail/proxy/utils/mapx" - "bitbucket.org/snail/proxy/utils/socks" + "github.com/snail007/goproxy/services" + "github.com/snail007/goproxy/services/kcpcfg" + "github.com/snail007/goproxy/utils" + "github.com/snail007/goproxy/utils/conncrypt" + "github.com/snail007/goproxy/utils/datasize" + "github.com/snail007/goproxy/utils/dnsx" + "github.com/snail007/goproxy/utils/iolimiter" + "github.com/snail007/goproxy/utils/lb" + "github.com/snail007/goproxy/utils/mapx" + "github.com/snail007/goproxy/utils/socks" "golang.org/x/crypto/ssh" ) diff --git a/services/socks/udp.go b/services/socks/udp.go index 69090e5..5d9ebd1 100644 --- a/services/socks/udp.go +++ b/services/socks/udp.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "bitbucket.org/snail/proxy/utils" - goaes "bitbucket.org/snail/proxy/utils/aes" - "bitbucket.org/snail/proxy/utils/socks" + "github.com/snail007/goproxy/utils" + goaes "github.com/snail007/goproxy/utils/aes" + "github.com/snail007/goproxy/utils/socks" ) func (s *Socks) ParentUDPKey() (key []byte) { diff --git a/services/sps/socksudp.go b/services/sps/socksudp.go index 8b6e87a..cc52f38 100644 --- a/services/sps/socksudp.go +++ b/services/sps/socksudp.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "bitbucket.org/snail/proxy/utils" - goaes "bitbucket.org/snail/proxy/utils/aes" - "bitbucket.org/snail/proxy/utils/socks" + "github.com/snail007/goproxy/utils" + goaes "github.com/snail007/goproxy/utils/aes" + "github.com/snail007/goproxy/utils/socks" ) func (s *SPS) proxyUDP(inConn *net.Conn, serverConn *socks.ServerConn) { diff --git a/services/sps/sps.go b/services/sps/sps.go index 10c9603..456a5aa 100644 --- a/services/sps/sps.go +++ b/services/sps/sps.go @@ -15,18 +15,18 @@ import ( "strings" "time" - "bitbucket.org/snail/proxy/services" - "bitbucket.org/snail/proxy/services/kcpcfg" - "bitbucket.org/snail/proxy/utils" - "bitbucket.org/snail/proxy/utils/conncrypt" - "bitbucket.org/snail/proxy/utils/datasize" - "bitbucket.org/snail/proxy/utils/dnsx" - "bitbucket.org/snail/proxy/utils/iolimiter" - "bitbucket.org/snail/proxy/utils/lb" - "bitbucket.org/snail/proxy/utils/mapx" - "bitbucket.org/snail/proxy/utils/sni" - "bitbucket.org/snail/proxy/utils/socks" - "bitbucket.org/snail/proxy/utils/ss" + "github.com/snail007/goproxy/services" + "github.com/snail007/goproxy/services/kcpcfg" + "github.com/snail007/goproxy/utils" + "github.com/snail007/goproxy/utils/conncrypt" + "github.com/snail007/goproxy/utils/datasize" + "github.com/snail007/goproxy/utils/dnsx" + "github.com/snail007/goproxy/utils/iolimiter" + "github.com/snail007/goproxy/utils/lb" + "github.com/snail007/goproxy/utils/mapx" + "github.com/snail007/goproxy/utils/sni" + "github.com/snail007/goproxy/utils/socks" + "github.com/snail007/goproxy/utils/ss" ) type SPSArgs struct { diff --git a/services/sps/ssudp.go b/services/sps/ssudp.go index 7f75cfa..9eccf1e 100644 --- a/services/sps/ssudp.go +++ b/services/sps/ssudp.go @@ -7,9 +7,9 @@ import ( "runtime/debug" "time" - "bitbucket.org/snail/proxy/utils" - goaes "bitbucket.org/snail/proxy/utils/aes" - "bitbucket.org/snail/proxy/utils/socks" + "github.com/snail007/goproxy/utils" + goaes "github.com/snail007/goproxy/utils/aes" + "github.com/snail007/goproxy/utils/socks" ) func (s *SPS) RunSSUDP(addr string) (err error) { diff --git a/services/tcp/tcp.go b/services/tcp/tcp.go index b58b8cb..33824d2 100644 --- a/services/tcp/tcp.go +++ b/services/tcp/tcp.go @@ -10,11 +10,11 @@ import ( "runtime/debug" "time" - "bitbucket.org/snail/proxy/services" - "bitbucket.org/snail/proxy/services/kcpcfg" - "bitbucket.org/snail/proxy/utils" - "bitbucket.org/snail/proxy/utils/jumper" - "bitbucket.org/snail/proxy/utils/mapx" + "github.com/snail007/goproxy/services" + "github.com/snail007/goproxy/services/kcpcfg" + "github.com/snail007/goproxy/utils" + "github.com/snail007/goproxy/utils/jumper" + "github.com/snail007/goproxy/utils/mapx" "strconv" ) diff --git a/services/tunnel/tunnel_bridge.go b/services/tunnel/tunnel_bridge.go index c9f142c..4484707 100644 --- a/services/tunnel/tunnel_bridge.go +++ b/services/tunnel/tunnel_bridge.go @@ -9,9 +9,9 @@ import ( "strconv" "time" - "bitbucket.org/snail/proxy/services" - "bitbucket.org/snail/proxy/utils" - "bitbucket.org/snail/proxy/utils/mapx" + "github.com/snail007/goproxy/services" + "github.com/snail007/goproxy/utils" + "github.com/snail007/goproxy/utils/mapx" //"github.com/xtaci/smux" smux "github.com/hashicorp/yamux" diff --git a/services/tunnel/tunnel_client.go b/services/tunnel/tunnel_client.go index edb5389..36182c2 100644 --- a/services/tunnel/tunnel_client.go +++ b/services/tunnel/tunnel_client.go @@ -9,10 +9,10 @@ import ( "os" "time" - "bitbucket.org/snail/proxy/services" - "bitbucket.org/snail/proxy/utils" - "bitbucket.org/snail/proxy/utils/jumper" - "bitbucket.org/snail/proxy/utils/mapx" + "github.com/snail007/goproxy/services" + "github.com/snail007/goproxy/utils" + "github.com/snail007/goproxy/utils/jumper" + "github.com/snail007/goproxy/utils/mapx" //"github.com/xtaci/smux" smux "github.com/hashicorp/yamux" diff --git a/services/tunnel/tunnel_server.go b/services/tunnel/tunnel_server.go index d26bea5..28737fb 100644 --- a/services/tunnel/tunnel_server.go +++ b/services/tunnel/tunnel_server.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "bitbucket.org/snail/proxy/services" - "bitbucket.org/snail/proxy/utils" - "bitbucket.org/snail/proxy/utils/jumper" - "bitbucket.org/snail/proxy/utils/mapx" + "github.com/snail007/goproxy/services" + "github.com/snail007/goproxy/utils" + "github.com/snail007/goproxy/utils/jumper" + "github.com/snail007/goproxy/utils/mapx" //"github.com/xtaci/smux" smux "github.com/hashicorp/yamux" diff --git a/services/udp/udp.go b/services/udp/udp.go index 6ea08bc..c2199ea 100644 --- a/services/udp/udp.go +++ b/services/udp/udp.go @@ -13,9 +13,9 @@ import ( "strings" "time" - "bitbucket.org/snail/proxy/services" - "bitbucket.org/snail/proxy/utils" - "bitbucket.org/snail/proxy/utils/mapx" + "github.com/snail007/goproxy/services" + "github.com/snail007/goproxy/utils" + "github.com/snail007/goproxy/utils/mapx" ) type UDPArgs struct { diff --git a/utils/dnsx/resolver.go b/utils/dnsx/resolver.go index f1a6514..71559f4 100644 --- a/utils/dnsx/resolver.go +++ b/utils/dnsx/resolver.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "bitbucket.org/snail/proxy/utils/mapx" + "github.com/snail007/goproxy/utils/mapx" dns "github.com/miekg/dns" ) diff --git a/utils/functions.go b/utils/functions.go index 4b1f470..00a4470 100755 --- a/utils/functions.go +++ b/utils/functions.go @@ -23,8 +23,8 @@ import ( "os/exec" "strings" - "bitbucket.org/snail/proxy/services/kcpcfg" - "bitbucket.org/snail/proxy/utils/lb" + "github.com/snail007/goproxy/services/kcpcfg" + "github.com/snail007/goproxy/utils/lb" "golang.org/x/crypto/pbkdf2" @@ -32,7 +32,7 @@ import ( "time" - "bitbucket.org/snail/proxy/utils/id" + "github.com/snail007/goproxy/utils/id" kcp "github.com/xtaci/kcp-go" ) diff --git a/utils/lb/backend.go b/utils/lb/backend.go index 90af686..49986fa 100644 --- a/utils/lb/backend.go +++ b/utils/lb/backend.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "bitbucket.org/snail/proxy/utils/dnsx" + "github.com/snail007/goproxy/utils/dnsx" ) // BackendConfig it's the configuration loaded diff --git a/utils/lb/lb.go b/utils/lb/lb.go index f1ae994..8d0b2b0 100644 --- a/utils/lb/lb.go +++ b/utils/lb/lb.go @@ -6,7 +6,7 @@ import ( "net" "sync" - "bitbucket.org/snail/proxy/utils/dnsx" + "github.com/snail007/goproxy/utils/dnsx" ) const ( diff --git a/utils/serve-channel.go b/utils/serve-channel.go index 61e3b7c..621747f 100644 --- a/utils/serve-channel.go +++ b/utils/serve-channel.go @@ -10,7 +10,7 @@ import ( "runtime/debug" "strconv" - "bitbucket.org/snail/proxy/services/kcpcfg" + "github.com/snail007/goproxy/services/kcpcfg" kcp "github.com/xtaci/kcp-go" ) diff --git a/utils/socks/server.go b/utils/socks/server.go index 2c124d2..6f72f50 100644 --- a/utils/socks/server.go +++ b/utils/socks/server.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "bitbucket.org/snail/proxy/utils" + "github.com/snail007/goproxy/utils" ) const ( diff --git a/utils/ss/util.go b/utils/ss/util.go index d4ae108..dcc56db 100644 --- a/utils/ss/util.go +++ b/utils/ss/util.go @@ -11,7 +11,7 @@ import ( "os" "strconv" - "bitbucket.org/snail/proxy/utils" + "github.com/snail007/goproxy/utils" ) const leakyBufSize = 4108 // data.len(2) + hmacsha1(10) + data(4096) diff --git a/utils/structs.go b/utils/structs.go index f38aac6..f07cb5c 100644 --- a/utils/structs.go +++ b/utils/structs.go @@ -15,9 +15,9 @@ import ( "sync" "time" - "bitbucket.org/snail/proxy/utils/dnsx" - "bitbucket.org/snail/proxy/utils/mapx" - "bitbucket.org/snail/proxy/utils/sni" + "github.com/snail007/goproxy/utils/dnsx" + "github.com/snail007/goproxy/utils/mapx" + "github.com/snail007/goproxy/utils/sni" "github.com/golang/snappy" )