diff options
Diffstat (limited to 'slirp/src')
57 files changed, 230 insertions, 85 deletions
diff --git a/slirp/src/arp_table.c b/slirp/src/arp_table.c index 58eafdcfd8..9d7a59eb2c 100644 --- a/slirp/src/arp_table.c +++ b/slirp/src/arp_table.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* * ARP table * diff --git a/slirp/src/bootp.c b/slirp/src/bootp.c index d396849a05..b208e3b216 100644 --- a/slirp/src/bootp.c +++ b/slirp/src/bootp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* * QEMU BOOTP/DHCP server * diff --git a/slirp/src/bootp.h b/slirp/src/bootp.h index 4043489835..d881ad620a 100644 --- a/slirp/src/bootp.h +++ b/slirp/src/bootp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* bootp/dhcp defines */ #ifndef SLIRP_BOOTP_H diff --git a/slirp/src/cksum.c b/slirp/src/cksum.c index 25bfa67348..9599f6a280 100644 --- a/slirp/src/cksum.c +++ b/slirp/src/cksum.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1988, 1992, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/debug.h b/slirp/src/debug.h index 44d922df37..c95fd8ffd2 100644 --- a/slirp/src/debug.h +++ b/slirp/src/debug.h @@ -1,8 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #ifndef DEBUG_H_ diff --git a/slirp/src/dhcpv6.c b/slirp/src/dhcpv6.c index e655c7d5b1..3c8f420912 100644 --- a/slirp/src/dhcpv6.c +++ b/slirp/src/dhcpv6.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * SLIRP stateless DHCPv6 * @@ -6,18 +7,35 @@ * * Copyright 2016 Thomas Huth, Red Hat Inc. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, - * or (at your option) any later version. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * 1. Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see <http://www.gnu.org/licenses/>. + * 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. + * + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 + * COPYRIGHT HOLDER 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. */ #include "slirp.h" diff --git a/slirp/src/dhcpv6.h b/slirp/src/dhcpv6.h index 3373f6cb89..dc26a93cff 100644 --- a/slirp/src/dhcpv6.h +++ b/slirp/src/dhcpv6.h @@ -1,10 +1,38 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Definitions and prototypes for SLIRP stateless DHCPv6 * * Copyright 2016 Thomas Huth, Red Hat Inc. * - * This work is licensed under the terms of the GNU GPL, version 2 - * or later. See the COPYING file in the top-level directory. + * 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. + * + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 + * COPYRIGHT HOLDER 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. */ #ifndef SLIRP_DHCPV6_H #define SLIRP_DHCPV6_H diff --git a/slirp/src/dnssearch.c b/slirp/src/dnssearch.c index c459cece8d..12c488971e 100644 --- a/slirp/src/dnssearch.c +++ b/slirp/src/dnssearch.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* * Domain search option for DHCP (RFC 3397) * diff --git a/slirp/src/if.c b/slirp/src/if.c index 1830cc396c..6eaac7292a 100644 --- a/slirp/src/if.c +++ b/slirp/src/if.c @@ -1,8 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h" diff --git a/slirp/src/if.h b/slirp/src/if.h index 69569c10df..b71c37d6ea 100644 --- a/slirp/src/if.h +++ b/slirp/src/if.h @@ -1,8 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #ifndef IF_H diff --git a/slirp/src/ip.h b/slirp/src/ip.h index 73a4d2a3d2..1484de1176 100644 --- a/slirp/src/ip.h +++ b/slirp/src/ip.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/ip6.h b/slirp/src/ip6.h index 1b3364f960..33683c8e20 100644 --- a/slirp/src/ip6.h +++ b/slirp/src/ip6.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. diff --git a/slirp/src/ip6_icmp.c b/slirp/src/ip6_icmp.c index c1e3d30470..5642457fdd 100644 --- a/slirp/src/ip6_icmp.c +++ b/slirp/src/ip6_icmp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. diff --git a/slirp/src/ip6_icmp.h b/slirp/src/ip6_icmp.h index e8ed753db5..d8d13e30fc 100644 --- a/slirp/src/ip6_icmp.h +++ b/slirp/src/ip6_icmp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. diff --git a/slirp/src/ip6_input.c b/slirp/src/ip6_input.c index 1b8c003c66..d9d2b7e9cd 100644 --- a/slirp/src/ip6_input.c +++ b/slirp/src/ip6_input.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. diff --git a/slirp/src/ip6_output.c b/slirp/src/ip6_output.c index 19d1ae7748..b86110662c 100644 --- a/slirp/src/ip6_output.c +++ b/slirp/src/ip6_output.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. diff --git a/slirp/src/ip_icmp.c b/slirp/src/ip_icmp.c index 120108f582..1aea18afa7 100644 --- a/slirp/src/ip_icmp.c +++ b/slirp/src/ip_icmp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/ip_icmp.h b/slirp/src/ip_icmp.h index a4e5b8b265..05d85c59dd 100644 --- a/slirp/src/ip_icmp.h +++ b/slirp/src/ip_icmp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/ip_input.c b/slirp/src/ip_input.c index e0b94b0e42..a714fecd58 100644 --- a/slirp/src/ip_input.c +++ b/slirp/src/ip_input.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1993 * The Regents of the University of California. All rights reserved. @@ -33,9 +34,6 @@ /* * Changes and additions relating to SLiRP are * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h" diff --git a/slirp/src/ip_output.c b/slirp/src/ip_output.c index f6ec141df5..8560197cf6 100644 --- a/slirp/src/ip_output.c +++ b/slirp/src/ip_output.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -33,9 +34,6 @@ /* * Changes and additions relating to SLiRP are * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h" diff --git a/slirp/src/libslirp.h b/slirp/src/libslirp.h index 2d13950065..3b28764bec 100644 --- a/slirp/src/libslirp.h +++ b/slirp/src/libslirp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ #ifndef LIBSLIRP_H #define LIBSLIRP_H diff --git a/slirp/src/main.h b/slirp/src/main.h index f11d4572b7..3b3f883703 100644 --- a/slirp/src/main.h +++ b/slirp/src/main.h @@ -1,8 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #ifndef SLIRP_MAIN_H diff --git a/slirp/src/mbuf.c b/slirp/src/mbuf.c index 521c02c967..800406ca9e 100644 --- a/slirp/src/mbuf.c +++ b/slirp/src/mbuf.c @@ -1,8 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ /* diff --git a/slirp/src/mbuf.h b/slirp/src/mbuf.h index e2d443418a..732c85c63c 100644 --- a/slirp/src/mbuf.h +++ b/slirp/src/mbuf.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/misc.c b/slirp/src/misc.c index 937a418d4e..7c5db0e0aa 100644 --- a/slirp/src/misc.c +++ b/slirp/src/misc.c @@ -1,8 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h" diff --git a/slirp/src/misc.h b/slirp/src/misc.h index c2ceadb591..23b7490448 100644 --- a/slirp/src/misc.h +++ b/slirp/src/misc.h @@ -1,8 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #ifndef MISC_H diff --git a/slirp/src/ncsi-pkt.h b/slirp/src/ncsi-pkt.h index ea07d1cd0f..4c0be39f6e 100644 --- a/slirp/src/ncsi-pkt.h +++ b/slirp/src/ncsi-pkt.h @@ -1,10 +1,36 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright Gavin Shan, IBM Corporation 2016. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * 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. + * + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 + * COPYRIGHT HOLDER 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. */ #ifndef NCSI_PKT_H diff --git a/slirp/src/ncsi.c b/slirp/src/ncsi.c index 359f52c284..6d574ec5ec 100644 --- a/slirp/src/ncsi.c +++ b/slirp/src/ncsi.c @@ -1,10 +1,38 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * NC-SI (Network Controller Sideband Interface) "echo" model * * Copyright (C) 2016-2018 IBM Corp. * - * This code is licensed under the GPL version 2 or later. See the - * COPYING file in the top-level directory. + * 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. + * + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 + * COPYRIGHT HOLDER 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. */ #include "slirp.h" diff --git a/slirp/src/ndp_table.c b/slirp/src/ndp_table.c index 34ea4fdf1f..78324877e2 100644 --- a/slirp/src/ndp_table.c +++ b/slirp/src/ndp_table.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. diff --git a/slirp/src/qtailq.h b/slirp/src/qtailq.h index a89b0c439a..d8aa0e19a4 100644 --- a/slirp/src/qtailq.h +++ b/slirp/src/qtailq.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* $NetBSD: queue.h,v 1.52 2009/04/20 09:56:08 mschuett Exp $ */ /* diff --git a/slirp/src/sbuf.c b/slirp/src/sbuf.c index 51a9f0cc7d..9c0b31b513 100644 --- a/slirp/src/sbuf.c +++ b/slirp/src/sbuf.c @@ -1,8 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h" diff --git a/slirp/src/sbuf.h b/slirp/src/sbuf.h index 1cb9a42834..337af1bbde 100644 --- a/slirp/src/sbuf.h +++ b/slirp/src/sbuf.h @@ -1,8 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #ifndef SBUF_H diff --git a/slirp/src/slirp.c b/slirp/src/slirp.c index 18af670a0a..169c85b906 100644 --- a/slirp/src/slirp.c +++ b/slirp/src/slirp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* * libslirp glue * diff --git a/slirp/src/slirp.h b/slirp/src/slirp.h index 8068ba1d1e..39580934f3 100644 --- a/slirp/src/slirp.h +++ b/slirp/src/slirp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ #ifndef SLIRP_H #define SLIRP_H diff --git a/slirp/src/socket.c b/slirp/src/socket.c index f2428a3ae8..bb752fdcae 100644 --- a/slirp/src/socket.c +++ b/slirp/src/socket.c @@ -1,8 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h" @@ -173,6 +171,7 @@ int soread(struct socket *so) { int n, nn; + size_t buf_len; struct sbuf *sb = &so->so_snd; struct iovec iov[2]; @@ -183,7 +182,8 @@ soread(struct socket *so) * No need to check if there's enough room to read. * soread wouldn't have been called if there weren't */ - sopreprbuf(so, iov, &n); + buf_len = sopreprbuf(so, iov, &n); + assert(buf_len != 0); nn = recv(so->s, iov[0].iov_base, iov[0].iov_len,0); if (nn <= 0) { @@ -259,6 +259,7 @@ int soreadbuf(struct socket *so, const char *buf, int size) * No need to check if there's enough room to read. * soread wouldn't have been called if there weren't */ + assert(size > 0); if (sopreprbuf(so, iov, &n) < size) goto err; diff --git a/slirp/src/socket.h b/slirp/src/socket.h index e4d12cd591..25403898cd 100644 --- a/slirp/src/socket.h +++ b/slirp/src/socket.h @@ -1,8 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #ifndef SLIRP_SOCKET_H diff --git a/slirp/src/state.c b/slirp/src/state.c index f5dd80cdc8..09cea3590e 100644 --- a/slirp/src/state.c +++ b/slirp/src/state.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* * libslirp * @@ -23,7 +24,6 @@ */ #include "slirp.h" #include "vmstate.h" -#include "state.h" #include "stream.h" static int slirp_tcp_post_load(void *opaque, int version) diff --git a/slirp/src/state.h b/slirp/src/state.h deleted file mode 100644 index e69de29bb2..0000000000 --- a/slirp/src/state.h +++ /dev/null diff --git a/slirp/src/stream.c b/slirp/src/stream.c index d114dde334..9c1764c0b7 100644 --- a/slirp/src/stream.c +++ b/slirp/src/stream.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* * libslirp io streams * diff --git a/slirp/src/stream.h b/slirp/src/stream.h index 985334c043..08bb5b6610 100644 --- a/slirp/src/stream.h +++ b/slirp/src/stream.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ #ifndef STREAM_H_ #define STREAM_H_ diff --git a/slirp/src/tcp.h b/slirp/src/tcp.h index 47aaea6c5b..79d3251bb5 100644 --- a/slirp/src/tcp.h +++ b/slirp/src/tcp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tcp_input.c b/slirp/src/tcp_input.c index b10477fc57..50a1145ec9 100644 --- a/slirp/src/tcp_input.c +++ b/slirp/src/tcp_input.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. @@ -33,9 +34,6 @@ /* * Changes and additions relating to SLiRP * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h" diff --git a/slirp/src/tcp_output.c b/slirp/src/tcp_output.c index e9674df121..6bbaf6ca6f 100644 --- a/slirp/src/tcp_output.c +++ b/slirp/src/tcp_output.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -33,9 +34,6 @@ /* * Changes and additions relating to SLiRP * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h" diff --git a/slirp/src/tcp_subr.c b/slirp/src/tcp_subr.c index 1db59caa89..fde9207b0c 100644 --- a/slirp/src/tcp_subr.c +++ b/slirp/src/tcp_subr.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -33,9 +34,6 @@ /* * Changes and additions relating to SLiRP * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h" diff --git a/slirp/src/tcp_timer.c b/slirp/src/tcp_timer.c index 7be54570af..be361a1bb6 100644 --- a/slirp/src/tcp_timer.c +++ b/slirp/src/tcp_timer.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tcp_timer.h b/slirp/src/tcp_timer.h index b25b3911d7..709f63987a 100644 --- a/slirp/src/tcp_timer.h +++ b/slirp/src/tcp_timer.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tcp_var.h b/slirp/src/tcp_var.h index 27ef1a51cb..162be6e95e 100644 --- a/slirp/src/tcp_var.h +++ b/slirp/src/tcp_var.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tcpip.h b/slirp/src/tcpip.h index 07dbf2c432..560a86417c 100644 --- a/slirp/src/tcpip.h +++ b/slirp/src/tcpip.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tftp.c b/slirp/src/tftp.c index 2d8f978786..2071dca2a6 100644 --- a/slirp/src/tftp.c +++ b/slirp/src/tftp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* * tftp.c - a simple, read-only tftp server for qemu * diff --git a/slirp/src/tftp.h b/slirp/src/tftp.h index a4c4a64e64..3fe3b70205 100644 --- a/slirp/src/tftp.h +++ b/slirp/src/tftp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* tftp defines */ #ifndef SLIRP_TFTP_H diff --git a/slirp/src/udp.c b/slirp/src/udp.c index fa9f4a08bd..27bb829c37 100644 --- a/slirp/src/udp.c +++ b/slirp/src/udp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/udp.h b/slirp/src/udp.h index 3d29504caa..29c0297179 100644 --- a/slirp/src/udp.h +++ b/slirp/src/udp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/udp6.c b/slirp/src/udp6.c index be5cba1f54..bfcc7ec6fa 100644 --- a/slirp/src/udp6.c +++ b/slirp/src/udp6.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron diff --git a/slirp/src/util.c b/slirp/src/util.c index 5ec2fa87ab..60bb200801 100644 --- a/slirp/src/util.c +++ b/slirp/src/util.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* * util.c (mostly based on QEMU os-win32.c) * diff --git a/slirp/src/util.h b/slirp/src/util.h index e94ee4e7f1..01f1e0e068 100644 --- a/slirp/src/util.h +++ b/slirp/src/util.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (c) 2003-2008 Fabrice Bellard * Copyright (c) 2010-2019 Red Hat, Inc. diff --git a/slirp/src/vmstate.c b/slirp/src/vmstate.c index 4d08b47c61..43bb3ebc6f 100644 --- a/slirp/src/vmstate.c +++ b/slirp/src/vmstate.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * VMState interpreter * @@ -6,8 +7,35 @@ * Authors: * Juan Quintela <quintela@redhat.com> * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. + * 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. + * + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 + * COPYRIGHT HOLDER 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. */ #include <assert.h> #include <errno.h> diff --git a/slirp/src/vmstate.h b/slirp/src/vmstate.h index cfa7b8c825..44efea7b50 100644 --- a/slirp/src/vmstate.h +++ b/slirp/src/vmstate.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * QEMU migration/snapshot declarations * @@ -5,23 +6,35 @@ * * Original author: Juan Quintela <quintela@redhat.com> * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. + * 1. Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. + * 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. + * + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 + * COPYRIGHT HOLDER 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. */ #ifndef VMSTATE_H_ #define VMSTATE_H_ |