diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-09-08 13:49:56 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-09-10 11:33:13 +0200 |
| commit | 6050ab685553c7312ef105d2c4a5230c3fcf4002 (patch) | |
| tree | ff96280109f4200733a4bbfc81278cad4ff5367f /src/core_read.cpp | |
| parent | Merge pull request #4874 (diff) | |
| download | discoin-6050ab685553c7312ef105d2c4a5230c3fcf4002.tar.xz discoin-6050ab685553c7312ef105d2c4a5230c3fcf4002.zip | |
netbase: Make SOCKS5 negotiation interruptible
Avoids that SOCKS5 negotiation will hold up the shutdown process.
- Sockets can stay in non-blocking mode, no need to switch it on/off
anymore
- Adds a timeout (20 seconds) on SOCK5 negotiation. This should be
enough for even Tor to get a connection to a hidden service, and
avoids blocking the opencon thread indefinitely on a hanging proxy.
Fixes #2954.
Diffstat (limited to 'src/core_read.cpp')
0 files changed, 0 insertions, 0 deletions