Add mboxes

src/serve.h

@@ -4,66 +4,13 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "flexnbd.h"
 #include "parse.h"
 #include "acl.h"
 
 
 static const int block_allocation_resolution = 4096;//128<<10;
 
-enum mirror_finish_action {
-	ACTION_EXIT,
-	ACTION_NOTHING
-};
-
-enum mirror_state {
-	MS_UNKNOWN,
-	MS_INIT,
-	MS_GO,
-	MS_FINALISE,
-	MS_DONE,
-	MS_FAIL_CONNECT,
-	MS_FAIL_REJECTED,
-	MS_FAIL_NO_HELLO,
-	MS_FAIL_SIZE_MISMATCH
-};
-
-struct mirror_status {
-	pthread_t            thread;
-	/* set to 1, then join thread to make mirror terminate early */
-	int                  signal_abandon;
-	union mysockaddr *   connect_to;
-	union mysockaddr *   connect_from;
-	int                  client;
-	char                 *filename;
-	off64_t              max_bytes_per_second;
-	enum mirror_finish_action action_at_finish;
-	
-	char                 *mapped;
-	struct bitset_mapping *dirty_map;
-
-	/* Pass a commit state pointer, then it will be updated
-	 * immediately before commit_signal is sent.
-	 */
-	enum mirror_state *  commit_state;
-
-	/* commit_signal is sent immediately after attempting to connect
-	 * and checking the remote size, whether successful or not.
-	 */
-	struct self_pipe *   commit_signal;
-};
-
-
-struct mirror_super {
-	struct mirror_status * mirror;
-	struct self_pipe * commit_signal;
-	pthread_t thread;
-};
-
-
-struct control_params {
-	int                       socket;
-	struct server* serve;
-};
 
 struct client_tbl_entry {
 	pthread_t thread;
@@ -74,6 +21,9 @@ struct client_tbl_entry {
 
 #define MAX_NBD_CLIENTS 16
 struct server {
+	/* The flexnbd wrapper this server is attached to */
+	struct flexnbd * flexnbd;
+
 	/** address/port to bind to */
 	union mysockaddr     bind_to;
 	/** (static) file name to serve */
@@ -101,11 +51,6 @@ struct server {
 	struct self_pipe *   acl_updated_signal;
 	pthread_mutex_t      l_acl;
 
-	/** vacuum_signal will be sent when client threads terminate.
-	 * This is mainly to keep valgrind happy
-	 */
-	struct self_pipe *   vacuum_signal;
-
 	struct mirror_status* mirror;
 	struct mirror_super * mirror_super; 
 	int                  server_fd;
@@ -117,18 +62,18 @@ struct server {
 	struct client_tbl_entry *nbd_client;
 
 
-	/* Marker for whether or not this server has control over the
-	 * data in the file, or if we're waiting to receive it from an
-	 * inbound migration which hasn't yet finished.
+	/* Marker for whether this server has control over the data in
+	 * the file, or if we're waiting to receive it from an inbound
+	 * migration which hasn't yet finished.
 	 */
 	int has_control;
 };
 
 struct server * server_create( 
+		struct flexnbd * flexnbd,
 		char* s_ip_address, 
 		char* s_port, 
 		char* s_file,
-		char *s_ctrl_sock, 
 		int default_deny,
 		int acl_entries, 
 		char** s_acl_entries,
@@ -144,6 +89,7 @@ void serve_wait_for_close( struct server * serve );
 void server_replace_acl( struct server *serve, struct acl * acl);
 void server_control_arrived( struct server *serve );
 int server_is_in_control( struct server *serve );
+int server_default_deny( struct server * serve );
 
 int do_serve( struct server * );