aboutsummaryrefslogtreecommitdiff
path: root/slirp
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2012-02-17 16:35:36 +0100
committerJan Kiszka <jan.kiszka@siemens.com>2012-02-27 14:54:49 +0100
commitb87ffa163185e339f9f9f1e6dbc561e0f990442d (patch)
tree55fd67eb9d537004e86d1be958054085cdd3543e /slirp
parentb248ede2ef2792d364bd305e5e92e24921c924a8 (diff)
downloadqemu-arm-b87ffa163185e339f9f9f1e6dbc561e0f990442d.tar.gz
slirp: Refactor if_start
Replace gotos with a while loop, fix coding style. CC: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> CC: Fabien Chouteau <chouteau@adacore.com> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Diffstat (limited to 'slirp')
-rw-r--r--slirp/if.c78
1 files changed, 36 insertions, 42 deletions
diff --git a/slirp/if.c b/slirp/if.c
index 710ec230e6..33f08e1151 100644
--- a/slirp/if.c
+++ b/slirp/if.c
@@ -149,39 +149,36 @@ diddit:
* from the second session, then one packet from the third, then back
* to the first, etc. etc.
*/
-void
-if_start(Slirp *slirp)
+void if_start(Slirp *slirp)
{
uint64_t now = qemu_get_clock_ns(rt_clock);
int requeued = 0;
bool from_batchq = false;
- struct mbuf *ifm, *ifqt;
-
- DEBUG_CALL("if_start");
+ struct mbuf *ifm, *ifqt;
- if (slirp->if_queued == 0)
- return; /* Nothing to do */
+ DEBUG_CALL("if_start");
- again:
+ while (slirp->if_queued) {
/* check if we can really output */
if (!slirp_can_output(slirp->opaque))
return;
- /*
- * See which queue to get next packet from
- * If there's something in the fastq, select it immediately
- */
- if (slirp->if_fastq.ifq_next != &slirp->if_fastq) {
- ifm = slirp->if_fastq.ifq_next;
- } else {
- /* Nothing on fastq, see if next_m is valid */
- if (slirp->next_m != &slirp->if_batchq)
- ifm = slirp->next_m;
- else
- ifm = slirp->if_batchq.ifq_next;
-
- from_batchq = true;
- }
+ /*
+ * See which queue to get next packet from
+ * If there's something in the fastq, select it immediately
+ */
+ if (slirp->if_fastq.ifq_next != &slirp->if_fastq) {
+ ifm = slirp->if_fastq.ifq_next;
+ } else {
+ /* Nothing on fastq, see if next_m is valid */
+ if (slirp->next_m != &slirp->if_batchq) {
+ ifm = slirp->next_m;
+ } else {
+ ifm = slirp->if_batchq.ifq_next;
+ }
+
+ from_batchq = true;
+ }
slirp->if_queued--;
@@ -189,7 +186,7 @@ if_start(Slirp *slirp)
if (ifm->expiration_date >= now && !if_encap(slirp, ifm)) {
/* Packet is delayed due to pending ARP resolution */
requeued++;
- goto out;
+ continue;
}
if (from_batchq) {
@@ -197,28 +194,25 @@ if_start(Slirp *slirp)
slirp->next_m = ifm->ifq_next;
}
- /* Remove it from the queue */
- ifqt = ifm->ifq_prev;
- remque(ifm);
+ /* Remove it from the queue */
+ ifqt = ifm->ifq_prev;
+ remque(ifm);
- /* If there are more packets for this session, re-queue them */
- if (ifm->ifs_next != /* ifm->ifs_prev != */ ifm) {
- insque(ifm->ifs_next, ifqt);
- ifs_remque(ifm);
- }
+ /* If there are more packets for this session, re-queue them */
+ if (ifm->ifs_next != ifm) {
+ insque(ifm->ifs_next, ifqt);
+ ifs_remque(ifm);
+ }
- /* Update so_queued */
- if (ifm->ifq_so) {
- if (--ifm->ifq_so->so_queued == 0)
- /* If there's no more queued, reset nqueued */
- ifm->ifq_so->so_nqueued = 0;
- }
+ /* Update so_queued */
+ if (ifm->ifq_so && --ifm->ifq_so->so_queued == 0) {
+ /* If there's no more queued, reset nqueued */
+ ifm->ifq_so->so_nqueued = 0;
+ }
m_free(ifm);
- out:
- if (slirp->if_queued)
- goto again;
+ }
- slirp->if_queued = requeued;
+ slirp->if_queued = requeued;
}