diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2019-02-12 17:09:52 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-02-12 20:47:42 +0100 |
| commit | fdbfba8cbf04b587f9bab11b8e6a87afc38556e5 (patch) | |
| tree | 37a867a670f31469c4fd0388601202aabca3f763 /slirp/ip_icmp.c | |
| parent | 0b5e750bea635b167eb03d86c3d9a09bbd43bc06 (diff) | |
slirp: remove slirp_ prefix for socket wrappers
QEMU wraps the socket functions in os-win32.h, but in commit
a9d8b3ec4385793815d71217857304, the header inclusion was dropped,
breaking libslirp on Windows.
There are already a few socket functions that are wrapped in libslirp,
with "slirp_" prefix, but many of them are missing, and we are going
to wrap the missing functions in a second patch.
Using "slirp_" prefix avoids the conflict with socket function #define
wrappers in QEMU os-win32.h, but they are quite intrusive. In the end,
the functions should behave the same as original one, but with errno
being set. To avoid the churn, and potential confusion, remove the
"slirp_" prefix. A series of #undef is necessary until libslirp is
made standalone to prevent the #define conflict with QEMU.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20190212160953.29051-2-marcandre.lureau@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Diffstat (limited to 'slirp/ip_icmp.c')
| -rw-r--r-- | slirp/ip_icmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slirp/ip_icmp.c b/slirp/ip_icmp.c index ce79c0b051..120108f582 100644 --- a/slirp/ip_icmp.c +++ b/slirp/ip_icmp.c @@ -114,7 +114,7 @@ static int icmp_send(struct socket *so, struct mbuf *m, int hlen) void icmp_detach(struct socket *so) { so->slirp->cb->unregister_poll_fd(so->s, so->slirp->opaque); - slirp_closesocket(so->s); + closesocket(so->s); sofree(so); } @@ -421,7 +421,7 @@ void icmp_receive(struct socket *so) icp = mtod(m, struct icmp *); id = icp->icmp_id; - len = slirp_recv(so->s, icp, M_ROOM(m), 0); + len = recv(so->s, icp, M_ROOM(m), 0); /* * The behavior of reading SOCK_DGRAM+IPPROTO_ICMP sockets is inconsistent * between host OSes. On Linux, only the ICMP header and payload is |