Merge remote-tracking branch 'remotes/kraxel/tags/pull-fixes-20170403-1' into staging

[mirror_qemu.git] / slirp / mbuf.h

diff --git a/slirp/mbuf.h b/slirp/mbuf.h
index b74544b42b8432c549dffd28ad58fde1f1df9f48..893601ff9dc63c2d70dfa064c09a5ca405dce9cf 100644 (file)
--- a/slirp/mbuf.h
+++ b/slirp/mbuf.h
@@ -30,8 +30,8 @@
  * mbuf.h,v 1.9 1994/11/14 13:54:20 bde Exp
  */
 
-#ifndef _MBUF_H_
-#define _MBUF_H_
+#ifndef MBUF_H
+#define MBUF_H
 
 #define MINCSIZE 4096  /* Amount to increase mbuf if too small */
 
@@ -49,22 +49,6 @@
  * free the m_ext.  This is inefficient memory-wise, but who cares.
  */
 
-/* XXX should union some of these! */
-/* header at beginning of each mbuf: */
-struct m_hdr {
-       struct  mbuf *mh_next;          /* Linked list of mbufs */
-       struct  mbuf *mh_prev;
-       struct  mbuf *mh_nextpkt;       /* Next packet in queue/record */
-       struct  mbuf *mh_prevpkt; /* Flags aren't used in the output queue */
-       int     mh_flags;         /* Misc flags */
-
-       int     mh_size;                /* Size of data */
-       struct  socket *mh_so;
-
-       caddr_t mh_data;                /* Location of data */
-       int     mh_len;                 /* Amount of data in this mbuf */
-};
-
 /*
  * How much room is in the mbuf, from m_data to the end of the mbuf
  */
@@ -80,26 +64,28 @@ struct m_hdr {
 #define M_TRAILINGSPACE M_FREEROOM
 
 struct mbuf {
-       struct  m_hdr m_hdr;
+       /* XXX should union some of these! */
+       /* header at beginning of each mbuf: */
+       struct  mbuf *m_next;           /* Linked list of mbufs */
+       struct  mbuf *m_prev;
+       struct  mbuf *m_nextpkt;        /* Next packet in queue/record */
+       struct  mbuf *m_prevpkt;        /* Flags aren't used in the output queue */
+       int     m_flags;                /* Misc flags */
+
+       int     m_size;                 /* Size of data */
+       struct  socket *m_so;
+
+       caddr_t m_data;                 /* Location of data */
+       int     m_len;                  /* Amount of data in this mbuf */
+
        Slirp *slirp;
-       union M_dat {
-               char    m_dat_[1]; /* ANSI don't like 0 sized arrays */
-               char    *m_ext_;
-       } M_dat;
+       bool    resolution_requested;
+       uint64_t expiration_date;
+       char   *m_ext;
+       /* start of dynamic buffer area, must be last element */
+       char    m_dat[];
 };
 
-#define m_next         m_hdr.mh_next
-#define m_prev         m_hdr.mh_prev
-#define m_nextpkt      m_hdr.mh_nextpkt
-#define m_prevpkt      m_hdr.mh_prevpkt
-#define m_flags                m_hdr.mh_flags
-#define        m_len           m_hdr.mh_len
-#define        m_data          m_hdr.mh_data
-#define m_size         m_hdr.mh_size
-#define m_dat          M_dat.m_dat_
-#define m_ext          M_dat.m_ext_
-#define m_so           m_hdr.mh_so
-
 #define ifq_prev m_prev
 #define ifq_next m_next
 #define ifs_prev m_prevpkt
@@ -113,6 +99,7 @@ struct mbuf {
                                         * it rather than putting it on the free list */
 
 void m_init(Slirp *);
+void m_cleanup(Slirp *slirp);
 struct mbuf * m_get(Slirp *);
 void m_free(struct mbuf *);
 void m_cat(register struct mbuf *, register struct mbuf *);
@@ -121,4 +108,9 @@ void m_adj(struct mbuf *, int);
 int m_copy(struct mbuf *, struct mbuf *, int, int);
 struct mbuf * dtom(Slirp *, void *);
 
+static inline void ifs_init(struct mbuf *ifm)
+{
+    ifm->ifs_next = ifm->ifs_prev = ifm;
+}
+
 #endif