code cleanup
This commit is contained in:
parent
68b28ed530
commit
64be213b66
3 changed files with 3 additions and 18 deletions
|
@ -22,7 +22,7 @@ type Listener struct {
|
|||
var _listener *Listener
|
||||
|
||||
func New(config string, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) (*Listener, error) {
|
||||
addr, cipher, password, err := parseSSURL(config)
|
||||
addr, cipher, password, err := ParseSSURL(config)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
|
@ -44,7 +44,7 @@ func (c *packet) InAddr() net.Addr {
|
|||
return c.pc.LocalAddr()
|
||||
}
|
||||
|
||||
func parseSSURL(s string) (addr, cipher, password string, err error) {
|
||||
func ParseSSURL(s string) (addr, cipher, password string, err error) {
|
||||
u, err := url.Parse(s)
|
||||
if err != nil {
|
||||
return
|
||||
|
|
|
@ -4,7 +4,6 @@ import (
|
|||
"context"
|
||||
"fmt"
|
||||
"net"
|
||||
"net/url"
|
||||
"strings"
|
||||
|
||||
"github.com/Dreamacro/clash/adapter/inbound"
|
||||
|
@ -34,7 +33,7 @@ type Listener struct {
|
|||
var _listener *Listener
|
||||
|
||||
func New(config string, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) (C.AdvanceListener, error) {
|
||||
addr, cipher, password, err := parseSSURL(config)
|
||||
addr, cipher, password, err := embedSS.ParseSSURL(config)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
@ -159,17 +158,3 @@ func HandleShadowSocks(conn net.Conn, in chan<- C.ConnContext) bool {
|
|||
}
|
||||
return embedSS.HandleShadowSocks(conn, in)
|
||||
}
|
||||
|
||||
func parseSSURL(s string) (addr, cipher, password string, err error) {
|
||||
u, err := url.Parse(s)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
addr = u.Host
|
||||
if u.User != nil {
|
||||
cipher = u.User.Username()
|
||||
password, _ = u.User.Password()
|
||||
}
|
||||
return
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue