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

Explicitly check for which fd is acceptable in server_accept

Browse Source
This commit is contained in:
Alex Young
2012-06-11 13:49:35 +01:00
parent 0b90517035
commit b5427d13db
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/serve.c
View File

@@ -492,22 +492,28 @@ int server_accept( struct server * params )
} }
if ( self_pipe_fd_isset( params->acl_updated_signal, &fds ) ) { if ( self_pipe_fd_isset( params->acl_updated_signal, &fds ) ) {
self_pipe_signal_clear( params->acl_updated_signal );
server_audit_clients( params ); server_audit_clients( params );
} }
activity_fd = FD_ISSET(params->server_fd, &fds) ? params->server_fd: if ( FD_ISSET( params->server_fd, &fds ) ){
params->control_fd;
client_fd = accept(activity_fd, &client_address.generic, &socklen); client_fd = accept( params->server_fd, &client_address.generic, &socklen );
if (activity_fd == params->server_fd) {
debug("Accepted nbd client socket"); debug("Accepted nbd client socket");
accept_nbd_client(params, client_fd, &client_address); accept_nbd_client(params, client_fd, &client_address);
}
if (activity_fd == params->control_fd) { } else if( FD_ISSET( params->control_fd, &fds ) ) {
client_fd = accept( params->control_fd, &client_address.generic, &socklen );
debug("Accepted control client socket"); debug("Accepted control client socket");
accept_control_connection(params, client_fd, &client_address); accept_control_connection(params, client_fd, &client_address);
} }
return 1; return 1;
} }