Commit f6e5aa36 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Samuel Thibault
Browse files

slirp: add unregister_poll_fd() callback 



Add a counter-part to register_poll_fd() for completeness.

(so far, register_poll_fd() is called only on struct socket fd)

Suggested-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
parent 848c7092

net/slirp.c

+6 −0
Original line number Diff line number Diff line
@@ -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,

slirp/ip_icmp.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

}

slirp/libslirp.h

+2 −0
Original line number Diff line number Diff line
@@ -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;

slirp/slirp.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

        }

slirp/tcp_subr.c

+2 −0
Original line number Diff line number Diff line
@@ -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 */