From nobody Tue May 7 16:00:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 154157395522032.934847537775454; Tue, 6 Nov 2018 22:59:15 -0800 (PST) Received: from localhost ([::1]:46064 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKHnv-0000zI-6q for importer@patchew.org; Wed, 07 Nov 2018 01:59:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKHmf-0007aG-Pp for qemu-devel@nongnu.org; Wed, 07 Nov 2018 01:57:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKHmc-0008B6-A6 for qemu-devel@nongnu.org; Wed, 07 Nov 2018 01:57:49 -0500 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]:36002) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gKHmb-00081q-Jl for qemu-devel@nongnu.org; Wed, 07 Nov 2018 01:57:46 -0500 Received: by mail-lf1-x141.google.com with SMTP id h192so10703067lfg.3 for ; Tue, 06 Nov 2018 22:57:43 -0800 (PST) Received: from localhost.localdomain ([77.221.221.49]) by smtp.gmail.com with ESMTPSA id f11sm2774744lfi.12.2018.11.06.22.57.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Nov 2018 22:57:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ECWu7runORybr5ZiaDECg1wh2n0PrE8c73WKa5tqL6w=; b=lT/sqfU6uh85vvt3lwl/jnRNJhnFwPfCfqRsdcuAzmXe8EIbfowtQ4hIp4FZlcDq18 6d410HC+8sfxvxCQEhEQzExAFl5csSrqJ+fygTXgBWvhwIgrDsMDtU6B4IEGvGWlwmAR wpP/knk8Uacmn9n/wLHmNLCfsULgbbiEFLCZEaGT1w8bTntzwrE8BJPZAHITdxNVO0L2 jgmVKoWnhaRwXjmaOd83RJY9DQgh5CXmc3I/Dod4K+Riyq+IPO//jHC9E8FmW+Ekob1i PYHlQJditV9ZMRwFwvUQBAePDqhJzV2tSyjJ/m2POfQOD+WwjASWRx3gZMQrgFhoRUu4 B1iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ECWu7runORybr5ZiaDECg1wh2n0PrE8c73WKa5tqL6w=; b=hg1sRIoq2lXDjbyL/WPrf+WCXzKAbeAtnLm4+/Wmxzl3MEQC31KnlxwG769jxwvwlr Rgvdxq+bpPycEKXVS3EcqbP6PojVQYUbe9KkoCG2xJhqhjCCZp1vp2AURICo3um33C4L yZLQlsT+Q5X74wfmykaVTOSayXR6hqJyHJQXu5TQMQ2IWE9yV0cpAkN9TP2S8jHICvmF r3Qj5fySj48Oyc7zg/wsXCbXJ278VLVWxSPUF4v3HjsPnE0nkuoqmFCRkz06F3AWqn2p f5QmqhSLWlJGiVYXPEFyNW9KrF2Zaw5dMu/7AEa66kvpr5ic12zIs1iXjdevJCvjHhr9 54qg== X-Gm-Message-State: AGRZ1gKQEUCq6w6yML7/RIuQG7dpQG3Kdvt9OetcOtRU3qYmbbM9SSDv OgoQZBcPSGLT0RgTx/bb1IEVzhPqsbQ= X-Google-Smtp-Source: AJdET5cPyBOq+XN+MRk+haUUha8QiGapjzJAM9/TfD1xiZP5IY8N/sLmiJ22VJkD5vd0v0DWSdd7Jw== X-Received: by 2002:a19:8fce:: with SMTP id s75mr384456lfk.151.1541573861170; Tue, 06 Nov 2018 22:57:41 -0800 (PST) From: Artem Pisarenko To: qemu-devel@nongnu.org Date: Wed, 7 Nov 2018 12:57:30 +0600 Message-Id: <7b5279e8946325b7f3c22a4a51ab02777202ce77.1541573846.git.artem.k.pisarenko@gmail.com> X-Mailer: git-send-email 2.7.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::141 Subject: [Qemu-devel] [PATCH] netdev: fix socket backend implementation and docs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Artem Pisarenko , Jason Wang , Markus Armbruster , Gerd Hoffmann , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Changes: - user documentation and QAPI 'NetdevSocketOptions' comments updated to match current implementation ('udp' type description added, 'fd' option separated to exclusive type and described, 'localaddr'-related description for 'mcast' type fixed, hostname parts in "[host]:port" options updated to match optional/required syntax, various fixes and improvements in options breakdown and wording); - 'fd' type backend: requirement for socket handle being already binded and connected made explicit and documented; - 'fd' type backend: fix broken SOCK_DGRAM support; - 'fd' type backend: removed multicast support and cleaned up broken workaround for it (never called); - fix possible broken multicasting in win32 platform; - fix parsing of "[host]:port" options (added error handling for cases where "host" part is documented as required but isn't provided); - some error messages improved; - other small fixes and refactoring in code. Signed-off-by: Artem Pisarenko --- Notes: (Since these changes are closely related, I've combined them in one pat= ch.) This patch addresses all issues I've pointed earlier (http://lists.nong= nu.org/archive/html/qemu-devel/2018-05/msg06695.html), except internal prot= ocol, and plus additional ones. =20 'fd' transport and its special 'af_inet multicast' case deserve special= attention. Firstly, it already wasn't working as expected at least in current qemu= version, so it isn't supposed to break any compabitibility if someone care= s. The only question is a way of fixing it. It depends on concept behind 'fd' transport, which is unknown to me. Se= ems like initially it was just optional parameter to any transport allowing= to replace newly created socket descriptor with user supplied one, but at = some time someone changed it to be separate transport and not accounted 'af= _inet multicast' case (code analysis shows that condition "is_connected && = mcast !=3D NULL" in 'net_socket_fd_init_dgram' function never can be true a= nd "s->dgram_dst" value is left unassigned). I would prefer concept of separate transport when qemu doesn't depend o= n underlying domain, type and protocol of socket (almost). To make it unive= rsal/flexible, qemu shouldn't handle their specifics, such as 'af_inet mult= icast' one. So I fixed things accordingly. For example, if user needs multi= casting, it should already know that it cannot share one socket between its= app and qemu instances, so user should use 'mcast' transport of qemu which= will create separate socket for qemu instance. And there are maybe other s= ocket types (possibly not existing at present moment yet) with their own sp= ecifics. Since this concept restricts usage of sockets which cannot work in conn= ected state (such as af_inet multicast), I've prepared and ready to submit = another version of patch which solves this restriction by checking socket t= ype and handling it accordingly. Currently it supports only 'af_inet multic= ast' case by preserving existed hack (slightly modified): it extracts multi= cast address from socket and duplicates socket in proper unconnected state.= It also requires synchronization with user who will unconnect original soc= ket back. All of this is very hacky, but I'm open for discussion... include/qemu-common.h | 3 + include/qemu/sockets.h | 2 +- net/net.c | 8 ++- net/socket.c | 148 ++++++++++++++++++++++-----------------------= ---- qapi/net.json | 12 ++-- qemu-options.hx | 85 +++++++++++++++++++++------- 6 files changed, 147 insertions(+), 111 deletions(-) diff --git a/include/qemu-common.h b/include/qemu-common.h index ed60ba2..d4e4121 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -67,6 +67,8 @@ int qemu_openpty_raw(int *aslave, char *pty_name); #define qemu_setsockopt(sockfd, level, optname, optval, optlen) \ setsockopt(sockfd, level, optname, (const void *)optval, optlen) #define qemu_recv(sockfd, buf, len, flags) recv(sockfd, (void *)buf, len, = flags) +#define qemu_send(sockfd, buf, len, flags) \ + send(sockfd, (const void *)buf, len, flags) #define qemu_sendto(sockfd, buf, len, flags, destaddr, addrlen) \ sendto(sockfd, (const void *)buf, len, flags, destaddr, addrlen) #else @@ -75,6 +77,7 @@ int qemu_openpty_raw(int *aslave, char *pty_name); #define qemu_setsockopt(sockfd, level, optname, optval, optlen) \ setsockopt(sockfd, level, optname, optval, optlen) #define qemu_recv(sockfd, buf, len, flags) recv(sockfd, buf, len, flags) +#define qemu_send(sockfd, buf, len, flags) send(sockfd, buf, len, flags) #define qemu_sendto(sockfd, buf, len, flags, destaddr, addrlen) \ sendto(sockfd, buf, len, flags, destaddr, addrlen) #endif diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index 8140fea..3fad004 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -46,7 +46,7 @@ void socket_listen_cleanup(int fd, Error **errp); int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp= ); =20 /* Old, ipv4 only bits. Don't use for new code. */ -int parse_host_port(struct sockaddr_in *saddr, const char *str, +int parse_host_port(struct sockaddr_in *saddr, const char *str, bool h_add= r_opt, Error **errp); int socket_init(void); =20 diff --git a/net/net.c b/net/net.c index 07c194a..5103d78 100644 --- a/net/net.c +++ b/net/net.c @@ -83,7 +83,7 @@ static int get_str_sep(char *buf, int buf_size, const cha= r **pp, int sep) return 0; } =20 -int parse_host_port(struct sockaddr_in *saddr, const char *str, +int parse_host_port(struct sockaddr_in *saddr, const char *str, bool h_add= r_opt, Error **errp) { char buf[512]; @@ -99,6 +99,10 @@ int parse_host_port(struct sockaddr_in *saddr, const cha= r *str, } saddr->sin_family =3D AF_INET; if (buf[0] =3D=3D '\0') { + if (!h_addr_opt) { + error_setg(errp, "'%s' doesn't contain hostname/address part",= str); + return -1; + } saddr->sin_addr.s_addr =3D 0; } else { if (qemu_isdigit(buf[0])) { @@ -111,7 +115,7 @@ int parse_host_port(struct sockaddr_in *saddr, const ch= ar *str, he =3D gethostbyname(buf); if (he =3D=3D NULL) { error_setg(errp, "can't resolve host address '%s'", buf); - return - 1; + return -1; } saddr->sin_addr =3D *(struct in_addr *)he->h_addr; } diff --git a/net/socket.c b/net/socket.c index 90ef351..1dd44dc 100644 --- a/net/socket.c +++ b/net/socket.c @@ -40,7 +40,10 @@ typedef struct NetSocketState { int fd; SocketReadState rs; unsigned int send_index; /* number of bytes sent (only SOCK_STREA= M) */ - struct sockaddr_in dgram_dst; /* contains inet host and port destinati= on iff connectionless (SOCK_DGRAM) */ + bool dgram_connected; /* whether connect() call was done for s= ocket + * (SOCK_DGRAM) */ + struct sockaddr_in dgram_dst; /* contains inet host and port destinati= on + * if dgram_connected=3Dfalse */ IOHandler *send_fn; /* differs between SOCK_STREAM/SOCK_DGRA= M */ bool read_poll; /* waiting to receive data? */ bool write_poll; /* waiting to transmit data? */ @@ -78,7 +81,8 @@ static void net_socket_writable(void *opaque) qemu_flush_queued_packets(&s->nc); } =20 -static ssize_t net_socket_receive(NetClientState *nc, const uint8_t *buf, = size_t size) +static ssize_t net_socket_receive(NetClientState *nc, + const uint8_t *buf, size_t size) { NetSocketState *s =3D DO_UPCAST(NetSocketState, nc, nc); uint32_t len =3D htonl(size); @@ -113,15 +117,21 @@ static ssize_t net_socket_receive(NetClientState *nc,= const uint8_t *buf, size_t return size; } =20 -static ssize_t net_socket_receive_dgram(NetClientState *nc, const uint8_t = *buf, size_t size) +static ssize_t net_socket_receive_dgram(NetClientState *nc, + const uint8_t *buf, size_t size) { NetSocketState *s =3D DO_UPCAST(NetSocketState, nc, nc); + struct sockaddr *raddr =3D NULL; + socklen_t raddr_size =3D 0; ssize_t ret; =20 + if (!s->dgram_connected) { + raddr =3D (struct sockaddr *)&s->dgram_dst; + raddr_size =3D sizeof(s->dgram_dst); + } + do { - ret =3D qemu_sendto(s->fd, buf, size, 0, - (struct sockaddr *)&s->dgram_dst, - sizeof(s->dgram_dst)); + ret =3D qemu_sendto(s->fd, buf, size, 0, raddr, raddr_size); } while (ret =3D=3D -1 && errno =3D=3D EINTR); =20 if (ret =3D=3D -1 && errno =3D=3D EAGAIN) { @@ -213,6 +223,7 @@ static int net_socket_mcast_create(struct sockaddr_in *= mcastaddr, struct in_addr *localaddr, Error **errp) { + struct sockaddr_in bind_addr; struct ip_mreq imr; int fd; int val, ret; @@ -249,14 +260,7 @@ static int net_socket_mcast_create(struct sockaddr_in = *mcastaddr, goto fail; } =20 - ret =3D bind(fd, (struct sockaddr *)mcastaddr, sizeof(*mcastaddr)); - if (ret < 0) { - error_setg_errno(errp, errno, "can't bind ip=3D%s to socket", - inet_ntoa(mcastaddr->sin_addr)); - goto fail; - } - - /* Add host to multicast group */ + /* Init multicast group request */ imr.imr_multiaddr =3D mcastaddr->sin_addr; if (localaddr) { imr.imr_interface =3D *localaddr; @@ -264,6 +268,21 @@ static int net_socket_mcast_create(struct sockaddr_in = *mcastaddr, imr.imr_interface.s_addr =3D htonl(INADDR_ANY); } =20 + bind_addr =3D *mcastaddr; +#ifdef _WIN32 + /* See remarks about multicasting at + * https://docs.microsoft.com/ru-ru/windows/desktop/api/winsock2/nf-wi= nsock2-bind + */ + bind_addr.sin_addr =3D imr.imr_interface; +#endif + ret =3D bind(fd, (struct sockaddr *)&bind_addr, sizeof(bind_addr)); + if (ret < 0) { + error_setg_errno(errp, errno, "can't bind ip=3D%s to socket", + inet_ntoa(bind_addr.sin_addr)); + goto fail; + } + + /* Add host to multicast group */ ret =3D qemu_setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &imr, sizeof(struct ip_mreq)); if (ret < 0) { @@ -328,66 +347,26 @@ static NetClientInfo net_dgram_socket_info =3D { static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer, const char *model, const char *name, - int fd, int is_connected, - const char *mcast, - Error **errp) + int fd, bool is_connected) { - struct sockaddr_in saddr; - int newfd; NetClientState *nc; NetSocketState *s; =20 - /* fd passed: multicast: "learn" dgram_dst address from bound address = and save it - * Because this may be "shared" socket from a "master" process, datagr= ams would be recv() - * by ONLY ONE process: we must "clone" this dgram socket --jjo - */ - - if (is_connected && mcast !=3D NULL) { - if (parse_host_port(&saddr, mcast, errp) < 0) { - goto err; - } - /* must be bound */ - if (saddr.sin_addr.s_addr =3D=3D 0) { - error_setg(errp, "can't setup multicast destination addres= s"); - goto err; - } - /* clone dgram socket */ - newfd =3D net_socket_mcast_create(&saddr, NULL, errp); - if (newfd < 0) { - goto err; - } - /* clone newfd to fd, close newfd */ - dup2(newfd, fd); - close(newfd); - - } - nc =3D qemu_new_net_client(&net_dgram_socket_info, peer, model, name); =20 s =3D DO_UPCAST(NetSocketState, nc, nc); =20 s->fd =3D fd; s->listen_fd =3D -1; + s->dgram_connected =3D is_connected; s->send_fn =3D net_socket_send_dgram; net_socket_rs_init(&s->rs, net_socket_rs_finalize, false); net_socket_read_poll(s, true); =20 - /* mcast: save bound address as dst */ - if (is_connected && mcast !=3D NULL) { - s->dgram_dst =3D saddr; - snprintf(nc->info_str, sizeof(nc->info_str), - "socket: fd=3D%d (cloned mcast=3D%s:%d)", - fd, inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port)); - } else { - snprintf(nc->info_str, sizeof(nc->info_str), - "socket: fd=3D%d", fd); - } + snprintf(nc->info_str, sizeof(nc->info_str), + "socket: fd=3D%d", fd); =20 return s; - -err: - closesocket(fd); - return NULL; } =20 static void net_socket_connect(void *opaque) @@ -407,7 +386,7 @@ static NetClientInfo net_socket_info =3D { static NetSocketState *net_socket_fd_init_stream(NetClientState *peer, const char *model, const char *name, - int fd, int is_connected) + int fd, bool is_connected) { NetClientState *nc; NetSocketState *s; @@ -435,21 +414,20 @@ static NetSocketState *net_socket_fd_init_stream(NetC= lientState *peer, =20 static NetSocketState *net_socket_fd_init(NetClientState *peer, const char *model, const char *n= ame, - int fd, int is_connected, - const char *mc, Error **errp) + int fd, bool is_connected, + Error **errp) { int so_type =3D -1, optlen=3Dsizeof(so_type); =20 if(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type, (socklen_t *)&optlen)< 0) { - error_setg(errp, "can't get socket option SO_TYPE"); + error_setg_errno(errp, errno, "can't get socket option SO_TYPE"); closesocket(fd); return NULL; } switch(so_type) { case SOCK_DGRAM: - return net_socket_fd_init_dgram(peer, model, name, fd, is_connecte= d, - mc, errp); + return net_socket_fd_init_dgram(peer, model, name, fd, is_connecte= d); case SOCK_STREAM: return net_socket_fd_init_stream(peer, model, name, fd, is_connect= ed); default: @@ -497,7 +475,7 @@ static int net_socket_listen_init(NetClientState *peer, struct sockaddr_in saddr; int fd, ret; =20 - if (parse_host_port(&saddr, host_str, errp) < 0) { + if (parse_host_port(&saddr, host_str, true, errp) < 0) { return -1; } =20 @@ -542,10 +520,11 @@ static int net_socket_connect_init(NetClientState *pe= er, Error **errp) { NetSocketState *s; - int fd, connected, ret; + int fd, ret; struct sockaddr_in saddr; + bool connected; =20 - if (parse_host_port(&saddr, host_str, errp) < 0) { + if (parse_host_port(&saddr, host_str, false, errp) < 0) { return -1; } =20 @@ -556,7 +535,7 @@ static int net_socket_connect_init(NetClientState *peer, } qemu_set_nonblock(fd); =20 - connected =3D 0; + connected =3D false; for(;;) { ret =3D connect(fd, (struct sockaddr *)&saddr, sizeof(saddr)); if (ret < 0) { @@ -572,11 +551,11 @@ static int net_socket_connect_init(NetClientState *pe= er, return -1; } } else { - connected =3D 1; + connected =3D true; break; } } - s =3D net_socket_fd_init(peer, model, name, fd, connected, NULL, errp); + s =3D net_socket_fd_init(peer, model, name, fd, connected, errp); if (!s) { return -1; } @@ -599,7 +578,7 @@ static int net_socket_mcast_init(NetClientState *peer, struct sockaddr_in saddr; struct in_addr localaddr, *param_localaddr; =20 - if (parse_host_port(&saddr, host_str, errp) < 0) { + if (parse_host_port(&saddr, host_str, false, errp) < 0) { return -1; } =20 @@ -619,7 +598,7 @@ static int net_socket_mcast_init(NetClientState *peer, return -1; } =20 - s =3D net_socket_fd_init(peer, model, name, fd, 0, NULL, errp); + s =3D net_socket_fd_init(peer, model, name, fd, false, errp); if (!s) { return -1; } @@ -644,11 +623,11 @@ static int net_socket_udp_init(NetClientState *peer, int fd, ret; struct sockaddr_in laddr, raddr; =20 - if (parse_host_port(&laddr, lhost, errp) < 0) { + if (parse_host_port(&laddr, lhost, true, errp) < 0) { return -1; } =20 - if (parse_host_port(&raddr, rhost, errp) < 0) { + if (parse_host_port(&raddr, rhost, false, errp) < 0) { return -1; } =20 @@ -667,20 +646,26 @@ static int net_socket_udp_init(NetClientState *peer, } ret =3D bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)); if (ret < 0) { - error_setg_errno(errp, errno, "can't bind ip=3D%s to socket", - inet_ntoa(laddr.sin_addr)); + error_setg_errno(errp, errno, "can't bind %s:%"PRIu16" to socket", + inet_ntoa(laddr.sin_addr), laddr.sin_port); + closesocket(fd); + return -1; + } + do { + ret =3D connect(fd, (struct sockaddr *)&raddr, sizeof(raddr)); + } while ((ret < 0) && (errno =3D=3D EINTR)); + if (ret < 0) { + error_setg_errno(errp, errno, "can't connect socket"); closesocket(fd); return -1; } qemu_set_nonblock(fd); =20 - s =3D net_socket_fd_init(peer, model, name, fd, 0, NULL, errp); + s =3D net_socket_fd_init(peer, model, name, fd, true, errp); if (!s) { return -1; } =20 - s->dgram_dst =3D raddr; - snprintf(s->nc.info_str, sizeof(s->nc.info_str), "socket: udp=3D%s:%d", inet_ntoa(raddr.sin_addr), ntohs(raddr.sin_port)); @@ -697,7 +682,7 @@ int net_init_socket(const Netdev *netdev, const char *n= ame, =20 if (sock->has_fd + sock->has_listen + sock->has_connect + sock->has_mc= ast + sock->has_udp !=3D 1) { - error_setg(errp, "exactly one of listen=3D, connect=3D, mcast=3D o= r udp=3D" + error_setg(errp, "exactly one of fd=3D, listen=3D, connect=3D, mca= st=3D or udp=3D" " is required"); return -1; } @@ -715,8 +700,7 @@ int net_init_socket(const Netdev *netdev, const char *n= ame, return -1; } qemu_set_nonblock(fd); - if (!net_socket_fd_init(peer, "socket", name, fd, 1, sock->mcast, - errp)) { + if (!net_socket_fd_init(peer, "socket", name, fd, true, errp)) { return -1; } return 0; diff --git a/qapi/net.json b/qapi/net.json index 8f99fd9..d6f526b 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -269,15 +269,15 @@ # # @fd: file descriptor of an already opened socket # -# @listen: port number, and optional hostname, to listen on +# @listen: port number, and optional hostname, to listen on (new TCP socke= t) # -# @connect: port number, and optional hostname, to connect to +# @connect: port number, and optional hostname, to connect to (new TCP soc= ket) # -# @mcast: UDP multicast address and port number +# @localaddr: source address (optional for tunnel) and port (new UDP socke= t) # -# @localaddr: source address and port for multicast and udp packets +# @mcast: multicast address and port number (new UDP multicast socket) # -# @udp: UDP unicast address and port number +# @udp: unicast address and port number (new UDP tunnel socket) # # Since: 1.2 ## @@ -286,8 +286,8 @@ '*fd': 'str', '*listen': 'str', '*connect': 'str', - '*mcast': 'str', '*localaddr': 'str', + '*mcast': 'str', '*udp': 'str' } } =20 ## diff --git a/qemu-options.hx b/qemu-options.hx index 08f8516..510ad8f 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1892,15 +1892,23 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, " use 'pincounter=3Don' to work around broken counter h= andling in peer\n" " use 'offset=3DX' to add an extra offset between heade= r and data\n" #endif - "-netdev socket,id=3Dstr[,fd=3Dh][,listen=3D[host]:port][,connect=3Dho= st:port]\n" + "-netdev socket,id=3Dstr,fd=3Dh\n" " configure a network backend to connect to another net= work\n" - " using a socket connection\n" - "-netdev socket,id=3Dstr[,fd=3Dh][,mcast=3Dmaddr:port[,localaddr=3Dadd= r]]\n" + " using an existing socket connection\n" + "-netdev socket,id=3Dstr,listen=3D[host]:port\n" + " configure a network backend to accept and use an inco= ming TCP connection\n" + " from remote client\n" + "-netdev socket,id=3Dstr,connect=3Dhost:port\n" + " configure a network backend to connect to remote serv= er\n" + " using an outgoing TCP connection\n" + "-netdev socket,id=3Dstr,mcast=3Dmaddr:port[,localaddr=3Daddr]\n" " configure a network backend to connect to a multicast= maddr and port\n" - " use 'localaddr=3Daddr' to specify the host address to= send packets from\n" - "-netdev socket,id=3Dstr[,fd=3Dh][,udp=3Dhost:port][,localaddr=3Dhost:= port]\n" - " configure a network backend to connect to another net= work\n" + " using UDP multicasting\n" + " use 'localaddr' to specify the address of host networ= k interface to bind to\n" + "-netdev socket,id=3Dstr,udp=3Drhost:rport,localaddr=3D[host]:port\n" + " configure a network backend to connect to an unicast = rhost and rport\n" " using an UDP tunnel\n" + " use 'localaddr' to specify the host address and port = to bind to\n" #ifdef CONFIG_VDE "-netdev vde,id=3Dstr[,sock=3Dsocketpath][,port=3Dn][,group=3Dgroupnam= e][,mode=3Doctalmode]\n" " configure a network backend to connect to port 'n' of= a vde switch\n" @@ -2211,14 +2219,25 @@ qemu-system-i386 linux.img -netdev bridge,id=3Dn1 -= device virtio-net,netdev=3Dn1 qemu-system-i386 linux.img -netdev bridge,br=3Dqemubr0,id=3Dn1 -device vir= tio-net,netdev=3Dn1 @end example =20 -@item -netdev socket,id=3D@var{id}[,fd=3D@var{h}][,listen=3D[@var{host}]:@= var{port}][,connect=3D@var{host}:@var{port}] +@item -netdev socket,id=3D@var{id},fd=3D@var{h} =20 -This host network backend can be used to connect the guest's network to -another QEMU virtual machine using a TCP socket connection. If @option{lis= ten} -is specified, QEMU waits for incoming connections on @var{port} -(@var{host} is optional). @option{connect} is used to connect to -another QEMU instance using the @option{listen} option. @option{fd}=3D@var= {h} -specifies an already opened TCP socket. +Configure a socket host network backend to connect the guest's network to +another QEMU virtual machine using an existing socket connection, specified +by socket descriptor @option{fd}=3D@var{h}. +User application must pass already binded and/or connected socket endpoint= of +SOCK_STREAM or SOCK_DGRAM type, created in AF_LOCAL/AF_UNIX or AF_INET dom= ain. +For example, application may create unix socket pair to connect two QEMU +instances. On the other side, this has restriction preventing passing +multicast (AF_INET) sockets, because they will not work in connected state. + +@item -netdev socket,id=3D@var{id}[,listen=3D[@var{host}]:@var{port}][,con= nect=3D@var{host}:@var{port}] + +Configure a socket host network backend to connect the guest's network to +another QEMU virtual machine using a TCP socket connection (IPv4 only). +Exactly one of @option{listen} or @option{connect} options must be specifi= ed. +Option @option{listen} tells QEMU to wait for incoming (single) connection +on @var{port} (@var{host} is optional). Option @option{connect} tells QEMU +to connect to another QEMU instance using the @option{listen} option. =20 Example: @example @@ -2232,21 +2251,26 @@ qemu-system-i386 linux.img \ -netdev socket,id=3Dn2,connect=3D127.0.0.1:1234 @end example =20 -@item -netdev socket,id=3D@var{id}[,fd=3D@var{h}][,mcast=3D@var{maddr}:@va= r{port}[,localaddr=3D@var{addr}]] +@item -netdev socket,id=3D@var{id},mcast=3D@var{maddr}:@var{port}[,localad= dr=3D@var{addr}] =20 Configure a socket host network backend to share the guest's network traff= ic -with another QEMU virtual machines using a UDP multicast socket, effective= ly -making a bus for every QEMU with same multicast address @var{maddr} and @v= ar{port}. -NOTES: +with another QEMU virtual machines using a UDP multicasting (IPv4 only), +effectively making a bus for every QEMU with same multicast address @var{m= addr} +and @var{port}. +Use @option{localaddr}=3D@var{addr} to specify address of specific network +interface on host machine to bind socket to. + +Notes: @enumerate @item Several QEMU can be running on different hosts and share same bus (assuming correct multicast setup for these hosts). @item -mcast support is compatible with User Mode Linux (argument @option{eth@var= {N}=3Dmcast}), see -@url{http://user-mode-linux.sf.net}. +Without specifying @option{localaddr} default network interface will be +selected, which choice is very specific to host OS and its setup. @item -Use @option{fd=3Dh} to specify an already opened UDP multicast socket. +mcast support is compatible with User Mode Linux (argument +@option{eth@var{N}=3Dmcast}), see @url{http://user-mode-linux.sf.net}. @end enumerate =20 Example: @@ -2282,6 +2306,27 @@ qemu-system-i386 linux.img \ -netdev socket,id=3Dn1,mcast=3D239.192.168.1:1102,localad= dr=3D1.2.3.4 @end example =20 +@item -netdev socket,id=3D@var{id},udp=3D@var{rhost}:@var{rport},localaddr= =3D[@var{host}]:@var{port} + +Configure a socket host network backend to connect the guest's network to +another QEMU virtual machine using an UDP tunnel (IPv4 only). +Use @option{localaddr} to specify @var{host} address (optional) and @var{p= ort} +to bind socket to (receive packets in and send packets from). Another QEMU +instance must be binded to specified @var{rhost} (or all addresses) +and @var{rport}. + +Example: +@example +# launch a first QEMU instance +qemu-system-i386 linux.img \ + -device e1000,netdev=3Dn1,mac=3D52:54:00:12:34:56 \ + -netdev socket,id=3Dn1,udp=3D127.0.0.1:1234,localaddr=3D:= 4321 +# launch a second QEMU instance +qemu-system-i386 linux.img \ + -device e1000,netdev=3Dn2,mac=3D52:54:00:12:34:57 \ + -netdev socket,id=3Dn2,udp=3D127.0.0.1:4321,localaddr=3D:= 1234 +@end example + @item -netdev l2tpv3,id=3D@var{id},src=3D@var{srcaddr},dst=3D@var{dstaddr}= [,srcport=3D@var{srcport}][,dstport=3D@var{dstport}],txsession=3D@var{txses= sion}[,rxsession=3D@var{rxsession}][,ipv6][,udp][,cookie64][,counter][,pinc= ounter][,txcookie=3D@var{txcookie}][,rxcookie=3D@var{rxcookie}][,offset=3D@= var{offset}] Configure a L2TPv3 pseudowire host network backend. L2TPv3 (RFC3391) is a popular protocol to transport Ethernet (and other Layer 2) data frames bet= ween --=20 2.7.4