diff options
| -rw-r--r-- | slirp/if.c | 11 | ||||
| -rw-r--r-- | slirp/slirp.h | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/slirp/if.c b/slirp/if.c index 14fdef1e57..f7aebe9557 100644 --- a/slirp/if.c +++ b/slirp/if.c @@ -163,10 +163,17 @@ void if_start(Slirp *slirp) DEBUG_CALL("if_start"); + if (slirp->if_start_busy) { + return; + } + slirp->if_start_busy = true; + while (slirp->if_queued) { /* check if we can really output */ - if (!slirp_can_output(slirp->opaque)) + if (!slirp_can_output(slirp->opaque)) { + slirp->if_start_busy = false; return; + } /* * See which queue to get next packet from @@ -221,4 +228,6 @@ void if_start(Slirp *slirp) } slirp->if_queued = requeued; + + slirp->if_start_busy = false; } diff --git a/slirp/slirp.h b/slirp/slirp.h index 28a5c037e6..416d44a996 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -239,6 +239,7 @@ struct Slirp { struct mbuf if_fastq; /* fast queue (for interactive data) */ struct mbuf if_batchq; /* queue for non-interactive data */ struct mbuf *next_m; /* pointer to next mbuf to output */ + bool if_start_busy; /* avoid if_start recursion */ /* ip states */ struct ipq ipq; /* ip reass. queue */ |