target/arm: Split contiguous stores for endianness

[qemu.git] / slirp / sbuf.c

diff --git a/slirp/sbuf.c b/slirp/sbuf.c
index 209064b1aaf6822e0734d1e6ddd0ae6fb18aad46..912f235f6524bf116e4ce687be5d1080d6f56710 100644 (file)
--- a/slirp/sbuf.c
+++ b/slirp/sbuf.c
@@ -5,28 +5,23 @@
  * terms and conditions of the copyright.
  */
 
-#include <slirp.h>
-
-/* Done as a macro in socket.h */
-/* int
- * sbspace(struct sockbuff *sb)
- * {
- *     return SB_DATALEN - sb->sb_cc;
- * }
- */
+#include "qemu/osdep.h"
+#include "slirp.h"
+#include "qemu/main-loop.h"
+
+static void sbappendsb(struct sbuf *sb, struct mbuf *m);
 
 void
-sbfree(sb)
-       struct sbuf *sb;
+sbfree(struct sbuf *sb)
 {
        free(sb->sb_data);
 }
 
 void
-sbdrop(sb, num)
-       struct sbuf *sb;
-       int num;
+sbdrop(struct sbuf *sb, int num)
 {
+    int limit = sb->sb_datalen / 2;
+
        /*
         * We can only drop how much we have
         * This should never succeed
@@ -38,12 +33,13 @@ sbdrop(sb, num)
        if(sb->sb_rptr >= sb->sb_data + sb->sb_datalen)
                sb->sb_rptr -= sb->sb_datalen;
 
+    if (sb->sb_cc < limit && sb->sb_cc + num >= limit) {
+        qemu_notify_event();
+    }
 }
 
 void
-sbreserve(sb, size)
-       struct sbuf *sb;
-       int size;
+sbreserve(struct sbuf *sb, int size)
 {
        if (sb->sb_data) {
                /* Already alloced, realloc if necessary */
@@ -72,15 +68,13 @@ sbreserve(sb, size)
  * (the socket is non-blocking, so we won't hang)
  */
 void
-sbappend(so, m)
-       struct socket *so;
-       struct mbuf *m;
+sbappend(struct socket *so, struct mbuf *m)
 {
        int ret = 0;
 
        DEBUG_CALL("sbappend");
-       DEBUG_ARG("so = %lx", (long)so);
-       DEBUG_ARG("m = %lx", (long)m);
+       DEBUG_ARG("so = %p", so);
+       DEBUG_ARG("m = %p", m);
        DEBUG_ARG("m->m_len = %d", m->m_len);
 
        /* Shouldn't happen, but...  e.g. foreign host closes connection */
@@ -97,7 +91,7 @@ sbappend(so, m)
        if (so->so_urgc) {
                sbappendsb(&so->so_rcv, m);
                m_free(m);
-               sosendoob(so);
+               (void)sosendoob(so);
                return;
        }
 
@@ -106,7 +100,7 @@ sbappend(so, m)
         * ottherwise it'll arrive out of order, and hence corrupt
         */
        if (!so->so_rcv.sb_cc)
-          ret = send(so->s, m->m_data, m->m_len, 0);
+          ret = slirp_send(so, m->m_data, m->m_len, 0);
 
        if (ret <= 0) {
                /*
@@ -133,10 +127,8 @@ sbappend(so, m)
  * Copy the data from m into sb
  * The caller is responsible to make sure there's enough room
  */
-void
-sbappendsb(sb, m)
-        struct sbuf *sb;
-        struct mbuf *m;
+static void
+sbappendsb(struct sbuf *sb, struct mbuf *m)
 {
        int len, n,  nn;
 
@@ -173,11 +165,7 @@ sbappendsb(sb, m)
  * done in sbdrop when the data is acked
  */
 void
-sbcopy(sb, off, len, to)
-       struct sbuf *sb;
-       int off;
-       int len;
-       char *to;
+sbcopy(struct sbuf *sb, int off, int len, char *to)
 {
        char *from;
 
@@ -198,4 +186,3 @@ sbcopy(sb, off, len, to)
                   memcpy(to+off,sb->sb_data,len);
        }
 }
-