gchar* runuser=NULL;
/** What group we're running as */
gchar* rungroup=NULL;
+/** whether to export using the old negotiation protocol (port-based) */
+gboolean do_oldstyle=FALSE;
/** Logging macros, now nothing goes to syslog unless you say ISSERVER */
#ifdef ISSERVER
if(nonspecial<2) {
g_free(serve);
serve=NULL;
+ } else {
+ do_oldstyle = TRUE;
}
if(do_output) {
if(!serve) {
SERVER *serve = NULL;
serve=g_new0(SERVER, 1);
- if (serve == NULL)
+ if(serve == NULL)
return NULL;
- if (s->exportname)
+ if(s->exportname)
serve->exportname = g_strdup(s->exportname);
serve->expected_size = s->expected_size;
- if (s->listenaddr)
+ if(s->listenaddr)
serve->listenaddr = g_strdup(s->listenaddr);
serve->port = s->port;
- if (s->authname)
+ if(s->authname)
serve->authname = strdup(s->authname);
serve->flags = s->flags;
serve->socket_family = serve->socket_family;
serve->cidrlen = s->cidrlen;
- if (s->prerun)
+ if(s->prerun)
serve->prerun = g_strdup(s->prerun);
- if (s->postrun)
+ if(s->postrun)
serve->postrun = g_strdup(s->postrun);
+
+ if(s->servename)
+ serve->servename = g_strdup(s->servename);
return serve;
}
{ "listenaddr", FALSE, PARAM_STRING, NULL, 0 },
};
const int lp_size=sizeof(lp)/sizeof(PARAM);
- int do_oldstyle;
PARAM gp[] = {
{ "user", FALSE, PARAM_STRING, &runuser, 0 },
{ "group", FALSE, PARAM_STRING, &rungroup, 0 },
g_key_file_free(cfile);
return NULL;
}
+ if(s.port && !do_oldstyle) {
+ g_warning("A port was specified, but oldstyle exports were not requested. This may not do what you expect.");
+ g_warning("Please read 'man 5 nbd-server' and search for oldstyle for more info");
+ }
} else {
s.virtstyle=VIRT_IPLIT;
}
uint64_t size_host;
uint32_t flags = NBD_FLAG_HAS_FLAGS;
uint16_t smallflags = 0;
+ uint64_t magic;
memset(zeros, '\0', sizeof(zeros));
if(!client || !client->modern) {
if(client)
exit(EXIT_FAILURE);
}
- cliserv_magic = htonll(cliserv_magic);
- if (write(net, &cliserv_magic, sizeof(cliserv_magic)) < 0) {
+ if(client && client->modern) {
+ magic = htonll(opts_magic);
+ } else {
+ magic = htonll(cliserv_magic);
+ }
+ if (write(net, &magic, sizeof(magic)) < 0) {
err_nonfatal("Negotiation failed: %m");
if(client)
exit(EXIT_FAILURE);
}
}
if(!client) {
- uint64_t reserved;
- uint64_t magic;
+ uint32_t reserved;
uint32_t opt;
- uint64_t namelen;
+ uint32_t namelen;
char* name;
int i;
read(net, &reserved, sizeof(reserved));
read(net, &magic, sizeof(magic));
magic = ntohll(magic);
- if(magic != cliserv_magic) {
+ if(magic != opts_magic) {
close(net);
return NULL;
}
return NULL;
}
read(net, &namelen, sizeof(namelen));
- namelen = ntohll(namelen);
+ namelen = ntohl(namelen);
name = malloc(namelen+1);
name[namelen+1]=0;
- read(net, &name, namelen);
+ read(net, name, namelen);
for(i=0; i<servers->len; i++) {
SERVER* serve = &(g_array_index(servers, SERVER, i));
if(!strcmp(serve->servename, name)) {
err("Negotiation failed: %m");
if (client->server->flags & F_READONLY)
flags |= NBD_FLAG_READ_ONLY;
- flags = htonl(flags);
- if (write(client->net, &flags, 4) < 0)
- err("Negotiation failed: %m");
+ if (!client->modern) {
+ flags = htonl(flags);
+ if (write(client->net, &flags, 4) < 0)
+ err("Negotiation failed: %m");
+ } else {
+ smallflags = (uint16_t)(flags & ~((uint16_t)0));
+ smallflags = htons(smallflags);
+ if (write(client->net, &smallflags, sizeof(smallflags)) < 0) {
+ err("Negotiation failed: %m");
+ }
+ }
if (write(client->net, zeros, 124) < 0)
err("Negotiation failed: %m");
return NULL;
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;
+ if((sock=(g_array_index(servers, SERVER, i)).socket)) {
+ FD_SET(sock, &mset);
+ max=sock>max?sock:max;
+ }
}
if(modernsock) {
FD_SET(modernsock, &mset);
- max=modernsock>max?sock:max;
+ max=modernsock>max?modernsock:max;
}
for(;;) {
CLIENT *client = NULL;
gchar *port = NULL;
int e;
+ if(!do_oldstyle) {
+ return serve->servename ? 1 : 0;
+ }
memset(&hints,'\0',sizeof(hints));
hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG | AI_NUMERICSERV;
hints.ai_socktype = SOCK_STREAM;