diff options
| author | Simon Rettberg | 2013-11-12 16:39:04 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-11-12 16:39:04 +0100 |
| commit | 080d2c7799e7d2e3a1378bc94c7d530542a75539 (patch) | |
| tree | 4f1f8ce5c697f961dbc53a27669a57297f5e8ea1 /src/server/net.c | |
| parent | [SERVER] Fix embarrassing deadlock when deleting old images (diff) | |
| parent | tiny fix (diff) | |
| download | dnbd3-080d2c7799e7d2e3a1378bc94c7d530542a75539.tar.gz dnbd3-080d2c7799e7d2e3a1378bc94c7d530542a75539.tar.xz dnbd3-080d2c7799e7d2e3a1378bc94c7d530542a75539.zip | |
Merge branch 'simon' of dnbd3:dnbd3 into simon
Conflicts:
src/server/altservers.c
Diffstat (limited to 'src/server/net.c')
| -rw-r--r-- | src/server/net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/net.c b/src/server/net.c index 3e9383d..1d9d226 100644 --- a/src/server/net.c +++ b/src/server/net.c @@ -50,7 +50,7 @@ static inline char recv_request_header(int sock, dnbd3_request_t *request) int ret, fails = 0; // Read request header from socket while ( (ret = recv( sock, request, sizeof(*request), MSG_WAITALL )) != sizeof(*request) ) { - if ( ret >= 0 || ++fails > 10 ) return FALSE; + if ( ret >= 0 || ++fails > SOCKET_TIMEOUT_SERVER_RETRIES ) return FALSE; const int err = errno; if ( err == EAGAIN || err == EINTR ) continue; printf( "[DEBUG] Error receiving request: Could not read message header (%d/%d, e=%d)\n", ret, (int)sizeof(*request), err ); |