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

Added dummy control socket answering / changed serve_accept_loop to use

Browse Source 
select() to avoid a separate listening thread.
This commit is contained in:
Matthew Bloch
2012-05-18 23:39:16 +01:00
parent b533e4e31c
commit 580b821f61
2 changed files with 59 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
params.h
View File

@@ -30,7 +30,7 @@ struct mode_serve_params {
char* control_socket_name; char* control_socket_name;
int server; int server;
int control; int control;
char* block_allocation_map; char* block_allocation_map;
}; };

83
serve.c
View File

@@ -342,7 +342,7 @@ void serve_open_control_socket(struct mode_serve_params* params)
if (!params->control_socket_name) if (!params->control_socket_name)
return; return;
params->control = socket(AF_UNIX, SOCK_DGRAM, 0); params->control = socket(AF_UNIX, SOCK_STREAM, 0);
SERVER_ERROR_ON_FAILURE(params->control, SERVER_ERROR_ON_FAILURE(params->control,
"Couldn't create control socket"); "Couldn't create control socket");
@@ -350,45 +350,78 @@ void serve_open_control_socket(struct mode_serve_params* params)
bind_address.sun_family = AF_UNIX; bind_address.sun_family = AF_UNIX;
strcpy(bind_address.sun_path, params->control_socket_name); strcpy(bind_address.sun_path, params->control_socket_name);
unlink(params->control_socket_name); /* ignore failure */
SERVER_ERROR_ON_FAILURE( SERVER_ERROR_ON_FAILURE(
bind(params->control, &bind_address, sizeof(bind_address)), bind(params->control, &bind_address, sizeof(bind_address)),
"Couldn't bind control socket to %s", "Couldn't bind control socket to %s",
params->control_socket_name params->control_socket_name
); );
SERVER_ERROR_ON_FAILURE(
listen(params->control, 5),
"Couldn't listen on control socket"
);
}
void accept_nbd_client(struct mode_serve_params* params, int client_fd, struct sockaddr* client_address)
{
pthread_t client_thread;
struct client_params* client_params;
if (params->acl &&
!is_included_in_acl(params->acl_entries, params->acl, client_address)) {
write(client_fd, "Access control error", 20);
close(client_fd);
return;
}
client_params = xmalloc(sizeof(struct client_params));
client_params->socket = client_fd;
client_params->filename = params->filename;
client_params->block_allocation_map =
params->block_allocation_map;
client_thread = pthread_create(&client_thread, NULL,
client_serve, client_params);
SERVER_ERROR_ON_FAILURE(client_thread,
"Failed to create client thread");
/* FIXME: keep track of them? */
/* FIXME: maybe shouldn't be fatal? */
}
void accept_control_connection(struct mode_serve_params* params, int client_fd, struct sockaddr* client_address)
{
write(client_fd, "hello", 5);
close(client_fd);
} }
void serve_accept_loop(struct mode_serve_params* params) void serve_accept_loop(struct mode_serve_params* params)
{ {
while (1) { while (1) {
pthread_t client_thread; int activity_fd, client_fd;
struct sockaddr client_address; struct sockaddr client_address;
struct client_params* client_params; fd_set fds;
socklen_t socket_length=0; socklen_t socklen=0;
int client_socket = accept(params->server, &client_address, FD_ZERO(&fds);
&socket_length); FD_SET(params->server, &fds);
FD_SET(params->control, &fds);
SERVER_ERROR_ON_FAILURE(client_socket, "accept() failed");
if (params->acl && SERVER_ERROR_ON_FAILURE(
!is_included_in_acl(params->acl_entries, params->acl, &client_address)) { select(FD_SETSIZE, &fds, NULL, NULL, NULL),
write(client_socket, "Access control error", 20); "select() failed"
close(client_socket); );
continue;
}
client_params = xmalloc(sizeof(struct client_params)); activity_fd = FD_ISSET(params->server, &fds) ? params->server :
client_params->socket = client_socket; params->control;
client_params->filename = params->filename; client_fd = accept(activity_fd, &client_address, &socklen);
client_params->block_allocation_map = SERVER_ERROR_ON_FAILURE(client_fd, "accept() failed");
params->block_allocation_map;
client_thread = pthread_create(&client_thread, NULL, if (activity_fd == params->server)
client_serve, client_params); accept_nbd_client(params, client_fd, &client_address);
SERVER_ERROR_ON_FAILURE(client_thread, if (activity_fd == params->control)
"Failed to create client thread"); accept_control_connection(params, client_fd, &client_address);
/* FIXME: keep track of them? */
/* FIXME: maybe shouldn't be fatal? */
} }
} }