bughz/glider
1
0
Fork 0
mirror of https://github.com/nadoo/glider.git synced 2025-11-04 15:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

mixed: remove ss from mixed proxy

Browse Source
This commit is contained in:
nadoo 2017-09-06 16:21:27 +08:00
parent ec21d5325f
commit 93aac48d73
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -41,6 +41,7 @@ General:
- Rule proxy based on destinations: [Config Examples](config/examples) - Rule proxy based on destinations: [Config Examples](config/examples)
TODO: TODO:
- [ ] UDP over TCP
- [ ] UDP Tunnel - [ ] UDP Tunnel
- [ ] Linux tproxy support & UDP Relay - [ ] Linux tproxy support & UDP Relay
- [ ] TUN/TAP device support - [ ] TUN/TAP device support

8
dns.go
View File

@ -77,19 +77,19 @@ func NewDNS(addr, raddr string, sDialer Dialer) (*DNS, error) {
// ListenAndServe . // ListenAndServe .
func (s *DNS) ListenAndServe() { func (s *DNS) ListenAndServe() {
l, err := net.ListenPacket("udp", s.addr) c, err := net.ListenPacket("udp", s.addr)
if err != nil { if err != nil {
logf("failed to listen on %s: %v", s.addr, err) logf("failed to listen on %s: %v", s.addr, err)
return return
} }
defer l.Close() defer c.Close()
logf("listening UDP on %s", s.addr) logf("listening UDP on %s", s.addr)
for { for {
data := make([]byte, DNSUDPMaxLen) data := make([]byte, DNSUDPMaxLen)
n, clientAddr, err := l.ReadFrom(data) n, clientAddr, err := c.ReadFrom(data)
if err != nil { if err != nil {
logf("DNS local read error: %v", err) logf("DNS local read error: %v", err)
continue continue
@ -146,7 +146,7 @@ func (s *DNS) ListenAndServe() {
} }
_, err = l.WriteTo(msg, clientAddr) _, err = c.WriteTo(msg, clientAddr)
if err != nil { if err != nil {
logf("error in local write: %s\n", err) logf("error in local write: %s\n", err)
} }

8
mixed.go
View File

@ -24,7 +24,6 @@ type MixedProxy struct {
addr string addr string
http *HTTP http *HTTP
socks5 *SOCKS5 socks5 *SOCKS5
ss *SS
} }
// NewMixedProxy returns a mixed proxy. // NewMixedProxy returns a mixed proxy.
@ -37,10 +36,6 @@ func NewMixedProxy(network, addr, user, pass string, sDialer Dialer) (*MixedProx
p.http, _ = NewHTTP(addr, nil, sDialer) p.http, _ = NewHTTP(addr, nil, sDialer)
p.socks5, _ = NewSOCKS5(network, addr, user, pass, nil, sDialer) p.socks5, _ = NewSOCKS5(network, addr, user, pass, nil, sDialer)
if user != "" && pass != "" {
p.ss, _ = NewSS(addr, user, pass, nil, sDialer)
}
return p, nil return p, nil
} }
@ -103,7 +98,4 @@ func (p *MixedProxy) Serve(conn net.Conn) {
} }
} }
if p.ss != nil {
p.ss.Serve(c)
}
} }