Moved sockaddr_address_data to serve.c and renamed params.h to serve.h

src/serve.h

@@ -0,0 +1,101 @@
+#ifndef __PARAMS_H
+#define __PARAMS_H
+
+#define _GNU_SOURCE
+
+#ifndef _LARGEFILE64_SOURCE
+# define _LARGEFILE64_SOURCE
+#endif
+
+#include "parse.h"
+
+#include <sys/types.h>
+
+enum mirror_finish_action {
+	ACTION_PROXY,
+	ACTION_EXIT,
+	ACTION_NOTHING
+};
+
+struct mirror_status {
+	pthread_t            thread;
+	int                  client;
+	char                 *filename;
+	off64_t              max_bytes_per_second;
+	enum mirror_finish_action action_at_finish;
+	
+	char                 *mapped;
+	struct bitset_mapping *dirty_map;
+};
+
+struct control_params {
+	int                       socket;
+	struct server* serve;
+};
+
+#define MAX_NBD_CLIENTS 16
+struct server {
+	/** address/port to bind to */
+	union mysockaddr     bind_to;
+	/** does an empty ACL mean "deny all"? */
+	int                  default_deny;
+	/** number of entries in current access control list*/
+	int                  acl_entries;
+	/** pointer to access control list entries*/
+	struct ip_and_mask   (*acl)[0];
+	/** (static) file name to serve */
+	char*                filename;
+	/** file name of INCOMPLETE flag */
+	char*                filename_incomplete;
+	/** TCP backlog for listen() */
+	int                  tcp_backlog;
+	/** (static) file name of UNIX control socket (or NULL if none) */
+	char*                control_socket_name;
+	/** size of file */
+	off64_t              size;
+
+        /* NB dining philosophers if we ever mave more than one thread 
+         * that might need to pause the whole server.  At the moment we only
+         * have the one.
+         */
+       
+	/** Claimed around any accept/thread starting loop */
+	pthread_mutex_t      l_accept; 
+	/** Claims around any I/O to this file */
+	pthread_mutex_t      l_io;
+	
+	/** set to non-zero to cause r/w requests to go via this fd */
+	int                  proxy_fd;
+	
+	/** to interrupt accept loop and clients, write() to close_signal[1] */
+	int                  close_signal[2];
+
+	struct mirror_status* mirror;
+	int                  server_fd;
+	int                  control_fd;
+	
+	char*                block_allocation_map;
+	
+	struct { pthread_t thread; union mysockaddr address; }
+	                     nbd_client[MAX_NBD_CLIENTS];
+};
+
+struct mode_readwrite_params {
+	union mysockaddr     connect_to;
+	off64_t              from;
+	off64_t              len;
+	int                  data_fd;
+	int                  client;
+};
+
+struct client_params {
+	int     socket;
+	
+	int     fileno;
+	char*   mapped;
+	
+	struct server* serve; /* FIXME: remove above duplication */
+};
+
+#endif
+