Result of tests. It works! Whee!
if(!strtol(optarg, NULL, 0)) {
// not parseable as a number, assume it's the device and we have a name
nbddev = optarg;
nonspecial++;
} else {
if(!strtol(optarg, NULL, 0)) {
// not parseable as a number, assume it's the device and we have a name
nbddev = optarg;
nonspecial++;
} else {
if(name) {
usage("port and name specified at the same time. This is not supported.");
exit(EXIT_FAILURE);
if(name) {
usage("port and name specified at the same time. This is not supported.");
exit(EXIT_FAILURE);
SERVER *serve = NULL;
serve=g_new0(SERVER, 1);
SERVER *serve = NULL;
serve=g_new0(SERVER, 1);
serve->exportname = g_strdup(s->exportname);
serve->expected_size = s->expected_size;
serve->exportname = g_strdup(s->exportname);
serve->expected_size = s->expected_size;
serve->listenaddr = g_strdup(s->listenaddr);
serve->port = s->port;
serve->listenaddr = g_strdup(s->listenaddr);
serve->port = s->port;
serve->authname = strdup(s->authname);
serve->flags = s->flags;
serve->authname = strdup(s->authname);
serve->flags = s->flags;
serve->socket_family = serve->socket_family;
serve->cidrlen = s->cidrlen;
serve->socket_family = serve->socket_family;
serve->cidrlen = s->cidrlen;
serve->prerun = g_strdup(s->prerun);
serve->prerun = g_strdup(s->prerun);
serve->postrun = g_strdup(s->postrun);
serve->postrun = g_strdup(s->postrun);
+
+ if(s->servename)
+ serve->servename = g_strdup(s->servename);
namelen = ntohll(namelen);
name = malloc(namelen+1);
name[namelen+1]=0;
namelen = ntohll(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)) {
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;
err("Negotiation failed: %m");
if (client->server->flags & F_READONLY)
flags |= NBD_FLAG_READ_ONLY;
- if (write(client->net, &flags, 4) < 0)
- err("Negotiation failed: %m");
+ if (write(client->net, &flags, 4) < 0)
+ err("Negotiation failed: %m");
+ } else {
+ smallflags = (uint16_t)(flags & ~((uint16_t)0));
+ 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;
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++) {
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);
}
if(modernsock) {
FD_SET(modernsock, &mset);
- max=modernsock>max?sock:max;
+ max=modernsock>max?modernsock:max;
}
for(;;) {
CLIENT *client = NULL;
}
for(;;) {
CLIENT *client = NULL;