From e3a110b527f749a2acec079c261f4481aadd3edc Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Fri, 5 Aug 2011 14:05:53 +0200 Subject: slirp: Only start packet expiration for delayed ones The expiration timeout must only affect packets that are queued due to pending ARP resolutions. The old version broke ping e.g. Signed-off-by: Jan Kiszka --- slirp/if.c | 3 --- slirp/slirp.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'slirp') diff --git a/slirp/if.c b/slirp/if.c index 47bebe4..2852396 100644 --- a/slirp/if.c +++ b/slirp/if.c @@ -106,9 +106,6 @@ if_output(struct socket *so, struct mbuf *ifm) ifs_init(ifm); insque(ifm, ifq); - /* Expiration date = Now + 1 second */ - ifm->expiration_date = qemu_get_clock_ns(rt_clock) + 1000000000ULL; - diddit: slirp->if_queued++; diff --git a/slirp/slirp.c b/slirp/slirp.c index a86cc6e..2c242ef 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -738,6 +738,9 @@ int if_encap(Slirp *slirp, struct mbuf *ifm) slirp->client_ipaddr = iph->ip_dst; slirp_output(slirp->opaque, arp_req, sizeof(arp_req)); ifm->arp_requested = true; + + /* Expire request and drop outgoing packet after 1 second */ + ifm->expiration_date = qemu_get_clock_ns(rt_clock) + 1000000000ULL; } return 0; } else { -- cgit v1.1