hardcoresushi/libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

ctlsock: raise timeout to 10 seconds

Browse Source 
There was at least one user who hit the earlier 1 second timeout. Raise to 10
seconds which ought to be enough for anyone.

Fixes https://github.com/rfjakob/gocryptfs/issues/683
This commit is contained in:
Jakob Unterwurzacher 2022-08-22 14:00:04 +02:00
parent 702a2e19cc
commit 5582d8370c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ctlsock/ctlsock.go
View File

@ -21,9 +21,13 @@ type CtlSock struct {
Conn net.Conn Conn net.Conn
} }
// There was at least one user who hit the earlier 1 second timeout. Raise to 10
// seconds which ought to be enough for anyone.
const ctlsockTimeout = 10 * time.Second
// New opens the socket at `socketPath` and stores it in a `CtlSock` object. // New opens the socket at `socketPath` and stores it in a `CtlSock` object.
func New(socketPath string) (*CtlSock, error) { func New(socketPath string) (*CtlSock, error) {
conn, err := net.DialTimeout("unix", socketPath, 1*time.Second) conn, err := net.DialTimeout("unix", socketPath, ctlsockTimeout)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -32,7 +36,7 @@ func New(socketPath string) (*CtlSock, error) {
// Query sends a request to the control socket returns the response. // Query sends a request to the control socket returns the response.
func (c *CtlSock) Query(req *RequestStruct) (*ResponseStruct, error) { func (c *CtlSock) Query(req *RequestStruct) (*ResponseStruct, error) {
c.Conn.SetDeadline(time.Now().Add(time.Second)) c.Conn.SetDeadline(time.Now().Add(ctlsockTimeout))
msg, err := json.Marshal(req) msg, err := json.Marshal(req)
if err != nil { if err != nil {
return nil, err return nil, err