diff options
| author | Simon Rettberg | 2015-01-07 18:54:05 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2015-01-07 18:54:05 +0100 |
| commit | 6b10e711d698b327f99862955277fdc359d66863 (patch) | |
| tree | f8bf0f171865e0b5ccf1d280194706fc8ba5212a | |
| parent | [SERVER] Get rid of epoll in alservers.c, make valgrind+gdb happy by handling... (diff) | |
| download | dnbd3-6b10e711d698b327f99862955277fdc359d66863.tar.gz dnbd3-6b10e711d698b327f99862955277fdc359d66863.tar.xz dnbd3-6b10e711d698b327f99862955277fdc359d66863.zip | |
[SERVER] Set client connection timeout in client thread
| -rw-r--r-- | src/server/net.c | 2 | ||||
| -rw-r--r-- | src/server/server.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/net.c b/src/server/net.c index 3dfa231..b7c0ff2 100644 --- a/src/server/net.c +++ b/src/server/net.c @@ -140,6 +140,8 @@ void *net_client_handler(void *dnbd3_client) memset( &payload, 0, sizeof(payload) ); reply.magic = dnbd3_packet_magic; + sock_setTimeout( client->sock, _clientTimeout ); + // Receive first packet. This must be CMD_SELECT_IMAGE by protocol specification if ( recv_request_header( client->sock, &request ) ) { if ( request.cmd != CMD_SELECT_IMAGE ) { diff --git a/src/server/server.c b/src/server/server.c index d03a9fd..d50e532 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -361,8 +361,6 @@ int main(int argc, char *argv[]) } //memlogf("INFO: Client connected\n"); - sock_setTimeout( fd, _clientTimeout ); - dnbd3_client_t *dnbd3_client = dnbd3_initClient( &client, fd ); if ( dnbd3_client == NULL ) { close( fd ); |