NBD: Use qemu_socket functions to open TCP and UNIX sockets
This commit has the side-effect of making the qemu-nbd binary
capable of binding to IPv6 addresses. ("-b ::1", for instance).
block/nbd.c fails to parse IPv6 IP addresses correctly at this
point, but will work over IPv6 when given a hostname. It still
works over IPv4 as before.
We move the qemu-sockets object from the 'common' to the 'block'
list in the Makefile. The common list includes the block list,
so this is effectively a no-op for the rest of the code.
We also add 32-bit 'magic' attributes to nbd_(request|reply) to
facilitate calculating maximum request/response sizes later.
Signed-off-by: Nick Thomas <nick@bytemark.co.uk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Nick Thomas
Kevin Wolf
parent
b82eac92ac
commit
c12504ceef
@ -14,7 +14,7 @@ oslib-obj-$(CONFIG_POSIX) += oslib-posix.o
|
||||
# block-obj-y is code used by both qemu system emulation and qemu-img
|
||||
|
||||
block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o async.o
|
||||
block-obj-y += nbd.o block.o aio.o aes.o qemu-config.o qemu-progress.o
|
||||
block-obj-y += nbd.o block.o aio.o aes.o qemu-config.o qemu-progress.o qemu-sockets.o
|
||||
block-obj-$(CONFIG_POSIX) += posix-aio-compat.o
|
||||
block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
|
||||
|
||||
@ -94,7 +94,7 @@ common-obj-$(CONFIG_SSI_SD) += ssi-sd.o
|
||||
common-obj-$(CONFIG_SD) += sd.o
|
||||
common-obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o
|
||||
common-obj-y += bt-hci-csr.o
|
||||
common-obj-y += buffered_file.o migration.o migration-tcp.o qemu-sockets.o
|
||||
common-obj-y += buffered_file.o migration.o migration-tcp.o
|
||||
common-obj-y += qemu-char.o savevm.o #aio.o
|
||||
common-obj-y += msmouse.o ps2.o
|
||||
common-obj-y += qdev.o qdev-properties.o
|
||||
|
||||
158
nbd.c
158
nbd.c
@ -107,156 +107,56 @@ size_t nbd_wr_sync(int fd, void *buffer, size_t size, bool do_read)
|
||||
return offset;
|
||||
}
|
||||
|
||||
static void combine_addr(char *buf, size_t len, const char* address,
|
||||
uint16_t port)
|
||||
{
|
||||
/* If the address-part contains a colon, it's an IPv6 IP so needs [] */
|
||||
if (strstr(address, ":")) {
|
||||
snprintf(buf, len, "[%s]:%u", address, port);
|
||||
} else {
|
||||
snprintf(buf, len, "%s:%u", address, port);
|
||||
}
|
||||
}
|
||||
|
||||
int tcp_socket_outgoing(const char *address, uint16_t port)
|
||||
{
|
||||
int s;
|
||||
struct in_addr in;
|
||||
struct sockaddr_in addr;
|
||||
|
||||
s = socket(PF_INET, SOCK_STREAM, 0);
|
||||
if (s == -1) {
|
||||
return -1;
|
||||
char address_and_port[128];
|
||||
combine_addr(address_and_port, 128, address, port);
|
||||
return tcp_socket_outgoing_spec(address_and_port);
|
||||
}
|
||||
|
||||
if (inet_aton(address, &in) == 0) {
|
||||
struct hostent *ent;
|
||||
|
||||
ent = gethostbyname(address);
|
||||
if (ent == NULL) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
memcpy(&in, ent->h_addr, sizeof(in));
|
||||
}
|
||||
|
||||
addr.sin_family = AF_INET;
|
||||
addr.sin_port = htons(port);
|
||||
memcpy(&addr.sin_addr.s_addr, &in, sizeof(in));
|
||||
|
||||
if (connect(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
return s;
|
||||
error:
|
||||
closesocket(s);
|
||||
return -1;
|
||||
int tcp_socket_outgoing_spec(const char *address_and_port)
|
||||
{
|
||||
return inet_connect(address_and_port, SOCK_STREAM);
|
||||
}
|
||||
|
||||
int tcp_socket_incoming(const char *address, uint16_t port)
|
||||
{
|
||||
int s;
|
||||
struct in_addr in;
|
||||
struct sockaddr_in addr;
|
||||
int opt;
|
||||
|
||||
s = socket(PF_INET, SOCK_STREAM, 0);
|
||||
if (s == -1) {
|
||||
return -1;
|
||||
char address_and_port[128];
|
||||
combine_addr(address_and_port, 128, address, port);
|
||||
return tcp_socket_incoming_spec(address_and_port);
|
||||
}
|
||||
|
||||
if (inet_aton(address, &in) == 0) {
|
||||
struct hostent *ent;
|
||||
|
||||
ent = gethostbyname(address);
|
||||
if (ent == NULL) {
|
||||
goto error;
|
||||
int tcp_socket_incoming_spec(const char *address_and_port)
|
||||
{
|
||||
char *ostr = NULL;
|
||||
int olen = 0;
|
||||
return inet_listen(address_and_port, ostr, olen, SOCK_STREAM, 0);
|
||||
}
|
||||
|
||||
memcpy(&in, ent->h_addr, sizeof(in));
|
||||
}
|
||||
|
||||
addr.sin_family = AF_INET;
|
||||
addr.sin_port = htons(port);
|
||||
memcpy(&addr.sin_addr.s_addr, &in, sizeof(in));
|
||||
|
||||
opt = 1;
|
||||
if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
|
||||
(const void *) &opt, sizeof(opt)) == -1) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (listen(s, 128) == -1) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
return s;
|
||||
error:
|
||||
closesocket(s);
|
||||
return -1;
|
||||
}
|
||||
|
||||
#ifndef _WIN32
|
||||
int unix_socket_incoming(const char *path)
|
||||
{
|
||||
int s;
|
||||
struct sockaddr_un addr;
|
||||
char *ostr = NULL;
|
||||
int olen = 0;
|
||||
|
||||
s = socket(PF_UNIX, SOCK_STREAM, 0);
|
||||
if (s == -1) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
memset(&addr, 0, sizeof(addr));
|
||||
addr.sun_family = AF_UNIX;
|
||||
pstrcpy(addr.sun_path, sizeof(addr.sun_path), path);
|
||||
|
||||
if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (listen(s, 128) == -1) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
return s;
|
||||
error:
|
||||
closesocket(s);
|
||||
return -1;
|
||||
return unix_listen(path, ostr, olen);
|
||||
}
|
||||
|
||||
int unix_socket_outgoing(const char *path)
|
||||
{
|
||||
int s;
|
||||
struct sockaddr_un addr;
|
||||
|
||||
s = socket(PF_UNIX, SOCK_STREAM, 0);
|
||||
if (s == -1) {
|
||||
return -1;
|
||||
return unix_connect(path);
|
||||
}
|
||||
|
||||
memset(&addr, 0, sizeof(addr));
|
||||
addr.sun_family = AF_UNIX;
|
||||
pstrcpy(addr.sun_path, sizeof(addr.sun_path), path);
|
||||
|
||||
if (connect(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
return s;
|
||||
error:
|
||||
closesocket(s);
|
||||
return -1;
|
||||
}
|
||||
#else
|
||||
int unix_socket_incoming(const char *path)
|
||||
{
|
||||
errno = ENOTSUP;
|
||||
return -1;
|
||||
}
|
||||
|
||||
int unix_socket_outgoing(const char *path)
|
||||
{
|
||||
errno = ENOTSUP;
|
||||
return -1;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/* Basic flow
|
||||
|
||||
Server Client
|
||||
|
||||
9
nbd.h
9
nbd.h
@ -22,19 +22,22 @@
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <qemu-common.h>
|
||||
|
||||
#include "block_int.h"
|
||||
|
||||
struct nbd_request {
|
||||
uint32_t magic;
|
||||
uint32_t type;
|
||||
uint64_t handle;
|
||||
uint64_t from;
|
||||
uint32_t len;
|
||||
};
|
||||
} __attribute__ ((__packed__));
|
||||
|
||||
struct nbd_reply {
|
||||
uint32_t magic;
|
||||
uint32_t error;
|
||||
uint64_t handle;
|
||||
};
|
||||
} __attribute__ ((__packed__));
|
||||
|
||||
enum {
|
||||
NBD_CMD_READ = 0,
|
||||
@ -47,6 +50,8 @@ enum {
|
||||
size_t nbd_wr_sync(int fd, void *buffer, size_t size, bool do_read);
|
||||
int tcp_socket_outgoing(const char *address, uint16_t port);
|
||||
int tcp_socket_incoming(const char *address, uint16_t port);
|
||||
int tcp_socket_outgoing_spec(const char *address_and_port);
|
||||
int tcp_socket_incoming_spec(const char *address_and_port);
|
||||
int unix_socket_outgoing(const char *path);
|
||||
int unix_socket_incoming(const char *path);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user