[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/27] slirp: add unregister_poll_fd() callback
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 10/27] slirp: add unregister_poll_fd() callback |
Date: |
Thu, 17 Jan 2019 15:43:42 +0400 |
Add a counter-part to register_poll_fd() for completeness.
(so far, register_poll_fd() is called only on struct socket fd)
Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
slirp/libslirp.h | 2 ++
net/slirp.c | 6 ++++++
slirp/ip_icmp.c | 1 +
slirp/slirp.c | 3 ++-
slirp/tcp_subr.c | 2 ++
slirp/udp.c | 1 +
6 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/slirp/libslirp.h b/slirp/libslirp.h
index 70e99139bf6..8ce69f0be39 100644
--- a/slirp/libslirp.h
+++ b/slirp/libslirp.h
@@ -29,6 +29,8 @@ typedef struct SlirpCb {
void (*timer_mod)(void *timer, int64_t expire_time);
/* Register a fd for future polling */
void (*register_poll_fd)(int fd);
+ /* Unregister a fd */
+ void (*unregister_poll_fd)(int fd);
} SlirpCb;
diff --git a/net/slirp.c b/net/slirp.c
index 6f756a4dccc..78ba96b63f7 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -191,6 +191,11 @@ static void net_slirp_register_poll_fd(int fd)
qemu_fd_register(fd);
}
+static void net_slirp_unregister_poll_fd(int fd)
+{
+ /* no qemu_fd_unregister */
+}
+
static const SlirpCb slirp_cb = {
.output = net_slirp_output,
.guest_error = net_slirp_guest_error,
@@ -199,6 +204,7 @@ static const SlirpCb slirp_cb = {
.timer_free = net_slirp_timer_free,
.timer_mod = net_slirp_timer_mod,
.register_poll_fd = net_slirp_register_poll_fd,
+ .unregister_poll_fd = net_slirp_unregister_poll_fd,
};
static int net_slirp_init(NetClientState *peer, const char *model,
diff --git a/slirp/ip_icmp.c b/slirp/ip_icmp.c
index b59daa801d1..19e247f773e 100644
--- a/slirp/ip_icmp.c
+++ b/slirp/ip_icmp.c
@@ -114,6 +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);
slirp_closesocket(so->s);
sofree(so);
}
diff --git a/slirp/slirp.c b/slirp/slirp.c
index dd72829017f..fdf26d5e626 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -1015,7 +1015,8 @@ int slirp_remove_hostfwd(Slirp *slirp, int is_udp, struct
in_addr host_addr,
getsockname(so->s, (struct sockaddr *)&addr, &addr_len) == 0 &&
addr.sin_addr.s_addr == host_addr.s_addr &&
addr.sin_port == port) {
- close(so->s);
+ so->slirp->cb->unregister_poll_fd(so->s);
+ slirp_closesocket(so->s);
sofree(so);
return 0;
}
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
index 8087ffc047f..d8846a33b0c 100644
--- a/slirp/tcp_subr.c
+++ b/slirp/tcp_subr.c
@@ -337,6 +337,7 @@ tcp_close(struct tcpcb *tp)
/* clobber input socket cache if we're closing the cached connection */
if (so == slirp->tcp_last_so)
slirp->tcp_last_so = &slirp->tcb;
+ so->slirp->cb->unregister_poll_fd(so->s);
slirp_closesocket(so->s);
sbfree(&so->so_rcv);
sbfree(&so->so_snd);
@@ -498,6 +499,7 @@ void tcp_connect(struct socket *inso)
/* Close the accept() socket, set right state */
if (inso->so_state & SS_FACCEPTONCE) {
/* If we only accept once, close the accept() socket */
+ so->slirp->cb->unregister_poll_fd(so->s);
slirp_closesocket(so->s);
/* Don't select it yet, even though we have an FD */
diff --git a/slirp/udp.c b/slirp/udp.c
index 6c3fb9a29ff..3915971b506 100644
--- a/slirp/udp.c
+++ b/slirp/udp.c
@@ -292,6 +292,7 @@ udp_attach(struct socket *so, unsigned short af)
void
udp_detach(struct socket *so)
{
+ so->slirp->cb->unregister_poll_fd(so->s);
slirp_closesocket(so->s);
sofree(so);
}
--
2.20.1.98.gecbdaf0899
- [Qemu-devel] [PATCH 07/27] slirp: replace QEMU_PACKED with SLIRP_PACKED, (continued)
- [Qemu-devel] [PATCH 07/27] slirp: replace QEMU_PACKED with SLIRP_PACKED, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 08/27] slirp: replace most qemu socket utilities with slirp own version, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 09/27] slirp: replace qemu_set_nonblock(), Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 11/27] slirp: replace qemu_notify_event() with a callback, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 10/27] slirp: add unregister_poll_fd() callback,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 13/27] slirp: do not include qemu headers in libslirp.h public API header, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 12/27] slirp: move QEMU state saving to a separate unit, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 14/27] slirp: improve windows headers inclusion, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 16/27] slirp: remove qemu timer.h dependency, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 17/27] slirp: remove now useless QEMU headers inclusions, Marc-André Lureau, 2019/01/17