From af2e832762165ef4a0093de5e3555520cb0b9cec Mon Sep 17 00:00:00 2001 From: Andrew Rioux Date: Mon, 20 Jan 2025 20:39:26 -0500 Subject: [PATCH] feat: fixed pcap linking and added nix packages --- .cargo/config.toml | 4 +- .gitignore | 1 + Cargo.lock | 17 - Cargo.toml | 8 +- LICENSE | 661 +++++++++++++++++++++++++++++++++++++++ LICENSE.winpcap | 237 ++++++++++++++ build_common.rs | 14 + build_freebsd.rs | 6 - deny.toml | 50 +++ flake.lock | 37 ++- flake.nix | 55 ++-- nl-sys/Cargo.toml | 1 + nl-sys/build.rs | 2 + packages.nix | 122 ++++++++ packets/Cargo.toml | 1 + pcap-sys/Cargo.toml | 13 +- pcap-sys/build.rs | 12 +- pcap-sys/src/lib.rs | 6 +- pcap-sys/src/stream.rs | 5 +- sparse-beacon/Cargo.toml | 1 + sparse-beacon/build.rs | 2 +- system-libs.nix | 39 ++- taplo.toml | 7 + 23 files changed, 1220 insertions(+), 81 deletions(-) create mode 100644 LICENSE create mode 100644 LICENSE.winpcap create mode 100644 build_common.rs delete mode 100644 build_freebsd.rs create mode 100644 deny.toml create mode 100644 packages.nix create mode 100644 taplo.toml diff --git a/.cargo/config.toml b/.cargo/config.toml index d5db07a..b05ddc5 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,7 +1,7 @@ -[target.x86_64-unknown-linux-gnu] +[target.x86_64-unknown-linux-musl] linker = "clang" -[target.x86_64-unknown-linux-musl] +[target.x86_64-unknown-linux-gnu] linker = "clang" [target.x86_64-unknown-freebsd] diff --git a/.gitignore b/.gitignore index 2d5df85..7343d41 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /target .direnv +/result diff --git a/Cargo.lock b/Cargo.lock index df14f88..fa18567 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -53,15 +53,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cmake" -version = "0.1.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e" -dependencies = [ - "cc", -] - [[package]] name = "errno" version = "0.3.10" @@ -72,12 +63,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - [[package]] name = "futures" version = "0.3.31" @@ -230,9 +215,7 @@ version = "0.1.0" name = "pcap-sys" version = "0.1.0" dependencies = [ - "cmake", "errno", - "fs_extra", "futures", "libc", "packets", diff --git a/Cargo.toml b/Cargo.toml index d98d8e2..1c839a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,12 +1,8 @@ [workspace] -members = [ - "sparse-beacon", - "nl-sys", - "packets", - "pcap-sys" -] +members = ["sparse-beacon", "nl-sys", "packets", "pcap-sys"] resolver = "2" package.version = "2.0.0" +metadata.crane.name = "sparse" [profile.release] strip = true diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..be3f7b2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. + + + Copyright (C) + + 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 . + +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 +. diff --git a/LICENSE.winpcap b/LICENSE.winpcap new file mode 100644 index 0000000..54bbb2e --- /dev/null +++ b/LICENSE.winpcap @@ -0,0 +1,237 @@ +Copyright (c) 1999 - 2005 NetGroup, Politecnico di Torino (Italy). +Copyright (c) 2005 - 2010 CACE Technologies, Davis (California). +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. 2. Redistributions +in binary form must reproduce the above copyright notice, this list of +conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. 3. Neither the name +of the Politecnico di Torino, CACE Technologies nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +This product includes software developed by the University of California, +Lawrence Berkeley Laboratory and its contributors. This product +includes software developed by the Kungliga Tekniska Högskolan and +its contributors. This product includes software developed by Yen Yen +Lim and North Dakota State University. + +======= + +Portions Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 +The Regents of the University of California. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: 1. Redistributions of source code must retain the above +copyright notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this +software must display the following acknowledgement: "This product +includes software developed by the University of California, Berkeley +and its contributors." 4. Neither the name of the University nor the +names of its contributors may be used to endorse or promote products +derived from this software without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, +OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE. + +======= + +Portions Copyright (c) 1983 Regents of the University of California. All +rights reserved. + +Redistribution and use in source and binary forms are permitted provided +that the above copyright notice and this paragraph are duplicated +in all such forms and that any documentation, advertising materials, +and other materials related to such distribution and use acknowledge +that the software was developed by the University of California, +Berkeley. The name of the University may not be used to endorse or +promote products derived from this software without specific prior +written permission. THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED +WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + +======= + +Portions Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan +(Royal Institute of Technology, Stockholm, Sweden). All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: 1. Redistributions of source code must retain the above +copyright notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this +software must display the following acknowledgement: "This product +includes software developed by the Kungliga Tekniska Högskolan and +its contributors." 4. Neither the name of the University nor the +names of its contributors may be used to endorse or promote products +derived from this software without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, +OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE. + +======= + +Portions Copyright (c) 1997 Yen Yen Lim and North Dakota State +University. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: 1. Redistributions of source code must retain the above +copyright notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software +must display the following acknowledgement: "This product includes +software developed by Yen Yen Lim and North Dakota State University" +4. The name of the author may not be used to endorse or promote products +derived from this software without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN +NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +======= + +Portions Copyright (c) 1993 by Digital Equipment Corporation. + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies, and that +the name of Digital Equipment Corporation not be used in advertising or +publicity pertaining to distribution of the document or software without +specific, written prior permission. THE SOFTWARE IS PROVIDED "AS IS" +AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +======= + +Portions Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project. All +rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: 1. Redistributions of source code must retain the above +copyright notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. +3. Neither the name of the project nor the names of its contributors may +be used to endorse or promote products derived from this software without +specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE +PROJECT AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +======= + +Portions Copyright (c) 1996 Juniper Networks, Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that: (1) source code distributions +retain the above copyright notice and this paragraph in its entirety, +(2) distributions including binary code include the above copyright +notice and this paragraph in its entirety in the documentation or other +materials provided with the distribution. The name of Juniper Networks +may not be used to endorse or promote products derived from this software +without specific prior written permission. THIS SOFTWARE IS PROVIDED +``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, +WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE. + +======= + +Portions Copyright (c) 2001 Daniel Hartmeier All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: - Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. - +Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTOR "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, +OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE. + +======= + +Portions Copyright 1989 by Carnegie Mellon. + +Permission to use, copy, modify, and distribute this program for +any purpose and without fee is hereby granted, provided that this +copyright and permission notice appear on all copies and supporting +documentation, the name of Carnegie Mellon not be used in advertising or +publicity pertaining to distribution of the program without specific +prior permission, and notice be given in supporting documentation +that copying and distribution is by permission of Carnegie Mellon and +Stanford University. Carnegie Mellon makes no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. ' diff --git a/build_common.rs b/build_common.rs new file mode 100644 index 0000000..2cb1d8a --- /dev/null +++ b/build_common.rs @@ -0,0 +1,14 @@ +{ + if std::env::var("CARGO_CFG_TARGET_OS").unwrap() == "freebsd" { + let freebsd_libs = std::env::var("FREEBSD_LIBS").unwrap(); + println!("cargo:rustc-link-arg=--sysroot={freebsd_libs}"); + println!("cargo:rustc-link-arg=-L{freebsd_libs}/lib"); + println!("cargo:rustc-link-arg=-L{freebsd_libs}/usr/lib"); + } + if std::env::var("CARGO_CFG_TARGET_ENV").unwrap() == "gnu" && std::env::var("CARGO_CFG_TARGET_OS").unwrap() == "linux" { + let glibc_libs = std::env::var("GLIBC_LIBS").unwrap(); + let glibc_libs_static = std::env::var("GLIBC_LIBS_STATIC").unwrap(); + println!("cargo:rustc-link-arg=-L{glibc_libs}/lib"); + println!("cargo:rustc-link-arg=-L{glibc_libs_static}/lib"); + } +} diff --git a/build_freebsd.rs b/build_freebsd.rs deleted file mode 100644 index c21766e..0000000 --- a/build_freebsd.rs +++ /dev/null @@ -1,6 +0,0 @@ -if std::env::var("CARGO_CFG_TARGET_OS").unwrap() == "freebsd" { - let freebsd_libs = std::env::var("FREEBSD_LIBS").unwrap(); - println!("cargo:rustc-link-arg=--sysroot={freebsd_libs}"); - println!("cargo:rustc-link-arg=-L{freebsd_libs}/lib"); - println!("cargo:rustc-link-arg=-L{freebsd_libs}/usr/lib"); -} diff --git a/deny.toml b/deny.toml new file mode 100644 index 0000000..2e8478e --- /dev/null +++ b/deny.toml @@ -0,0 +1,50 @@ +[graph] +targets = [ + "x86_64-unknown-linux-musl", + "x86_64-pc-windows-gnu", + "x86_64-unknown-freebsd" +] +all-features = false +no-default-features = false + +[output] +feature-depth = 1 + +[advisories] +ignore = [] + +[licenses] +allow = [ + "MIT", + "Apache-2.0", + "Unicode-3.0", +] +confidence-threshold = 0.8 +exceptions = [] + +[licenses.private] +ignore = true +registries = [] + +[bans] +multiple-versions = "warn" +wildcards = "allow" +highlight = "all" +workspace-default-features = "allow" +external-default-features = "allow" +allow = [] +deny = [] + +skip = [] +skip-tree = [] + +[sources] +unknown-registry = "warn" +unknown-git = "warn" +allow-registry = ["https://github.com/rust-lang/crates.io-index"] +allow-git = [] + +[sources.allow-org] +github = [] +gitlab = [] +bitbucket = [] diff --git a/flake.lock b/flake.lock index 6dd8246..6ac171b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "advisory-db": { + "flake": false, + "locked": { + "lastModified": 1737246984, + "narHash": "sha256-cjWzMwqej9zVoFGV5NkefOspMDJJ+gN3+zkFZcBBAkc=", + "owner": "rustsec", + "repo": "advisory-db", + "rev": "cfd49ce116f12c856a3f3c065d041fd0dd7169dc", + "type": "github" + }, + "original": { + "owner": "rustsec", + "repo": "advisory-db", + "type": "github" + } + }, "crane": { "locked": { "lastModified": 1737250794, @@ -64,11 +80,11 @@ "libpcap-src": { "flake": false, "locked": { - "lastModified": 1737231768, - "narHash": "sha256-cZpHFjy0cqLeP4TJR80aAMi0V4qzPcEmwU8ouhxZ0sM=", + "lastModified": 1737403834, + "narHash": "sha256-Lrt/PPdmvnGDtgUuLnSrJm9bqZ0oOq/qjn+H/A7F+vQ=", "ref": "refs/heads/master", - "rev": "1fd4281671fb78533bfb3cfac31db78a4015cdcd", - "revCount": 6400, + "rev": "4f45904ae414e6ea8c1794576a76fde60218d3b4", + "revCount": 6406, "type": "git", "url": "https://github.com/the-tcpdump-group/libpcap" }, @@ -79,11 +95,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737165118, - "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=", + "lastModified": 1737299813, + "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566", + "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", "type": "github" }, "original": { @@ -95,6 +111,7 @@ }, "root": { "inputs": { + "advisory-db": "advisory-db", "crane": "crane", "flake-utils": "flake-utils", "freebsd-libs-packed": "freebsd-libs-packed", @@ -113,11 +130,11 @@ ] }, "locked": { - "lastModified": 1737253755, - "narHash": "sha256-T1FIl8yuQ0cJx2DBMvWH73O/igJGaumNNyZkea2m3a0=", + "lastModified": 1737340068, + "narHash": "sha256-5UciRckNV+YOZ6y6ASBIb01cySB12whDxgFUK+EqT8g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9e4b97a04063ff39a37b63e8fb31cc2b4adf9227", + "rev": "275c824ed9e90e7fd4f96d187bde3670062e721f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 26f2939..c9a4d28 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,10 @@ }; crane.url = "github:ipetkov/crane"; flake-utils.url = "github:numtide/flake-utils"; + advisory-db = { + url = "github:rustsec/advisory-db"; + flake = false; + }; libpcap-src = { url = "git+https://github.com/the-tcpdump-group/libpcap"; @@ -35,8 +39,9 @@ # echo '000007: 09' | xxd -r - target/x86_64-unknown-freebsd/debug/sparse-beacon }; - outputs = { self, nixpkgs, flake-utils, crane, rust-overlay, libpcap-src - , libnl-src, winpcap-libs, winpcap-installer, freebsd-libs-packed }: + outputs = { self, nixpkgs, flake-utils, crane, rust-overlay, advisory-db + , libpcap-src, libnl-src, winpcap-libs, winpcap-installer + , freebsd-libs-packed }: flake-utils.lib.eachSystem [ "x86_64-linux" ] (system: let pkgs = import nixpkgs { @@ -49,11 +54,10 @@ freebsd-libs-packed; }; inherit (system-libs) - bsd-toolchain winpcap-drivers freebsd-libs libnl libpcap-linux - libpcap-freebsd; + bsd-toolchain winpcap-drivers freebsd-libs libnl libpcap-linux-gnu + libpcap-linux-musl libpcap-freebsd; buildTools = with pkgs; [ - mold lld zig clang @@ -64,7 +68,7 @@ pkgsCross.mingwW64.windows.pthreads ]; - devShellTools = with pkgs; [ rust-analyzer ]; + devShellTools = with pkgs; [ rust-analyzer taplo cargo-deny ]; craneLib = (crane.mkLib pkgs).overrideToolchain (p: p.rust-bin.stable.latest.default.override { @@ -76,30 +80,33 @@ ]; }); - patch-elf = header: drv: path: - pkgs.stdenv.mkDerivation { - name = "elf-patch-${header}"; + buildEnvironment = { + SPARSE_BUILD_WINPCAP_LIBS = "${winpcap-libs}/Lib"; + SPARSE_BUILD_WINPCAP_DRIVERS = "${winpcap-drivers}/npf.sys"; + SPARSE_BUILD_LIBPCAP_LINUX_GNU = libpcap-linux-gnu; + SPARSE_BUILD_LIBPCAP_LINUX_MUSL = libpcap-linux-musl; + SPARSE_BUILD_LIBPCAP_FREEBSD = libpcap-freebsd; + SPARSE_BUILD_LIBNL = libnl; - buildInputs = with pkgs; [ vim ]; - }; - patch-freebsd-elf = patch-elf 9; + FREEBSD_LIBS = freebsd-libs; + GLIBC_LIBS = pkgs.glibc; + GLIBC_LIBS_STATIC = pkgs.glibc.static; + }; + + outputs = import ./packages.nix ({ + inherit pkgs buildTools buildEnvironment craneLib advisory-db + winpcap-libs; + } // system-libs); in { + packages = outputs.packages; + checks = outputs.checks; + devShells = { - default = craneLib.devShell { + default = craneLib.devShell (buildEnvironment // { name = "sparse-default"; packages = buildTools ++ devShellTools; - - SPARSE_BUILD_WINPCAP_LIBS = "${winpcap-libs}/Lib"; - SPARSE_BUILD_WINPCAP_DRIVERS = "${winpcap-drivers}/npf.sys"; - SPARSE_BUILD_LIBPCAP_LINUX = libpcap-linux; - SPARSE_BUILD_LIBPCAP_FREEBSD = libpcap-freebsd; - SPARSE_BUILD_LIBNL = libnl; - - FREEBSD_LIBS = freebsd-libs; - - RUSTFLAGS = "-Ctarget-feature=+crt-static"; - }; + }); }; }); } diff --git a/nl-sys/Cargo.toml b/nl-sys/Cargo.toml index 38ceb9b..018626c 100644 --- a/nl-sys/Cargo.toml +++ b/nl-sys/Cargo.toml @@ -2,6 +2,7 @@ name = "nl-sys" version = "0.1.0" edition = "2021" +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/nl-sys/build.rs b/nl-sys/build.rs index be894bf..242c0bc 100644 --- a/nl-sys/build.rs +++ b/nl-sys/build.rs @@ -14,6 +14,8 @@ // along with this program. If not, see . fn main() -> std::io::Result<()> { + include!("../build_common.rs"); + cc::Build::new() .compiler("clang") .file("src/bridge.c") diff --git a/packages.nix b/packages.nix new file mode 100644 index 0000000..f3376da --- /dev/null +++ b/packages.nix @@ -0,0 +1,122 @@ +{ pkgs, buildTools, buildEnvironment, craneLib, advisory-db, winpcap-libs +, winpcap-drivers, freebsd-libs, libnl, libpcap-linux-musl, libpcap-linux-gnu +, libpcap-freebsd }: +let + patch-elf = header: drv: path: + let hdr = toString header; + in pkgs.stdenv.mkDerivation { + name = "elf-patch-${hdr}"; + + buildInputs = with pkgs; [ vim ]; + + src = drv; + + buildPhase = '' + mkdir -p $out/$(dirname ${path}) + cp ${drv}/${path} $out/${path} + echo '000007: ${hdr}' xxd -r - $out/${path} + ''; + }; + patch-freebsd-elf = patch-elf 9; + + src = craneLib.cleanCargoSource ./.; + + commonArgs = buildEnvironment // { + inherit src; + strictDeps = true; + + nativeBuildInputs = buildTools; + buildInputs = buildTools; + }; + + freebsdArgs = commonArgs // { + CARGO_BUILD_RUSTFLAGS = + "-Ctarget-feature=+crt-static -Clink-args=--target=x86_64-unknown-freebsd -Clink-args=--sysroot=${freebsd-libs} -Clink-args=-L${freebsd-libs}/lib -Clink-args=-L${freebsd-libs}/usr/lib -Clink-args=-L${libpcap-freebsd}/lib"; + + doCheck = false; + }; + + windowsArgs = commonArgs // { doCheck = false; }; + + linuxCargoArtifacts = craneLib.buildDepsOnly (commonArgs // { + name = "sparse-deps-linux"; + cargoExtraArgs = "--target=x86_64-unknown-linux-musl --locked"; + }); + freebsdCargoArtifacts = craneLib.buildDepsOnly (freebsdArgs // { + name = "sparse-deps-freebsd"; + cargoExtraArgs = "--target=x86_64-unknown-freebsd --locked"; + }); + windowsCargoArtifacts = craneLib.buildDepsOnly (windowsArgs // { + name = "sparse-deps-windows"; + cargoExtraArgs = "--target=x86_64-pc-windows-gnu --locked"; + }); + + fileSetForCrate = crate: + pkgs.lib.fileset.toSource { + root = ./.; + fileset = pkgs.lib.fileset.unions [ + ./.cargo/config.toml + ./Cargo.toml + ./Cargo.lock + ./build_common.rs + (craneLib.fileset.commonCargoSources ./pcap-sys) + (craneLib.fileset.commonCargoSources ./nl-sys) + (craneLib.fileset.commonCargoSources ./packets) + (craneLib.fileset.commonCargoSources crate) + ]; + }; + + sparse-beacon-linux = craneLib.buildPackage (commonArgs // { + cargoArtifacts = linuxCargoArtifacts; + name = "sparse-beacon-linux"; + cargoExtraArgs = "-p sparse-beacon"; + src = fileSetForCrate ./sparse-beacon; + + CARGO_BUILD_TARGET = "x86_64-unknown-linux-musl"; + CARGO_BUILD_RUSTFLAGS = "-Ctarget-feature=+crt-static"; + }); + + sparse-beacon-freebsd-sysv = craneLib.buildPackage (freebsdArgs // { + inherit src; + cargoArtifacts = freebsdCargoArtifacts; + name = "sparse-beacon-freebsd"; + cargoExtraArgs = "-p sparse-beacon"; + + nativeBuildInputs = buildTools; + + CARGO_BUILD_TARGET = "x86_64-unknown-freebsd"; + CARGO_BUILD_RUSTFLAGS = "-Ctarget-feature=+crt-static"; + }); + + sparse-beacon-freebsd = + patch-freebsd-elf sparse-beacon-freebsd-sysv "bin/sparse-beacon"; + + sparse-beacon-windows = craneLib.buildPackage (windowsArgs // { + cargoArtifacts = windowsCargoArtifacts; + name = "sparse-beacon-windows"; + cargoExtraArgs = "-p sparse-beacon"; + src = fileSetForCrate ./sparse-beacon; + + CARGO_BUILD_TARGET = "x86_64-pc-windows-gnu"; + CARGO_BUILD_RUSTFLAGS = "-Ctarget-feature=+crt-static"; + }); + + outputs = rec { + packages = { + inherit sparse-beacon-linux sparse-beacon-windows + sparse-beacon-freebsd-sysv sparse-beacon-freebsd; + }; + checks = outputs.packages // { + rs-fmt = craneLib.cargoFmt { inherit src; }; + rs-audit = craneLib.cargoAudit { inherit src advisory-db; }; + rs-toml-fmt = craneLib.taploFmt { + src = pkgs.lib.sourceFilesBySuffices src [ ".toml" ]; + }; + rs-deny = craneLib.cargoDeny { inherit src; }; + rs-clippy = craneLib.cargoClippy (commonArgs // { + cargoArtifacts = linuxCargoArtifacts; + cargoClippyExtraArgs = "--all-targets -- --deny warnings"; + }); + }; + }; +in outputs diff --git a/packets/Cargo.toml b/packets/Cargo.toml index ff4201f..914f25d 100644 --- a/packets/Cargo.toml +++ b/packets/Cargo.toml @@ -2,6 +2,7 @@ name = "packets" version = "0.1.0" edition = "2021" +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/pcap-sys/Cargo.toml b/pcap-sys/Cargo.toml index d434a94..9f25709 100644 --- a/pcap-sys/Cargo.toml +++ b/pcap-sys/Cargo.toml @@ -17,15 +17,18 @@ name = "pcap-sys" version = "0.1.0" edition = "2021" +license = "AGPL-3.0-only" +publish = false [dependencies] errno = "0.3.10" futures = "0.3.25" libc = "0.2.169" -tokio = { version = "1.21.2", features = ["net", "rt", "macros", "rt-multi-thread" ] } +tokio = { version = "1.21.2", features = [ + "net", + "rt", + "macros", + "rt-multi-thread", +] } tokio-stream = "0.1.14" packets = { path = "../packets" } - -[build-dependencies] -cmake = "0.1" -fs_extra = "1.3.0" diff --git a/pcap-sys/build.rs b/pcap-sys/build.rs index 142cae0..83168af 100644 --- a/pcap-sys/build.rs +++ b/pcap-sys/build.rs @@ -13,10 +13,8 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -use fs_extra::dir::{copy, CopyOptions}; - fn main() { - include!("../build_freebsd.rs"); + include!("../build_common.rs"); if std::env::var("CARGO_CFG_TARGET_OS").unwrap() == "windows" { let libdir = std::env::var("SPARSE_BUILD_WINPCAP_LIBS").unwrap(); @@ -27,8 +25,12 @@ fn main() { let libdir = std::env::var("SPARSE_BUILD_LIBPCAP_FREEBSD").unwrap(); println!("cargo:rustc-link-search=native={libdir}/lib"); println!("cargo:rustc-link-lib=static=pcap"); - } else { - let libdir = std::env::var("SPARSE_BUILD_LIBPCAP_LINUX").unwrap(); + } else if std::env::var("CARGO_CFG_TARGET_ENV").unwrap() == "musl" { + let libdir = std::env::var("SPARSE_BUILD_LIBPCAP_LINUX_MUSL").unwrap(); + println!("cargo:rustc-link-search=native={libdir}/lib"); + println!("cargo:rustc-link-lib=static=pcap"); + } else if std::env::var("CARGO_CFG_TARGET_ENV").unwrap() == "gnu" { + let libdir = std::env::var("SPARSE_BUILD_LIBPCAP_LINUX_GNU").unwrap(); println!("cargo:rustc-link-search=native={libdir}/lib"); println!("cargo:rustc-link-lib=static=pcap"); } diff --git a/pcap-sys/src/lib.rs b/pcap-sys/src/lib.rs index c41403e..77dce13 100644 --- a/pcap-sys/src/lib.rs +++ b/pcap-sys/src/lib.rs @@ -15,7 +15,7 @@ use std::{ ffi::{CStr, CString}, - ptr, slice + ptr, slice, }; pub mod error; @@ -410,7 +410,9 @@ impl Interface { Ok(stream::InterfaceStream { inner: tokio::io::unix::AsyncFd::with_interest( - stream::InternalInterfaceStream::::new(unsafe { std::mem::transmute(self) })?, + stream::InternalInterfaceStream::::new(unsafe { + std::mem::transmute(self) + })?, tokio::io::Interest::READABLE, )?, }) diff --git a/pcap-sys/src/stream.rs b/pcap-sys/src/stream.rs index 2554161..5dad497 100644 --- a/pcap-sys/src/stream.rs +++ b/pcap-sys/src/stream.rs @@ -24,7 +24,10 @@ use futures::{ready, StreamExt}; use tokio::io::unix::AsyncFd; use tokio_stream::StreamMap; -use super::{error, ffi, packets, Activated, NotListening, Disabled, State, Interface, DevActivated, DevDisabled, PcapDevIterator}; +use super::{ + error, ffi, packets, Activated, DevActivated, DevDisabled, Disabled, Interface, NotListening, + PcapDevIterator, State, +}; pub(crate) struct InternalInterfaceStream { interface: Interface, diff --git a/sparse-beacon/Cargo.toml b/sparse-beacon/Cargo.toml index b6a6bbd..eebc818 100644 --- a/sparse-beacon/Cargo.toml +++ b/sparse-beacon/Cargo.toml @@ -2,6 +2,7 @@ name = "sparse-beacon" version = "0.7.0" edition = "2021" +publish = false [dependencies] pcap-sys = { path = "../pcap-sys" } diff --git a/sparse-beacon/build.rs b/sparse-beacon/build.rs index 0fe8f5f..d4809bd 100644 --- a/sparse-beacon/build.rs +++ b/sparse-beacon/build.rs @@ -1,3 +1,3 @@ fn main() { - include!("../build_freebsd.rs"); + include!("../build_common.rs"); } diff --git a/system-libs.nix b/system-libs.nix index d127dc1..f2b573a 100644 --- a/system-libs.nix +++ b/system-libs.nix @@ -9,6 +9,7 @@ let mkdir -p $out tar xvJpf ${freebsd-libs-packed} -C $out ./usr/lib tar xvJpf ${freebsd-libs-packed} -C $out ./usr/include + tar xvJpf ${freebsd-libs-packed} -C $out ./lib ''; }; @@ -80,8 +81,42 @@ in { ''; }; - libpcap-linux = pkgs.stdenv.mkDerivation { - name = "libpcap-static-linux"; + libpcap-linux-gnu = pkgs.stdenv.mkDerivation { + name = "libpcap-static-linux-gnu"; + + buildInputs = with pkgs; [ clang automake bison cmake flex glibc.static ]; + + src = libpcap-src; + + configurePhase = '' + cmake \ + -DCMAKE_BUILD_TYPE=MinSizeRel \ + -DBUILD_SHARED_LIBS=OFF \ + -DDISABLE_BLUETOOTH=ON \ + -DDISABLE_DAG=ON \ + -DDISABLE_DBUS=ON \ + -DDISABLE_DPDK=ON \ + -DDISABLE_NETMAP=ON \ + -DDISABLE_RDMA=ON \ + -DDISABLE_LINUX_USBMON=ON \ + -DDISABLE_SNF=ON \ + -DPCAP_TYPE=linux \ + . + ''; + + buildPhase = '' + cmake --build . --target pcap_static + ''; + + installPhase = '' + mkdir -p $out/lib + + cp libpcap.a $out/lib + ''; + }; + + libpcap-linux-musl = pkgs.stdenv.mkDerivation { + name = "libpcap-static-linux-musl"; buildInputs = with pkgs; [ clang automake bison cmake flex musl ]; diff --git a/taplo.toml b/taplo.toml new file mode 100644 index 0000000..6771bd8 --- /dev/null +++ b/taplo.toml @@ -0,0 +1,7 @@ +include = [ + "Cargo.toml", + "taplo.toml", + "*-sys/Cargo.toml", + "sparse-*/Cargo.toml", + "packets/Cargo.toml", +]