ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

slirp: use virtual time for packet expiration 

Make all packets expiration time based on virtual clock.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
Marc-André Lureau 2018-11-22 02:06:27 +04:00 committed by Samuel Thibault
parent 5d300fc922
commit 6c2d0980e2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slirp/if.c
View File

@ -148,7 +148,7 @@ diddit:
*/ */
void if_start(Slirp *slirp) void if_start(Slirp *slirp)
{ {
uint64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); uint64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
bool from_batchq = false; bool from_batchq = false;
struct mbuf *ifm, *ifm_next, *ifqt; struct mbuf *ifm, *ifm_next, *ifqt;

7
slirp/slirp.c
View File

@ -582,7 +582,7 @@ void slirp_pollfds_poll(GArray *pollfds, int select_error)
return; return;
} }
curtime = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); curtime = qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL);
QTAILQ_FOREACH(slirp, &slirp_instances, entry) { QTAILQ_FOREACH(slirp, &slirp_instances, entry) {
/* /*
@ -909,7 +909,8 @@ static int if_encap4(Slirp *slirp, struct mbuf *ifm, struct ethhdr *eh,
ifm->resolution_requested = true; ifm->resolution_requested = true;
/* Expire request and drop outgoing packet after 1 second */ /* Expire request and drop outgoing packet after 1 second */
ifm->expiration_date = qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + 1000000000ULL; ifm->expiration_date =
qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 1000000000ULL;
} }
return 0; return 0;
} else { } else {
@ -936,7 +937,7 @@ static int if_encap6(Slirp *slirp, struct mbuf *ifm, struct ethhdr *eh,
ndp_send_ns(slirp, ip6h->ip_dst); ndp_send_ns(slirp, ip6h->ip_dst);
ifm->resolution_requested = true; ifm->resolution_requested = true;
ifm->expiration_date = ifm->expiration_date =
qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + 1000000000ULL; qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 1000000000ULL;
} }
return 0; return 0;
} else { } else {