- dev - passt

[PATCH] test: Remove race between commands run in the same context
by David Gibson 08 Apr '23

08 Apr '23

context_run() has a race condition if two commands are run in close proximity (generally involving at least one in the background). Because we always use the same name for the temporary fifo files, if another command is issued while the fifos for the first still exist, mkfifo will fail, typically causing the entire test script to jam. Create unique names for the temporary fifos to avoid this problem. Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au> --- test/lib/context | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/lib/context b/test/lib/context index d9d8260..09cad89 100644 --- a/test/lib/context +++ b/test/lib/context @@ -93,8 +93,8 @@ context_run() { __name="$1" __log="${LOGDIR}/context_${__name}.log" __enter="${STATESETUP}/context_${__name}.enter" - __stdout="${STATESETUP}/context_${__name}.stdout" - __stderr="${STATESETUP}/context_${__name}.stderr" + __stdout="$(mktemp -u "${STATESETUP}/context_${__name}.stdout.XXXXXXXX")" + __stderr="$(mktemp -u "${STATESETUP}/context_${__name}.stderr.XXXXXXXX")" shift echo "$*" >> "${__log}" mkfifo "${__stdout}" "${__stderr}" -- 2.39.2

2 3

[PATCH v2 00/14] Improved tool for testing across multiple namespaces
by David Gibson 08 Apr '23

08 Apr '23

This series extends the "nsholder" tool we use in the tests to "nstool" with some more features. In particular it allows entering an established namespace with capabilities intact, and it allows entering them with less verbose options than nsenter. For now this only gives a modest simplification of the tests, but it should enable more in future. I haven't managed to get all the way through the testsuite with this: it's wedging in the IPv4 UDP throughput tests, but that's happening for me with the main branch too. I'll debug that, but I don't want to delay this series on that for now. Changes since v1: * Fixed a bunch of bad indentation from a bad copy/paste * Assorted minor cleanups based on review from Stefano David Gibson (14): nstool: Rename nsholder to nstool nstool: Reverse parameters to nstool nstool: Move description of its operation modes from comment to usage nstool: Split some command line parsing and socket setup to subcommands nstool: Replace "pid" subcommand with "info" subcommand nstool: Detect what namespaces target is in nstool: Add magic number to advertized information nstool: Helpers to iterate through namespace types nstool: Add nstool exec command to execute commands in an nstool namespace nstool: Add --keep-caps option to nstool exec test: Initialise ${TRACE} properly test: Use "nstool exec" to slightly simplify tests nstool: Advertise the holder's cwd (in its mountns) across the socket nstool: Enter holder's cwd when changing mount ns with nstool exec test/.gitignore | 2 +- test/Makefile | 4 +- test/lib/context | 14 +- test/lib/setup | 49 ++-- test/nsholder.c | 139 ------------ test/nstool.c | 565 +++++++++++++++++++++++++++++++++++++++++++++++ test/run | 5 +- 7 files changed, 602 insertions(+), 176 deletions(-) delete mode 100644 test/nsholder.c create mode 100644 test/nstool.c -- 2.39.2

2 15

[PATCH] passt: Relicense to GPL 2.0, or any later version
by Stefano Brivio 06 Apr '23

06 Apr '23

In practical terms, passt doesn't benefit from the additional protection offered by the AGPL over the GPL, because it's not suitable to be executed over a computer network. Further, restricting the distribution under the version 3 of the GPL wouldn't provide any practical advantage either, as long as the passt codebase is concerned, and might cause unnecessary compatibility dilemmas. Change licensing terms to the GNU General Public License Version 2, or any later version, with written permission from all current and past contributors, namely: myself, David Gibson, Laine Stump, Andrea Bolognani, Paul Holzinger, Richard W.M. Jones, Chris Kuhn, Florian Weimer, Giuseppe Scrivano, Stefan Hajnoczi, and Vasiliy Ulyanov. Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- Thanks everybody for the cooperation on the matter! There's no need for an explicit Acked-by: or Reviewed-by: tag on this patch. LICENSES/AGPL-3.0-or-later.txt | 661 -------------------------- LICENSES/GPL-2.0-or-later.txt | 117 +++++ Makefile | 2 +- README.md | 2 +- arch.c | 2 +- arch.h | 2 +- arp.c | 2 +- arp.h | 2 +- checksum.c | 2 +- checksum.h | 2 +- conf.c | 2 +- conf.h | 2 +- contrib/apparmor/abstractions/passt | 2 +- contrib/apparmor/abstractions/pasta | 2 +- contrib/apparmor/usr.bin.passt | 2 +- contrib/fedora/passt.spec | 4 +- contrib/fedora/rpkg.conf | 2 +- contrib/fedora/rpkg.macros | 2 +- contrib/selinux/passt.fc | 2 +- contrib/selinux/passt.if | 2 +- contrib/selinux/passt.te | 2 +- contrib/selinux/pasta.fc | 2 +- contrib/selinux/pasta.te | 2 +- dhcp.c | 2 +- dhcp.h | 2 +- dhcpv6.c | 2 +- dhcpv6.h | 2 +- doc/demo.sh | 2 +- doc/passt_overview.excalidraw.license | 2 +- doc/pasta_overview.excalidraw.license | 2 +- hooks/pre-push | 2 +- icmp.c | 2 +- icmp.h | 2 +- igmp.c | 2 +- inany.h | 2 +- isolation.c | 2 +- isolation.h | 2 +- lineread.c | 2 +- lineread.h | 2 +- log.c | 2 +- log.h | 2 +- mld.c | 2 +- ndp.c | 2 +- ndp.h | 2 +- netlink.c | 2 +- netlink.h | 2 +- packet.c | 2 +- packet.h | 2 +- passt.1 | 2 +- passt.c | 2 +- passt.h | 2 +- pasta.c | 2 +- pasta.h | 2 +- pcap.c | 2 +- pcap.h | 2 +- port_fwd.h | 2 +- qrap.1 | 2 +- qrap.c | 2 +- seccomp.sh | 2 +- siphash.c | 2 +- siphash.h | 2 +- slirp4netns.sh | 2 +- tap.c | 2 +- tap.h | 2 +- tcp.c | 2 +- tcp.h | 2 +- tcp_conn.h | 2 +- tcp_splice.c | 2 +- tcp_splice.h | 2 +- test/Makefile | 2 +- test/README.md | 2 +- test/build/all | 2 +- test/build/clang_tidy | 2 +- test/build/cppcheck | 2 +- test/demo/passt | 2 +- test/demo/pasta | 2 +- test/demo/podman | 2 +- test/distro/debian | 2 +- test/distro/fedora | 2 +- test/distro/opensuse | 2 +- test/distro/ubuntu | 2 +- test/env/mate-terminal.profile | 2 +- test/lib/context | 2 +- test/lib/layout | 2 +- test/lib/layout_ugly | 2 +- test/lib/perf_report | 2 +- test/lib/setup | 2 +- test/lib/setup_ugly | 2 +- test/lib/term | 2 +- test/lib/test | 2 +- test/lib/util | 2 +- test/lib/video | 2 +- test/memory/passt | 2 +- test/nsholder.c | 2 +- test/passt.mbuto | 2 +- test/passt.mem.mbuto | 2 +- test/passt/dhcp | 2 +- test/passt/ndp | 2 +- test/passt/shutdown | 2 +- test/passt/tcp | 2 +- test/passt/udp | 2 +- test/passt_in_ns/icmp | 2 +- test/passt_in_ns/shutdown | 2 +- test/passt_in_ns/tcp | 2 +- test/passt_in_ns/udp | 2 +- test/pasta/dhcp | 2 +- test/pasta/ndp | 2 +- test/pasta/tcp | 2 +- test/pasta/udp | 2 +- test/pasta_options/log_to_file | 2 +- test/perf/passt_tcp | 2 +- test/perf/passt_udp | 2 +- test/perf/pasta_tcp | 2 +- test/perf/pasta_udp | 2 +- test/run | 2 +- test/two_guests/basic | 2 +- udp.c | 2 +- udp.h | 2 +- util.c | 2 +- util.h | 2 +- 120 files changed, 236 insertions(+), 780 deletions(-) delete mode 100644 LICENSES/AGPL-3.0-or-later.txt create mode 100644 LICENSES/GPL-2.0-or-later.txt diff --git a/LICENSES/AGPL-3.0-or-later.txt b/LICENSES/AGPL-3.0-or-later.txt deleted file mode 100644 index be3f7b2..0000000 --- a/LICENSES/AGPL-3.0-or-later.txt +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - 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 Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <https://www.gnu.org/licenses/>. - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -<https://www.gnu.org/licenses/>. diff --git a/LICENSES/GPL-2.0-or-later.txt b/LICENSES/GPL-2.0-or-later.txt new file mode 100644 index 0000000..17cb286 --- /dev/null +++ b/LICENSES/GPL-2.0-or-later.txt @@ -0,0 +1,117 @@ +GNU GENERAL PUBLIC LICENSE +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. + + c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + + one line to give the program's name and an idea of what it does. Copyright (C) yyyy name of author + + 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. + + 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. + + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. + +signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice diff --git a/Makefile b/Makefile index 0dd1057..a5256f5 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/README.md b/README.md index 1f800b2..6d00313 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@  diff --git a/arch.c b/arch.c index a2c4562..012123c 100644 --- a/arch.c +++ b/arch.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/arch.h b/arch.h index 40e0ce2..2fdbbf0 100644 --- a/arch.h +++ b/arch.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2022 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/arp.c b/arp.c index 930b9ea..a35c1b6 100644 --- a/arp.c +++ b/arp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/arp.h b/arp.h index ecb82fc..ac5cd16 100644 --- a/arp.h +++ b/arp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2021 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/checksum.c b/checksum.c index 9631f91..f2b82a4 100644 --- a/checksum.c +++ b/checksum.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later AND BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later AND BSD-3-Clause /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/checksum.h b/checksum.h index c6b6fb4..21c0310 100644 --- a/checksum.h +++ b/checksum.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2021 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/conf.c b/conf.c index f519a6a..447b000 100644 --- a/conf.c +++ b/conf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/conf.h b/conf.h index c39d413..ce7b8c5 100644 --- a/conf.h +++ b/conf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2021 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/contrib/apparmor/abstractions/passt b/contrib/apparmor/abstractions/passt index 000e3db..6e2a6f3 100644 --- a/contrib/apparmor/abstractions/passt +++ b/contrib/apparmor/abstractions/passt @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/contrib/apparmor/abstractions/pasta b/contrib/apparmor/abstractions/pasta index 7d802ac..9cba25a 100644 --- a/contrib/apparmor/abstractions/pasta +++ b/contrib/apparmor/abstractions/pasta @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/contrib/apparmor/usr.bin.passt b/contrib/apparmor/usr.bin.passt index 7433d01..652051d 100644 --- a/contrib/apparmor/usr.bin.passt +++ b/contrib/apparmor/usr.bin.passt @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/contrib/fedora/passt.spec b/contrib/fedora/passt.spec index 3eb2e0e..8d28ef6 100644 --- a/contrib/fedora/passt.spec +++ b/contrib/fedora/passt.spec @@ -14,7 +14,7 @@ Name: passt Version: {{{ git_version }}} Release: 1%{?dist} Summary: User-mode networking daemons for virtual machines and namespaces -License: AGPLv3+ and BSD +License: GPLv2+ and BSD Group: System Environment/Daemons URL: https://passt.top/ Source: https://passt.top/passt/snapshot/passt-%{git_hash}.tar.xz @@ -84,7 +84,7 @@ fi %selinux_relabel_post -s %{selinuxtype} %files -%license LICENSES/{AGPL-3.0-or-later.txt,BSD-3-Clause.txt} +%license LICENSES/{GPL-2.0-or-later.txt,BSD-3-Clause.txt} %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/README.md %doc %{_docdir}/%{name}/demo.sh diff --git a/contrib/fedora/rpkg.conf b/contrib/fedora/rpkg.conf index 2b88e8f..1c9dbae 100644 --- a/contrib/fedora/rpkg.conf +++ b/contrib/fedora/rpkg.conf @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/contrib/fedora/rpkg.macros b/contrib/fedora/rpkg.macros index 06359ab..c226c84 100644 --- a/contrib/fedora/rpkg.macros +++ b/contrib/fedora/rpkg.macros @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/contrib/selinux/passt.fc b/contrib/selinux/passt.fc index 88e388e..fb5b5d4 100644 --- a/contrib/selinux/passt.fc +++ b/contrib/selinux/passt.fc @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/contrib/selinux/passt.if b/contrib/selinux/passt.if index f7560a7..df87486 100644 --- a/contrib/selinux/passt.if +++ b/contrib/selinux/passt.if @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/contrib/selinux/passt.te b/contrib/selinux/passt.te index 590ad40..687ae40 100644 --- a/contrib/selinux/passt.te +++ b/contrib/selinux/passt.te @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/contrib/selinux/pasta.fc b/contrib/selinux/pasta.fc index e72b4ac..2ffb41a 100644 --- a/contrib/selinux/pasta.fc +++ b/contrib/selinux/pasta.fc @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASTA - Pack A Subtle Tap Abstraction # for network namespace/tap device mode diff --git a/contrib/selinux/pasta.te b/contrib/selinux/pasta.te index 7856019..367d09f 100644 --- a/contrib/selinux/pasta.te +++ b/contrib/selinux/pasta.te @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASTA - Pack A Subtle Tap Abstraction # for network namespace/tap device mode diff --git a/dhcp.c b/dhcp.c index edab780..d04648c 100644 --- a/dhcp.c +++ b/dhcp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/dhcp.h b/dhcp.h index 1591689..87aeecd 100644 --- a/dhcp.h +++ b/dhcp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2021 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/dhcpv6.c b/dhcpv6.c index d0e6c7f..fc42a84 100644 --- a/dhcpv6.c +++ b/dhcpv6.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/dhcpv6.h b/dhcpv6.h index d84e0b9..5809988 100644 --- a/dhcpv6.h +++ b/dhcpv6.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2021 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/doc/demo.sh b/doc/demo.sh index 5b05ddf..6b0917c 100755 --- a/doc/demo.sh +++ b/doc/demo.sh @@ -1,6 +1,6 @@ #!/bin/sh -e # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # diff --git a/doc/passt_overview.excalidraw.license b/doc/passt_overview.excalidraw.license index fb0f784..650bd73 100644 --- a/doc/passt_overview.excalidraw.license +++ b/doc/passt_overview.excalidraw.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: 2020-2021 Red Hat GmbH <sbrivio(a)redhat.com> -SPDX-License-Identifier: AGPL-3.0-or-later +SPDX-License-Identifier: GPL-2.0-or-later diff --git a/doc/pasta_overview.excalidraw.license b/doc/pasta_overview.excalidraw.license index fb0f784..650bd73 100644 --- a/doc/pasta_overview.excalidraw.license +++ b/doc/pasta_overview.excalidraw.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: 2020-2021 Red Hat GmbH <sbrivio(a)redhat.com> -SPDX-License-Identifier: AGPL-3.0-or-later +SPDX-License-Identifier: GPL-2.0-or-later diff --git a/hooks/pre-push b/hooks/pre-push index 89717e7..33a2052 100755 --- a/hooks/pre-push +++ b/hooks/pre-push @@ -1,6 +1,6 @@ #!/bin/sh -e # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/icmp.c b/icmp.c index ddf83f8..44f73c8 100644 --- a/icmp.c +++ b/icmp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/icmp.h b/icmp.h index 275486d..f899e6d 100644 --- a/icmp.h +++ b/icmp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2021 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/igmp.c b/igmp.c index da7e83d..0e77584 100644 --- a/igmp.c +++ b/igmp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/inany.h b/inany.h index 7ff32f0..8f0897b 100644 --- a/inany.h +++ b/inany.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright Red Hat * Author: David Gibson <david(a)gibson.dropbear.id.au> * diff --git a/isolation.c b/isolation.c index 20dc879..5f89047 100644 --- a/isolation.c +++ b/isolation.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/isolation.h b/isolation.h index 54c60f6..6ca00bf 100644 --- a/isolation.h +++ b/isolation.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright Red Hat * Author: Stefano Brivio <sbrivio(a)redhat.com> * Author: David Gibson <david(a)gibson.dropbear.id.au> diff --git a/lineread.c b/lineread.c index 6ffb14e..d631da4 100644 --- a/lineread.c +++ b/lineread.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/lineread.h b/lineread.h index b6faff5..af86418 100644 --- a/lineread.h +++ b/lineread.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright Red Hat * Author: David Gibson <david(a)gibson.dropbear.id.au> */ diff --git a/log.c b/log.c index d7411ba..3a3d101 100644 --- a/log.c +++ b/log.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/log.h b/log.h index d4ea141..3aab29d 100644 --- a/log.h +++ b/log.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2022 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/mld.c b/mld.c index 04d24c7..a6d7c35 100644 --- a/mld.c +++ b/mld.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/ndp.c b/ndp.c index 80e1f19..adab1d2 100644 --- a/ndp.c +++ b/ndp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/ndp.h b/ndp.h index b012747..b33cd69 100644 --- a/ndp.h +++ b/ndp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2021 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/netlink.c b/netlink.c index 00aa3e9..b99af85 100644 --- a/netlink.c +++ b/netlink.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/netlink.h b/netlink.h index 3c991cc..ca4d6ef 100644 --- a/netlink.h +++ b/netlink.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2021 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/packet.c b/packet.c index d1ff998..ce807e2 100644 --- a/packet.c +++ b/packet.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/packet.h b/packet.h index 8fa36d6..9e5fc74 100644 --- a/packet.h +++ b/packet.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2022 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/passt.1 b/passt.1 index cb7ae4e..9c4da20 100644 --- a/passt.1 +++ b/passt.1 @@ -1,4 +1,4 @@ -.\" SPDX-License-Identifier: AGPL-3.0-or-later +.\" SPDX-License-Identifier: GPL-2.0-or-later .\" Copyright (c) 2020-2022 Red Hat GmbH .\" Author: Stefano Brivio <sbrivio(a)redhat.com> .TH passt 1 diff --git a/passt.c b/passt.c index dfec9d4..7fa1170 100644 --- a/passt.c +++ b/passt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/passt.h b/passt.h index 006d1c1..73fe808 100644 --- a/passt.h +++ b/passt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2021 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/pasta.c b/pasta.c index 6c9a412..3a4d704 100644 --- a/pasta.c +++ b/pasta.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/pasta.h b/pasta.h index 0ccb7e9..8722ca1 100644 --- a/pasta.h +++ b/pasta.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2021 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/pcap.c b/pcap.c index c7c6ffd..524612a 100644 --- a/pcap.c +++ b/pcap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/pcap.h b/pcap.h index c2af3cf..da5a7e8 100644 --- a/pcap.h +++ b/pcap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2021 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/port_fwd.h b/port_fwd.h index 6f55e19..6ed3f14 100644 --- a/port_fwd.h +++ b/port_fwd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright Red Hat * Author: Stefano Brivio <sbrivio(a)redhat.com> * Author: David Gibson <david(a)gibson.dropbear.id.au> diff --git a/qrap.1 b/qrap.1 index 5246e1b..c9e0598 100644 --- a/qrap.1 +++ b/qrap.1 @@ -1,4 +1,4 @@ -.\" SPDX-License-Identifier: AGPL-3.0-or-later +.\" SPDX-License-Identifier: GPL-2.0-or-later .\" Copyright (c) 2020-2021 Red Hat GmbH .\" Author: Stefano Brivio <sbrivio(a)redhat.com> .TH qrap 1 diff --git a/qrap.c b/qrap.c index d0e2fb2..1e5a802 100644 --- a/qrap.c +++ b/qrap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * diff --git a/seccomp.sh b/seccomp.sh index b075efd..092c24e 100755 --- a/seccomp.sh +++ b/seccomp.sh @@ -1,6 +1,6 @@ #!/bin/sh -eu # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/siphash.c b/siphash.c index e8b144d..e266e15 100644 --- a/siphash.c +++ b/siphash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/siphash.h b/siphash.h index 80208ee..5b0d0c3 100644 --- a/siphash.h +++ b/siphash.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2021 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/slirp4netns.sh b/slirp4netns.sh index 1d089b7..51aab4b 100755 --- a/slirp4netns.sh +++ b/slirp4netns.sh @@ -1,6 +1,6 @@ #!/bin/sh -euf # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/tap.c b/tap.c index 68ef480..faa4e26 100644 --- a/tap.c +++ b/tap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/tap.h b/tap.h index 40cf480..a1ad115 100644 --- a/tap.h +++ b/tap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2021 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/tcp.c b/tcp.c index 056e917..0ed9bfa 100644 --- a/tcp.c +++ b/tcp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/tcp.h b/tcp.h index 36e5391..a9e3425 100644 --- a/tcp.h +++ b/tcp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2021 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/tcp_conn.h b/tcp_conn.h index c22632b..9e2b1bf 100644 --- a/tcp_conn.h +++ b/tcp_conn.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright Red Hat * Author: Stefano Brivio <sbrivio(a)redhat.com> * Author: David Gibson <david(a)gibson.dropbear.id.au> diff --git a/tcp_splice.c b/tcp_splice.c index 5bfad2a..71256b0 100644 --- a/tcp_splice.c +++ b/tcp_splice.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASTA - Pack A Subtle Tap Abstraction * for network namespace/tap device mode diff --git a/tcp_splice.h b/tcp_splice.h index 6814ae7..99dbac8 100644 --- a/tcp_splice.h +++ b/tcp_splice.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2022 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/test/Makefile b/test/Makefile index 1341677..8d9be0b 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # Tests makefile # diff --git a/test/README.md b/test/README.md index 3b085bd..03c7f57 100644 --- a/test/README.md +++ b/test/README.md @@ -1,5 +1,5 @@  diff --git a/test/build/all b/test/build/all index bacb1d1..1f79e0d 100644 --- a/test/build/all +++ b/test/build/all @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/build/clang_tidy b/test/build/clang_tidy index 0ead9e8..40573bf 100644 --- a/test/build/clang_tidy +++ b/test/build/clang_tidy @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/build/cppcheck b/test/build/cppcheck index 05166dd..0e1dbce 100644 --- a/test/build/cppcheck +++ b/test/build/cppcheck @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/demo/passt b/test/demo/passt index 879169f..a3c18b8 100644 --- a/test/demo/passt +++ b/test/demo/passt @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/demo/pasta b/test/demo/pasta index ee046d0..f48585d 100644 --- a/test/demo/pasta +++ b/test/demo/pasta @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/demo/podman b/test/demo/podman index c5bc05a..edd403a 100644 --- a/test/demo/podman +++ b/test/demo/podman @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/distro/debian b/test/distro/debian index 08cfe05..42914f8 100644 --- a/test/distro/debian +++ b/test/distro/debian @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/distro/fedora b/test/distro/fedora index 73a53b5..331f90b 100644 --- a/test/distro/fedora +++ b/test/distro/fedora @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/distro/opensuse b/test/distro/opensuse index 03d1406..eab722b 100644 --- a/test/distro/opensuse +++ b/test/distro/opensuse @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/distro/ubuntu b/test/distro/ubuntu index 2f0dbdc..8750455 100644 --- a/test/distro/ubuntu +++ b/test/distro/ubuntu @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/env/mate-terminal.profile b/test/env/mate-terminal.profile index 0ba9e7b..a4ce899 100644 --- a/test/env/mate-terminal.profile +++ b/test/env/mate-terminal.profile @@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2021 Red Hat GmbH <sbrivio(a)redhat.com> -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later [/] allow-bold=true diff --git a/test/lib/context b/test/lib/context index ee6b683..e84fc18 100644 --- a/test/lib/context +++ b/test/lib/context @@ -1,6 +1,6 @@ #! /bin/sh # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/lib/layout b/test/lib/layout index b190060..f9a1cf1 100644 --- a/test/lib/layout +++ b/test/lib/layout @@ -1,6 +1,6 @@ #!/bin/sh # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/lib/layout_ugly b/test/lib/layout_ugly index 22f6169..2aaf1ec 100644 --- a/test/lib/layout_ugly +++ b/test/lib/layout_ugly @@ -1,6 +1,6 @@ #!/bin/sh # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/lib/perf_report b/test/lib/perf_report index 4ffb14b..d51a2b4 100755 --- a/test/lib/perf_report +++ b/test/lib/perf_report @@ -1,6 +1,6 @@ #!/bin/sh # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/lib/setup b/test/lib/setup index 5f8ce26..4311af9 100755 --- a/test/lib/setup +++ b/test/lib/setup @@ -1,6 +1,6 @@ #!/bin/sh # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/lib/setup_ugly b/test/lib/setup_ugly index bcf07ef..4b2a077 100755 --- a/test/lib/setup_ugly +++ b/test/lib/setup_ugly @@ -1,6 +1,6 @@ #!/bin/sh # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/lib/term b/test/lib/term index 8515c50..aa05bf1 100755 --- a/test/lib/term +++ b/test/lib/term @@ -1,6 +1,6 @@ #!/bin/sh # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/lib/test b/test/lib/test index 29612c2..115dd21 100755 --- a/test/lib/test +++ b/test/lib/test @@ -1,6 +1,6 @@ #!/bin/sh # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/lib/util b/test/lib/util index c1b3262..98cb9d8 100755 --- a/test/lib/util +++ b/test/lib/util @@ -1,6 +1,6 @@ #!/bin/sh # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/lib/video b/test/lib/video index 0ed6a3e..320d4a0 100755 --- a/test/lib/video +++ b/test/lib/video @@ -1,6 +1,6 @@ #!/bin/sh # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/memory/passt b/test/memory/passt index 3da6235..1193af8 100644 --- a/test/memory/passt +++ b/test/memory/passt @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/nsholder.c b/test/nsholder.c index 010a051..03cf7a2 100644 --- a/test/nsholder.c +++ b/test/nsholder.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* nsholder - maintain a namespace to be entered by other processes * diff --git a/test/passt.mbuto b/test/passt.mbuto index d9cb078..90816d2 100755 --- a/test/passt.mbuto +++ b/test/passt.mbuto @@ -1,6 +1,6 @@ #!/bin/sh # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/passt.mem.mbuto b/test/passt.mem.mbuto index dc06015..56f5139 100755 --- a/test/passt.mem.mbuto +++ b/test/passt.mem.mbuto @@ -1,6 +1,6 @@ #!/bin/sh # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/passt/dhcp b/test/passt/dhcp index eef5183..7272755 100644 --- a/test/passt/dhcp +++ b/test/passt/dhcp @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/passt/ndp b/test/passt/ndp index 280b3ae..6de4081 100644 --- a/test/passt/ndp +++ b/test/passt/ndp @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/passt/shutdown b/test/passt/shutdown index e309ac6..02c6c10 100644 --- a/test/passt/shutdown +++ b/test/passt/shutdown @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/passt/tcp b/test/passt/tcp index 67668aa..91e49e0 100644 --- a/test/passt/tcp +++ b/test/passt/tcp @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/passt/udp b/test/passt/udp index b9533e0..80d0fa3 100644 --- a/test/passt/udp +++ b/test/passt/udp @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/passt_in_ns/icmp b/test/passt_in_ns/icmp index f326d4b..a2697db 100644 --- a/test/passt_in_ns/icmp +++ b/test/passt_in_ns/icmp @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/passt_in_ns/shutdown b/test/passt_in_ns/shutdown index 45901df..cd6cb19 100644 --- a/test/passt_in_ns/shutdown +++ b/test/passt_in_ns/shutdown @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/passt_in_ns/tcp b/test/passt_in_ns/tcp index 842b345..cdb7060 100644 --- a/test/passt_in_ns/tcp +++ b/test/passt_in_ns/tcp @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/passt_in_ns/udp b/test/passt_in_ns/udp index d9cd85a..8a02513 100644 --- a/test/passt_in_ns/udp +++ b/test/passt_in_ns/udp @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/pasta/dhcp b/test/pasta/dhcp index 80eabf5..309001b 100644 --- a/test/pasta/dhcp +++ b/test/pasta/dhcp @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/pasta/ndp b/test/pasta/ndp index d2b2c0b..bb33110 100644 --- a/test/pasta/ndp +++ b/test/pasta/ndp @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/pasta/tcp b/test/pasta/tcp index eeda20b..6ab18c5 100644 --- a/test/pasta/tcp +++ b/test/pasta/tcp @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/pasta/udp b/test/pasta/udp index c8ff418..30e3a85 100644 --- a/test/pasta/udp +++ b/test/pasta/udp @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/pasta_options/log_to_file b/test/pasta_options/log_to_file index 29fb2c8..fcdd553 100644 --- a/test/pasta_options/log_to_file +++ b/test/pasta_options/log_to_file @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/perf/passt_tcp b/test/perf/passt_tcp index 3338f14..7046f3c 100644 --- a/test/perf/passt_tcp +++ b/test/perf/passt_tcp @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/perf/passt_udp b/test/perf/passt_udp index 0cfb669..a117b6a 100644 --- a/test/perf/passt_udp +++ b/test/perf/passt_udp @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/perf/pasta_tcp b/test/perf/pasta_tcp index 8ebb25c..4b13384 100644 --- a/test/perf/pasta_tcp +++ b/test/perf/pasta_tcp @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/perf/pasta_udp b/test/perf/pasta_udp index 112d70d..7007b6f 100644 --- a/test/perf/pasta_udp +++ b/test/perf/pasta_udp @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/run b/test/run index e07513f..5ddb8a9 100755 --- a/test/run +++ b/test/run @@ -1,6 +1,6 @@ #!/bin/sh -e # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/test/two_guests/basic b/test/two_guests/basic index dba4b9e..09fbd3e 100644 --- a/test/two_guests/basic +++ b/test/two_guests/basic @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later # # PASST - Plug A Simple Socket Transport # for qemu/UNIX domain socket mode diff --git a/udp.c b/udp.c index ddf01db..39c59d4 100644 --- a/udp.c +++ b/udp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/udp.h b/udp.h index 0e81be8..e64ef18 100644 --- a/udp.h +++ b/udp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2021 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ diff --git a/util.c b/util.c index fddb5ed..c3e3471 100644 --- a/util.c +++ b/util.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later /* PASST - Plug A Simple Socket Transport * for qemu/UNIX domain socket mode diff --git a/util.h b/util.h index 8367f51..ba3e3da 100644 --- a/util.h +++ b/util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: AGPL-3.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later * Copyright (c) 2021 Red Hat GmbH * Author: Stefano Brivio <sbrivio(a)redhat.com> */ -- 2.39.2

1 0

[PATCH 00/14] Improved tool for testing across multiple namespaces
by David Gibson 06 Apr '23

06 Apr '23

This series extends the "nsholder" tool we use in the tests to "nstool" with some more features. In particular it allows entering an established namespace with capabilities intact, and it allows entering them with less verbose options than nsenter. For now this only gives a modest simplification of the tests, but it should enable more in future. I haven't managed to get all the way through the testsuite with this: it's wedging in the IPv4 UDP throughput tests, but that's happening for me with the main branch too. I'll debug that, but I don't want to delay this series on that for now. David Gibson (14): nstool: Rename nsholder to nstool nstool: Reverse parameters to nstool nstool: Move description of its operation modes from comment to usage nstool: Split some command line parsing and socket setup to subcommands nstool: Replace "pid" subcommand with "info" subcommand nstool: Detect what namespaces target is in nstool: Add magic number to advertized information nstool: Helpers to iterate through namespace types nstool: Add nstool exec command to execute commands in an nstool namespace nstool: Add --keep-caps option to nstool exec test: Initialise ${TRACE} properly test: Use "nstool exec" to slightly simplify tests nstool: Advertise the holder's cwd (in its mountns) across the socket nstool: Enter holder's cwd when changing mount ns with nstool exec test/.gitignore | 2 +- test/Makefile | 4 +- test/lib/context | 14 +- test/lib/setup | 49 ++--- test/nsholder.c | 139 ------------ test/nstool.c | 562 +++++++++++++++++++++++++++++++++++++++++++++++ test/run | 5 +- 7 files changed, 599 insertions(+), 176 deletions(-) delete mode 100644 test/nsholder.c create mode 100644 test/nstool.c -- 2.39.2

2 35

passt: new version 2023_03_29.b10b983 available
by Stefano Brivio 30 Mar '23

30 Mar '23

The new version with tag 2023_03_29.b10b983 includes the following changes: b10b983 fedora: Adjust path for SELinux policy and interface file to latest guidelines 387f4ac fedora: Don't install useless SELinux interface file for pasta dafd92d selinux: Drop useless interface file for pasta 98a9a7d conf: Allow binding to ports on an interface without a specific address 33d88f7 tcp: Clear ACK_FROM_TAP_DUE also on unchanged ACK sequence from peer 4e73e9b tcp: Don't special case the handling of the ack of a syn 085672f tcp: Clarify allowed state for tcp_data_from_tap() https://passt.top/passt/log/?qt=range&q=2023_03_21.1ee2f7c..2023_03_29.b10b… Packages: - Debian tracker: https://tracker.debian.org/pkg/passt - Copr (CentOS Stream, EPEL, Fedora, Mageia, openSUSE): https://copr.fedorainfracloud.org/coprs/sbrivio/passt/build/5727640/ permanent mirror: https://passt.top/builds/copr/0^20230329.gb10b983/ - Fedora updates: https://bodhi.fedoraproject.org/updates/?packages=passt - Ubuntu tracker: https://packages.ubuntu.com/lunar/passt - Static builds: - Package for other RPM-based distributions, x86_64 only: https://passt.top/builds/latest/x86_64/passt-g02130bb-1.x86_64.rpm - x86_64 static binaries: https://passt.top/builds/latest/x86_64/ - Debian package, from x86_64 static build: https://passt.top/builds/latest/x86_64/passt_02130bb-1_all.deb -- Stefano

1 0

[PATCH] fedora: Adjust path for SELinux policy and interface file to latest guidelines
by Stefano Brivio 29 Mar '23

29 Mar '23

Forget about: https://fedoraproject.org/wiki/SELinux_Policy_Modules_Packaging_Draft and: https://fedoraproject.org/wiki/PackagingDrafts/SELinux_Independent_Policy The guidelines to follow are: https://fedoraproject.org/wiki/SELinux/IndependentPolicy Start from fixing the most pressing issue, that is, a path conflict with policy-selinux-devel about passt.if, and, while at it, adjust the installation paths for policy files too. Reported-by: Xose Vazquez Perez <xose.vazquez(a)gmail.com> Link: https://bugzilla.redhat.com/show_bug.cgi?id=2182476 Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- contrib/fedora/passt.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/fedora/passt.spec b/contrib/fedora/passt.spec index da1accb..88aa3a7 100644 --- a/contrib/fedora/passt.spec +++ b/contrib/fedora/passt.spec @@ -62,17 +62,17 @@ ln -sr %{buildroot}%{_mandir}/man1/pasta.1 %{buildroot}%{_mandir}/man1/pasta.avx pushd contrib/selinux make -f %{_datadir}/selinux/devel/Makefile -install -p -m 644 -D passt.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/passt.pp -install -p -m 644 -D passt.if %{buildroot}%{_datadir}/selinux/devel/include/contrib/passt.if -install -p -m 644 -D pasta.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/pasta.pp +install -p -m 644 -D passt.pp %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/passt.pp +install -p -m 644 -D passt.if %{buildroot}%{_datadir}/selinux/devel/include/distributed/passt.if +install -p -m 644 -D pasta.pp %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/pasta.pp popd %pre selinux %selinux_relabel_pre -s %{selinuxtype} %post selinux -%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{name}/passt.pp -%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{name}/pasta.pp +%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/passt.pp +%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/pasta.pp %postun selinux if [ $1 -eq 0 ]; then -- 2.39.2

1 0

[PATCH 1/2] selinux: Drop useless interface file for pasta
by Stefano Brivio 27 Mar '23

27 Mar '23

This was meant to be an example, but I managed to add syntax errors to it. Drop it altogether. Reported-by: Carl G. <carlg(a)fedoraproject.org> Link: https://bugzilla.redhat.com/show_bug.cgi?id=2182145 Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- contrib/selinux/pasta.if | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 contrib/selinux/pasta.if diff --git a/contrib/selinux/pasta.if b/contrib/selinux/pasta.if deleted file mode 100644 index 149045a..0000000 --- a/contrib/selinux/pasta.if +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later -# -# PASTA - Pack A Subtle Tap Abstraction -# for network namespace/tap device mode -# -# contrib/selinux/pasta.if - SELinux profile: Interface File for pasta -# -# Copyright (c) 2022 Red Hat GmbH -# Author: Stefano Brivio <sbrivio(a)redhat.com> - -interface('passt_read_data',' - gen_require(` - type passt_data_t; - ') - allow $1 passt_t:dir { search add_name }; - allow $1 passt_t:file { open read getattr }; -') - -interface('pasta_read_data',' - gen_require(` - type pasta_data_t; - ') - allow $1 pasta_t:dir { search add_name }; - allow $1 pasta_t:file { open read getattr }; -') -- 2.39.2

1 1

[PATCH] conf: Allow binding to ports on an interface without a specific address
by Stefano Brivio 27 Mar '23

27 Mar '23

Somebody might want to bind listening sockets to a specific interface, but not a specific address, and there isn't really a reason to prevent that. For example: -t %eth0/2022 Alternatively, we support options such as -t 0.0.0.0%eth0/2022 and -t ::%eth0/2022, but not together, for the same port. Enable this kind of syntax and add examples to the man page. Reported-by: Paul Holzinger <pholzing(a)redhat.com> Link: https://github.com/containers/podman/issues/14425#issuecomment-1485192195 Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- conf.c | 4 +++- passt.1 | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/conf.c b/conf.c index 04e9956..f519a6a 100644 --- a/conf.c +++ b/conf.c @@ -263,7 +263,9 @@ static void conf_ports(const struct ctx *c, char optname, const char *optarg, ifname++; } - if (inet_pton(AF_INET, buf, addr)) + if (ifname == buf + 1) /* Interface without address */ + addr = NULL; + else if (inet_pton(AF_INET, buf, addr)) af = AF_INET; else if (inet_pton(AF_INET6, buf, addr)) af = AF_INET6; diff --git a/passt.1 b/passt.1 index 4c90634..cb7ae4e 100644 --- a/passt.1 +++ b/passt.1 @@ -385,6 +385,9 @@ Forward local port 22, bound to 192.0.2.1, to port 22 on the guest -t 192.0.2.1%eth0/22 Forward local port 22, bound to 192.0.2.1 and interface eth0, to port 22 .TP +-t %eth0/22 +Forward local port 22, bound to any address on interface eth0, to port 22 +.TP -t 2000-5000,~3000-3010 Forward local ports between 2000 and 5000, except for those between 3000 and 3010 @@ -467,6 +470,9 @@ Forward local port 22, bound to 192.0.2.1, to port 22 in the target namespace -t 192.0.2.1%eth0/22 Forward local port 22, bound to 192.0.2.1 and interface eth0, to port 22 .TP +-t %eth0/22 +Forward local port 22, bound to any address on interface eth0, to port 22 +.TP -t 2000-5000,~3000-3010 Forward local ports between 2000 and 5000, except for those between 3000 and 3010 -- 2.39.2

1 0

[PATCH 0/2] tcp: Correct handling of first ACK (or SYN-ACK) packet
by David Gibson 27 Mar '23

27 Mar '23

We have a subtle problem in the handling of the very first ack-flagged packet (either the SYN-ACK or ACK from the three way handshake). Stefano has posted a couple of versions of a patch addressing this, however I think this is a better approach. From the TCP logical point of view, that first ACK does advance the sequence number, and if we treat it as doing so, then the logic we already had in tcp_update_seqack_from_tap() is correct. David Gibson (2): tcp: Clarify allowed state for tcp_data_from_tap() tcp: Don't special case the handling of the ack of a syn tcp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.39.2

2 3

[PATCH] tcp: Clear and set ACK_FROM_TAP_DUE also on unchanged ACK sequence from peer
by Stefano Brivio 24 Mar '23

24 Mar '23

Since commit cc6d8286d104 ("tcp: Reset ACK_FROM_TAP_DUE flag only as needed, update timer"), we don't clear ACK_FROM_TAP_DUE whenever we process an ACK segment, but, more correctly, only if we're really not waiting for a further ACK segment, that is, only if the acknowledged sequence matches what we sent. In the new function implementing this, tcp_update_seqack_from_tap(), we also reset the retransmission counter and store the updated ACK sequence. Both should be done iff forward progress is acknowledged, implied by the fact that the new ACK sequence is greater than the one we previously stored. At that point, it looked natural to also include the statements that clear and set the ACK_FROM_TAP_DUE flag inside the same conditional block: if we're not making forward progress, the need for an ACK, or lack thereof, should remain unchanged. There's a case where this isn't true, though: if a client initiates a connection, and the server doesn't send data, with the client also not sending any further data except for what's possibly sent along with the first ACK segment following SYN, ACK from the server, we'll never, in the established state of the connection, call tcp_update_seqack_from_tap() with reported forward progress. In that case, we'll never reset the initial ACK_FROM_TAP_DUE (used to trigger handshake timeouts), interpret the trigger as a the need for a retransmission (which won't actually retransmit anything), and eventually time out a perfectly healthy connection once we reach the maximum retransmission count. This is relatively simple to reproduce if we switch back to 30s iperf3 test runs, but it depends on the timing of the iperf3 client: sometimes the first ACK from the client (part of the three-way handshake) will come with data (and we'll hit the problem), sometimes data will be sent later (and we call to tcp_update_seqack_from_tap() from tcp_data_from_tap() later, avoiding the issue). A reliable reproducer is a simpler: $ strace -e accept,shutdown socat TCP-LISTEN:1111 STDIO & [2] 2202832 $ pasta --config-net -- sh -c '(sleep 30; echo a) | socat STDIN TCP:88.198.0.161:1111' accept(5, {sa_family=AF_INET, sin_port=htons(57200), sin_addr=inet_addr("127.0.0.1")}, [16]) = 6 shutdown(6, SHUT_RDWR) = 0 --- SIGTTOU {si_signo=SIGTTOU, si_code=SI_KERNEL} --- --- stopped by SIGTTOU --- 2023/03/23 16:05:06 socat[3] E write(5, 0x5645dbca9000, 2): Connection reset by peer where the socat client connects, and no data exchange happens for 30s in either direction. Here, I'm using the default gateway address to reach the socat server on the host. Fix this by clearing and setting the ACK_FROM_TAP_DUE flag regardless of reported forward progress. If we clear it when it's already unset, conn_flag() will do nothing with it. If it was set, it's always fine to reschedule the timer (as long as we're waiting for a further ACK), because we just received an ACK segment, no matter its sequence. Fixes: cc6d8286d104 ("tcp: Reset ACK_FROM_TAP_DUE flag only as needed, update timer") Reported-by: David Gibson <david(a)gibson.dropbear.id.au> Analysed-by: David Gibson <david(a)gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- tcp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tcp.c b/tcp.c index f156287..b225bbe 100644 --- a/tcp.c +++ b/tcp.c @@ -1610,12 +1610,12 @@ out: static void tcp_update_seqack_from_tap(const struct ctx *c, struct tcp_tap_conn *conn, uint32_t seq) { - if (SEQ_GT(seq, conn->seq_ack_from_tap)) { - if (seq == conn->seq_to_tap) - conn_flag(c, conn, ~ACK_FROM_TAP_DUE); - else - conn_flag(c, conn, ACK_FROM_TAP_DUE); + if (seq == conn->seq_to_tap) + conn_flag(c, conn, ~ACK_FROM_TAP_DUE); + else + conn_flag(c, conn, ACK_FROM_TAP_DUE); + if (SEQ_GT(seq, conn->seq_ack_from_tap)) { conn->retrans = 0; conn->seq_ack_from_tap = seq; } -- 2.39.2

2 3