qtest: Assure that init_socket()'s listen() does not fail

[mirror_qemu.git] / slirp / mbuf.c

diff --git a/slirp/mbuf.c b/slirp/mbuf.c
index 7963d346a0662919efa0f45bcffb4023df93479a..4fefb043bf882979ff2396e5bc1b4f5bbeb20aa4 100644 (file)
--- a/slirp/mbuf.c
+++ b/slirp/mbuf.c
@@ -17,22 +17,40 @@
 
 #include <slirp.h>
 
-int mbuf_alloced = 0;
-struct mbuf m_freelist, m_usedlist;
 #define MBUF_THRESH 30
-int mbuf_max = 0;
 
 /*
  * Find a nice value for msize
  * XXX if_maxlinkhdr already in mtu
  */
-#define SLIRP_MSIZE (IF_MTU + IF_MAXLINKHDR + sizeof(struct m_hdr ) + 6)
+#define SLIRP_MSIZE (IF_MTU + IF_MAXLINKHDR + offsetof(struct mbuf, m_dat) + 6)
 
 void
-m_init(void)
+m_init(Slirp *slirp)
 {
-       m_freelist.m_next = m_freelist.m_prev = &m_freelist;
-       m_usedlist.m_next = m_usedlist.m_prev = &m_usedlist;
+    slirp->m_freelist.m_next = slirp->m_freelist.m_prev = &slirp->m_freelist;
+    slirp->m_usedlist.m_next = slirp->m_usedlist.m_prev = &slirp->m_usedlist;
+}
+
+void m_cleanup(Slirp *slirp)
+{
+    struct mbuf *m, *next;
+
+    m = slirp->m_usedlist.m_next;
+    while (m != &slirp->m_usedlist) {
+        next = m->m_next;
+        if (m->m_flags & M_EXT) {
+            free(m->m_ext);
+        }
+        free(m);
+        m = next;
+    }
+    m = slirp->m_freelist.m_next;
+    while (m != &slirp->m_freelist) {
+        next = m->m_next;
+        free(m);
+        m = next;
+    }
 }
 
 /*
@@ -44,36 +62,37 @@ m_init(void)
  * which tells m_free to actually free() it
  */
 struct mbuf *
-m_get(void)
+m_get(Slirp *slirp)
 {
        register struct mbuf *m;
        int flags = 0;
 
        DEBUG_CALL("m_get");
 
-       if (m_freelist.m_next == &m_freelist) {
+       if (slirp->m_freelist.m_next == &slirp->m_freelist) {
                m = (struct mbuf *)malloc(SLIRP_MSIZE);
                if (m == NULL) goto end_error;
-               mbuf_alloced++;
-               if (mbuf_alloced > MBUF_THRESH)
+               slirp->mbuf_alloced++;
+               if (slirp->mbuf_alloced > MBUF_THRESH)
                        flags = M_DOFREE;
-               if (mbuf_alloced > mbuf_max)
-                       mbuf_max = mbuf_alloced;
+               m->slirp = slirp;
        } else {
-               m = m_freelist.m_next;
+               m = slirp->m_freelist.m_next;
                remque(m);
        }
 
        /* Insert it in the used list */
-       insque(m,&m_usedlist);
+       insque(m,&slirp->m_usedlist);
        m->m_flags = (flags | M_USEDLIST);
 
        /* Initialise it */
-       m->m_size = SLIRP_MSIZE - sizeof(struct m_hdr);
+       m->m_size = SLIRP_MSIZE - offsetof(struct mbuf, m_dat);
        m->m_data = m->m_dat;
        m->m_len = 0;
         m->m_nextpkt = NULL;
         m->m_prevpkt = NULL;
+        m->arp_requested = false;
+        m->expiration_date = (uint64_t)-1;
 end_error:
        DEBUG_ARG("m = %lx", (long )m);
        return m;
@@ -99,10 +118,10 @@ m_free(struct mbuf *m)
         * Either free() it or put it on the free list
         */
        if (m->m_flags & M_DOFREE) {
+               m->slirp->mbuf_alloced--;
                free(m);
-               mbuf_alloced--;
        } else if ((m->m_flags & M_FREELIST) == 0) {
-               insque(m,&m_freelist);
+               insque(m,&m->slirp->m_freelist);
                m->m_flags = M_FREELIST; /* Clobber other flags */
        }
   } /* if(m) */
@@ -197,7 +216,7 @@ m_copy(struct mbuf *n, struct mbuf *m, int off, int len)
  * Fortunately, it's not used often
  */
 struct mbuf *
-dtom(void *dat)
+dtom(Slirp *slirp, void *dat)
 {
        struct mbuf *m;
 
@@ -205,7 +224,8 @@ dtom(void *dat)
        DEBUG_ARG("dat = %lx", (long )dat);
 
        /* bug corrected for M_EXT buffers */
-       for (m = m_usedlist.m_next; m != &m_usedlist; m = m->m_next) {
+       for (m = slirp->m_usedlist.m_next; m != &slirp->m_usedlist;
+            m = m->m_next) {
          if (m->m_flags & M_EXT) {
            if( (char *)dat>=m->m_ext && (char *)dat<(m->m_ext + m->m_size) )
              return m;