memset(zeros, '\0', sizeof(zeros));
if(!client || !client->modern) {
+ /* common */
if (write(net, INIT_PASSWD, 8) < 0) {
err_nonfatal("Negotiation failed: %m");
if(client)
exit(EXIT_FAILURE);
}
- if(client && client->modern) {
+ if(!client || client->modern) {
+ /* modern */
magic = htonll(opts_magic);
} else {
+ /* oldstyle */
magic = htonll(cliserv_magic);
}
if (write(net, &magic, sizeof(magic)) < 0) {
}
}
if(!client) {
+ /* modern */
uint32_t reserved;
uint32_t opt;
uint32_t namelen;
read(net, &namelen, sizeof(namelen));
namelen = ntohl(namelen);
name = malloc(namelen+1);
- name[namelen+1]=0;
+ name[namelen]=0;
read(net, name, namelen);
for(i=0; i<servers->len; i++) {
SERVER* serve = &(g_array_index(servers, SERVER, i));
return client;
}
}
+ return NULL;
}
+ /* common */
size_host = htonll((u64)(client->exportsize));
if (write(net, &size_host, 8) < 0)
err("Negotiation failed: %m");
if (client->server->flags & F_READONLY)
flags |= NBD_FLAG_READ_ONLY;
if (!client->modern) {
+ /* oldstyle */
flags = htonl(flags);
if (write(client->net, &flags, 4) < 0)
err("Negotiation failed: %m");
} else {
+ /* modern */
smallflags = (uint16_t)(flags & ~((uint16_t)0));
smallflags = htons(smallflags);
if (write(client->net, &smallflags, sizeof(smallflags)) < 0) {
err("Negotiation failed: %m");
}
}
+ /* common */
if (write(client->net, zeros, 124) < 0)
err("Negotiation failed: %m");
return NULL;
if(!client) {
err_nonfatal("negotiation failed");
close(net);
+ net=0;
}
}
for(i=0;i<servers->len && !net;i++) {
static gchar errstr[1024];
const static int errstr_len=1024;
+static uint64_t size;
+
typedef enum {
CONNECTION_TYPE_NONE,
CONNECTION_TYPE_CONNECT,
return retval;
}
-int setup_connection(gchar *hostname, int port, CONNECTION_TYPE ctype) {
+int setup_connection(gchar *hostname, int port, gchar* name, CONNECTION_TYPE ctype) {
int sock;
struct hostent *host;
struct sockaddr_in addr;
char buf[256];
+ uint64_t mymagic = (name ? opts_magic : cliserv_magic);
u64 tmp64;
+ uint32_t tmp32 = 0;
sock=0;
if(ctype<CONNECTION_TYPE_CONNECT)
goto err_open;
}
tmp64=ntohll(tmp64);
- if(tmp64 != cliserv_magic) {
- strncpy(errstr, "cliserv_magic does not match", errstr_len);
+ if(tmp64 != mymagic) {
+ strncpy(errstr, "mymagic does not match", errstr_len);
goto err_open;
}
if(ctype<CONNECTION_TYPE_FULL)
goto end;
- /* The information we get now contains information on sizes. If
- * we're here, that means we want a 'working' connection, but
- * we're not interested in the sizes. So, read them but throw
- * the values away. We need to read the size of the device (a
- * 64bit integer) plus the reserved fields (128 bytes; should
- * all be zeroes).
- */
- read_all(sock, buf, sizeof(tmp64)+128);
+ if(!name) {
+ read_all(sock, &size, sizeof(size));
+ size=ntohll(size);
+ read_all(sock, buf, 128);
+ goto end;
+ }
+ /* flags */
+ read_all(sock, buf, sizeof(uint16_t));
+ /* reserved field */
+ write(sock, &tmp32, sizeof(tmp32));
+ /* magic */
+ tmp64 = htonll(opts_magic);
+ write(sock, &tmp64, sizeof(tmp64));
+ /* name */
+ tmp32 = htonl(NBD_OPT_EXPORT_NAME);
+ write(sock, &tmp32, sizeof(tmp32));
+ tmp32 = htonl((uint32_t)strlen(name));
+ write(sock, &tmp32, sizeof(tmp32));
+ write(sock, name, strlen(name));
+ read_all(sock, &size, sizeof(size));
+ size = ntohll(size);
+ read_all(sock, buf, sizeof(uint16_t)+124);
goto end;
err_open:
close(sock);
return retval;
}
-int throughput_test(gchar* hostname, int port, int sock, char sock_is_open, char close_sock) {
+int throughput_test(gchar* hostname, int port, char* name, int sock, char sock_is_open, char close_sock) {
long long int i;
char buf[1024];
struct nbd_request req;
- u64 size;
int requests=0;
fd_set set;
struct timeval tv;
size=0;
if(!sock_is_open) {
- if((sock=setup_connection(hostname, port, CONNECTION_TYPE_CLISERV))<0) {
+ if((sock=setup_connection(hostname, port, name, CONNECTION_TYPE_FULL))<0) {
g_warning("Could not open socket: %s", errstr);
retval=-1;
goto err;
}
- } else {
- /* Assume the file is at least 4k in size. Not much of a test
- * this way, but, well. */
- size=4096;
- }
- if((tmp=read_all(sock, &size, sizeof(u64)))<0) {
- retval=-1;
- snprintf(errstr, errstr_len, "Could not read from socket: %s", strerror(errno));
- goto err_open;
}
- if(tmp==0) {
- retval=-1;
- snprintf(errstr, errstr_len, "Server closed connection unexpectedly when trying to read size of device in throughput test");
- goto err;
- }
- read_all(sock,&buf,128);
- size=ntohll(size);
req.magic=htonl(NBD_REQUEST_MAGIC);
req.type=htonl(NBD_CMD_READ);
req.len=htonl(1024);
int main(int argc, char**argv) {
gchar *hostname;
- long int p;
+ long int p = 0;
int port;
+ char* name = NULL;
int sock=0;
if(argc<3) {
g_message("%d: Not enough arguments", (int)getpid());
g_message("%d: Usage: %s <hostname> <port>", (int)getpid(), argv[0]);
+ g_message("%d: Or: %s <hostname> -N <exportname>", (int)getpid(), argv[0]);
exit(EXIT_FAILURE);
}
logging();
hostname=g_strdup(argv[1]);
- p=(strtol(argv[2], NULL, 0));
- if(p==LONG_MIN||p==LONG_MAX) {
- g_critical("Could not parse port number: %s", strerror(errno));
- exit(EXIT_FAILURE);
+ if(!strncmp(argv[2], "-N", 2)) {
+ name = g_strdup(argv[3]);
+ p = 10809;
+ } else {
+ p=(strtol(argv[2], NULL, 0));
+ if(p==LONG_MIN||p==LONG_MAX) {
+ g_critical("Could not parse port number: %s", strerror(errno));
+ exit(EXIT_FAILURE);
+ }
}
port=(int)p;
- if(throughput_test(hostname, port, sock, FALSE, TRUE)<0) {
+ if(throughput_test(hostname, port, name, sock, FALSE, TRUE)<0) {
g_warning("Could not run throughput test: %s", errstr);
exit(EXIT_FAILURE);
}
projects / nbd.git / commitdiff