From nobody Sat Oct 4 21:49:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549988460860413.7325484837427; Tue, 12 Feb 2019 08:21:00 -0800 (PST) Received: from localhost ([127.0.0.1]:41961 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtanp-0000mG-P1 for importer@patchew.org; Tue, 12 Feb 2019 11:20:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtakh-0006rg-MF for qemu-devel@nongnu.org; Tue, 12 Feb 2019 11:17:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtake-0006o2-CI for qemu-devel@nongnu.org; Tue, 12 Feb 2019 11:17:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43594) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtakV-0006f1-HE for qemu-devel@nongnu.org; Tue, 12 Feb 2019 11:17:34 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EB84587633; Tue, 12 Feb 2019 16:10:00 +0000 (UTC) Received: from localhost (unknown [10.36.112.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47DAE5D973; Tue, 12 Feb 2019 16:10:00 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 12 Feb 2019 17:09:53 +0100 Message-Id: <20190212160953.29051-3-marcandre.lureau@redhat.com> In-Reply-To: <20190212160953.29051-1-marcandre.lureau@redhat.com> References: <20190212160953.29051-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 12 Feb 2019 16:10:01 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] slirp: wrap the remaining socket functions 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: peter.maydell@linaro.org, hsp.cat7@gmail.com, Samuel Thibault , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Jan Kiszka Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" QEMU wraps the socket functions in os-win32.h, but in commit a9d8b3ec4385793815d71217857304, the header inclusion was dropped, breaking libslirp on Windows. Wrap the missing functions. Rename the wrapped function with "slirp_" prefix and "_wrap" suffix, for consistency and to avoid a clash with existing function (such as "slirp_socket"). Fixes: a9d8b3ec ("slirp: replace remaining qemu headers dependency") Signed-off-by: Marc-Andr=C3=A9 Lureau --- slirp/util.h | 56 +++++++++++++++--- slirp/util.c | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 209 insertions(+), 11 deletions(-) diff --git a/slirp/util.h b/slirp/util.h index 685b5af099..c4207a49d6 100644 --- a/slirp/util.h +++ b/slirp/util.h @@ -83,23 +83,61 @@ struct iovec { =20 /* FIXME: remove me when made standalone */ #ifdef _WIN32 +#undef accept +#undef bind #undef closesocket +#undef connect +#undef getpeername +#undef getsockname #undef getsockopt #undef ioctlsocket +#undef listen #undef recv +#undef recvfrom +#undef send +#undef sendto #undef setsockopt +#undef shutdown +#undef socket #endif =20 #ifdef _WIN32 -#define closesocket slirp_closesocket -int slirp_closesocket(int fd); -#define ioctlsocket slirp_ioctlsocket -int slirp_ioctlsocket(int fd, int req, void *val); -#define getsockopt(sockfd, level, optname, optval, optlen) \ - getsockopt(sockfd, level, optname, (void *)optval, optlen) -#define setsockopt(sockfd, level, optname, optval, optlen) \ - setsockopt(sockfd, level, optname, (const void *)optval, optlen) -#define recv(sockfd, buf, len, flags) recv(sockfd, (void *)buf, len, flags) +#define connect slirp_connect_wrap +int slirp_connect_wrap(int fd, const struct sockaddr *addr, int addrlen); +#define listen slirp_listen_wrap +int slirp_listen_wrap(int fd, int backlog); +#define bind slirp_bind_wrap +int slirp_bind_wrap(int fd, const struct sockaddr *addr, int addrlen); +#define socket slirp_socket_wrap +int slirp_socket_wrap(int domain, int type, int protocol); +#define accept slirp_accept_wrap +int slirp_accept_wrap(int fd, struct sockaddr *addr, int *addrlen); +#define shutdown slirp_shutdown_wrap +int slirp_shutdown_wrap(int fd, int how); +#define getpeername slirp_getpeername_wrap +int slirp_getpeername_wrap(int fd, struct sockaddr *addr, int *addrlen); +#define getsockname slirp_getsockname_wrap +int slirp_getsockname_wrap(int fd, struct sockaddr *addr, int *addrlen); +#define send slirp_send_wrap +ssize_t slirp_send_wrap(int fd, const void *buf, size_t len, int flags); +#define sendto slirp_sendto_wrap +ssize_t slirp_sendto_wrap(int fd, const void *buf, size_t len, int flags, + const struct sockaddr *dest_addr, int addrlen); +#define recv slirp_recv_wrap +ssize_t slirp_recv_wrap(int fd, void *buf, size_t len, int flags); +#define recvfrom slirp_recvfrom_wrap +ssize_t slirp_recvfrom_wrap(int fd, void *buf, size_t len, int flags, + struct sockaddr *src_addr, int *addrlen); +#define closesocket slirp_closesocket_wrap +int slirp_closesocket_wrap(int fd); +#define ioctlsocket slirp_ioctlsocket_wrap +int slirp_ioctlsocket_wrap(int fd, int req, void *val); +#define getsockopt slirp_getsockopt_wrap +int slirp_getsockopt_wrap(int sockfd, int level, int optname, + void *optval, int *optlen); +#define setsockopt slirp_setsockopt_wrap +int slirp_setsockopt_wrap(int sockfd, int level, int optname, + const void *optval, int optlen); =20 int inet_aton(const char *cp, struct in_addr *ia); #else diff --git a/slirp/util.c b/slirp/util.c index 84f5afdbc3..1cbaa26b60 100644 --- a/slirp/util.c +++ b/slirp/util.c @@ -167,7 +167,7 @@ static int socket_error(void) } =20 #undef ioctlsocket -int slirp_ioctlsocket(int fd, int req, void *val) +int slirp_ioctlsocket_wrap(int fd, int req, void *val) { int ret; ret =3D ioctlsocket(fd, req, val); @@ -178,7 +178,7 @@ int slirp_ioctlsocket(int fd, int req, void *val) } =20 #undef closesocket -int slirp_closesocket(int fd) +int slirp_closesocket_wrap(int fd) { int ret; ret =3D closesocket(fd); @@ -187,6 +187,166 @@ int slirp_closesocket(int fd) } return ret; } + +#undef connect +int slirp_connect_wrap(int sockfd, const struct sockaddr *addr, int addrle= n) +{ + int ret; + ret =3D connect(sockfd, addr, addrlen); + if (ret < 0) { + errno =3D socket_error(); + } + return ret; +} + +#undef listen +int slirp_listen_wrap(int sockfd, int backlog) +{ + int ret; + ret =3D listen(sockfd, backlog); + if (ret < 0) { + errno =3D socket_error(); + } + return ret; +} + +#undef bind +int slirp_bind_wrap(int sockfd, const struct sockaddr *addr, int addrlen) +{ + int ret; + ret =3D bind(sockfd, addr, addrlen); + if (ret < 0) { + errno =3D socket_error(); + } + return ret; +} + +#undef socket +int slirp_socket_wrap(int domain, int type, int protocol) +{ + int ret; + ret =3D socket(domain, type, protocol); + if (ret < 0) { + errno =3D socket_error(); + } + return ret; +} + +#undef accept +int slirp_accept_wrap(int sockfd, struct sockaddr *addr, int *addrlen) +{ + int ret; + ret =3D accept(sockfd, addr, addrlen); + if (ret < 0) { + errno =3D socket_error(); + } + return ret; +} + +#undef shutdown +int slirp_shutdown_wrap(int sockfd, int how) +{ + int ret; + ret =3D shutdown(sockfd, how); + if (ret < 0) { + errno =3D socket_error(); + } + return ret; +} + +#undef getsockopt +int slirp_getsockopt_wrap(int sockfd, int level, int optname, + void *optval, int *optlen) +{ + int ret; + ret =3D getsockopt(sockfd, level, optname, optval, optlen); + if (ret < 0) { + errno =3D socket_error(); + } + return ret; +} + +#undef setsockopt +int slirp_setsockopt_wrap(int sockfd, int level, int optname, + const void *optval, int optlen) +{ + int ret; + ret =3D setsockopt(sockfd, level, optname, optval, optlen); + if (ret < 0) { + errno =3D socket_error(); + } + return ret; +} + +#undef getpeername +int slirp_getpeername_wrap(int sockfd, struct sockaddr *addr, + int *addrlen) +{ + int ret; + ret =3D getpeername(sockfd, addr, addrlen); + if (ret < 0) { + errno =3D socket_error(); + } + return ret; +} + +#undef getsockname +int slirp_getsockname_wrap(int sockfd, struct sockaddr *addr, + int *addrlen) +{ + int ret; + ret =3D getsockname(sockfd, addr, addrlen); + if (ret < 0) { + errno =3D socket_error(); + } + return ret; +} + +#undef send +ssize_t slirp_send_wrap(int sockfd, const void *buf, size_t len, int flags) +{ + int ret; + ret =3D send(sockfd, buf, len, flags); + if (ret < 0) { + errno =3D socket_error(); + } + return ret; +} + +#undef sendto +ssize_t slirp_sendto_wrap(int sockfd, const void *buf, size_t len, int fla= gs, + const struct sockaddr *addr, int addrlen) +{ + int ret; + ret =3D sendto(sockfd, buf, len, flags, addr, addrlen); + if (ret < 0) { + errno =3D socket_error(); + } + return ret; +} + +#undef recv +ssize_t slirp_recv_wrap(int sockfd, void *buf, size_t len, int flags) +{ + int ret; + ret =3D recv(sockfd, buf, len, flags); + if (ret < 0) { + errno =3D socket_error(); + } + return ret; +} + +#undef recvfrom +ssize_t slirp_recvfrom_wrap(int sockfd, void *buf, size_t len, int flags, + struct sockaddr *addr, int *addrlen) +{ + int ret; + ret =3D recvfrom(sockfd, buf, len, flags, addr, addrlen); + if (ret < 0) { + errno =3D socket_error(); + } + return ret; +} #endif /* WIN32 */ =20 void slirp_pstrcpy(char *buf, int buf_size, const char *str) --=20 2.21.0.rc0.1.g036caf7885