Skip to content

Commit

Permalink
refactor: remove explicit enabling of keepalive for tcp (#186)
Browse files Browse the repository at this point in the history
* refactor: remove explicit enabling of keepalive for tcp

* Use `WrapStreamListener`.
  • Loading branch information
sbruens authored Jul 1, 2024
1 parent c4d9214 commit ace37b1
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions cmd/outline-ss-server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"syscall"
"time"

"github.com/Jigsaw-Code/outline-sdk/transport"
"github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"
"github.com/Jigsaw-Code/outline-ss-server/ipinfo"
"github.com/Jigsaw-Code/outline-ss-server/service"
Expand Down Expand Up @@ -91,14 +90,7 @@ func (s *SSServer) startPort(portNum int) error {
tcpHandler := service.NewTCPHandler(portNum, authFunc, s.m, tcpReadTimeout)
packetHandler := service.NewPacketHandler(s.natTimeout, port.cipherList, s.m)
s.ports[portNum] = port
accept := func() (transport.StreamConn, error) {
conn, err := listener.AcceptTCP()
if err == nil {
conn.SetKeepAlive(true)
}
return conn, err
}
go service.StreamServe(accept, tcpHandler.Handle)
go service.StreamServe(service.WrapStreamListener(listener.AcceptTCP), tcpHandler.Handle)
go packetHandler.Handle(port.packetConn)
return nil
}
Expand Down

0 comments on commit ace37b1

Please sign in to comment.