Skip to content

Commit

Permalink
Fix compile on Windows, hopefully
Browse files Browse the repository at this point in the history
  • Loading branch information
mholt committed Jun 21, 2023
1 parent 806341e commit 9563666
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
9 changes: 9 additions & 0 deletions listen_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,15 @@ func listenTCPOrUnix(ctx context.Context, lnKey string, network, address string,
listenerPool.LoadOrStore(lnKey, nil)
}

// if new listener is a unix socket, make sure we can reuse it later
// (we do our own "unlink on close" -- not required, but more tidy)
one := int32(1)
if unix, ok := ln.(*net.UnixListener); ok {
unix.SetUnlinkOnClose(false)
ln = &unixListener{unix, lnKey, &one}
unixSockets[lnKey] = ln.(*unixListener)
}

// lightly wrap the listener so that when it is closed,
// we can decrement the usage pool counter
return deleteListener{ln, lnKey}, err
Expand Down
18 changes: 5 additions & 13 deletions listeners.go
Original file line number Diff line number Diff line change
Expand Up @@ -186,19 +186,11 @@ func (na NetworkAddress) listen(ctx context.Context, portOffset uint, config net
return nil, fmt.Errorf("unsupported network type: %s", na.Network)
}

// if new listener is a unix socket, make sure we can reuse it later
// (we do our own "unlink on close" -- not required, but more tidy)
one := int32(1)
switch lnValue := ln.(type) {
case deleteListener:
if unix, ok := lnValue.Listener.(*net.UnixListener); ok {
unix.SetUnlinkOnClose(false)
ln = &unixListener{unix, lnKey, &one}
unixSockets[lnKey] = ln.(*unixListener)
}
case *net.UnixConn:
ln = &unixConn{lnValue, address, lnKey, &one}
unixSockets[lnKey] = ln.(*unixConn)
// TODO: Not 100% sure this is necessary, but we do this for net.UnixListener in listen_unix.go, so...
if unix, ok := ln.(*net.UnixConn); ok {
one := int32(1)
ln = &unixConn{unix, address, lnKey, &one}
unixSockets[lnKey] = unix
}

return ln, nil
Expand Down

0 comments on commit 9563666

Please sign in to comment.