mirror of
https://github.com/renorris/openfsd
synced 2026-03-22 06:25:35 +08:00
Revert "add client timeout via net/Conn SetDeadline"
This reverts commit 8affb6210e.
This commit is contained in:
@@ -108,8 +108,6 @@ func (s *Server) eventLoop(client *Client) {
|
||||
go client.senderWorker()
|
||||
|
||||
for {
|
||||
// Set deadline and attempt to read
|
||||
client.conn.SetReadDeadline(getTimeBySecondsInFuture(s.cfg.ConnectionTimeoutSeconds))
|
||||
if !client.scanner.Scan() {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -35,10 +35,8 @@ func (s *Server) handleConn(ctx context.Context, conn net.Conn) {
|
||||
fmt.Println(err)
|
||||
}
|
||||
}()
|
||||
defer conn.Close()
|
||||
|
||||
// Set timeout for login phase
|
||||
conn.SetDeadline(getTimeBySecondsInFuture(s.cfg.ConnectionTimeoutSeconds))
|
||||
defer conn.Close()
|
||||
|
||||
if err := sendServerIdent(conn); err != nil {
|
||||
fmt.Printf("Error sending server ident: %v\n", err)
|
||||
|
||||
@@ -16,9 +16,6 @@ type ServerConfig struct {
|
||||
NumMetarWorkers int `env:"NUM_METAR_WORKERS, default=4"` // Number of METAR fetch workers to run
|
||||
|
||||
ServiceHTTPListenAddr string `env:"SERVICE_HTTP_LISTEN_ADDR, default=:13618"`
|
||||
|
||||
// Seconds after which a connection will be closed for inactivity
|
||||
ConnectionTimeoutSeconds int `env:"CONNECTION_TIMEOUT_SECONDS, default=30"`
|
||||
}
|
||||
|
||||
func loadServerConfig(ctx context.Context) (config *ServerConfig, err error) {
|
||||
|
||||
@@ -7,7 +7,6 @@ import (
|
||||
"slices"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
// FSD error codes
|
||||
@@ -419,8 +418,3 @@ func sendSendFastPacket(client *Client, enabled bool) {
|
||||
|
||||
client.send(builder.String())
|
||||
}
|
||||
|
||||
// getTimeBySecondsInFuture returns time.Now + seconds
|
||||
func getTimeBySecondsInFuture(seconds int) time.Time {
|
||||
return time.Now().Add(time.Duration(seconds) * time.Second)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user