Merge branch 'xtensa' of git://jcmvbkbc.spb.ru/dumb/qemu-xtensa

[qemu.git] / slirp / if.c

diff --git a/slirp/if.c b/slirp/if.c
index 2d79e45bcde2b5628c74bc6ca6943efecf2f6bcc..33f08e11519f0c217f6b26b445b786321652919e 100644 (file)
--- a/slirp/if.c
+++ b/slirp/if.c
@@ -8,8 +8,6 @@
 #include <slirp.h>
 #include "qemu-timer.h"
 
-#define ifs_init(ifm) ((ifm)->ifs_next = (ifm)->ifs_prev = (ifm))
-
 static void
 ifs_insque(struct mbuf *ifm, struct mbuf *ifmhead)
 {
@@ -106,9 +104,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++;
 
@@ -154,76 +149,70 @@ 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;
-    uint64_t now;
-
-       struct mbuf *ifm, *ifqt;
+    bool from_batchq = false;
+    struct mbuf *ifm, *ifqt;
 
-       DEBUG_CALL("if_start");
+    DEBUG_CALL("if_start");
 
-       if (slirp->if_queued == 0)
-          return; /* Nothing to do */
-
- again:
+    while (slirp->if_queued) {
         /* check if we can really output */
         if (!slirp_can_output(slirp->opaque))
             return;
 
-        now = qemu_get_clock_ns(rt_clock);
-
-       /*
-        * 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;
-
-               /* Set which packet to send on next iteration */
-               slirp->next_m = ifm->ifq_next;
-       }
-       /* Remove it from the queue */
-       ifqt = ifm->ifq_prev;
-       remque(ifm);
-       slirp->if_queued--;
-
-       /* 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);
-       }
-
-       /* 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;
-       }
-
-        if (ifm->expiration_date < now) {
-            /* Expired */
-            m_free(ifm);
+        /*
+         * 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 {
-            /* Encapsulate the packet for sending */
-            if (if_encap(slirp, ifm)) {
-                m_free(ifm);
+            /* Nothing on fastq, see if next_m is valid */
+            if (slirp->next_m != &slirp->if_batchq) {
+                ifm = slirp->next_m;
             } else {
-                /* re-queue */
-                insque(ifm, ifqt);
-                requeued++;
+                ifm = slirp->if_batchq.ifq_next;
             }
+
+            from_batchq = true;
+        }
+
+        slirp->if_queued--;
+
+        /* Try to send packet unless it already expired */
+        if (ifm->expiration_date >= now && !if_encap(slirp, ifm)) {
+            /* Packet is delayed due to pending ARP resolution */
+            requeued++;
+            continue;
+        }
+
+        if (from_batchq) {
+            /* Set which packet to send on next iteration */
+            slirp->next_m = ifm->ifq_next;
         }
 
-       if (slirp->if_queued)
-          goto again;
+        /* 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) {
+            insque(ifm->ifs_next, ifqt);
+            ifs_remque(ifm);
+        }
+
+        /* 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);
+
+    }
 
-        slirp->if_queued = requeued;
+    slirp->if_queued = requeued;
 }