claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle libslirp 4.9.0's deprecations

Browse Source
This commit is contained in:
Alexander Babikov
2025-03-07 21:24:55 +05:00
parent c20161457a
commit e84bbcac0f
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/network/net_slirp.c
View File

@@ -155,14 +155,22 @@ net_slirp_timer_mod(void *timer, int64_t expire_timer, UNUSED(void *opaque))
} }
static void static void
#if SLIRP_CHECK_VERSION(4, 9, 0)
net_slirp_register_poll_socket(slirp_os_socket fd, void *opaque)
#else
net_slirp_register_poll_fd(int fd, void *opaque) net_slirp_register_poll_fd(int fd, void *opaque)
#endif
{ {
(void) fd; (void) fd;
(void) opaque; (void) opaque;
} }
static void static void
#if SLIRP_CHECK_VERSION(4, 9, 0)
net_slirp_unregister_poll_socket(slirp_os_socket fd, void *opaque)
#else
net_slirp_unregister_poll_fd(int fd, void *opaque) net_slirp_unregister_poll_fd(int fd, void *opaque)
#endif
{ {
(void) fd; (void) fd;
(void) opaque; (void) opaque;
@@ -198,7 +206,11 @@ net_slirp_send_packet(const void *qp, size_t pkt_len, void *opaque)
#ifdef _WIN32 #ifdef _WIN32
static int static int
# if SLIRP_CHECK_VERSION(4, 9, 0)
net_slirp_add_poll(slirp_os_socket fd, int events, void *opaque)
# else
net_slirp_add_poll(int fd, int events, void *opaque) net_slirp_add_poll(int fd, int events, void *opaque)
# endif
{ {
net_slirp_t *slirp = (net_slirp_t *) opaque; net_slirp_t *slirp = (net_slirp_t *) opaque;
long bitmask = 0; long bitmask = 0;
@@ -216,7 +228,11 @@ net_slirp_add_poll(int fd, int events, void *opaque)
} }
#else #else
static int static int
# if SLIRP_CHECK_VERSION(4, 9, 0)
net_slirp_add_poll(slirp_os_socket fd, int events, void *opaque)
# else
net_slirp_add_poll(int fd, int events, void *opaque) net_slirp_add_poll(int fd, int events, void *opaque)
# endif
{ {
net_slirp_t *slirp = (net_slirp_t *) opaque; net_slirp_t *slirp = (net_slirp_t *) opaque;
@@ -307,8 +323,13 @@ static const SlirpCb slirp_cb = {
.timer_new = net_slirp_timer_new, .timer_new = net_slirp_timer_new,
.timer_free = net_slirp_timer_free, .timer_free = net_slirp_timer_free,
.timer_mod = net_slirp_timer_mod, .timer_mod = net_slirp_timer_mod,
#if SLIRP_CHECK_VERSION(4, 9, 0)
.register_poll_socket = net_slirp_register_poll_socket,
.unregister_poll_socket = net_slirp_unregister_poll_socket,
#else
.register_poll_fd = net_slirp_register_poll_fd, .register_poll_fd = net_slirp_register_poll_fd,
.unregister_poll_fd = net_slirp_unregister_poll_fd, .unregister_poll_fd = net_slirp_unregister_poll_fd,
#endif
.notify = net_slirp_notify .notify = net_slirp_notify
}; };
@@ -362,7 +383,11 @@ net_slirp_thread(void *priv)
bool run = true; bool run = true;
while (run) { while (run) {
uint32_t timeout = -1; uint32_t timeout = -1;
# if SLIRP_CHECK_VERSION(4, 9, 0)
slirp_pollfds_fill_socket(slirp->slirp, &timeout, net_slirp_add_poll, slirp);
# else
slirp_pollfds_fill(slirp->slirp, &timeout, net_slirp_add_poll, slirp); slirp_pollfds_fill(slirp->slirp, &timeout, net_slirp_add_poll, slirp);
# endif
if (timeout < 0) if (timeout < 0)
timeout = INFINITE; timeout = INFINITE;
@@ -409,7 +434,11 @@ net_slirp_thread(void *priv)
net_slirp_add_poll(net_event_get_fd(&slirp->stop_event), SLIRP_POLL_IN, slirp); net_slirp_add_poll(net_event_get_fd(&slirp->stop_event), SLIRP_POLL_IN, slirp);
net_slirp_add_poll(net_event_get_fd(&slirp->tx_event), SLIRP_POLL_IN, slirp); net_slirp_add_poll(net_event_get_fd(&slirp->tx_event), SLIRP_POLL_IN, slirp);
# if SLIRP_CHECK_VERSION(4, 9, 0)
slirp_pollfds_fill_socket(slirp->slirp, &timeout, net_slirp_add_poll, slirp);
# else
slirp_pollfds_fill(slirp->slirp, &timeout, net_slirp_add_poll, slirp); slirp_pollfds_fill(slirp->slirp, &timeout, net_slirp_add_poll, slirp);
# endif
int ret = poll(slirp->pfd, slirp->pfd_len, timeout); int ret = poll(slirp->pfd, slirp->pfd_len, timeout);