#define MY_NAME "nbd_server"
#include "cliserv.h"
+/** Default position of the config file */
+#ifndef SYSCONFDIR
+#define SYSCONFDIR "/etc"
+#endif
+#define CFILE SYSCONFDIR "/nbd-server/config"
+
+/** Where our config file actually is */
+gchar* config_file_pos;
+
/** how much space for child PIDs we have by default. Dynamically
allocated, and will be realloc()ed if out of space, so this should
probably be fair for most situations. */
*
* Actually, do we need this at all? Can't we just say '0 is autodetect', and
* live with it? Or better yet, use an extra flag, or so?
+ * Answer: yes, we need it, as the hunksize is defined to this when the
+ * multiple file thingy isn't used.
*/
#define OFFT_MAX (((((off_t)1)<<((sizeof(off_t)-1)*8))-1)<<7)+127
#define LINELEN 256 /**< Size of static buffer used to read the
authorization file (yuck) */
#define BUFSIZE (1024*1024) /**< Size of buffer that can hold requests */
#define GIGA (1*1024*1024*1024) /**< 1 Gigabyte. Used as hunksize when doing
- the multiple file thingy */
+ the multiple file thingy. @todo: make this a
+ configuration option. */
#define DIFFPAGESIZE 4096 /**< diff file uses those chunks */
#define F_READONLY 1 /**< flag to tell us a file is readonly */
#define F_MULTIFILE 2 /**< flag to tell us a file is exported using -m */
-#define F_COPYONWRITE 4 /**< flag to tell us a file is exported using copyonwrite */
+#define F_COPYONWRITE 4 /**< flag to tell us a file is exported using
+ copyonwrite */
#define F_AUTOREADONLY 8 /**< flag to tell us a file is set to autoreadonly */
GHashTable *children;
char pidfname[256]; /**< name of our PID file */
+char default_authname[] = "/etc/nbd_server.allow"; /**< default name of allow file */
/**
* Variables associated with a server.
**/
typedef struct {
- char* exportname; /**< (unprocessed) filename of the file we're exporting */
+ gchar* exportname; /**< (unprocessed) filename of the file we're exporting */
off_t hunksize; /**< size of a hunk of an exported file */
off_t expected_size; /**< size of the exported file as it was told to
us through configuration */
int flags; /**< flags associated with this exported file */
unsigned int timeout;/**< how long a connection may be idle
(0=forever) */
+ int socket; /**< The socket of this server. */
} SERVER;
/**
off_t exportsize; /**< size of the file we're exporting */
char *clientname; /**< peer */
char *exportname; /**< (processed) filename of the file we're exporting */
- int export[1024]; /**< array of filedescriptors of exported files;
+ GArray *export; /**< array of filedescriptors of exported files;
only the first is actually used unless we're
doing the multiple file option */
- int lastpoint; /**< For keeping track of where we are in a file.
- This code is BUGGY currently, at least in
- combination with the multiple file option. */
int net; /**< The actual client socket */
SERVER *server; /**< The server this client is getting data from */
char* difffilename; /**< filename of the copy-on-write file, if any */
int difffile; /**< filedescriptor of copyonwrite file. @todo
- shouldn't this be an array too? (cfr
- nbd_server_opts::export) Or make -m and -c
- mutually exclusive */
+ shouldn't this be an array too? (cfr export) Or
+ make -m and -c mutually exclusive */
u32 difffilelen; /**< number of pages in difffile */
u32 *difmap; /**< see comment on the global difmap for this one */
} CLIENT;
/**
+ * Type of configuration file values
+ **/
+typedef enum {
+ PARAM_INT, /**< This parameter is an integer */
+ PARAM_STRING, /**< This parameter is a string */
+ PARAM_BOOL, /**< This parameter is a boolean */
+} PARAM_TYPE;
+/**
+ * Configuration file values
+ **/
+typedef struct {
+ gchar *paramname; /**< Name of the parameter, as it appears in
+ the config file */
+ gboolean required; /**< Whether this is a required (as opposed to
+ optional) parameter */
+ PARAM_TYPE ptype; /**< Type of the parameter. */
+ gpointer target; /**< Pointer to where the data of this
+ parameter should be written. If ptype is
+ PARAM_BOOL, the data is or'ed rather than
+ overwritten. */
+ gint flagval; /**< Flag mask for this parameter in case ptype
+ is PARAM_BOOL. */
+} PARAM;
+
+/**
* Check whether a client is allowed to connect. Works with an authorization
* file which contains one line per machine, no wildcards.
*
- * @param name IP address of client trying to connect (in human-readable form)
+ * @param opts The client who's trying to connect.
* @return 0 - authorization refused, 1 - OK
**/
int authorized_client(CLIENT *opts) {
* @param buf a buffer
* @param len the number of bytes to be read
**/
-inline void readit(int f, void *buf, size_t len)
-{
+inline void readit(int f, void *buf, size_t len) {
ssize_t res;
while (len > 0) {
DEBUG("*");
* @param buf a buffer containing data
* @param len the number of bytes to be written
**/
-inline void writeit(int f, void *buf, size_t len)
-{
+inline void writeit(int f, void *buf, size_t len) {
ssize_t res;
while (len > 0) {
DEBUG("+");
* function so that we can call it from multiple places
*/
void usage() {
- printf("This is nbd-server version " VERSION "\n");
- printf("Usage: port file_to_export [size][kKmM] [-r] [-m] [-c] [-a timeout_sec]\n"
- " -r read only\n"
- " -m multiple file\n"
- " -c copy on write\n"
- " -l file with list of hosts that are allowed to connect.\n"
- " -a maximum idle seconds, terminates when idle time exceeded\n"
- " if port is set to 0, stdin is used (for running from inetd)\n"
- " if file_to_export contains '%%s', it is substituted with IP\n"
- " address of machine trying to connect\n" );
+ printf("This is nbd-server version " VERSION "\n");
+ printf("Usage: port file_to_export [size][kKmM] [-l authorize_file] [-r] [-m] [-c] [-a timeout_sec] [-C configuration file]\n"
+ "\t-r|--read-only\t\tread only\n"
+ "\t-m|--multi-file\t\tmultiple file\n"
+ "\t-c|--copy-on-write\tcopy on write\n"
+ "\t-C|--config-file\tspecify an alternat configuration file\n"
+ "\t-l|--authorize-file\tfile with list of hosts that are allowed to\n\t\t\t\tconnect.\n"
+ "\t-a|--idle-time\t\tmaximum idle seconds; server terminates when\n\t\t\t\tidle time exceeded\n\n"
+ "\tif port is set to 0, stdin is used (for running from inetd)\n"
+ "\tif file_to_export contains '%%s', it is substituted with the IP\n"
+ "\t\taddress of the machine trying to connect\n" );
+ printf("Using configuration file %s\n", CFILE);
}
/**
* Parse the command line.
*
- * @todo getopt() is a great thing, and easy to use. Also, we want to
- * create a configuration file which nbd-server will read. Maybe do (as in,
- * parse) that here.
- *
* @param argc the argc argument to main()
* @param argv the argv argument to main()
**/
SERVER* cmdline(int argc, char *argv[]) {
int i=0;
+ int nonspecial=0;
int c;
struct option long_options[] = {
{"read-only", no_argument, NULL, 'r'},
{"copy-on-write", no_argument, NULL, 'c'},
{"authorize-file", required_argument, NULL, 'l'},
{"idle-time", required_argument, NULL, 'a'},
+ {"config-file", required_argument, NULL, 'C'},
{0,0,0,0}
};
SERVER *serve;
+ off_t es;
+ size_t last;
+ char suffix;
- serve=g_malloc(sizeof(SERVER));
+ if(argc==1) {
+ return NULL;
+ }
+ serve=g_new0(SERVER, 1);
serve->hunksize=OFFT_MAX;
- while((c=getopt_long(argc, argv, "a:cl:mr", long_options, &i))>=0) {
+ serve->authname = g_strdup(default_authname);
+ while((c=getopt_long(argc, argv, "-a:C:cl:mr", long_options, &i))>=0) {
switch (c) {
+ case 1:
+ /* non-option argument */
+ switch(nonspecial++) {
+ case 0:
+ serve->port=strtol(optarg, NULL, 0);
+ break;
+ case 1:
+ serve->exportname = g_strdup(optarg);
+ if(serve->exportname[0] != '/') {
+ fprintf(stderr, "E: The to be exported file needs to be an absolute filename!\n");
+ exit(EXIT_FAILURE);
+ }
+ break;
+ case 2:
+ last=strlen(optarg)-1;
+ suffix=optarg[last];
+ if (suffix == 'k' || suffix == 'K' ||
+ suffix == 'm' || suffix == 'M')
+ optarg[last] = '\0';
+ es = (off_t)atol(optarg);
+ switch (suffix) {
+ case 'm':
+ case 'M': es <<= 10;
+ case 'k':
+ case 'K': es <<= 10;
+ default : break;
+ }
+ serve->expected_size = es;
+ break;
+ }
+ break;
case 'r':
serve->flags |= F_READONLY;
break;
case 'c':
serve->flags |=F_COPYONWRITE;
break;
+ case 'C':
+ g_free(config_file_pos);
+ config_file_pos=g_strdup(optarg);
+ break;
case 'l':
- serve->authname=optarg;
+ g_free(serve->authname);
+ serve->authname=g_strdup(optarg);
break;
case 'a':
serve->timeout=strtol(optarg, NULL, 0);
break;
default:
usage();
- exit(0);
+ exit(EXIT_FAILURE);
break;
}
}
/* What's left: the port to export, the name of the to be exported
* file, and, optionally, the size of the file, in that order. */
- if(++i>=argc) {
- usage();
- exit(0);
- }
- serve->port=strtol(argv[i], NULL, 0);
- if(++i>=argc) {
- usage();
- exit(0);
- }
- serve->exportname = argv[i];
- if(++i<argc) {
- off_t es;
- size_t last = strlen(argv[i])-1;
- char suffix = argv[i][last];
- if (suffix == 'k' || suffix == 'K' ||
- suffix == 'm' || suffix == 'M')
- argv[i][last] = '\0';
- es = (off_t)atol(argv[i]);
- switch (suffix) {
- case 'm':
- case 'M': es <<= 10;
- case 'k':
- case 'K': es <<= 10;
- default : break;
- }
- serve->expected_size = es;
+ if(nonspecial<2) {
+ g_free(serve);
+ serve=NULL;
}
return serve;
}
/**
+ * Error codes for config file parsing
+ **/
+typedef enum {
+ CFILE_NOTFOUND, /**< The configuration file is not found */
+ CFILE_MISSING_GENERIC, /**< The (required) group "generic" is missing */
+ CFILE_KEY_MISSING, /**< A (required) key is missing */
+ CFILE_VALUE_INVALID, /**< A value is syntactically invalid */
+ CFILE_PROGERR /**< Programmer error */
+} CFILE_ERRORS;
+
+/**
+ * Remove a SERVER from memory. Used from the hash table
+ **/
+void remove_server(gpointer s) {
+ SERVER *server;
+
+ server=(SERVER*)s;
+ g_free(server->exportname);
+ if(server->authname)
+ g_free(server->authname);
+ g_free(server);
+}
+
+/**
+ * Parse the config file.
+ *
+ * @param f the name of the config file
+ * @param e a GError. @see CFILE_ERRORS for what error values this function can
+ * return.
+ * @return a GHashTable of SERVER* pointers, with the port number as the hash
+ * key. If the config file is empty or does not exist, returns an empty
+ * GHashTable; if the config file contains an error, returns NULL, and
+ * e is set appropriately
+ **/
+GArray* parse_cfile(gchar* f, GError** e) {
+ SERVER s;
+ PARAM p[] = {
+ { "exportname", TRUE, PARAM_STRING, NULL, 0 },
+ { "port", TRUE, PARAM_INT, NULL, 0 },
+ { "authfile", FALSE, PARAM_STRING, NULL, 0 },
+ { "timeout", FALSE, PARAM_INT, NULL, 0 },
+ { "filesize", FALSE, PARAM_INT, NULL, 0 },
+ { "readonly", FALSE, PARAM_BOOL, NULL, F_READONLY },
+ { "multifile", FALSE, PARAM_BOOL, NULL, F_MULTIFILE },
+ { "copyonwrite", FALSE, PARAM_BOOL, NULL, F_COPYONWRITE },
+ };
+ const int p_size=8;
+ GKeyFile *cfile;
+ GError *err = NULL;
+ GQuark errdomain;
+ GArray *retval=NULL;
+ gchar **groups;
+ gboolean value;
+ gint i,j;
+
+ memset(&s, '\0', sizeof(SERVER));
+ errdomain = g_quark_from_string("parse_cfile");
+ cfile = g_key_file_new();
+ retval = g_array_new(FALSE, TRUE, sizeof(SERVER));
+ if(!g_key_file_load_from_file(cfile, f, G_KEY_FILE_KEEP_COMMENTS |
+ G_KEY_FILE_KEEP_TRANSLATIONS, &err)) {
+ g_set_error(e, errdomain, CFILE_NOTFOUND, "Could not open config file.");
+ g_key_file_free(cfile);
+ return retval;
+ }
+ if(strcmp(g_key_file_get_start_group(cfile), "generic")) {
+ g_set_error(e, errdomain, CFILE_MISSING_GENERIC, "Config file does not contain the [generic] group!");
+ g_key_file_free(cfile);
+ return NULL;
+ }
+ groups = g_key_file_get_groups(cfile, NULL);
+ for(i=1;groups[i];i++) {
+ p[0].target=&(s.exportname);
+ p[1].target=&(s.port);
+ p[2].target=&(s.authname);
+ p[3].target=&(s.timeout);
+ p[4].target=&(s.expected_size);
+ p[5].target=p[6].target=p[7].target=p[8].target=&(s.flags);
+ for(j=0;j<p_size;j++) {
+ g_assert(p[j].target != NULL);
+ g_assert(p[j].ptype==PARAM_INT||p[j].ptype==PARAM_STRING||p[j].ptype==PARAM_BOOL);
+ switch(p[j].ptype) {
+ case PARAM_INT:
+ *((gint*)p[j].target) =
+ g_key_file_get_integer(cfile,
+ groups[i],
+ p[j].paramname,
+ &err);
+ break;
+ case PARAM_STRING:
+ *((gchar**)p[j].target) =
+ g_key_file_get_string(cfile,
+ groups[i],
+ p[j].paramname,
+ &err);
+ break;
+ case PARAM_BOOL:
+ value = g_key_file_get_boolean(cfile,
+ groups[i],
+ p[j].paramname, &err);
+ if(!err) {
+ *((gint*)p[j].target) |= value;
+ }
+ break;
+ }
+ if(err) {
+ if(err->code == G_KEY_FILE_ERROR_KEY_NOT_FOUND) {
+ if(p[j].required) {
+ g_set_error(e, errdomain, CFILE_KEY_MISSING, "Could not find required value %s in group %s: %s", p[j].paramname, groups[i], err->message);
+ g_array_free(retval, TRUE);
+ g_error_free(err);
+ g_key_file_free(cfile);
+ return NULL;
+ } else {
+ g_clear_error(&err);
+ continue;
+ }
+ g_set_error(e, errdomain, CFILE_VALUE_INVALID, "Could not parse %s in group %s: %s", p[j].paramname, groups[i], err->message);
+ g_array_free(retval, TRUE);
+ g_error_free(err);
+ g_key_file_free(cfile);
+ return NULL;
+ }
+ }
+ }
+ g_array_append_val(retval, s);
+ }
+ return retval;
+}
+
+/**
* Signal handler for SIGCHLD
* @param s the signal we're handling (must be SIGCHLD, or something
* is severely wrong)
**/
-void sigchld_handler(int s)
-{
+void sigchld_handler(int s) {
int* status=NULL;
int* i;
- char buf[80];
pid_t pid;
while((pid=wait(status)) > 0) {
* is severely wrong).
**/
void sigterm_handler(int s) {
- int i;
int parent=0;
g_hash_table_foreach(children, killchild, &parent);
* @return the size of the file, or OFFT_MAX if detection was
* impossible.
**/
-off_t size_autodetect(int export)
-{
+off_t size_autodetect(int export) {
off_t es;
u32 es32;
struct stat stat_buf;
}
/**
- * Seek to a position in a file, unless we're already there.
+ * seek to a position in a file, with error handling.
* @param handle a filedescriptor
* @param a position to seek to
- * @param client the client we're working for
+ * @todo get rid of this; lastpoint is a global variable right now, but it
+ * shouldn't be. If we pass it on as a parameter, that makes things a *lot*
+ * easier.
**/
-void maybeseek(int handle, off_t a, CLIENT* client) {
- if (a < 0 || a > client->exportsize) {
- err("Can not happen\n");
- }
- if (client->lastpoint != a) {
- if (lseek(handle, a, SEEK_SET) < 0) {
- err("Can not seek locally!\n");
- }
- client->lastpoint = a;
- } else {
- DEBUG("S");
+void myseek(int handle,off_t a) {
+ if (lseek(handle, a, SEEK_SET) < 0) {
+ err("Can not seek locally!\n");
}
}
* @param a The offset where the write should start
* @param buf The buffer to write from
* @param len The length of buf
+ * @param client The client we're serving for
* @return The number of bytes actually written, or -1 in case of an error
**/
-int rawexpwrite(off_t a, char *buf, size_t len, CLIENT *client)
-{
+int rawexpwrite(off_t a, char *buf, size_t len, CLIENT *client) {
ssize_t res;
- maybeseek(client->export[a/client->server->hunksize],
- a%client->server->hunksize, client);
- res = write(client->export[a/client->server->hunksize], buf, len);
+ myseek(g_array_index(client->export, int, (int)(a/client->server->hunksize)), a%client->server->hunksize);
+ ;
+ res = write(g_array_index(client->export, int, (int)((off_t)a/(off_t)(client->server->hunksize))), buf, len);
return (res < 0 || (size_t)res != len);
}
/**
- * seek to a position in a file, no matter what. Used when using maybeseek is a
- * bad idea (for instance, because we're reading the copyonwrite file instead
- * of the exported file).
- * @param handle a filedescriptor
- * @param a position to seek to
- * @todo get rid of this; lastpoint is a global variable right now, but it
- * shouldn't be. If we pass it on as a parameter, that makes things a *lot*
- * easier.
- **/
-void myseek(int handle,off_t a) {
- if (lseek(handle, a, SEEK_SET) < 0) {
- err("Can not seek locally!\n");
- }
-}
-
-/**
* Read an amount of bytes at a given offset from the right file. This
* abstracts the read-side of the multiple files option.
*
* @param a The offset where the read should start
* @param buf A buffer to read into
* @param len The size of buf
+ * @param client The client we're serving for
* @return The number of bytes actually read, or -1 in case of an
* error.
**/
-int rawexpread(off_t a, char *buf, size_t len, CLIENT *client)
-{
+int rawexpread(off_t a, char *buf, size_t len, CLIENT *client) {
ssize_t res;
- maybeseek(client->export[a/client->server->hunksize],
- a%client->server->hunksize, client);
- res = read(client->export[a/client->server->hunksize], buf, len);
+ myseek(g_array_index(client->export,int,(int)a/client->server->hunksize),
+ a%client->server->hunksize);
+ res = read(g_array_index(client->export,int,(int)a/client->server->hunksize), buf, len);
return (res < 0 || (size_t)res != len);
}
* @param a The offset where the read should start
* @param buf A buffer to read into
* @param len The size of buf
+ * @param client The client we're going to read for
* @return The number of bytes actually read, or -1 in case of an error
**/
-int expread(off_t a, char *buf, size_t len, CLIENT *client)
-{
+int expread(off_t a, char *buf, size_t len, CLIENT *client) {
off_t rdlen, offset;
off_t mapcnt, mapl, maph, pagestart;
-
+
if (!(client->server->flags & F_COPYONWRITE))
return rawexpread(a, buf, len, client);
DEBUG3("Asked to read %d bytes at %Lu.\n", len, (unsigned long long)a);
} else { /* the block is not there */
DEBUG2("Page %Lu is not here, we read the original one\n",
(unsigned long long)mapcnt);
- return rawexpread(a, buf, rdlen, client);
+ if(rawexpread(a, buf, rdlen, client)) return -1;
}
len-=rdlen; a+=rdlen; buf+=rdlen;
}
* @param a The offset where the write should start
* @param buf The buffer to write from
* @param len The length of buf
+ * @param client The client we're going to write for.
* @return The number of bytes actually written, or -1 in case of an error
**/
int expwrite(off_t a, char *buf, size_t len, CLIENT *client) {
/**
* Do the initial negotiation.
*
- * @param net A socket to do the negotiation over
+ * @param client The client we're negotiating with.
**/
void negotiate(CLIENT *client) {
char zeros[300];
/** sending macro. */
#define SEND(net,reply) writeit( net, &reply, sizeof( reply ));
/** error macro. */
-#define ERROR(client,reply) { reply.error = htonl(-1); SEND(client->net,reply); reply.error = 0; client->lastpoint = -1; }
+#define ERROR(client,reply) { reply.error = htonl(-1); SEND(client->net,reply); reply.error = 0; }
/**
* Serve a file to a single client.
*
* @todo This beast needs to be split up in many tiny little manageable
* pieces. Preferably with a chainsaw.
*
- * @param net A network socket, connected to an nbd client
+ * @param client The client we're going to serve to.
* @return never
**/
-int mainloop(CLIENT *client)
-{
+int mainloop(CLIENT *client) {
struct nbd_request request;
struct nbd_reply reply;
+ gboolean go_on=TRUE;
#ifdef DODBG
int i = 0;
#endif
DEBUG("Entering request loop!\n");
reply.magic = htonl(NBD_REPLY_MAGIC);
reply.error = 0;
- while (1) {
+ while (go_on) {
char buf[BUFSIZE];
size_t len;
#ifdef DODBG
request.from = ntohll(request.from);
request.type = ntohl(request.type);
- if (request.type==NBD_CMD_DISC) { /* Disconnect request */
- if (client->difmap) g_free(client->difmap) ;
- if (client->difffile>=0) {
- close(client->difffile) ; unlink(client->difffilename) ; }
- err("Disconnect request received.") ;
+ if (request.type==NBD_CMD_DISC) {
+ msg2(LOG_INFO, "Disconnect request received.");
+ if (client->difmap) g_free(client->difmap) ;
+ if (client->difffile>=0) {
+ close(client->difffile);
+ unlink(client->difffilename);
+ free(client->difffilename);
+ }
+ go_on=FALSE;
+ continue;
}
len = ntohl(request.len);
if (request.magic != htonl(NBD_REQUEST_MAGIC))
err("Not enough magic.");
- if (len > BUFSIZE)
+ if (len > BUFSIZE + sizeof(struct nbd_reply))
err("Request too big!");
#ifdef DODBG
printf("%s from %Lu (%Lu) len %d, ", request.type ? "WRITE" :
#endif
memcpy(reply.handle, request.handle, sizeof(reply.handle));
if ((request.from + len) > (OFFT_MAX)) {
- DEBUG("[Number too large!]");
- ERROR(client, reply);
- continue;
+ DEBUG("[Number too large!]");
+ ERROR(client, reply);
+ continue;
}
if (((ssize_t)((off_t)request.from + len) > client->exportsize) ||
continue;
}
- if (request.type==1) { /* WRITE */
+ if (request.type==NBD_CMD_WRITE) {
DEBUG("wr: net->buf, ");
readit(client->net, buf, len);
DEBUG("buf->exp, ");
ERROR(client, reply);
continue;
}
- client->lastpoint += len;
SEND(client->net, reply);
DEBUG("OK!\n");
continue;
DEBUG("exp->buf, ");
if (expread(request.from, buf + sizeof(struct nbd_reply), len, client)) {
- client->lastpoint = -1;
DEBUG("Read failed: %m");
ERROR(client, reply);
continue;
}
- client->lastpoint += len;
DEBUG("buf->net, ");
memcpy(buf, &reply, sizeof(struct nbd_reply));
writeit(client->net, buf, len + sizeof(struct nbd_reply));
DEBUG("OK!\n");
}
+ return 0;
}
/**
**/
int splitexport(CLIENT* client) {
off_t i;
+ int fhandle;
+ client->export = g_array_new(TRUE, TRUE, sizeof(int));
for (i=0; i<client->exportsize; i+=client->server->hunksize) {
gchar *tmpname;
tmpname=g_strdup(client->exportname);
}
DEBUG2( "Opening %s\n", tmpname );
- if ((client->export[ i/ client->server->hunksize ] =
- open(tmpname, (client->server->flags &
- F_READONLY) ? O_RDONLY
- : O_RDWR)) == -1) {
+ if((fhandle = open(tmpname, (client->server->flags & F_READONLY) ? O_RDONLY : O_RDWR)) == -1) {
/* Read WRITE ACCESS was requested by media is only read only */
client->server->flags |= F_AUTOREADONLY;
client->server->flags |= F_READONLY;
- if ((client->export[i/client->server->hunksize] =
- open(tmpname, O_RDONLY)) == -1)
+ if((fhandle = open(tmpname, O_RDONLY)) == -1)
err("Could not open exported file: %m");
}
+ g_array_insert_val(client->export,i/client->server->hunksize,fhandle);
g_free(tmpname);
}
+ return 0;
+}
- if (client->server->flags & F_COPYONWRITE) {
- snprintf(client->difffilename, 1024, "%s-%s-%d.diff",client->exportname,client->clientname,
- (int)getpid()) ;
- client->difffilename[1023]='\0';
- msg3(LOG_INFO,"About to create map and diff file %s",client->difffilename) ;
- client->difffile=open(client->difffilename,O_RDWR | O_CREAT | O_TRUNC,0600) ;
- if (client->difffile<0) err("Could not create diff file (%m)") ;
- if ((client->difmap=calloc(client->exportsize/DIFFPAGESIZE,sizeof(u32)))==NULL)
- err("Could not allocate memory") ;
- for (i=0;i<client->exportsize/DIFFPAGESIZE;i++) client->difmap[i]=(u32)-1 ;
- }
+int copyonwrite_prepare(CLIENT* client) {
+ off_t i;
+ if ((client->difffilename = malloc(1024))==NULL)
+ err("Failed to allocate string for diff file name");
+ snprintf(client->difffilename, 1024, "%s-%s-%d.diff",client->exportname,client->clientname,
+ (int)getpid()) ;
+ client->difffilename[1023]='\0';
+ msg3(LOG_INFO,"About to create map and diff file %s",client->difffilename) ;
+ client->difffile=open(client->difffilename,O_RDWR | O_CREAT | O_TRUNC,0600) ;
+ if (client->difffile<0) err("Could not create diff file (%m)") ;
+ if ((client->difmap=calloc(client->exportsize/DIFFPAGESIZE,sizeof(u32)))==NULL)
+ err("Could not allocate memory") ;
+ for (i=0;i<client->exportsize/DIFFPAGESIZE;i++) client->difmap[i]=(u32)-1 ;
return 0;
}
/**
* Serve a connection.
*
- * @todo allow for multithreading, perhaps use libevent.
+ * @todo allow for multithreading, perhaps use libevent. Not just yet, though;
+ * follow the road map.
*
- * @param net A network socket connected to an nbd client
+ * @param client a connected client
**/
void serveconnection(CLIENT *client) {
- char buf[80];
splitexport(client);
+
if (!client->server->expected_size) {
- client->exportsize = size_autodetect(client->export[0]);
+ client->exportsize = size_autodetect(g_array_index(client->export,int,0));
} else {
/* Perhaps we should check first. Not now. */
client->exportsize = client->server->expected_size;
msg3(LOG_INFO, "size of exported file/device is %Lu", (unsigned long long)client->exportsize);
}
+ if (client->server->flags & F_COPYONWRITE) {
+ copyonwrite_prepare(client);
+ }
+
setmysockopt(client->net);
mainloop(client);
}
/**
- * Find the name of the file we have to serve. This will use snprintf()
+ * Find the name of the file we have to serve. This will use g_strdup_printf
* to put the IP address of the client inside a filename containing
- * "%s". That name is then written to exportname2
+ * "%s". That name is then written to client->exportname.
*
* @param net A socket connected to an nbd client
* @param client information about the client. The IP address in human-readable
}
/**
- * Connect the socket, and start to serve. This function will fork()
- * if a connection from an authorized client is received, and will
- * start mainloop().
- *
- * @todo modularize this giant beast. Preferably with a chainsaw. Also,
- * it has no business starting mainloop(); it should connect, and be
- * done with it.
+ * Go daemon (unless we specified at compile time that we didn't want this)
+ * @param serve the first server of our configuration. If its port is zero,
+ * then do not daemonize, because we're doing inetd then. This parameter
+ * is only used to create a PID file of the form
+ * /var/run/nbd-server.<port>.pid; it's not modified in any way.
+ **/
+#if !defined(NODAEMON) && !defined(NOFORK)
+void daemonize(SERVER* serve) {
+ FILE*pidf;
+
+ if(daemon(0,0)<0) {
+ err("daemon");
+ }
+ if(serve) {
+ snprintf(pidfname, sizeof(char)*255, "/var/run/nbd-server.%d.pid", serve->port);
+ } else {
+ strncpy(pidfname, "/var/run/nbd-server.pid", sizeof(char)*255);
+ }
+ pidf=fopen(pidfname, "w");
+ if(pidf) {
+ fprintf(pidf,"%d\n", (int)getpid());
+ fclose(pidf);
+ } else {
+ perror("fopen");
+ fprintf(stderr, "Not fatal; continuing");
+ }
+}
+#else
+#define daemonize(serve)
+#endif /* !defined(NODAEMON) && !defined(NOFORK) */
+
+/**
+ * Connect a server's socket.
*
- * @param port the port where we will listen
+ * @param serve the server we want to connect.
**/
-void connectme(SERVER* serve) {
+void setup_serve(SERVER *serve) {
struct sockaddr_in addrin;
struct sigaction sa;
int addrinlen = sizeof(addrin);
- int net, sock, newpid, i;
#ifndef sun
int yes=1;
#else
char yes='1';
#endif /* sun */
-#ifndef NODAEMON
-#ifndef NOFORK
- FILE*pidf;
-
- if((serve->port)) {
- if(daemon(0,0)<0) {
- err("daemon");
- }
- snprintf(pidfname, sizeof(char)*255, "/var/run/nbd-server.%d.pid", serve->port);
- pidf=fopen(pidfname, "w");
- if(pidf) {
- fprintf(pidf,"%d", (int)getpid());
- fclose(pidf);
- } else {
- perror("fopen");
- fprintf(stderr, "Not fatal; continuing");
- }
- }
-#endif /* NOFORK */
-#endif /* NODAEMON */
-
- if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
+ if ((serve->socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
err("socket: %m");
/* lose the pesky "Address already in use" error message */
- if (setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&yes,sizeof(int)) == -1) {
+ if (setsockopt(serve->socket,SOL_SOCKET,SO_REUSEADDR,&yes,sizeof(int)) == -1) {
err("setsockopt SO_REUSEADDR");
}
- if (setsockopt(sock,SOL_SOCKET,SO_KEEPALIVE,&yes,sizeof(int)) == -1) {
+ if (setsockopt(serve->socket,SOL_SOCKET,SO_KEEPALIVE,&yes,sizeof(int)) == -1) {
err("setsockopt SO_KEEPALIVE");
}
addrin.sin_family = AF_INET;
addrin.sin_port = htons(serve->port);
addrin.sin_addr.s_addr = 0;
- if (bind(sock, (struct sockaddr *) &addrin, addrinlen) < 0)
+ if (bind(serve->socket, (struct sockaddr *) &addrin, addrinlen) < 0)
err("bind: %m");
DEBUG("listen, ");
- if (listen(sock, 1) < 0)
+ if (listen(serve->socket, 1) < 0)
err("listen: %m");
- DEBUG("accept, ");
sa.sa_handler = sigchld_handler;
sigemptyset(&sa.sa_mask);
sa.sa_flags = SA_RESTART;
if(sigaction(SIGTERM, &sa, NULL) == -1)
err("sigaction: %m");
children=g_hash_table_new_full(g_int_hash, g_int_equal, NULL, destroy_pid_t);
- for(;;) { /* infinite loop */
+}
+
+/**
+ * Connect our servers.
+ **/
+void setup_servers(GArray* servers) {
+ int i;
+
+ for(i=0;i<servers->len;i++) {
+ setup_serve(&(g_array_index(servers, SERVER, i)));
+ }
+}
+
+/**
+ * Loop through the available servers, and serve them.
+ **/
+int serveloop(GArray* servers) {
+ struct sockaddr_in addrin;
+ socklen_t addrinlen=sizeof(addrin);
+ SERVER *serve;
+ int i, max, sock;
+ fd_set mset, rset;
+ struct timeval tv;
+
+ /*
+ * Set up the master fd_set. The set of descriptors we need
+ * to select() for never changes anyway and it buys us a *lot*
+ * of time to only build this once. However, if we ever choose
+ * to not fork() for clients anymore, we may have to revisit
+ * this.
+ */
+ max=0;
+ FD_ZERO(&mset);
+ for(i=0;i<servers->len;i++) {
+ sock=(g_array_index(servers, SERVER, i)).socket;
+ FD_SET(sock, &mset);
+ max=sock>max?sock:max;
+ }
+ for(;;) {
CLIENT *client;
+ int net;
pid_t *pid;
- if ((net = accept(sock, (struct sockaddr *) &addrin, &addrinlen)) < 0)
- err("accept: %m");
-
- client = g_malloc(sizeof(CLIENT));
- client->server=serve;
- client->exportsize=OFFT_MAX;
- client->net=net;
- set_peername(net, client);
- if (!authorized_client(client)) {
- msg2(LOG_INFO,"Unauthorized client") ;
- close(net) ;
- continue ;
- }
- msg2(LOG_INFO,"Authorized client") ;
- pid=g_malloc(sizeof(pid_t));
+ memcpy(&rset, &mset, sizeof(fd_set));
+ tv.tv_sec=0;
+ tv.tv_usec=500;
+ if(select(max+1, &rset, NULL, NULL, &tv)>0) {
+ DEBUG("accept, ");
+ for(i=0;i<servers->len;i++) {
+ serve=&(g_array_index(servers, SERVER, i));
+ if(FD_ISSET(serve->socket, &rset)) {
+ if ((net=accept(serve->socket, (struct sockaddr *) &addrin, &addrinlen)) < 0)
+ err("accept: %m");
+
+ client = g_malloc(sizeof(CLIENT));
+ client->server=serve;
+ client->exportsize=OFFT_MAX;
+ client->net=net;
+ set_peername(net, client);
+ if (!authorized_client(client)) {
+ msg2(LOG_INFO,"Unauthorized client") ;
+ close(net);
+ continue;
+ }
+ msg2(LOG_INFO,"Authorized client") ;
+ pid=g_malloc(sizeof(pid_t));
#ifndef NOFORK
- if ((*pid=fork())<0) {
- msg3(LOG_INFO,"Could not fork (%s)",strerror(errno)) ;
- close(net) ;
- continue ;
- }
- if (*pid>0) { /* parent */
- close(net);
- g_hash_table_insert(children, pid, pid);
- continue;
- }
- /* child */
- g_hash_table_destroy(children);
- close(sock) ;
+ if ((*pid=fork())<0) {
+ msg3(LOG_INFO,"Could not fork (%s)",strerror(errno)) ;
+ close(net);
+ continue;
+ }
+ if (*pid>0) { /* parent */
+ close(net);
+ g_hash_table_insert(children, pid, pid);
+ continue;
+ }
+ /* child */
+ g_hash_table_destroy(children);
+ for(i=0;i<servers->len,serve=(g_array_index(servers, SERVER*, i));i++) {
+ close(serve->socket);
+ }
+ /* FALSE does not free the
+ actual data. This is required,
+ because the client has a
+ direct reference into that
+ data, and otherwise we get a
+ segfault... */
+ g_array_free(servers, FALSE);
#endif // NOFORK
- msg2(LOG_INFO,"Starting to serve") ;
- serveconnection(client);
+ msg2(LOG_INFO,"Starting to serve");
+ serveconnection(client);
+ }
+ }
+ }
}
}
* Main entry point...
**/
int main(int argc, char *argv[]) {
- SERVER* serve;
+ SERVER *serve;
+ GArray *servers;
+ GError *err=NULL;
+
if (sizeof( struct nbd_request )!=28) {
fprintf(stderr,"Bad size of structure. Alignment problems?\n");
exit(-1) ;
}
+
logging();
+ config_file_pos = g_strdup(CFILE);
serve=cmdline(argc, argv);
-
+ servers = parse_cfile(config_file_pos, &err);
+ if(!servers || !servers->len) {
+ g_warning("Could not parse config file: %s", err->message);
+ }
+ if(serve) {
+ g_array_append_val(servers, *serve);
+ }
+
+/* We don't support this at this time */
+#if 0
if (!(serve->port)) {
CLIENT *client;
#ifndef ISSERVER
- /* You really should define ISSERVER if you're going to use inetd
- * mode, but if you don't, closing stdout and stderr (which inetd
- * had connected to the client socket) will let it work. */
+ /* You really should define ISSERVER if you're going to use
+ * inetd mode, but if you don't, closing stdout and stderr
+ * (which inetd had connected to the client socket) will let it
+ * work. */
close(1);
close(2);
open("/dev/null", O_WRONLY);
client->net=0;
client->exportsize=OFFT_MAX;
set_peername(0,client);
- serveconnection(0);
+ serveconnection(client);
return 0;
}
- connectme(serve); /* serve infinitely */
+#endif
+ if((!serve) && (!servers||!servers->len)) {
+ g_message("Nothing to do! Bye!");
+ exit(EXIT_FAILURE);
+ }
+ daemonize(serve);
+ setup_servers(servers);
+ serveloop(servers);
return 0 ;
}
-