Add handshake timeout
2 files changed