mirror of
https://github.com/nadoo/glider.git
synced 2026-11-19 07:09:42 +08:00
ss: change the conn close behavior (fixed #180)
This commit is contained in:
1 parent
42c15b9262
commit
226dd97d7d
5 files changed
+24
-18
No files matched your search
+5
-3
@@ -1,6 +1,7 @@
|
||||
package ss
|
||||
|
||||
import (
|
||||
"io/ioutil"
|
||||
"net"
|
||||
"strings"
|
||||
"sync"
|
||||
@@ -51,11 +52,12 @@ func (s *SS) Serve(c net.Conn) {
|
||||
c.SetKeepAlive(true)
|
||||
}
|
||||
|
||||
c = s.StreamConn(c)
|
||||
sc := s.StreamConn(c)
|
||||
|
||||
tgt, err := socks.ReadAddr(c)
|
||||
tgt, err := socks.ReadAddr(sc)
|
||||
if err != nil {
|
||||
log.F("[ss] failed to get target address: %v", err)
|
||||
proxy.Copy(ioutil.Discard, c) // https://github.com/nadoo/glider/issues/180
|
||||
return
|
||||
}
|
||||
|
||||
@@ -71,7 +73,7 @@ func (s *SS) Serve(c net.Conn) {
|
||||
|
||||
log.F("[ss] %s <-> %s via %s", c.RemoteAddr(), tgt, dialer.Addr())
|
||||
|
||||
if err = proxy.Relay(c, rc); err != nil {
|
||||
if err = proxy.Relay(sc, rc); err != nil {
|
||||
log.F("[ss] %s <-> %s via %s, relay error: %v", c.RemoteAddr(), tgt, dialer.Addr(), err)
|
||||
// record remote conn failure only
|
||||
if !strings.Contains(err.Error(), s.addr) {
|
||||
|
||||
@@ -40,7 +40,7 @@ func (s *Unix) ListenAndServe() {
|
||||
s.ListenAndServeTCP()
|
||||
}
|
||||
|
||||
// ListenAndServe serves tcp requests.
|
||||
// ListenAndServeTCP serves tcp requests.
|
||||
func (s *Unix) ListenAndServeTCP() {
|
||||
os.Remove(s.addr)
|
||||
l, err := net.Listen("unix", s.addr)
|
||||
@@ -91,7 +91,7 @@ func (s *Unix) Serve(c net.Conn) {
|
||||
}
|
||||
}
|
||||
|
||||
// ListenAndServe serves udp requests.
|
||||
// ListenAndServeUDP serves udp requests.
|
||||
func (s *Unix) ListenAndServeUDP() {
|
||||
os.Remove(s.addru)
|
||||
c, err := net.ListenPacket("unixgram", s.addru)
|
||||
|
||||
@@ -35,9 +35,10 @@ const (
|
||||
SecurityNone byte = 5
|
||||
)
|
||||
|
||||
// CMD types
|
||||
// CmdType is the type of vmess cmd
|
||||
type CmdType byte
|
||||
|
||||
// Cmd Types
|
||||
const (
|
||||
CmdTCP CmdType = 1
|
||||
CmdUDP CmdType = 2
|
||||
|
||||
Reference in new issue
Block a user