Skip to content

Commit ace37b1

Browse files
authored
refactor: remove explicit enabling of keepalive for tcp (#186)
* refactor: remove explicit enabling of keepalive for tcp * Use `WrapStreamListener`.
1 parent c4d9214 commit ace37b1

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

cmd/outline-ss-server/main.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"syscall"
2727
"time"
2828

29-
"github.com/Jigsaw-Code/outline-sdk/transport"
3029
"github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"
3130
"github.com/Jigsaw-Code/outline-ss-server/ipinfo"
3231
"github.com/Jigsaw-Code/outline-ss-server/service"
@@ -91,14 +90,7 @@ func (s *SSServer) startPort(portNum int) error {
9190
tcpHandler := service.NewTCPHandler(portNum, authFunc, s.m, tcpReadTimeout)
9291
packetHandler := service.NewPacketHandler(s.natTimeout, port.cipherList, s.m)
9392
s.ports[portNum] = port
94-
accept := func() (transport.StreamConn, error) {
95-
conn, err := listener.AcceptTCP()
96-
if err == nil {
97-
conn.SetKeepAlive(true)
98-
}
99-
return conn, err
100-
}
101-
go service.StreamServe(accept, tcpHandler.Handle)
93+
go service.StreamServe(service.WrapStreamListener(listener.AcceptTCP), tcpHandler.Handle)
10294
go packetHandler.Handle(port.packetConn)
10395
return nil
10496
}

0 commit comments

Comments
 (0)