general: optimized codes

This commit is contained in:
nadoo committed 2018-07-06 11:30:42 +08:00
1 parent 049c5b1458
commit 621e8ed018
5 files changed
+13 -28

No files matched your search

+2 -5
View File
@@ -43,11 +43,8 @@ func NewHTTP(s string, dialer proxy.Dialer) (*HTTP, error) {
}
addr := u.Host
var user, pass string
if u.User != nil {
user = u.User.Username()
pass, _ = u.User.Password()
}
user := u.User.Username()
pass, _ := u.User.Password()
h := &HTTP{
dialer: dialer,
+2 -5
View File
@@ -52,11 +52,8 @@ func NewSOCKS5(s string, dialer proxy.Dialer) (*SOCKS5, error) {
}
addr := u.Host
var user, pass string
if u.User != nil {
user = u.User.Username()
pass, _ = u.User.Password()
}
user := u.User.Username()
pass, _ := u.User.Password()
h := &SOCKS5{
dialer: dialer,
+2 -5
View File
@@ -38,11 +38,8 @@ func NewSS(s string, dialer proxy.Dialer) (*SS, error) {
}
addr := u.Host
var method, pass string
if u.User != nil {
method = u.User.Username()
pass, _ = u.User.Password()
}
method := u.User.Username()
pass, _ := u.User.Password()
ciph, err := core.PickCipher(method, nil, pass)
if err != nil {
+2 -5
View File
@@ -45,11 +45,8 @@ func NewSSR(s string, dialer proxy.Dialer) (*SSR, error) {
}
addr := u.Host
var method, pass string
if u.User != nil {
method = u.User.Username()
pass, _ = u.User.Password()
}
method := u.User.Username()
pass, _ := u.User.Password()
p := &SSR{
dialer: dialer,
+5 -8
View File
@@ -27,7 +27,6 @@ func init() {
}
// NewVMess returns a vmess proxy.
// vmess://security:uuid@host:port?alertID=num
func NewVMess(s string, dialer proxy.Dialer) (*VMess, error) {
u, err := url.Parse(s)
if err != nil {
@@ -36,21 +35,19 @@ func NewVMess(s string, dialer proxy.Dialer) (*VMess, error) {
}
addr := u.Host
var security, uuid string
if u.User != nil {
security = u.User.Username()
}
security := u.User.Username()
uuid, ok := u.User.Password()
if !ok {
// vmess://uuid@host:port?alertID=num, no security specified
// no security type specified, vmess://uuid@server
uuid = security
security = ""
}
query := u.Query()
aid := query.Get("alterID")
if aid == "" {
aid = "0"
}
alterID, err := strconv.ParseUint(aid, 10, 32)
if err != nil {