ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/slirp/udp.h
Revision: 1.4
Committed: 2012-03-30T01:10:28Z (12 years, 7 months ago) by asvitkine
Content type: text/plain
Branch: MAIN
CVS Tags: HEAD
Changes since 1.3: +1 -5 lines
Log Message:
Switch slirp to 3-clause BSD license. This change went in upstream to QEMU's
version of slirp (where this code comes from), with the following checkin:

commit 2f5f89963186d42a7ded253bc6cf5b32abb45cec
Author: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Date:   Mon Jan 26 19:37:41 2009 +0000

    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

File Contents

# Content
1 /*
2 * Copyright (c) 1982, 1986, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 3. Neither the name of the University nor the names of its contributors
14 * may be used to endorse or promote products derived from this software
15 * without specific prior written permission.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
18 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * @(#)udp.h 8.1 (Berkeley) 6/10/93
30 * udp.h,v 1.3 1994/08/21 05:27:41 paul Exp
31 */
32
33 #ifndef _UDP_H_
34 #define _UDP_H_
35
36 #define UDP_TTL 0x60
37 #define UDP_UDPDATALEN 16192
38
39 extern struct socket *udp_last_so;
40
41 /*
42 * Udp protocol header.
43 * Per RFC 768, September, 1981.
44 */
45 #ifdef PRAGMA_PACK_SUPPORTED
46 #pragma pack(1)
47 #endif
48
49 struct udphdr {
50 u_int16_t uh_sport; /* source port */
51 u_int16_t uh_dport; /* destination port */
52 int16_t uh_ulen; /* udp length */
53 u_int16_t uh_sum; /* udp checksum */
54 } PACKED__;
55
56 #ifdef PRAGMA_PACK_SUPPORTED
57 #pragma pack(0)
58 #endif
59
60 /*
61 * UDP kernel structures and variables.
62 */
63 struct udpiphdr {
64 struct ipovly ui_i; /* overlaid ip structure */
65 struct udphdr ui_u; /* udp header */
66 };
67 #define ui_next ui_i.ih_next
68 #define ui_prev ui_i.ih_prev
69 #define ui_x1 ui_i.ih_x1
70 #define ui_pr ui_i.ih_pr
71 #define ui_len ui_i.ih_len
72 #define ui_src ui_i.ih_src
73 #define ui_dst ui_i.ih_dst
74 #define ui_sport ui_u.uh_sport
75 #define ui_dport ui_u.uh_dport
76 #define ui_ulen ui_u.uh_ulen
77 #define ui_sum ui_u.uh_sum
78
79 struct udpstat {
80 /* input statistics: */
81 u_long udps_ipackets; /* total input packets */
82 u_long udps_hdrops; /* packet shorter than header */
83 u_long udps_badsum; /* checksum error */
84 u_long udps_badlen; /* data length larger than packet */
85 u_long udps_noport; /* no socket on port */
86 u_long udps_noportbcast; /* of above, arrived as broadcast */
87 u_long udps_fullsock; /* not delivered, input socket full */
88 u_long udpps_pcbcachemiss; /* input packets missing pcb cache */
89 /* output statistics: */
90 u_long udps_opackets; /* total output packets */
91 };
92
93 /*
94 * Names for UDP sysctl objects
95 */
96 #define UDPCTL_CHECKSUM 1 /* checksum UDP packets */
97 #define UDPCTL_MAXID 2
98
99 extern struct udpstat udpstat;
100 extern struct socket udb;
101 struct mbuf;
102
103 void udp_init _P((void));
104 void udp_input _P((register struct mbuf *, int));
105 int udp_output _P((struct socket *, struct mbuf *, struct sockaddr_in *));
106 int udp_attach _P((struct socket *));
107 void udp_detach _P((struct socket *));
108 u_int8_t udp_tos _P((struct socket *));
109 void udp_emu _P((struct socket *, struct mbuf *));
110 struct socket * udp_listen _P((u_int, u_int32_t, u_int, int));
111 int udp_output2(struct socket *so, struct mbuf *m,
112 struct sockaddr_in *saddr, struct sockaddr_in *daddr,
113 int iptos);
114 #endif