cy/goproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'enterprise' into devtomerge

Browse Source
This commit is contained in:
arraykeys@gmail.com
2018-09-04 16:13:44 +08:00
parent 167442e288
commit c7c52a0788
28 changed files with 113 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
config.go
View File

@ -13,17 +13,17 @@ import (
"runtime/pprof" "runtime/pprof"
"time" "time"
sdk "bitbucket.org/snail/proxy/sdk/android-ios" sdk "github.com/snail007/goproxy/sdk/android-ios"
services "bitbucket.org/snail/proxy/services" services "github.com/snail007/goproxy/services"
httpx "bitbucket.org/snail/proxy/services/http" httpx "github.com/snail007/goproxy/services/http"
"bitbucket.org/snail/proxy/services/kcpcfg" "github.com/snail007/goproxy/services/kcpcfg"
keygenx "bitbucket.org/snail/proxy/services/keygen" keygenx "github.com/snail007/goproxy/services/keygen"
mux "bitbucket.org/snail/proxy/services/mux" mux "github.com/snail007/goproxy/services/mux"
socksx "bitbucket.org/snail/proxy/services/socks" socksx "github.com/snail007/goproxy/services/socks"
spsx "bitbucket.org/snail/proxy/services/sps" spsx "github.com/snail007/goproxy/services/sps"
tcpx "bitbucket.org/snail/proxy/services/tcp" tcpx "github.com/snail007/goproxy/services/tcp"
tunnelx "bitbucket.org/snail/proxy/services/tunnel" tunnelx "github.com/snail007/goproxy/services/tunnel"
udpx "bitbucket.org/snail/proxy/services/udp" udpx "github.com/snail007/goproxy/services/udp"
kcp "github.com/xtaci/kcp-go" kcp "github.com/xtaci/kcp-go"
"golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/pbkdf2"

12
main.go
View File

@ -6,22 +6,12 @@ import (
"os/signal" "os/signal"
"syscall" "syscall"
"bitbucket.org/snail/certverify/check" "github.com/snail007/goproxy/services"
"bitbucket.org/snail/proxy/services"
) )
const APP_VERSION = "6.0" const APP_VERSION = "6.0"
func main() { func main() {
isForever := false
for _, v := range os.Args[1:] {
if v == "--forever" {
isForever = true
}
}
if !isForever {
check.Init("proxy")
}
err := initConfig() err := initConfig()
if err != nil { if err != nil {
log.Fatalf("err : %s", err) log.Fatalf("err : %s", err)

4
sdk/android-ios/dns.go
View File

@ -11,8 +11,8 @@ import (
"golang.org/x/net/proxy" "golang.org/x/net/proxy"
services "bitbucket.org/snail/proxy/services" services "github.com/snail007/goproxy/services"
"bitbucket.org/snail/proxy/services/kcpcfg" "github.com/snail007/goproxy/services/kcpcfg"
"github.com/miekg/dns" "github.com/miekg/dns"
gocache "github.com/pmylund/go-cache" gocache "github.com/pmylund/go-cache"
) )

20
sdk/android-ios/sdk.go
View File

@ -10,16 +10,16 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"bitbucket.org/snail/proxy/services" "github.com/snail007/goproxy/services"
httpx "bitbucket.org/snail/proxy/services/http" httpx "github.com/snail007/goproxy/services/http"
"bitbucket.org/snail/proxy/services/kcpcfg" "github.com/snail007/goproxy/services/kcpcfg"
keygenx "bitbucket.org/snail/proxy/services/keygen" keygenx "github.com/snail007/goproxy/services/keygen"
mux "bitbucket.org/snail/proxy/services/mux" mux "github.com/snail007/goproxy/services/mux"
socksx "bitbucket.org/snail/proxy/services/socks" socksx "github.com/snail007/goproxy/services/socks"
spsx "bitbucket.org/snail/proxy/services/sps" spsx "github.com/snail007/goproxy/services/sps"
tcpx "bitbucket.org/snail/proxy/services/tcp" tcpx "github.com/snail007/goproxy/services/tcp"
tunnelx "bitbucket.org/snail/proxy/services/tunnel" tunnelx "github.com/snail007/goproxy/services/tunnel"
udpx "bitbucket.org/snail/proxy/services/udp" udpx "github.com/snail007/goproxy/services/udp"
kcp "github.com/xtaci/kcp-go" kcp "github.com/xtaci/kcp-go"
"golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/pbkdf2"

2
sdk/windows-linux/sdk.go
View File

@ -3,7 +3,7 @@ package main
import ( import (
"C" "C"
sdk "bitbucket.org/snail/proxy/sdk/android-ios" sdk "github.com/snail007/goproxy/sdk/android-ios"
) )
//export Start //export Start

18
services/http/http.go
View File

@ -12,16 +12,16 @@ import (
"strings" "strings"
"time" "time"
"bitbucket.org/snail/proxy/services" "github.com/snail007/goproxy/services"
"bitbucket.org/snail/proxy/services/kcpcfg" "github.com/snail007/goproxy/services/kcpcfg"
"bitbucket.org/snail/proxy/utils/datasize" "github.com/snail007/goproxy/utils/datasize"
"bitbucket.org/snail/proxy/utils/dnsx" "github.com/snail007/goproxy/utils/dnsx"
"bitbucket.org/snail/proxy/utils/iolimiter" "github.com/snail007/goproxy/utils/iolimiter"
"bitbucket.org/snail/proxy/utils/lb" "github.com/snail007/goproxy/utils/lb"
"bitbucket.org/snail/proxy/utils/mapx" "github.com/snail007/goproxy/utils/mapx"
"bitbucket.org/snail/proxy/utils" "github.com/snail007/goproxy/utils"
"bitbucket.org/snail/proxy/utils/conncrypt" "github.com/snail007/goproxy/utils/conncrypt"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
) )

6
services/keygen/keygen.go
View File

@ -6,9 +6,9 @@ import (
"os" "os"
"strings" "strings"
"bitbucket.org/snail/proxy/services" "github.com/snail007/goproxy/services"
"bitbucket.org/snail/proxy/utils" "github.com/snail007/goproxy/utils"
"bitbucket.org/snail/proxy/utils/cert" "github.com/snail007/goproxy/utils/cert"
) )
type KeygenArgs struct { type KeygenArgs struct {

8
services/mux/mux_bridge.go
View File

@ -12,10 +12,10 @@ import (
"sync" "sync"
"time" "time"
"bitbucket.org/snail/proxy/services" "github.com/snail007/goproxy/services"
"bitbucket.org/snail/proxy/services/kcpcfg" "github.com/snail007/goproxy/services/kcpcfg"
"bitbucket.org/snail/proxy/utils" "github.com/snail007/goproxy/utils"
"bitbucket.org/snail/proxy/utils/mapx" "github.com/snail007/goproxy/utils/mapx"
//"github.com/xtaci/smux" //"github.com/xtaci/smux"
smux "github.com/hashicorp/yamux" smux "github.com/hashicorp/yamux"

10
services/mux/mux_client.go
View File

@ -9,11 +9,11 @@ import (
"strings" "strings"
"time" "time"
"bitbucket.org/snail/proxy/services" "github.com/snail007/goproxy/services"
"bitbucket.org/snail/proxy/services/kcpcfg" "github.com/snail007/goproxy/services/kcpcfg"
"bitbucket.org/snail/proxy/utils" "github.com/snail007/goproxy/utils"
"bitbucket.org/snail/proxy/utils/jumper" "github.com/snail007/goproxy/utils/jumper"
"bitbucket.org/snail/proxy/utils/mapx" "github.com/snail007/goproxy/utils/mapx"
"github.com/golang/snappy" "github.com/golang/snappy"
//"github.com/xtaci/smux" //"github.com/xtaci/smux"

10
services/mux/mux_server.go
View File

@ -12,11 +12,11 @@ import (
"strings" "strings"
"time" "time"
"bitbucket.org/snail/proxy/services" "github.com/snail007/goproxy/services"
"bitbucket.org/snail/proxy/services/kcpcfg" "github.com/snail007/goproxy/services/kcpcfg"
"bitbucket.org/snail/proxy/utils" "github.com/snail007/goproxy/utils"
"bitbucket.org/snail/proxy/utils/jumper" "github.com/snail007/goproxy/utils/jumper"
"bitbucket.org/snail/proxy/utils/mapx" "github.com/snail007/goproxy/utils/mapx"
"github.com/golang/snappy" "github.com/golang/snappy"
//"github.com/xtaci/smux" //"github.com/xtaci/smux"

20
services/socks/socks.go
View File

@ -12,16 +12,16 @@ import (
"strings" "strings"
"time" "time"
"bitbucket.org/snail/proxy/services" "github.com/snail007/goproxy/services"
"bitbucket.org/snail/proxy/services/kcpcfg" "github.com/snail007/goproxy/services/kcpcfg"
"bitbucket.org/snail/proxy/utils" "github.com/snail007/goproxy/utils"
"bitbucket.org/snail/proxy/utils/conncrypt" "github.com/snail007/goproxy/utils/conncrypt"
"bitbucket.org/snail/proxy/utils/datasize" "github.com/snail007/goproxy/utils/datasize"
"bitbucket.org/snail/proxy/utils/dnsx" "github.com/snail007/goproxy/utils/dnsx"
"bitbucket.org/snail/proxy/utils/iolimiter" "github.com/snail007/goproxy/utils/iolimiter"
"bitbucket.org/snail/proxy/utils/lb" "github.com/snail007/goproxy/utils/lb"
"bitbucket.org/snail/proxy/utils/mapx" "github.com/snail007/goproxy/utils/mapx"
"bitbucket.org/snail/proxy/utils/socks" "github.com/snail007/goproxy/utils/socks"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
) )

6
services/socks/udp.go
View File

@ -9,9 +9,9 @@ import (
"strings" "strings"
"time" "time"
"bitbucket.org/snail/proxy/utils" "github.com/snail007/goproxy/utils"
goaes "bitbucket.org/snail/proxy/utils/aes" goaes "github.com/snail007/goproxy/utils/aes"
"bitbucket.org/snail/proxy/utils/socks" "github.com/snail007/goproxy/utils/socks"
) )
func (s *Socks) ParentUDPKey() (key []byte) { func (s *Socks) ParentUDPKey() (key []byte) {

6
services/sps/socksudp.go
View File

@ -7,9 +7,9 @@ import (
"strings" "strings"
"time" "time"
"bitbucket.org/snail/proxy/utils" "github.com/snail007/goproxy/utils"
goaes "bitbucket.org/snail/proxy/utils/aes" goaes "github.com/snail007/goproxy/utils/aes"
"bitbucket.org/snail/proxy/utils/socks" "github.com/snail007/goproxy/utils/socks"
) )
func (s *SPS) proxyUDP(inConn *net.Conn, serverConn *socks.ServerConn) { func (s *SPS) proxyUDP(inConn *net.Conn, serverConn *socks.ServerConn) {

24
services/sps/sps.go
View File

@ -15,18 +15,18 @@ import (
"strings" "strings"
"time" "time"
"bitbucket.org/snail/proxy/services" "github.com/snail007/goproxy/services"
"bitbucket.org/snail/proxy/services/kcpcfg" "github.com/snail007/goproxy/services/kcpcfg"
"bitbucket.org/snail/proxy/utils" "github.com/snail007/goproxy/utils"
"bitbucket.org/snail/proxy/utils/conncrypt" "github.com/snail007/goproxy/utils/conncrypt"
"bitbucket.org/snail/proxy/utils/datasize" "github.com/snail007/goproxy/utils/datasize"
"bitbucket.org/snail/proxy/utils/dnsx" "github.com/snail007/goproxy/utils/dnsx"
"bitbucket.org/snail/proxy/utils/iolimiter" "github.com/snail007/goproxy/utils/iolimiter"
"bitbucket.org/snail/proxy/utils/lb" "github.com/snail007/goproxy/utils/lb"
"bitbucket.org/snail/proxy/utils/mapx" "github.com/snail007/goproxy/utils/mapx"
"bitbucket.org/snail/proxy/utils/sni" "github.com/snail007/goproxy/utils/sni"
"bitbucket.org/snail/proxy/utils/socks" "github.com/snail007/goproxy/utils/socks"
"bitbucket.org/snail/proxy/utils/ss" "github.com/snail007/goproxy/utils/ss"
) )
type SPSArgs struct { type SPSArgs struct {

6
services/sps/ssudp.go
View File

@ -7,9 +7,9 @@ import (
"runtime/debug" "runtime/debug"
"time" "time"
"bitbucket.org/snail/proxy/utils" "github.com/snail007/goproxy/utils"
goaes "bitbucket.org/snail/proxy/utils/aes" goaes "github.com/snail007/goproxy/utils/aes"
"bitbucket.org/snail/proxy/utils/socks" "github.com/snail007/goproxy/utils/socks"
) )
func (s *SPS) RunSSUDP(addr string) (err error) { func (s *SPS) RunSSUDP(addr string) (err error) {

10
services/tcp/tcp.go
View File

@ -10,11 +10,11 @@ import (
"runtime/debug" "runtime/debug"
"time" "time"
"bitbucket.org/snail/proxy/services" "github.com/snail007/goproxy/services"
"bitbucket.org/snail/proxy/services/kcpcfg" "github.com/snail007/goproxy/services/kcpcfg"
"bitbucket.org/snail/proxy/utils" "github.com/snail007/goproxy/utils"
"bitbucket.org/snail/proxy/utils/jumper" "github.com/snail007/goproxy/utils/jumper"
"bitbucket.org/snail/proxy/utils/mapx" "github.com/snail007/goproxy/utils/mapx"
"strconv" "strconv"
) )

6
services/tunnel/tunnel_bridge.go
View File

@ -9,9 +9,9 @@ import (
"strconv" "strconv"
"time" "time"
"bitbucket.org/snail/proxy/services" "github.com/snail007/goproxy/services"
"bitbucket.org/snail/proxy/utils" "github.com/snail007/goproxy/utils"
"bitbucket.org/snail/proxy/utils/mapx" "github.com/snail007/goproxy/utils/mapx"
//"github.com/xtaci/smux" //"github.com/xtaci/smux"
smux "github.com/hashicorp/yamux" smux "github.com/hashicorp/yamux"

8
services/tunnel/tunnel_client.go
View File

@ -9,10 +9,10 @@ import (
"os" "os"
"time" "time"
"bitbucket.org/snail/proxy/services" "github.com/snail007/goproxy/services"
"bitbucket.org/snail/proxy/utils" "github.com/snail007/goproxy/utils"
"bitbucket.org/snail/proxy/utils/jumper" "github.com/snail007/goproxy/utils/jumper"
"bitbucket.org/snail/proxy/utils/mapx" "github.com/snail007/goproxy/utils/mapx"
//"github.com/xtaci/smux" //"github.com/xtaci/smux"
smux "github.com/hashicorp/yamux" smux "github.com/hashicorp/yamux"

8
services/tunnel/tunnel_server.go
View File

@ -12,10 +12,10 @@ import (
"strings" "strings"
"time" "time"
"bitbucket.org/snail/proxy/services" "github.com/snail007/goproxy/services"
"bitbucket.org/snail/proxy/utils" "github.com/snail007/goproxy/utils"
"bitbucket.org/snail/proxy/utils/jumper" "github.com/snail007/goproxy/utils/jumper"
"bitbucket.org/snail/proxy/utils/mapx" "github.com/snail007/goproxy/utils/mapx"
//"github.com/xtaci/smux" //"github.com/xtaci/smux"
smux "github.com/hashicorp/yamux" smux "github.com/hashicorp/yamux"

6
services/udp/udp.go
View File

@ -13,9 +13,9 @@ import (
"strings" "strings"
"time" "time"
"bitbucket.org/snail/proxy/services" "github.com/snail007/goproxy/services"
"bitbucket.org/snail/proxy/utils" "github.com/snail007/goproxy/utils"
"bitbucket.org/snail/proxy/utils/mapx" "github.com/snail007/goproxy/utils/mapx"
) )
type UDPArgs struct { type UDPArgs struct {

2
utils/dnsx/resolver.go
View File

@ -7,7 +7,7 @@ import (
"strings" "strings"
"time" "time"
"bitbucket.org/snail/proxy/utils/mapx" "github.com/snail007/goproxy/utils/mapx"
dns "github.com/miekg/dns" dns "github.com/miekg/dns"
) )

6
utils/functions.go
View File

@ -23,8 +23,8 @@ import (
"os/exec" "os/exec"
"strings" "strings"
"bitbucket.org/snail/proxy/services/kcpcfg" "github.com/snail007/goproxy/services/kcpcfg"
"bitbucket.org/snail/proxy/utils/lb" "github.com/snail007/goproxy/utils/lb"
"golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/pbkdf2"
@ -32,7 +32,7 @@ import (
"time" "time"
"bitbucket.org/snail/proxy/utils/id" "github.com/snail007/goproxy/utils/id"
kcp "github.com/xtaci/kcp-go" kcp "github.com/xtaci/kcp-go"
) )

2
utils/lb/backend.go
View File

@ -7,7 +7,7 @@ import (
"sync" "sync"
"time" "time"
"bitbucket.org/snail/proxy/utils/dnsx" "github.com/snail007/goproxy/utils/dnsx"
) )
// BackendConfig it's the configuration loaded // BackendConfig it's the configuration loaded

2
utils/lb/lb.go
View File

@ -6,7 +6,7 @@ import (
"net" "net"
"sync" "sync"
"bitbucket.org/snail/proxy/utils/dnsx" "github.com/snail007/goproxy/utils/dnsx"
) )
const ( const (

2
utils/serve-channel.go
View File

@ -10,7 +10,7 @@ import (
"runtime/debug" "runtime/debug"
"strconv" "strconv"
"bitbucket.org/snail/proxy/services/kcpcfg" "github.com/snail007/goproxy/services/kcpcfg"
kcp "github.com/xtaci/kcp-go" kcp "github.com/xtaci/kcp-go"
) )

2
utils/socks/server.go
View File

@ -6,7 +6,7 @@ import (
"strings" "strings"
"time" "time"
"bitbucket.org/snail/proxy/utils" "github.com/snail007/goproxy/utils"
) )
const ( const (

2
utils/ss/util.go
View File

@ -11,7 +11,7 @@ import (
"os" "os"
"strconv" "strconv"
"bitbucket.org/snail/proxy/utils" "github.com/snail007/goproxy/utils"
) )
const leakyBufSize = 4108 // data.len(2) + hmacsha1(10) + data(4096) const leakyBufSize = 4108 // data.len(2) + hmacsha1(10) + data(4096)

6
utils/structs.go
View File

@ -15,9 +15,9 @@ import (
"sync" "sync"
"time" "time"
"bitbucket.org/snail/proxy/utils/dnsx" "github.com/snail007/goproxy/utils/dnsx"
"bitbucket.org/snail/proxy/utils/mapx" "github.com/snail007/goproxy/utils/mapx"
"bitbucket.org/snail/proxy/utils/sni" "github.com/snail007/goproxy/utils/sni"
"github.com/golang/snappy" "github.com/golang/snappy"
) )