2004-04-22 04:10:48 +04:00
|
|
|
/*
|
|
|
|
* Copyright (c) 1982, 1986, 1988, 1993
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
Remove the advertising clause from the slirp license
According to the FSF, the 4-clause BSD license, which slirp is covered under,
is not compatible with the GPL or LGPL[1].
[1] http://www.fsf.org/licensing/licenses/index_html#GPLIncompatibleLicenses
There are three declared copyright holders in slirp that use the 4-clause
BSD license, the Regents of UC Berkley, Danny Gasparovski, and Kelly Price.
Below are the appropriate permissions to remove the advertise clause from slirp
from each party.
Special thanks go to Richard Fontana from Red Hat for contacting all of the
necessary authors to resolve this issue!
Regents of UC Berkley:
From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
July 22, 1999
To All Licensees, Distributors of Any Version of BSD:
As you know, certain of the Berkeley Software Distribution ("BSD") source
code files require that further distributions of products containing all or
portions of the software, acknowledge within their advertising materials
that such products contain software developed by UC Berkeley and its
contributors.
Specifically, the provision reads:
" * 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors."
Effective immediately, licensees and distributors are no longer required to
include the acknowledgement within advertising materials. Accordingly, the
foregoing paragraph of those BSD Unix files containing it is hereby deleted
in its entirety.
William Hoskins
Director, Office of Technology Licensing
University of California, Berkeley
Danny Gasparovski:
Subject: RE: Slirp license
Date: Thu, 8 Jan 2009 10:51:00 +1100
From: "Gasparovski, Daniel" <Daniel.Gasparovski@ato.gov.au>
To: "Richard Fontana" <rfontana@redhat.com>
Hi Richard,
I have no objection to having Slirp code in QEMU be licensed under the
3-clause BSD license.
Thanks for taking the effort to consult me about this.
Dan ...
Kelly Price:
Date: Thu, 8 Jan 2009 19:38:56 -0500
From: "Kelly Price" <strredwolf@gmail.com>
To: "Richard Fontana" <rfontana@redhat.com>
Subject: Re: Slirp license
Thanks for contacting me, Richard. I'm glad you were able to find
Dan, as I've been "keeping the light on" for Slirp. I have no use for
it now, and I have little time for it (now holding onto Keenspot's
Comic Genesis and having a regular US state government position). If
Dan would like to return to the project, I'd love to give it back to
him.
As for copyright, I don't own all of it. Dan does, so I will defer to
him. Any of my patches I will gladly license to the 3-part BSD
license. My interest in re-licensing was because we didn't have ready
info to contact Dan. If Dan would like to port Slirp back out of
QEMU, a lot of us 64-bit users would be grateful.
Feel free to share this email address with Dan. I will be glad to
effect a transfer of the project to him and Mr. Bellard of the QEMU
project.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6451 c046a42c-6fe2-441c-8c8c-71466251a162
2009-01-26 22:37:41 +03:00
|
|
|
* 3. Neither the name of the University nor the names of its contributors
|
2004-04-22 04:10:48 +04:00
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*
|
|
|
|
* @(#)mbuf.h 8.3 (Berkeley) 1/21/94
|
|
|
|
* mbuf.h,v 1.9 1994/11/14 13:54:20 bde Exp
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _MBUF_H_
|
|
|
|
#define _MBUF_H_
|
|
|
|
|
|
|
|
#define m_freem m_free
|
|
|
|
|
|
|
|
|
|
|
|
#define MINCSIZE 4096 /* Amount to increase mbuf if too small */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Macros for type conversion
|
|
|
|
* mtod(m,t) - convert mbuf pointer to data pointer of correct type
|
|
|
|
*/
|
|
|
|
#define mtod(m,t) ((t)(m)->m_data)
|
|
|
|
|
|
|
|
/* XXX About mbufs for slirp:
|
|
|
|
* Only one mbuf is ever used in a chain, for each "cell" of data.
|
|
|
|
* m_nextpkt points to the next packet, if fragmented.
|
|
|
|
* If the data is too large, the M_EXT is used, and a larger block
|
|
|
|
* is alloced. Therefore, m_free[m] must check for M_EXT and if set
|
|
|
|
* 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;
|
2007-09-17 01:08:06 +04:00
|
|
|
|
2004-04-22 04:10:48 +04:00
|
|
|
caddr_t mh_data; /* Location of data */
|
|
|
|
int mh_len; /* Amount of data in this mbuf */
|
|
|
|
};
|
|
|
|
|
2007-09-17 01:08:06 +04:00
|
|
|
/*
|
2004-04-22 04:10:48 +04:00
|
|
|
* How much room is in the mbuf, from m_data to the end of the mbuf
|
|
|
|
*/
|
|
|
|
#define M_ROOM(m) ((m->m_flags & M_EXT)? \
|
|
|
|
(((m)->m_ext + (m)->m_size) - (m)->m_data) \
|
|
|
|
: \
|
|
|
|
(((m)->m_dat + (m)->m_size) - (m)->m_data))
|
|
|
|
|
|
|
|
/*
|
|
|
|
* How much free room there is
|
|
|
|
*/
|
|
|
|
#define M_FREEROOM(m) (M_ROOM(m) - (m)->m_len)
|
|
|
|
#define M_TRAILINGSPACE M_FREEROOM
|
|
|
|
|
|
|
|
struct mbuf {
|
|
|
|
struct m_hdr m_hdr;
|
2009-06-24 16:42:31 +04:00
|
|
|
Slirp *slirp;
|
2004-04-22 04:10:48 +04:00
|
|
|
union M_dat {
|
|
|
|
char m_dat_[1]; /* ANSI don't like 0 sized arrays */
|
|
|
|
char *m_ext_;
|
|
|
|
} 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
|
|
|
|
#define ifs_next m_nextpkt
|
|
|
|
#define ifq_so m_so
|
|
|
|
|
|
|
|
#define M_EXT 0x01 /* m_ext points to more (malloced) data */
|
|
|
|
#define M_FREELIST 0x02 /* mbuf is on free list */
|
|
|
|
#define M_USEDLIST 0x04 /* XXX mbuf is on used list (for dtom()) */
|
|
|
|
#define M_DOFREE 0x08 /* when m_free is called on the mbuf, free()
|
|
|
|
* it rather than putting it on the free list */
|
|
|
|
|
2009-07-01 23:11:17 +04:00
|
|
|
void m_init(Slirp *);
|
|
|
|
struct mbuf * m_get(Slirp *);
|
|
|
|
void m_free(struct mbuf *);
|
|
|
|
void m_cat(register struct mbuf *, register struct mbuf *);
|
|
|
|
void m_inc(struct mbuf *, int);
|
|
|
|
void m_adj(struct mbuf *, int);
|
|
|
|
int m_copy(struct mbuf *, struct mbuf *, int, int);
|
|
|
|
struct mbuf * dtom(Slirp *, void *);
|
2004-04-22 04:10:48 +04:00
|
|
|
|
|
|
|
#endif
|