bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't close the same file descriptor more than once.

Browse Source
This commit is contained in:
Alex Young
2012-08-23 16:01:37 +01:00
parent b1a4db2727
commit c5dfe16f35
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/client.c
View File

@@ -490,11 +490,19 @@ void client_cleanup(struct client* client,
{
info("client cleanup for client %p", client);
if (client->socket) { close(client->socket); }
if (client->socket) {
close(client->socket);
client->socket = -1;
debug("Closed client socket fd %d", client->socket);
}
if (client->mapped) {
munmap(client->mapped, client->serve->size);
}
if (client->fileno) { close(client->fileno); }
if (client->fileno) {
close(client->fileno);
client->fileno = -1;
debug("Closed client file fd %d", client->fileno );
}
if ( server_io_locked( client->serve ) ) { server_unlock_io( client->serve ); }
if ( server_acl_locked( client->serve ) ) { server_unlock_acl( client->serve ); }
@@ -517,6 +525,7 @@ void* client_serve(void* client_uncast)
),
"Couldn't open/mmap file %s: %s", client->serve->filename, strerror( errno )
);
debug( "Opened client file fd %d", client->fileno);
debug("client: sending hello");
client_send_hello(client);
@@ -530,16 +539,7 @@ void* client_serve(void* client_uncast)
debug("client: control arrived" );
server_control_arrived( client->serve );
}
else {
warn( "client: control transfer failed." );
}
FATAL_IF_NEGATIVE(
close(client->socket),
"Couldn't close socket %d",
client->socket
);
debug("Cleaning client %p up normally in thread %p", client, pthread_self());
client_cleanup(client, 0);
debug("Client thread done" );