flexnbd: Make the killswitch runtime-selectable

We're not actually using it in production right now because it doesn't
shut its sockets down cleanly enough. This is a better option than
reverting the functionality or keeping production downgraded until
we sort out a handler that cleanly closes the sockets.
This commit is contained in:
nick
2013-07-03 09:56:35 +01:00
parent 81d41f567d
commit 9f34752842
8 changed files with 36 additions and 9 deletions

View File

@@ -86,7 +86,8 @@ struct flexnbd * flexnbd_create_serving(
int default_deny,
int acl_entries,
char** s_acl_entries,
int max_nbd_clients)
int max_nbd_clients,
int use_killswitch)
{
struct flexnbd * flexnbd = xmalloc( sizeof( struct flexnbd ) );
flexnbd->serve = server_create(
@@ -98,6 +99,7 @@ struct flexnbd * flexnbd_create_serving(
acl_entries,
s_acl_entries,
max_nbd_clients,
use_killswitch,
1);
flexnbd_create_shared( flexnbd,
s_ctrl_sock );
@@ -123,7 +125,7 @@ struct flexnbd * flexnbd_create_listening(
default_deny,
acl_entries,
s_acl_entries,
1, 0);
1, 0, 0);
flexnbd_create_shared( flexnbd, s_ctrl_sock );
return flexnbd;
}