bughz/glider
1
0
Fork 0
mirror of https://github.com/nadoo/glider.git synced 2025-02-24 01:45:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

general: optimized codes

Browse Source
This commit is contained in:
nadoo 2018-07-06 11:30:42 +08:00
parent 049c5b1458
commit 621e8ed018
5 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
proxy/http/http.go
View File

@ -43,11 +43,8 @@ func NewHTTP(s string, dialer proxy.Dialer) (*HTTP, error) {
} }
addr := u.Host addr := u.Host
var user, pass string user := u.User.Username()
if u.User != nil { pass, _ := u.User.Password()
user = u.User.Username()
pass, _ = u.User.Password()
}
h := &HTTP{ h := &HTTP{
dialer: dialer, dialer: dialer,

7
proxy/socks5/socks5.go
View File

@ -52,11 +52,8 @@ func NewSOCKS5(s string, dialer proxy.Dialer) (*SOCKS5, error) {
} }
addr := u.Host addr := u.Host
var user, pass string user := u.User.Username()
if u.User != nil { pass, _ := u.User.Password()
user = u.User.Username()
pass, _ = u.User.Password()
}
h := &SOCKS5{ h := &SOCKS5{
dialer: dialer, dialer: dialer,

7
proxy/ss/ss.go
View File

@ -38,11 +38,8 @@ func NewSS(s string, dialer proxy.Dialer) (*SS, error) {
} }
addr := u.Host addr := u.Host
var method, pass string method := u.User.Username()
if u.User != nil { pass, _ := u.User.Password()
method = u.User.Username()
pass, _ = u.User.Password()
}
ciph, err := core.PickCipher(method, nil, pass) ciph, err := core.PickCipher(method, nil, pass)
if err != nil { if err != nil {

7
proxy/ssr/ssr.go
View File

@ -45,11 +45,8 @@ func NewSSR(s string, dialer proxy.Dialer) (*SSR, error) {
} }
addr := u.Host addr := u.Host
var method, pass string method := u.User.Username()
if u.User != nil { pass, _ := u.User.Password()
method = u.User.Username()
pass, _ = u.User.Password()
}
p := &SSR{ p := &SSR{
dialer: dialer, dialer: dialer,

13
proxy/vmess/vmess.go
View File

@ -27,7 +27,6 @@ func init() {
} }
// NewVMess returns a vmess proxy. // NewVMess returns a vmess proxy.
// vmess://security:uuid@host:port?alertID=num
func NewVMess(s string, dialer proxy.Dialer) (*VMess, error) { func NewVMess(s string, dialer proxy.Dialer) (*VMess, error) {
u, err := url.Parse(s) u, err := url.Parse(s)
if err != nil { if err != nil {
@ -36,21 +35,19 @@ func NewVMess(s string, dialer proxy.Dialer) (*VMess, error) {
} }
addr := u.Host addr := u.Host
security := u.User.Username()
var security, uuid string
if u.User != nil {
security = u.User.Username()
}
uuid, ok := u.User.Password() uuid, ok := u.User.Password()
if !ok { if !ok {
// vmess://uuid@host:port?alertID=num, no security specified // no security type specified, vmess://uuid@server
uuid = security uuid = security
security = "" security = ""
} }
query := u.Query() query := u.Query()
aid := query.Get("alterID") aid := query.Get("alterID")
if aid == "" {
aid = "0"
}
alterID, err := strconv.ParseUint(aid, 10, 32) alterID, err := strconv.ParseUint(aid, 10, 32)
if err != nil { if err != nil {