From 06cb8bbe3854a36555a3df697fd17e51f19a4171 Mon Sep 17 00:00:00 2001 From: fuxuan Date: Sun, 24 Nov 2019 13:02:22 +0800 Subject: [PATCH] feat: rename --- README.md | 14 ++++++------ conf.go | 6 +++--- dev_linux.go | 2 +- dns/client.go | 4 ++-- dns/server.go | 4 ++-- go.mod | 10 ++++++++- go.sum | 4 ++-- ipset/ipset_linux.go | 4 ++-- ipset/ipset_other.go | 2 +- main.go | 42 ++++++++++++++++++------------------ main_linux.go | 4 ++-- proxy/dialer.go | 2 +- proxy/direct.go | 2 +- proxy/http/client.go | 6 +++--- proxy/http/http.go | 4 ++-- proxy/http/request.go | 2 +- proxy/http/server.go | 6 +++--- proxy/kcp/kcp.go | 4 ++-- proxy/mixed/mixed.go | 10 ++++----- proxy/obfs/obfs.go | 4 ++-- proxy/redir/redir_linux.go | 8 +++---- proxy/reject/reject.go | 2 +- proxy/server.go | 2 +- proxy/socks5/packet.go | 4 ++-- proxy/socks5/socks5.go | 8 +++---- proxy/ss/packet.go | 2 +- proxy/ss/ss.go | 10 ++++----- proxy/ssr/ssr.go | 6 +++--- proxy/tcptun/tcptun.go | 6 +++--- proxy/tls/tls.go | 4 ++-- proxy/tproxy/tproxy_linux.go | 4 ++-- proxy/udptun/udptun.go | 6 +++--- proxy/unix/unix.go | 4 ++-- proxy/uottun/uottun.go | 6 +++--- proxy/vmess/vmess.go | 4 ++-- proxy/ws/ws.go | 4 ++-- rule/config.go | 2 +- rule/rule.go | 6 +++--- strategy/forward.go | 4 ++-- strategy/strategy.go | 4 ++-- 40 files changed, 120 insertions(+), 112 deletions(-) diff --git a/README.md b/README.md index 65ad2fd..1f5e74a 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# [glider](https://github.com/nadoo/glider) +# [glider](https://github.com/dongxinb/glider) -[![Go Report Card](https://goreportcard.com/badge/github.com/nadoo/glider)](https://goreportcard.com/report/github.com/nadoo/glider) -[![GitHub release](https://img.shields.io/github/v/release/nadoo/glider.svg?include_prereleases)](https://github.com/nadoo/glider/releases) -[![Actions Status](https://github.com/nadoo/glider/workflows/Build/badge.svg)](https://github.com/nadoo/glider/actions) +[![Go Report Card](https://goreportcard.com/badge/github.com/dongxinb/glider)](https://goreportcard.com/report/github.com/dongxinb/glider) +[![GitHub release](https://img.shields.io/github/v/release/dongxinb/glider.svg?include_prereleases)](https://github.com/dongxinb/glider/releases) +[![Actions Status](https://github.com/dongxinb/glider/workflows/Build/badge.svg)](https://github.com/dongxinb/glider/actions) glider is a forward proxy with multiple protocols support, and also a dns forwarding server with ipset management features(like dnsmasq). @@ -79,12 +79,12 @@ TODO: Binary: -- [https://github.com/nadoo/glider/releases](https://github.com/nadoo/glider/releases) +- [https://github.com/dongxinb/glider/releases](https://github.com/dongxinb/glider/releases) Go Get (requires **Go 1.13+** ): ```bash -go get -u github.com/nadoo/glider +go get -u github.com/dongxinb/glider ``` ArchLinux: @@ -377,7 +377,7 @@ listen=tls://:443?cert=crtFilePath&key=keyFilePath,http:// ## Service -- systemd: [https://github.com/nadoo/glider/blob/master/systemd/](https://github.com/nadoo/glider/blob/master/systemd/) +- systemd: [https://github.com/dongxinb/glider/blob/master/systemd/](https://github.com/dongxinb/glider/blob/master/systemd/) ## Links diff --git a/conf.go b/conf.go index 4736578..64ccd11 100644 --- a/conf.go +++ b/conf.go @@ -8,9 +8,9 @@ import ( "github.com/nadoo/conflag" - "github.com/nadoo/glider/dns" - "github.com/nadoo/glider/rule" - "github.com/nadoo/glider/strategy" + "github.com/dongxinb/glider/dns" + "github.com/dongxinb/glider/rule" + "github.com/dongxinb/glider/strategy" ) var flag = conflag.New() diff --git a/dev_linux.go b/dev_linux.go index 52e7dd3..4e49a34 100644 --- a/dev_linux.go +++ b/dev_linux.go @@ -3,5 +3,5 @@ package main import ( - _ "github.com/nadoo/glider/proxy/tproxy" + _ "github.com/dongxinb/glider/proxy/tproxy" ) diff --git a/dns/client.go b/dns/client.go index d94fd03..c7120dd 100644 --- a/dns/client.go +++ b/dns/client.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" ) // HandleFunc function handles the dns TypeA or TypeAAAA answer. diff --git a/dns/server.go b/dns/server.go index d46dc58..716e1a0 100644 --- a/dns/server.go +++ b/dns/server.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" ) // conn timeout, seconds diff --git a/go.mod b/go.mod index 0c71f63..66f19c1 100644 --- a/go.mod +++ b/go.mod @@ -4,11 +4,19 @@ go 1.13 require ( github.com/dongxinb/go-shadowsocks2 v0.1.5 + github.com/klauspost/cpuid v1.2.1 // indirect + github.com/klauspost/reedsolomon v1.9.3 // indirect github.com/nadoo/conflag v0.2.2 - github.com/nadoo/glider v0.9.2 github.com/nadoo/shadowsocksR v0.1.0 + github.com/pkg/errors v0.8.1 // indirect + github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect + github.com/templexxx/xor v0.0.0-20181023030647-4e92f724b73b // indirect + github.com/tjfoc/gmsm v1.0.1 // indirect github.com/xtaci/kcp-go v5.4.11+incompatible + github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae // indirect golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 + golang.org/x/net v0.0.0-20191014212845-da9a3fd4c582 // indirect + golang.org/x/sys v0.0.0-20191020212454-3e7259c5e7c2 // indirect ) // Replace dependency modules with local developing copy diff --git a/go.sum b/go.sum index 52dd367..0ac51c7 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,8 @@ github.com/klauspost/reedsolomon v1.9.3 h1:N/VzgeMfHmLc+KHMD1UL/tNkfXAt8FnUqlgXG github.com/klauspost/reedsolomon v1.9.3/go.mod h1:CwCi+NUr9pqSVktrkN+Ondf06rkhYZ/pcNv7fu+8Un4= github.com/nadoo/conflag v0.2.2 h1:xywuyaevdBnA3+4g9S11ng+Nby725WN1LXargWnAXpM= github.com/nadoo/conflag v0.2.2/go.mod h1:dzFfDUpXdr2uS2oV+udpy5N2vfNOu/bFzjhX1WI52co= -github.com/nadoo/glider v0.9.2 h1:zfgJLgB8p87MRhVjeCbiXmmF2ZbCMyS5HCSqrR83J4c= -github.com/nadoo/glider v0.9.2/go.mod h1:S/94KRJFNtgoNlyEm4+33f/DrEsj/uxvismOW4FlIa0= +github.com/dongxinb/glider v0.9.2 h1:zfgJLgB8p87MRhVjeCbiXmmF2ZbCMyS5HCSqrR83J4c= +github.com/dongxinb/glider v0.9.2/go.mod h1:S/94KRJFNtgoNlyEm4+33f/DrEsj/uxvismOW4FlIa0= github.com/nadoo/go-shadowsocks2 v0.1.2 h1:+tCSt65YAAMf24wj3tqv6a9oVBcqSGFYVsifBZwT9w8= github.com/nadoo/go-shadowsocks2 v0.1.2/go.mod h1:/E2kSkS0mqF/e79wcAA0PezoWXk4CY9HldJlzwWtbwU= github.com/nadoo/shadowsocksR v0.1.0 h1:sYPxZi0l8F1nxDDcckzb0DHXxhe0LNW5iSeohqPw6Fg= diff --git a/ipset/ipset_linux.go b/ipset/ipset_linux.go index eb995e7..013999c 100644 --- a/ipset/ipset_linux.go +++ b/ipset/ipset_linux.go @@ -14,8 +14,8 @@ import ( "syscall" "unsafe" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/rule" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/rule" ) // NFNL_SUBSYS_IPSET netfilter netlink message types diff --git a/ipset/ipset_other.go b/ipset/ipset_other.go index 91445ad..c7fd8fe 100644 --- a/ipset/ipset_other.go +++ b/ipset/ipset_other.go @@ -5,7 +5,7 @@ package ipset import ( "errors" - "github.com/nadoo/glider/rule" + "github.com/dongxinb/glider/rule" ) // Manager struct diff --git a/main.go b/main.go index e3f1aee..4190b35 100644 --- a/main.go +++ b/main.go @@ -7,30 +7,30 @@ import ( "os/signal" "syscall" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/dns" - "github.com/nadoo/glider/ipset" - "github.com/nadoo/glider/proxy" - "github.com/nadoo/glider/rule" - "github.com/nadoo/glider/strategy" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/dns" + "github.com/dongxinb/glider/ipset" + "github.com/dongxinb/glider/proxy" + "github.com/dongxinb/glider/rule" + "github.com/dongxinb/glider/strategy" - _ "github.com/nadoo/glider/proxy/http" - _ "github.com/nadoo/glider/proxy/kcp" - _ "github.com/nadoo/glider/proxy/mixed" - _ "github.com/nadoo/glider/proxy/obfs" - _ "github.com/nadoo/glider/proxy/reject" - _ "github.com/nadoo/glider/proxy/socks5" - _ "github.com/nadoo/glider/proxy/ss" - _ "github.com/nadoo/glider/proxy/ssr" - _ "github.com/nadoo/glider/proxy/tcptun" - _ "github.com/nadoo/glider/proxy/tls" - _ "github.com/nadoo/glider/proxy/udptun" - _ "github.com/nadoo/glider/proxy/uottun" - _ "github.com/nadoo/glider/proxy/vmess" - _ "github.com/nadoo/glider/proxy/ws" + _ "github.com/dongxinb/glider/proxy/http" + _ "github.com/dongxinb/glider/proxy/kcp" + _ "github.com/dongxinb/glider/proxy/mixed" + _ "github.com/dongxinb/glider/proxy/obfs" + _ "github.com/dongxinb/glider/proxy/reject" + _ "github.com/dongxinb/glider/proxy/socks5" + _ "github.com/dongxinb/glider/proxy/ss" + _ "github.com/dongxinb/glider/proxy/ssr" + _ "github.com/dongxinb/glider/proxy/tcptun" + _ "github.com/dongxinb/glider/proxy/tls" + _ "github.com/dongxinb/glider/proxy/udptun" + _ "github.com/dongxinb/glider/proxy/uottun" + _ "github.com/dongxinb/glider/proxy/vmess" + _ "github.com/dongxinb/glider/proxy/ws" ) -var version = "0.9.2" +var version = "0.9.3" func main() { // read configs diff --git a/main_linux.go b/main_linux.go index ce57ebd..8dc5132 100644 --- a/main_linux.go +++ b/main_linux.go @@ -1,6 +1,6 @@ package main import ( - _ "github.com/nadoo/glider/proxy/redir" - _ "github.com/nadoo/glider/proxy/unix" + _ "github.com/dongxinb/glider/proxy/redir" + _ "github.com/dongxinb/glider/proxy/unix" ) diff --git a/proxy/dialer.go b/proxy/dialer.go index ec5df2f..1164fe7 100644 --- a/proxy/dialer.go +++ b/proxy/dialer.go @@ -6,7 +6,7 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/common/log" + "github.com/dongxinb/glider/common/log" ) // Dialer is used to create connection. diff --git a/proxy/direct.go b/proxy/direct.go index 5561376..a44e866 100644 --- a/proxy/direct.go +++ b/proxy/direct.go @@ -4,7 +4,7 @@ import ( "errors" "net" - "github.com/nadoo/glider/common/log" + "github.com/dongxinb/glider/common/log" ) // Direct proxy diff --git a/proxy/http/client.go b/proxy/http/client.go index db7ba95..b92e2b2 100644 --- a/proxy/http/client.go +++ b/proxy/http/client.go @@ -7,9 +7,9 @@ import ( "net" "net/textproto" - "github.com/nadoo/glider/common/conn" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/conn" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" ) // NewHTTPDialer returns a http proxy dialer. diff --git a/proxy/http/http.go b/proxy/http/http.go index e1a6bd3..25d6d3e 100644 --- a/proxy/http/http.go +++ b/proxy/http/http.go @@ -11,8 +11,8 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" ) // HTTP struct. diff --git a/proxy/http/request.go b/proxy/http/request.go index cf627bf..c6b875c 100644 --- a/proxy/http/request.go +++ b/proxy/http/request.go @@ -8,7 +8,7 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/common/log" + "github.com/dongxinb/glider/common/log" ) // Methods are http methods from rfc. diff --git a/proxy/http/server.go b/proxy/http/server.go index dccd7c7..1f8be9a 100644 --- a/proxy/http/server.go +++ b/proxy/http/server.go @@ -9,9 +9,9 @@ import ( "net/textproto" "time" - "github.com/nadoo/glider/common/conn" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/conn" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" ) // NewHTTPServer returns a http proxy server. diff --git a/proxy/kcp/kcp.go b/proxy/kcp/kcp.go index cd3bf68..4226fd9 100644 --- a/proxy/kcp/kcp.go +++ b/proxy/kcp/kcp.go @@ -11,8 +11,8 @@ import ( kcp "github.com/xtaci/kcp-go" "golang.org/x/crypto/pbkdf2" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" ) // KCP struct. diff --git a/proxy/mixed/mixed.go b/proxy/mixed/mixed.go index e59e554..d228c7c 100644 --- a/proxy/mixed/mixed.go +++ b/proxy/mixed/mixed.go @@ -5,11 +5,11 @@ import ( "net" "net/url" - "github.com/nadoo/glider/common/conn" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" - "github.com/nadoo/glider/proxy/http" - "github.com/nadoo/glider/proxy/socks5" + "github.com/dongxinb/glider/common/conn" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" + "github.com/dongxinb/glider/proxy/http" + "github.com/dongxinb/glider/proxy/socks5" ) // Mixed struct. diff --git a/proxy/obfs/obfs.go b/proxy/obfs/obfs.go index cd0f390..89db268 100644 --- a/proxy/obfs/obfs.go +++ b/proxy/obfs/obfs.go @@ -6,8 +6,8 @@ import ( "net" "net/url" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" ) // Obfs struct. diff --git a/proxy/redir/redir_linux.go b/proxy/redir/redir_linux.go index f03e8db..62f2035 100644 --- a/proxy/redir/redir_linux.go +++ b/proxy/redir/redir_linux.go @@ -10,10 +10,10 @@ import ( "syscall" "unsafe" - "github.com/nadoo/glider/common/conn" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/common/socks" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/conn" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/common/socks" + "github.com/dongxinb/glider/proxy" ) const ( diff --git a/proxy/reject/reject.go b/proxy/reject/reject.go index 13935c4..1a1ef41 100644 --- a/proxy/reject/reject.go +++ b/proxy/reject/reject.go @@ -5,7 +5,7 @@ import ( "errors" "net" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/proxy" ) // A Reject represents the base struct of a reject proxy. diff --git a/proxy/server.go b/proxy/server.go index 78fdac1..98e36ec 100644 --- a/proxy/server.go +++ b/proxy/server.go @@ -6,7 +6,7 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/common/log" + "github.com/dongxinb/glider/common/log" ) // Server interface diff --git a/proxy/socks5/packet.go b/proxy/socks5/packet.go index 0a28601..bbf691f 100644 --- a/proxy/socks5/packet.go +++ b/proxy/socks5/packet.go @@ -3,8 +3,8 @@ package socks5 import ( "net" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/common/socks" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/common/socks" ) // PktConn . diff --git a/proxy/socks5/socks5.go b/proxy/socks5/socks5.go index c6f0165..904db4b 100644 --- a/proxy/socks5/socks5.go +++ b/proxy/socks5/socks5.go @@ -18,10 +18,10 @@ import ( "sync" "time" - "github.com/nadoo/glider/common/conn" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/common/socks" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/conn" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/common/socks" + "github.com/dongxinb/glider/proxy" ) // Version is socks5 version number. diff --git a/proxy/ss/packet.go b/proxy/ss/packet.go index 91edf60..b921874 100644 --- a/proxy/ss/packet.go +++ b/proxy/ss/packet.go @@ -3,7 +3,7 @@ package ss import ( "net" - "github.com/nadoo/glider/common/socks" + "github.com/dongxinb/glider/common/socks" ) // PktConn . diff --git a/proxy/ss/ss.go b/proxy/ss/ss.go index 5516bee..34a8c6c 100644 --- a/proxy/ss/ss.go +++ b/proxy/ss/ss.go @@ -8,12 +8,12 @@ import ( "sync" "time" - "github.com/nadoo/go-shadowsocks2/core" + "github.com/dongxinb/go-shadowsocks2/core" - "github.com/nadoo/glider/common/conn" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/common/socks" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/conn" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/common/socks" + "github.com/dongxinb/glider/proxy" ) // SS is a base ss struct. diff --git a/proxy/ssr/ssr.go b/proxy/ssr/ssr.go index b9f6650..a16355e 100644 --- a/proxy/ssr/ssr.go +++ b/proxy/ssr/ssr.go @@ -12,9 +12,9 @@ import ( "github.com/nadoo/shadowsocksR/protocol" "github.com/nadoo/shadowsocksR/ssr" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/common/socks" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/common/socks" + "github.com/dongxinb/glider/proxy" ) // SSR struct. diff --git a/proxy/tcptun/tcptun.go b/proxy/tcptun/tcptun.go index 7da066b..0daf689 100644 --- a/proxy/tcptun/tcptun.go +++ b/proxy/tcptun/tcptun.go @@ -6,9 +6,9 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/common/conn" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/conn" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" ) // TCPTun struct. diff --git a/proxy/tls/tls.go b/proxy/tls/tls.go index a23262f..83bfac5 100644 --- a/proxy/tls/tls.go +++ b/proxy/tls/tls.go @@ -7,8 +7,8 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" ) // TLS struct. diff --git a/proxy/tproxy/tproxy_linux.go b/proxy/tproxy/tproxy_linux.go index 6c3149e..572ee96 100644 --- a/proxy/tproxy/tproxy_linux.go +++ b/proxy/tproxy/tproxy_linux.go @@ -13,8 +13,8 @@ import ( "syscall" "unsafe" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" ) // TProxy struct. diff --git a/proxy/udptun/udptun.go b/proxy/udptun/udptun.go index 0bee32a..9162fa7 100644 --- a/proxy/udptun/udptun.go +++ b/proxy/udptun/udptun.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "github.com/nadoo/glider/common/conn" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/conn" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" ) // UDPTun is a base udptun struct. diff --git a/proxy/unix/unix.go b/proxy/unix/unix.go index c38fdce..287e6ad 100644 --- a/proxy/unix/unix.go +++ b/proxy/unix/unix.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" ) // Unix domain socket struct. diff --git a/proxy/uottun/uottun.go b/proxy/uottun/uottun.go index 3bbe142..cc7bb0e 100644 --- a/proxy/uottun/uottun.go +++ b/proxy/uottun/uottun.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/nadoo/glider/common/conn" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/conn" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" ) // UoTTun is a base udp over tcp tunnel struct. diff --git a/proxy/vmess/vmess.go b/proxy/vmess/vmess.go index c3d6c93..ed2716e 100644 --- a/proxy/vmess/vmess.go +++ b/proxy/vmess/vmess.go @@ -6,8 +6,8 @@ import ( "net/url" "strconv" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" ) // VMess struct. diff --git a/proxy/ws/ws.go b/proxy/ws/ws.go index c0b98ce..74b5ad7 100644 --- a/proxy/ws/ws.go +++ b/proxy/ws/ws.go @@ -7,8 +7,8 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" ) // WS is the base ws proxy struct. diff --git a/rule/config.go b/rule/config.go index 68efc92..d1dc638 100644 --- a/rule/config.go +++ b/rule/config.go @@ -8,7 +8,7 @@ import ( "github.com/nadoo/conflag" - "github.com/nadoo/glider/strategy" + "github.com/dongxinb/glider/strategy" ) // Config , every rule dialer points to a rule file diff --git a/rule/rule.go b/rule/rule.go index b8474f9..b0b75dd 100644 --- a/rule/rule.go +++ b/rule/rule.go @@ -5,9 +5,9 @@ import ( "strings" "sync" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" - "github.com/nadoo/glider/strategy" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" + "github.com/dongxinb/glider/strategy" ) // Proxy struct diff --git a/strategy/forward.go b/strategy/forward.go index 81f4b32..14844da 100644 --- a/strategy/forward.go +++ b/strategy/forward.go @@ -7,8 +7,8 @@ import ( "strings" "sync/atomic" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" ) // StatusHandler function will be called when the forwarder's status changed diff --git a/strategy/strategy.go b/strategy/strategy.go index ba3e932..f4c6df2 100644 --- a/strategy/strategy.go +++ b/strategy/strategy.go @@ -11,8 +11,8 @@ import ( "sync/atomic" "time" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/proxy" + "github.com/dongxinb/glider/common/log" + "github.com/dongxinb/glider/proxy" ) // Config is strategy config struct.