diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-02-14 15:22:29 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-02-14 15:22:29 +0000 |
| commit | 7e407466b1efbd65225cc72fe09c0c5ec79df75b (patch) | |
| tree | 1e03d44f2be85d8e7d38bb0622f611a047a1df25 /slirp/socket.c | |
| parent | c4c5f6573a93dfbd351c41a27ea29a662d7445fa (diff) | |
| parent | adf1add2927c7bb652a168f5be627102921cf35f (diff) | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
Fix slirp on windows
Marc-André Lureau (2):
slirp: remove slirp_ prefix for socket wrappers
slirp: wrap the remaining socket functions
# gpg: Signature made Wed 13 Feb 2019 18:31:21 GMT
# gpg: using RSA key E61DBB15D4172BDEC97E92D9DB550E89F0FA54F3
# gpg: Good signature from "Samuel Thibault <samuel.thibault@aquilenet.fr>" [unknown]
# gpg: aka "Samuel Thibault <sthibault@debian.org>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@gnu.org>" [unknown]
# gpg: aka "Samuel Thibault <samuel.thibault@inria.fr>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@labri.fr>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@ens-lyon.org>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>" [unknown]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82 304B D017 8C76 7D06 9EE6
# Subkey fingerprint: E61D BB15 D417 2BDE C97E 92D9 DB55 0E89 F0FA 54F3
* remotes/thibault/tags/samuel-thibault:
slirp: wrap the remaining socket functions
slirp: remove slirp_ prefix for socket wrappers
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'slirp/socket.c')
| -rw-r--r-- | slirp/socket.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/slirp/socket.c b/slirp/socket.c index ce1d6ffa1d..4876ea3f31 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -185,7 +185,7 @@ soread(struct socket *so) */ sopreprbuf(so, iov, &n); - nn = slirp_recv(so->s, iov[0].iov_base, iov[0].iov_len,0); + nn = recv(so->s, iov[0].iov_base, iov[0].iov_len,0); if (nn <= 0) { if (nn < 0 && (errno == EINTR || errno == EAGAIN)) return 0; @@ -201,7 +201,7 @@ soread(struct socket *so) if (getpeername(so->s, paddr, &alen) < 0) { err = errno; } else { - slirp_getsockopt(so->s, SOL_SOCKET, SO_ERROR, + getsockopt(so->s, SOL_SOCKET, SO_ERROR, &err, &elen); } } @@ -231,7 +231,7 @@ soread(struct socket *so) */ if (n == 2 && nn == iov[0].iov_len) { int ret; - ret = slirp_recv(so->s, iov[1].iov_base, iov[1].iov_len,0); + ret = recv(so->s, iov[1].iov_base, iov[1].iov_len,0); if (ret > 0) nn += ret; } @@ -552,7 +552,7 @@ sorecvfrom(struct socket *so) */ len = M_FREEROOM(m); /* if (so->so_fport != htons(53)) { */ - slirp_ioctlsocket(so->s, FIONREAD, &n); + ioctlsocket(so->s, FIONREAD, &n); if (n > len) { n = (m->m_data - m->m_dat) + m->m_len + n + 1; @@ -724,7 +724,7 @@ tcp_listen(Slirp *slirp, uint32_t haddr, unsigned hport, uint32_t laddr, int tmperrno = errno; /* Don't clobber the real reason we failed */ if (s >= 0) { - slirp_closesocket(s); + closesocket(s); } sofree(so); /* Restore the real errno */ @@ -735,9 +735,9 @@ tcp_listen(Slirp *slirp, uint32_t haddr, unsigned hport, uint32_t laddr, #endif return NULL; } - slirp_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int)); + setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int)); opt = 1; - slirp_setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(int)); + setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(int)); getsockname(s,(struct sockaddr *)&addr,&addrlen); so->so_ffamily = AF_INET; |