From 460fec67ee3807bb2eb189587ffe803a48f317e5 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Wed, 24 Jun 2009 14:42:31 +0200 Subject: slirp: Factor out internal state structure The essence of this patch is to stuff (almost) all global variables of the slirp stack into the structure Slirp. In this step, we still keep the structure as global variable, directly accessible by the whole stack. Changes to the external interface of slirp will be applied in the following patches. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori --- slirp/mbuf.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'slirp/mbuf.h') diff --git a/slirp/mbuf.h b/slirp/mbuf.h index c482753fef..99fca43898 100644 --- a/slirp/mbuf.h +++ b/slirp/mbuf.h @@ -84,6 +84,7 @@ struct m_hdr { struct mbuf { struct m_hdr m_hdr; + Slirp *slirp; union M_dat { char m_dat_[1]; /* ANSI don't like 0 sized arrays */ char *m_ext_; @@ -114,15 +115,13 @@ struct mbuf { #define M_DOFREE 0x08 /* when m_free is called on the mbuf, free() * it rather than putting it on the free list */ -extern struct mbuf m_freelist, m_usedlist; - -void m_init _P((void)); -struct mbuf * m_get _P((void)); +void m_init _P((Slirp *)); +struct mbuf * m_get _P((Slirp *)); void m_free _P((struct mbuf *)); void m_cat _P((register struct mbuf *, register struct mbuf *)); void m_inc _P((struct mbuf *, int)); void m_adj _P((struct mbuf *, int)); int m_copy _P((struct mbuf *, struct mbuf *, int, int)); -struct mbuf * dtom _P((void *)); +struct mbuf * dtom _P((Slirp *, void *)); #endif -- cgit v1.2.1