From 4a536a8003111d98eb0195b5fae5bd66d3dd427b Mon Sep 17 00:00:00 2001 From: coral Date: Fri, 20 Mar 2026 16:14:57 -0700 Subject: [PATCH] more formatting --- Cargo.toml | 6 + LICENSE.md | 661 ++++++++++++++++++ pjsua/build.rs | 171 +++-- sipcord-bridge/Cargo.toml | 6 +- sipcord-bridge/src/audio/flac.rs | 2 +- sipcord-bridge/src/audio/wav.rs | 4 +- sipcord-bridge/src/call/mod.rs | 58 +- sipcord-bridge/src/fax/audio_port.rs | 12 +- sipcord-bridge/src/fax/spandsp.rs | 8 +- sipcord-bridge/src/fax/tiff_decoder.rs | 6 +- sipcord-bridge/src/main.rs | 2 +- sipcord-bridge/src/services/auth_cache.rs | 3 - sipcord-bridge/src/services/sound/mod.rs | 8 +- .../src/services/sound/streaming.rs | 2 +- sipcord-bridge/src/transport/discord/mod.rs | 50 +- sipcord-bridge/src/transport/discord/voice.rs | 8 +- .../src/transport/sip/audio_thread.rs | 14 +- sipcord-bridge/src/transport/sip/callbacks.rs | 46 +- .../src/transport/sip/channel_audio.rs | 15 +- .../src/transport/sip/ffi/direct_player.rs | 4 +- .../src/transport/sip/ffi/frame_utils.rs | 4 +- sipcord-bridge/src/transport/sip/ffi/init.rs | 11 +- .../src/transport/sip/ffi/looping_player.rs | 4 +- .../src/transport/sip/ffi/streaming_player.rs | 2 +- .../src/transport/sip/ffi/test_tone.rs | 2 +- sipcord-bridge/src/transport/sip/ffi/types.rs | 5 +- sipcord-bridge/src/transport/sip/mod.rs | 9 +- sipcord-bridge/src/transport/sip/nat.rs | 2 - .../src/transport/sip/register_handler.rs | 3 +- 29 files changed, 962 insertions(+), 166 deletions(-) create mode 100644 LICENSE.md diff --git a/Cargo.toml b/Cargo.toml index cd8458a..0d0c557 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,9 @@ [workspace] members = ["sipcord-bridge", "pjsua"] resolver = "2" + +[workspace.package] +authors = ["coral "] +license = "AGPL-3.0-only" +repository = "https://github.com/coral/sipcord-bridge" +homepage = "https://sipcord.net/" diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..be3f7b2 --- /dev/null +++ b/LICENSE.md @@ -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/pjsua/build.rs b/pjsua/build.rs index e6c0d51..48fafe2 100644 --- a/pjsua/build.rs +++ b/pjsua/build.rs @@ -20,17 +20,33 @@ fn main() { // Otherwise build from source via cmake. let include_paths = if let Ok(prefix) = env::var("PJPROJECT_DIR") { let prefix = PathBuf::from(&prefix); - println!("cargo:warning=Using pre-built pjproject from: {}", prefix.display()); + println!( + "cargo:warning=Using pre-built pjproject from: {}", + prefix.display() + ); let lib_dir = prefix.join("lib"); println!("cargo:rustc-link-search=native={}", lib_dir.display()); // Link libraries in the correct dependency order (same as build-from-source path) let pj_libs = [ - "pjsua-lib", "pjsua2", "pjsip-ua", "pjsip-simple", "pjsip", - "pjmedia-codec", "pjmedia", "pjmedia-audiodev", "pjnath", - "pjlib-util", "pjlib", - "srtp", "resample", "speex", "g7221", "gsm", "ilbc", + "pjsua-lib", + "pjsua2", + "pjsip-ua", + "pjsip-simple", + "pjsip", + "pjmedia-codec", + "pjmedia", + "pjmedia-audiodev", + "pjnath", + "pjlib-util", + "pjlib", + "srtp", + "resample", + "speex", + "g7221", + "gsm", + "ilbc", ]; for lib in &pj_libs { println!("cargo:rustc-link-lib=static={}", lib); @@ -98,10 +114,7 @@ fn main() { } } - let opus_paths = [ - "/opt/homebrew/opt/opus/lib", - "/usr/local/opt/opus/lib", - ]; + let opus_paths = ["/opt/homebrew/opt/opus/lib", "/usr/local/opt/opus/lib"]; for path in &opus_paths { if std::path::Path::new(path).exists() { println!("cargo:rustc-link-search=native={}", path); @@ -154,18 +167,26 @@ fn main() { clang_args.push("-DPJ_AUTOCONF=1".to_string()); - let pjsua_header = include_paths.iter() + let pjsua_header = include_paths + .iter() .find_map(|p| { let header = p.join("pjsua-lib/pjsua.h"); if header.exists() { return Some(header); } let header = p.join("pjsua.h"); - if header.exists() { Some(header) } else { None } + if header.exists() { + Some(header) + } else { + None + } }) .expect("Could not find pjsua.h header in installed location"); - println!("cargo:warning=Using pjsua.h from: {}", pjsua_header.display()); + println!( + "cargo:warning=Using pjsua.h from: {}", + pjsua_header.display() + ); println!("cargo:warning=Include paths: {:?}", include_paths); let bindings = bindgen::Builder::default() @@ -186,7 +207,10 @@ fn main() { .write_to_file(&bindings_path) .expect("Couldn't write bindings!"); - println!("cargo:warning=Bindings written to: {}", bindings_path.display()); + println!( + "cargo:warning=Bindings written to: {}", + bindings_path.display() + ); } /// Build pjproject from source and return include paths. @@ -240,17 +264,17 @@ fn build_from_source(out_dir: &PathBuf) -> Vec { // Link libraries in the correct order (dependencies matter!) let pj_libs = [ - "pjsua-lib", // main pjsua library - "pjsua2", // C++ wrapper (may be needed) - "pjsip-ua", // SIP user agent - "pjsip-simple", // SIP SIMPLE presence - "pjsip", // Core SIP - "pjmedia-codec",// Media codecs - "pjmedia", // Media framework + "pjsua-lib", // main pjsua library + "pjsua2", // C++ wrapper (may be needed) + "pjsip-ua", // SIP user agent + "pjsip-simple", // SIP SIMPLE presence + "pjsip", // Core SIP + "pjmedia-codec", // Media codecs + "pjmedia", // Media framework "pjmedia-audiodev", // Audio device - "pjnath", // NAT traversal - "pjlib-util", // Utility functions - "pjlib", // Core library + "pjnath", // NAT traversal + "pjlib-util", // Utility functions + "pjlib", // Core library // Third party "srtp", "resample", @@ -288,7 +312,11 @@ fn build_from_source(out_dir: &PathBuf) -> Vec { include_paths } -fn build_pjproject(pjproject_src: &std::path::Path, pjproject_build: &std::path::Path, pjproject_install: &std::path::Path) { +fn build_pjproject( + pjproject_src: &std::path::Path, + pjproject_build: &std::path::Path, + pjproject_install: &std::path::Path, +) { // Check for .pc file in build dir (CMake install doesn't always copy it to install dir) let pc_file = pjproject_build.join("libpjproject.pc"); @@ -305,7 +333,8 @@ fn build_pjproject(pjproject_src: &std::path::Path, pjproject_build: &std::path: let mut c_flags: Vec<&str> = vec!["-DPJSUA_MAX_CALLS=128"]; let mut cmake_args = vec![ - "-G".to_string(), "Unix Makefiles".to_string(), + "-G".to_string(), + "Unix Makefiles".to_string(), format!("-DCMAKE_INSTALL_PREFIX={}", pjproject_install.display()), "-DCMAKE_BUILD_TYPE=Release".to_string(), "-DBUILD_SHARED_LIBS=OFF".to_string(), @@ -342,7 +371,12 @@ fn build_pjproject(pjproject_src: &std::path::Path, pjproject_build: &std::path: let cxx = format!("{}-g++", cross_prefix); // Check if cross-compiler exists - if std::process::Command::new("which").arg(&cc).output().map(|o| o.status.success()).unwrap_or(false) { + if std::process::Command::new("which") + .arg(&cc) + .output() + .map(|o| o.status.success()) + .unwrap_or(false) + { cmake_args.push(format!("-DCMAKE_C_COMPILER={}", cc)); cmake_args.push(format!("-DCMAKE_CXX_COMPILER={}", cxx)); println!("cargo:warning=Using cross-compiler: {}", cc); @@ -353,7 +387,9 @@ fn build_pjproject(pjproject_src: &std::path::Path, pjproject_build: &std::path: if target.contains("aarch64") { c_flags.push("-mno-outline-atomics"); c_flags.push("-DPJ_POOL_ALIGNMENT=8"); - println!("cargo:warning=ARM64: Using inline atomics with 8-byte pool alignment"); + println!( + "cargo:warning=ARM64: Using inline atomics with 8-byte pool alignment" + ); } // The cross-compiler (from crossbuild-essential-arm64) has --sysroot=/usr/aarch64-linux-gnu @@ -371,7 +407,10 @@ fn build_pjproject(pjproject_src: &std::path::Path, pjproject_build: &std::path: cmake_args.push("-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=BOTH".to_string()); cmake_args.push("-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=BOTH".to_string()); cmake_args.push("-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER".to_string()); - println!("cargo:warning=Using multiarch library path: {}", multiarch_lib); + println!( + "cargo:warning=Using multiarch library path: {}", + multiarch_lib + ); // Explicitly set OpenSSL paths for cross-compilation let openssl_ssl = format!("{}/libssl.so", multiarch_lib); @@ -381,7 +420,10 @@ fn build_pjproject(pjproject_src: &std::path::Path, pjproject_build: &std::path: cmake_args.push("-DOPENSSL_INCLUDE_DIR=/usr/include".to_string()); cmake_args.push(format!("-DOPENSSL_SSL_LIBRARY={}", openssl_ssl)); cmake_args.push(format!("-DOPENSSL_CRYPTO_LIBRARY={}", openssl_crypto)); - println!("cargo:warning=Using cross-compiled OpenSSL from {}", multiarch_lib); + println!( + "cargo:warning=Using cross-compiled OpenSSL from {}", + multiarch_lib + ); } // Explicitly set Opus paths for cross-compilation @@ -389,7 +431,10 @@ fn build_pjproject(pjproject_src: &std::path::Path, pjproject_build: &std::path: if std::path::Path::new(&opus_lib).exists() { cmake_args.push("-DOPUS_INCLUDE_DIR=/usr/include".to_string()); cmake_args.push(format!("-DOPUS_LIBRARY={}", opus_lib)); - println!("cargo:warning=Using cross-compiled Opus from {}", multiarch_lib); + println!( + "cargo:warning=Using cross-compiled Opus from {}", + multiarch_lib + ); } } } @@ -409,7 +454,10 @@ fn build_pjproject(pjproject_src: &std::path::Path, pjproject_build: &std::path: for prefix in &openssl_prefixes { let include_path = format!("{}/include", prefix); - if std::path::Path::new(&include_path).join("openssl/ssl.h").exists() { + if std::path::Path::new(&include_path) + .join("openssl/ssl.h") + .exists() + { println!("cargo:warning=Found OpenSSL at: {}", prefix); cmake_args.push(format!("-DOPENSSL_ROOT_DIR={}", prefix)); if cfg!(target_os = "macos") { @@ -428,17 +476,17 @@ fn build_pjproject(pjproject_src: &std::path::Path, pjproject_build: &std::path: // Native build - find Opus codec library let opus_prefixes = if cfg!(target_os = "macos") { - vec![ - "/opt/homebrew/opt/opus", - "/usr/local/opt/opus", - ] + vec!["/opt/homebrew/opt/opus", "/usr/local/opt/opus"] } else { vec!["/usr", "/usr/local"] }; for prefix in &opus_prefixes { let include_path = format!("{}/include", prefix); - if std::path::Path::new(&include_path).join("opus/opus.h").exists() { + if std::path::Path::new(&include_path) + .join("opus/opus.h") + .exists() + { println!("cargo:warning=Found Opus at: {}", prefix); cmake_args.push(format!("-DOPUS_INCLUDE_DIR={}", include_path)); let lib_path = format!("{}/lib", prefix); @@ -473,8 +521,14 @@ fn build_pjproject(pjproject_src: &std::path::Path, pjproject_build: &std::path: .expect("Failed to run cmake configure"); if !cmake_result.status.success() { - eprintln!("CMake configure stdout: {}", String::from_utf8_lossy(&cmake_result.stdout)); - eprintln!("CMake configure stderr: {}", String::from_utf8_lossy(&cmake_result.stderr)); + eprintln!( + "CMake configure stdout: {}", + String::from_utf8_lossy(&cmake_result.stdout) + ); + eprintln!( + "CMake configure stderr: {}", + String::from_utf8_lossy(&cmake_result.stderr) + ); panic!("CMake configure failed"); } @@ -484,17 +538,36 @@ fn build_pjproject(pjproject_src: &std::path::Path, pjproject_build: &std::path: .unwrap_or(4); // Run CMake build - only build the libraries we need, not sample apps - println!("cargo:warning=Compiling pjproject with {} threads...", num_cpus); + println!( + "cargo:warning=Compiling pjproject with {} threads...", + num_cpus + ); let mut build_args = vec![ - "--build".to_string(), ".".to_string(), - "--config".to_string(), "Release".to_string(), + "--build".to_string(), + ".".to_string(), + "--config".to_string(), + "Release".to_string(), ]; // Specify only the library targets we need let targets = [ - "pjlib", "pjlib-util", "pjnath", "pjmedia", "pjmedia-audiodev", - "pjmedia-codec", "pjsip", "pjsip-simple", "pjsip-ua", "pjsua-lib", "pjsua2", - "resample", "srtp", "speex", "g7221", "gsm", "ilbc", + "pjlib", + "pjlib-util", + "pjnath", + "pjmedia", + "pjmedia-audiodev", + "pjmedia-codec", + "pjsip", + "pjsip-simple", + "pjsip-ua", + "pjsua-lib", + "pjsua2", + "resample", + "srtp", + "speex", + "g7221", + "gsm", + "ilbc", ]; for target in &targets { build_args.push("--target".to_string()); @@ -510,8 +583,14 @@ fn build_pjproject(pjproject_src: &std::path::Path, pjproject_build: &std::path: .expect("Failed to run cmake build"); if !build_result.status.success() { - eprintln!("CMake build stdout: {}", String::from_utf8_lossy(&build_result.stdout)); - eprintln!("CMake build stderr: {}", String::from_utf8_lossy(&build_result.stderr)); + eprintln!( + "CMake build stdout: {}", + String::from_utf8_lossy(&build_result.stdout) + ); + eprintln!( + "CMake build stderr: {}", + String::from_utf8_lossy(&build_result.stderr) + ); panic!("CMake build failed"); } println!("cargo:warning=Library builds complete"); diff --git a/sipcord-bridge/Cargo.toml b/sipcord-bridge/Cargo.toml index e3a20ec..acc6cd0 100644 --- a/sipcord-bridge/Cargo.toml +++ b/sipcord-bridge/Cargo.toml @@ -1,7 +1,11 @@ [package] name = "sipcord-bridge" version = "1.5.5" -edition = "2021" +edition = "2024" +authors.workspace = true +license = "AGPL-3.0-only" +repository.workspace = true +homepage.workspace = true publish = false [[bin]] diff --git a/sipcord-bridge/src/audio/flac.rs b/sipcord-bridge/src/audio/flac.rs index f8cbfc6..1eb9de9 100644 --- a/sipcord-bridge/src/audio/flac.rs +++ b/sipcord-bridge/src/audio/flac.rs @@ -2,7 +2,7 @@ //! //! Parses FLAC file bytes to extract raw PCM i16 samples. -use anyhow::{bail, Context}; +use anyhow::{Context, bail}; use tracing::debug; /// Parse a FLAC file and return the raw PCM i16 samples (mono). diff --git a/sipcord-bridge/src/audio/wav.rs b/sipcord-bridge/src/audio/wav.rs index f2efe16..84835c3 100644 --- a/sipcord-bridge/src/audio/wav.rs +++ b/sipcord-bridge/src/audio/wav.rs @@ -61,7 +61,9 @@ pub fn parse_wav(data: &[u8]) -> anyhow::Result<(Vec, u32)> { debug!("WAV format: {:?}", format); } b"data" => { - let fmt = format.as_ref().ok_or_else(|| anyhow::anyhow!("data chunk before fmt chunk"))?; + let fmt = format + .as_ref() + .ok_or_else(|| anyhow::anyhow!("data chunk before fmt chunk"))?; ensure!(fmt.audio_format == 1, "Only PCM format supported"); ensure!(fmt.bits_per_sample == 16, "Only 16-bit samples supported"); diff --git a/sipcord-bridge/src/call/mod.rs b/sipcord-bridge/src/call/mod.rs index 33ff721..4faeee3 100644 --- a/sipcord-bridge/src/call/mod.rs +++ b/sipcord-bridge/src/call/mod.rs @@ -18,18 +18,18 @@ use crate::fax::session::FaxSession; use crate::fax::spandsp::FaxT38Receiver; use crate::routing::{Backend, CallError, CallStartedInfo, OutboundCallRequest, RouteDecision}; use crate::services::snowflake::Snowflake; -use crate::services::sound::{create_sound_manager, SoundManager}; +use crate::services::sound::{SoundManager, create_sound_manager}; use crate::transport::discord::{ - register_discord_to_sip_producer, unregister_discord_to_sip_producer, DiscordEvent, - DiscordVoiceConnection, SharedDiscordClient, + DiscordEvent, DiscordVoiceConnection, SharedDiscordClient, register_discord_to_sip_producer, + unregister_discord_to_sip_producer, }; use crate::transport::sip::{ - cleanup_channel_port, clear_channel_stale_audio, empty_bridge_grace_period_secs, - register_call_channel, register_discord_to_sip, stop_loop, unregister_call_channel, - unregister_discord_to_sip, CallId, SipCommand, SipEvent, CONF_SAMPLE_RATE, + CONF_SAMPLE_RATE, CallId, SipCommand, SipEvent, cleanup_channel_port, + clear_channel_stale_audio, empty_bridge_grace_period_secs, register_call_channel, + register_discord_to_sip, stop_loop, unregister_call_channel, unregister_discord_to_sip, }; use anyhow::Result; -use crossbeam_channel::{bounded, Receiver, Sender}; +use crossbeam_channel::{Receiver, Sender, bounded}; use dashmap::{DashMap, DashSet}; use std::collections::HashSet; use std::path::PathBuf; @@ -332,7 +332,9 @@ impl BridgeCoordinator { bridge.sip_calls.remove(&call_id); info!( "Removed call {} from bridge for channel {} ({} callers remaining)", - call_id, channel_id, bridge.sip_calls.len() + call_id, + channel_id, + bridge.sip_calls.len() ); bridge.sip_calls.is_empty() } else { @@ -464,7 +466,14 @@ impl BridgeCoordinator { } => { info!( "T.38 re-INVITE for call {}: remote={}:{}, local_port={}, version={}, rate={}bps, mgmt={}, ec={}", - call_id, remote_ip, remote_port, local_port, t38_version, max_bit_rate, rate_management, udp_ec + call_id, + remote_ip, + remote_port, + local_port, + t38_version, + max_bit_rate, + rate_management, + udp_ec ); // Check if this call has a fax session @@ -671,7 +680,11 @@ impl BridgeCoordinator { if check_count.is_multiple_of(12) { info!( "Health check #{}: channel={}, healthy={}, queue={}%, overflows={}, reconnects={}", - check_count, channel_id, is_healthy, queue_fill, consecutive_overflows, + check_count, + channel_id, + is_healthy, + queue_fill, + consecutive_overflows, bridge.reconnect_attempts ); } @@ -694,7 +707,9 @@ impl BridgeCoordinator { if bridge.reconnect_attempts >= bridge_cfg.reconnect_max_attempts { error!( "Bridge for channel {} exceeded max reconnection attempts ({}/{}), tearing down", - channel_id, bridge.reconnect_attempts, bridge_cfg.reconnect_max_attempts + channel_id, + bridge.reconnect_attempts, + bridge_cfg.reconnect_max_attempts ); exhausted_bridges.push(channel_id); continue; @@ -815,7 +830,8 @@ impl BridgeCoordinator { if unhealthy_bridges.len() > max_per_cycle { warn!( "Rate limiting reconnections: {} unhealthy bridges but only processing {} per cycle", - unhealthy_bridges.len(), max_per_cycle + unhealthy_bridges.len(), + max_per_cycle ); unhealthy_bridges.truncate(max_per_cycle); } @@ -855,7 +871,10 @@ impl BridgeCoordinator { Ok(new_connection) => { info!( "Successfully reconnected bridge {} for channel {} (attempt {}/{})", - new_bridge_id, channel_id, attempt_num, bridge_cfg.reconnect_max_attempts + new_bridge_id, + channel_id, + attempt_num, + bridge_cfg.reconnect_max_attempts ); // Set up fresh ring buffers for reconnected channel setup_channel_ring_buffers(channel_id); @@ -890,7 +909,9 @@ impl BridgeCoordinator { if !stale.is_empty() { warn!( "Removed {} stale sip_calls from reconnected bridge {}: {:?}", - stale.len(), channel_id, stale + stale.len(), + channel_id, + stale ); } } @@ -899,7 +920,10 @@ impl BridgeCoordinator { error!( "Failed to reconnect bridge for channel {} (attempt {}/{}): {}. \ Bridge removed — {} SIP calls orphaned.", - channel_id, attempt_num, bridge_cfg.reconnect_max_attempts, e, + channel_id, + attempt_num, + bridge_cfg.reconnect_max_attempts, + e, sip_calls.len() ); // Re-insert the bridge entry (without connection) so calls @@ -1662,9 +1686,7 @@ async fn poll_recv(rx: &Receiver, name: &str, event_count: &mut u64) -> Op if event_count.is_multiple_of(500) { trace!( "{} event handler: processed {} events, queue depth: {}", - name, - event_count, - queue_len + name, event_count, queue_len ); } diff --git a/sipcord-bridge/src/fax/audio_port.rs b/sipcord-bridge/src/fax/audio_port.rs index e3ffd20..96638cc 100644 --- a/sipcord-bridge/src/fax/audio_port.rs +++ b/sipcord-bridge/src/fax/audio_port.rs @@ -6,18 +6,18 @@ //! //! This is analogous to the channel_audio.rs ports used for Discord↔SIP audio. -use crate::transport::sip::ffi::types::{ - ConfPort, SendablePool, SendablePort, CALL_CONF_PORTS, CONF_CHANNELS, CONF_SAMPLE_RATE, - SAMPLES_PER_FRAME, -}; use crate::transport::sip::CallId; +use crate::transport::sip::ffi::types::{ + CALL_CONF_PORTS, CONF_CHANNELS, CONF_SAMPLE_RATE, ConfPort, SAMPLES_PER_FRAME, SendablePool, + SendablePort, +}; use dashmap::DashMap; use parking_lot::Mutex; use pjsua::*; use rtrb::{Consumer, Producer}; use std::collections::HashMap; -use std::sync::atomic::{AtomicU64, Ordering}; use std::sync::OnceLock; +use std::sync::atomic::{AtomicU64, Ordering}; use tracing::{debug, error, warn}; /// Ring buffer capacity for fax audio (i16 mono @ 16kHz). @@ -180,7 +180,7 @@ pub async fn create_fax_audio_port(call_id: CallId) -> Option { // Queue the bidirectional conference connection to the audio thread // This avoids racing with pjmedia_port_get_frame let (done_tx, done_rx) = tokio::sync::oneshot::channel(); - use crate::transport::sip::ffi::types::{queue_pjsua_op, PendingPjsuaOp}; + use crate::transport::sip::ffi::types::{PendingPjsuaOp, queue_pjsua_op}; queue_pjsua_op(PendingPjsuaOp::ConnectFaxPort { call_id, fax_slot: conf_slot, diff --git a/sipcord-bridge/src/fax/spandsp.rs b/sipcord-bridge/src/fax/spandsp.rs index cb2c173..23388d4 100644 --- a/sipcord-bridge/src/fax/spandsp.rs +++ b/sipcord-bridge/src/fax/spandsp.rs @@ -89,8 +89,12 @@ fn configure_t30( t30.set_supported_compressions(compressions) .map_err(|e| anyhow::anyhow!("Failed to set compressions: {}", e))?; - let sizes = T4_SUPPORT_WIDTH_215MM | T4_SUPPORT_WIDTH_255MM | T4_SUPPORT_WIDTH_303MM - | T4_RESOLUTION_R8_STANDARD | T4_RESOLUTION_R8_FINE | T4_RESOLUTION_R8_SUPERFINE + let sizes = T4_SUPPORT_WIDTH_215MM + | T4_SUPPORT_WIDTH_255MM + | T4_SUPPORT_WIDTH_303MM + | T4_RESOLUTION_R8_STANDARD + | T4_RESOLUTION_R8_FINE + | T4_RESOLUTION_R8_SUPERFINE | T4_RESOLUTION_200_200; t30.set_supported_image_sizes(sizes) .map_err(|e| anyhow::anyhow!("Failed to set image sizes: {}", e))?; diff --git a/sipcord-bridge/src/fax/tiff_decoder.rs b/sipcord-bridge/src/fax/tiff_decoder.rs index a138c08..718c56f 100644 --- a/sipcord-bridge/src/fax/tiff_decoder.rs +++ b/sipcord-bridge/src/fax/tiff_decoder.rs @@ -6,7 +6,7 @@ //! Huffman table data derived from the ITU-T T.4 standard. //! Bit-reading approach inspired by the `fax` crate (MIT licensed). -use anyhow::{bail, Result}; +use anyhow::{Result, bail}; use image::GrayImage; use std::path::Path; use std::sync::OnceLock; @@ -1289,9 +1289,7 @@ mod tests { // When lines.len() == declared height, nothing changes let width = 10u32; let height = 50u32; - let lines: Vec> = (0..50) - .map(|_| vec![5, 10]) - .collect(); + let lines: Vec> = (0..50).map(|_| vec![5, 10]).collect(); let img = assemble_image(&lines, width, height, 0); assert_eq!(img.height(), 50); diff --git a/sipcord-bridge/src/main.rs b/sipcord-bridge/src/main.rs index bc3edd1..9a34b3b 100644 --- a/sipcord-bridge/src/main.rs +++ b/sipcord-bridge/src/main.rs @@ -12,7 +12,7 @@ use tracing::{error, info}; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; use sipcord_bridge::call::BridgeCoordinator; -use sipcord_bridge::config::{AppConfig, EnvConfig, SipConfig, APP_CONFIG}; +use sipcord_bridge::config::{APP_CONFIG, AppConfig, EnvConfig, SipConfig}; use sipcord_bridge::routing::static_router::StaticBackend; use sipcord_bridge::transport::discord::SharedDiscordClient; use sipcord_bridge::transport::sip::SipTransport; diff --git a/sipcord-bridge/src/services/auth_cache.rs b/sipcord-bridge/src/services/auth_cache.rs index e22fc8c..e38da98 100644 --- a/sipcord-bridge/src/services/auth_cache.rs +++ b/sipcord-bridge/src/services/auth_cache.rs @@ -166,7 +166,6 @@ mod tests { use super::*; use std::time::Duration; - #[test] fn test_md5_hex_empty() { assert_eq!(md5_hex(""), "d41d8cd98f00b204e9800998ecf8427e"); @@ -177,7 +176,6 @@ mod tests { assert_eq!(md5_hex("hello"), "5d41402abc4b2a76b9719d911017c592"); } - #[test] fn test_verify_digest_without_qop() { // Compute expected values manually @@ -243,7 +241,6 @@ mod tests { assert!(!verify_digest_with_ha1(&ha1, ¶ms)); } - #[test] fn test_auth_cache_record_failure() { let cache = AuthCache::new(Duration::from_secs(300), Duration::from_secs(60), 3); diff --git a/sipcord-bridge/src/services/sound/mod.rs b/sipcord-bridge/src/services/sound/mod.rs index 59ec9c9..29ae292 100644 --- a/sipcord-bridge/src/services/sound/mod.rs +++ b/sipcord-bridge/src/services/sound/mod.rs @@ -160,7 +160,9 @@ impl SoundManager { if rate != CONF_SAMPLE_RATE { anyhow::bail!( "Sound '{}' has wrong sample rate: {} Hz (expected {} Hz). Pre-resample the file.", - name, rate, CONF_SAMPLE_RATE + name, + rate, + CONF_SAMPLE_RATE ); } return Ok(samples); @@ -174,7 +176,9 @@ impl SoundManager { if rate != CONF_SAMPLE_RATE { anyhow::bail!( "Sound '{}' has wrong sample rate: {} Hz (expected {} Hz). Pre-resample the file.", - name, rate, CONF_SAMPLE_RATE + name, + rate, + CONF_SAMPLE_RATE ); } return Ok(samples); diff --git a/sipcord-bridge/src/services/sound/streaming.rs b/sipcord-bridge/src/services/sound/streaming.rs index 326139a..a6cba94 100644 --- a/sipcord-bridge/src/services/sound/streaming.rs +++ b/sipcord-bridge/src/services/sound/streaming.rs @@ -11,7 +11,7 @@ use std::collections::VecDeque; use std::fs::File; use std::path::Path; use symphonia::core::audio::{AudioBufferRef, Signal}; -use symphonia::core::codecs::{DecoderOptions, CODEC_TYPE_NULL}; +use symphonia::core::codecs::{CODEC_TYPE_NULL, DecoderOptions}; use symphonia::core::formats::FormatOptions; use symphonia::core::io::MediaSourceStream; use symphonia::core::meta::MetadataOptions; diff --git a/sipcord-bridge/src/transport/discord/mod.rs b/sipcord-bridge/src/transport/discord/mod.rs index 1251978..d815acd 100644 --- a/sipcord-bridge/src/transport/discord/mod.rs +++ b/sipcord-bridge/src/transport/discord/mod.rs @@ -22,9 +22,9 @@ use songbird::{ Config, CoreEvent, Event, EventContext, EventHandler as VoiceEventHandler, Songbird, TrackEvent, }; use std::collections::HashMap; -use std::sync::atomic::{AtomicBool, AtomicU32, AtomicU64, Ordering}; use std::sync::Arc; use std::sync::OnceLock; +use std::sync::atomic::{AtomicBool, AtomicU32, AtomicU64, Ordering}; use std::time::{SystemTime, UNIX_EPOCH}; use tokio::sync::oneshot; use tracing::{debug, error, info, trace, warn}; @@ -360,7 +360,9 @@ pub fn send_audio_to_discord_direct( if count.is_multiple_of(50) { debug!( "Resampler: input={} samples, output={} samples (ratio={:.2}, expected=3.0)", - input_len, output_mono_len, output_mono_len as f64 / input_len as f64 + input_len, + output_mono_len, + output_mono_len as f64 / input_len as f64 ); debug!( "SIP→Discord #{}: mono_out={}, stereo_out={} samples ({} bytes as f32)", @@ -446,7 +448,7 @@ fn silence_threshold() -> i16 { *CACHED.get_or_init(|| crate::config::AppConfig::audio().vad_silence_threshold) } -pub use voice::{resample_audio, resample_audio_into, StreamingAudioSource, DISCORD_SAMPLE_RATE}; +pub use voice::{DISCORD_SAMPLE_RATE, StreamingAudioSource, resample_audio, resample_audio_into}; /// Events emitted by the Discord module #[derive(Debug, Clone)] @@ -506,19 +508,20 @@ impl SharedDiscordClient { }); // Wait for gateway Ready event to get the bot's user ID - let bot_user_id = - match tokio::time::timeout(std::time::Duration::from_secs(15), ready_rx).await { - Ok(Ok(id)) => { - info!("Shared Discord client ready, bot user ID: {}", id); - id - } - _ => { - error!( + let bot_user_id = match tokio::time::timeout(std::time::Duration::from_secs(15), ready_rx) + .await + { + Ok(Ok(id)) => { + info!("Shared Discord client ready, bot user ID: {}", id); + id + } + _ => { + error!( "Failed to get bot user ID from shared client, feedback filtering may not work" ); - 0 - } - }; + 0 + } + }; // Let gateway stabilize tokio::time::sleep(std::time::Duration::from_millis(500)).await; @@ -907,16 +910,13 @@ impl VoiceEventHandler for TrackEventHandler { // Normal state changes - log at trace level trace!( "Track event for bridge {}: mode={:?}, position={:?}", - self.bridge_id, - state.playing, - state.position, + self.bridge_id, state.playing, state.position, ); } _ => { trace!( "Track event for bridge {}: mode={:?}", - self.bridge_id, - state.playing, + self.bridge_id, state.playing, ); } } @@ -1021,9 +1021,7 @@ impl VoiceEventHandler for VoiceReceiver { } else { trace!( "Recorded SSRC {} -> user {} for bridge {}", - speaking.ssrc, - user_id_snowflake, - self.bridge_id + speaking.ssrc, user_id_snowflake, self.bridge_id ); } } @@ -1102,9 +1100,7 @@ impl VoiceEventHandler for VoiceReceiver { if should_log { trace!( "VoiceTick #{}: {} speaking, {} silent users", - count, - speaker_count, - silent_count + count, speaker_count, silent_count ); } @@ -1237,9 +1233,7 @@ impl VoiceEventHandler for VoiceReceiver { } else if mono_len > 0 { trace!( "VoiceTick: {} speakers, {} mono samples, max amp: {}", - speaker_count, - mono_len, - max_amp + speaker_count, mono_len, max_amp ); // Direct ring buffer path: resample 48kHz→16kHz and write to ring buffer diff --git a/sipcord-bridge/src/transport/discord/voice.rs b/sipcord-bridge/src/transport/discord/voice.rs index f1ed71f..4071d98 100644 --- a/sipcord-bridge/src/transport/discord/voice.rs +++ b/sipcord-bridge/src/transport/discord/voice.rs @@ -132,7 +132,8 @@ impl Read for StreamingAudioSource { let ms_buffered = samples_available as f64 / 48000.0 / 2.0 * 1000.0; tracing::info!( "StreamingAudioSource: Pre-buffer complete ({} samples, {:.0}ms), starting output", - samples_available, ms_buffered + samples_available, + ms_buffered ); } else { // Still pre-buffering - return silence @@ -157,7 +158,10 @@ impl Read for StreamingAudioSource { let ms_buffered = samples_available as f64 / 48000.0 / 2.0 * 1000.0; tracing::debug!( "StreamingAudioSource #{}: ring buffer has {} samples ({:.1}ms), Songbird wants {} samples", - count, samples_available, ms_buffered, samples_requested + count, + samples_available, + ms_buffered, + samples_requested ); } diff --git a/sipcord-bridge/src/transport/sip/audio_thread.rs b/sipcord-bridge/src/transport/sip/audio_thread.rs index 027e516..8aae82f 100644 --- a/sipcord-bridge/src/transport/sip/audio_thread.rs +++ b/sipcord-bridge/src/transport/sip/audio_thread.rs @@ -27,7 +27,11 @@ fn drain_queue(queue: &SegQueue, name: &str) { count += 1; } if count > 0 { - tracing::warn!("Drained {} stale {} from previous audio thread", count, name); + tracing::warn!( + "Drained {} stale {} from previous audio thread", + count, + name + ); } } @@ -121,7 +125,9 @@ pub fn start_audio_thread() { // clocked when we make connections via pjsua_conf_connect. if frame_count == 1 { AUDIO_THREAD_READY.store(true, Ordering::SeqCst); - tracing::debug!("Audio thread ready after first frame, processing pending channel completions"); + tracing::debug!( + "Audio thread ready after first frame, processing pending channel completions" + ); process_pending_channel_completions(); } @@ -141,7 +147,9 @@ pub fn start_audio_thread() { if processing_ms > FRAME_PTIME_MS as f64 { tracing::warn!( "AUDIO OVERRUN: Frame #{} processing took {:.2}ms (>{}ms), audio will crunch!", - frame_count, processing_ms, FRAME_PTIME_MS + frame_count, + processing_ms, + FRAME_PTIME_MS ); } else if processing_ms > (FRAME_PTIME_MS as f64 * 0.8) { // Warn if approaching the limit (>80% of frame time) diff --git a/sipcord-bridge/src/transport/sip/callbacks.rs b/sipcord-bridge/src/transport/sip/callbacks.rs index 720061f..634b8fe 100644 --- a/sipcord-bridge/src/transport/sip/callbacks.rs +++ b/sipcord-bridge/src/transport/sip/callbacks.rs @@ -125,11 +125,7 @@ pub unsafe fn extract_user_agent(rdata: *const pjsip_rx_data) -> Option // Extract the header value let value = pj_str_to_string(&(*str_hdr).hvalue); - if value.is_empty() { - None - } else { - Some(value) - } + if value.is_empty() { None } else { Some(value) } } /// Check if User-Agent indicates a SIPVicious scanner or similar tool @@ -192,19 +188,11 @@ pub unsafe fn extract_digest_auth_from_rdata( method: String::new(), // Will be set by caller qop: { let qop = pj_str_to_string(&digest.qop); - if qop.is_empty() { - None - } else { - Some(qop) - } + if qop.is_empty() { None } else { Some(qop) } }, nc: { let nc = pj_str_to_string(&digest.nc); - if nc.is_empty() { - None - } else { - Some(nc) - } + if nc.is_empty() { None } else { Some(nc) } }, cnonce: { let cnonce = pj_str_to_string(&digest.cnonce); @@ -451,7 +439,9 @@ pub unsafe extern "C" fn on_incoming_call_cb( if result.should_log { tracing::warn!( "PERMABAN IP {} - SIPVicious scanner detected: User-Agent='{}' (call {})", - ip, user_agent, call_id + ip, + user_agent, + call_id ); } } @@ -511,7 +501,11 @@ pub unsafe extern "C" fn on_incoming_call_cb( if result.should_log { tracing::warn!( "Timed out IP {} for suspicious extension: {} (call {}, offense_level={}, timeout={}s)", - ip, extension, call_id, result.offense_level, result.timeout_secs + ip, + extension, + call_id, + result.offense_level, + result.timeout_secs ); } } @@ -794,7 +788,13 @@ pub unsafe extern "C" fn on_call_media_state_cb(raw_call_id: pjsua_call_id) { tracing::info!( "Call {} MEDIA ACTIVE: conf_port={}, media_dir={}, media_cnt={}, call_state={}, pending_channel={:?}, codec={}", - call_id, conf_port, dir, ci.media_cnt, ci.state, pending_channel, codec_info + call_id, + conf_port, + dir, + ci.media_cnt, + ci.state, + pending_channel, + codec_info ); if conf_port.is_valid() { @@ -824,7 +824,9 @@ pub unsafe extern "C" fn on_call_media_state_cb(raw_call_id: pjsua_call_id) { if old_port != conf_port { tracing::info!( "Call {} conf_port changed from {} to {} (media renegotiation), reconnecting", - call_id, old_port, conf_port + call_id, + old_port, + conf_port ); // Get the channel this call is registered with @@ -887,7 +889,11 @@ pub unsafe extern "C" fn on_call_media_state_cb(raw_call_id: pjsua_call_id) { tracing::info!( "Reconnected call {} (new port {}) <-> call {} (port {}) in channel {}", - call_id, conf_port, other_id, other_port, channel_id + call_id, + conf_port, + other_id, + other_port, + channel_id ); } } diff --git a/sipcord-bridge/src/transport/sip/channel_audio.rs b/sipcord-bridge/src/transport/sip/channel_audio.rs index cce3e91..8eb4e58 100644 --- a/sipcord-bridge/src/transport/sip/channel_audio.rs +++ b/sipcord-bridge/src/transport/sip/channel_audio.rs @@ -13,9 +13,9 @@ use parking_lot::{Mutex, RwLock}; use pjsua::*; use rtrb::Consumer; use std::collections::{HashMap, VecDeque}; -use std::sync::atomic::Ordering; use std::sync::Arc; use std::sync::OnceLock; +use std::sync::atomic::Ordering; use std::time::{Duration, Instant}; // Discord→SIP ring buffer consumers (written by Discord, read by audio thread) @@ -112,7 +112,10 @@ pub unsafe extern "C" fn channel_port_get_frame( if call_count.is_multiple_of(500) { tracing::trace!( "channel_port_get_frame #{}: CACHE HIT for channel={} ({}ms since last drain, {} total hits)", - call_count, channel_id, now.duration_since(*last_time).as_millis(), hits + call_count, + channel_id, + now.duration_since(*last_time).as_millis(), + hits ); } (cached.as_ptr(), *cached_len) @@ -211,7 +214,10 @@ fn get_samples_from_buffer(channel_id: Snowflake, buf: &mut [i16; SAMPLES_PER_FR if underruns <= 10 || underruns.is_multiple_of(100) { tracing::warn!( "BUFFER UNDERRUN (Discord->SIP): channel={}, only {} available (need {}), total: {}", - channel_id, available, SAMPLES_PER_FRAME, underruns + channel_id, + available, + SAMPLES_PER_FRAME, + underruns ); } buf[available..].fill(0); @@ -501,7 +507,8 @@ pub fn register_call_channel(call_id: CallId, channel_id: Snowflake) { PENDING_CONF_CONNECTIONS.push((call_id, channel_id)); tracing::debug!( "Queued conference connections for call {} -> channel {} (will be processed by audio thread)", - call_id, channel_id + call_id, + channel_id ); } diff --git a/sipcord-bridge/src/transport/sip/ffi/direct_player.rs b/sipcord-bridge/src/transport/sip/ffi/direct_player.rs index edeae4f..37c3210 100644 --- a/sipcord-bridge/src/transport/sip/ffi/direct_player.rs +++ b/sipcord-bridge/src/transport/sip/ffi/direct_player.rs @@ -79,7 +79,7 @@ pub unsafe extern "C" fn direct_player_on_destroy(this_port: *mut pjmedia_port) /// This queues the operation to be executed by the audio thread to avoid /// deadlocks with the audio thread's pjsua_conf_connect/disconnect calls. pub fn play_audio_to_call_direct(call_id: CallId, samples: &[i16]) -> Result<()> { - use super::types::{queue_pjsua_op, PendingPjsuaOp}; + use super::types::{PendingPjsuaOp, queue_pjsua_op}; tracing::debug!( "Queueing PlayDirect for call {} ({} samples)", @@ -96,7 +96,7 @@ pub fn play_audio_to_call_direct(call_id: CallId, samples: &[i16]) -> Result<()> /// Internal implementation of play_audio_to_call_direct /// Called from the audio thread to actually create and connect the player pub fn play_audio_to_call_direct_internal(call_id: CallId, samples: &[i16]) -> Result<()> { - use super::frame_utils::{create_and_connect_port, PortCallbacks}; + use super::frame_utils::{PortCallbacks, create_and_connect_port}; // Get call's conference port let call_conf_port = CALL_CONF_PORTS diff --git a/sipcord-bridge/src/transport/sip/ffi/frame_utils.rs b/sipcord-bridge/src/transport/sip/ffi/frame_utils.rs index 625d0c9..c1afeaa 100644 --- a/sipcord-bridge/src/transport/sip/ffi/frame_utils.rs +++ b/sipcord-bridge/src/transport/sip/ffi/frame_utils.rs @@ -4,8 +4,8 @@ //! put_frame callback used by ports that only produce audio. use super::types::{ - CallId, ConfPort, SendablePool, CONF_CHANNELS, CONF_MASTER_PORT, CONF_SAMPLE_RATE, - SAMPLES_PER_FRAME, + CONF_CHANNELS, CONF_MASTER_PORT, CONF_SAMPLE_RATE, CallId, ConfPort, SAMPLES_PER_FRAME, + SendablePool, }; use anyhow::Result; use parking_lot::Mutex; diff --git a/sipcord-bridge/src/transport/sip/ffi/init.rs b/sipcord-bridge/src/transport/sip/ffi/init.rs index 58f771f..0f98222 100644 --- a/sipcord-bridge/src/transport/sip/ffi/init.rs +++ b/sipcord-bridge/src/transport/sip/ffi/init.rs @@ -251,7 +251,7 @@ pub fn init_pjsua(config: &SipConfig, tls_config: Option<&TlsConfig>) -> Result< // won't accept TCP connections. We must respect the transport the // client registered with. { - extern "C" { + unsafe extern "C" { static mut pjsip_sip_cfg_var: pjsip_cfg_t; } pjsip_sip_cfg_var.endpt.disable_tcp_switch = pj_constants__PJ_TRUE as _; @@ -538,14 +538,19 @@ pub fn init_pjsua(config: &SipConfig, tls_config: Option<&TlsConfig>) -> Result< tracing::info!( "Master port ACTUAL config: clock_rate={}, channels={}, frame_time={}us, bits={}, samples_per_frame={}", - actual_clock_rate, actual_channel_count, actual_frame_time_usec, actual_bits_per_sample, actual_samples_per_frame + actual_clock_rate, + actual_channel_count, + actual_frame_time_usec, + actual_bits_per_sample, + actual_samples_per_frame ); // CRITICAL: Verify the conference bridge is actually at our configured rate if actual_clock_rate != CONF_SAMPLE_RATE { tracing::error!( "SAMPLE RATE MISMATCH! Requested {}Hz but got {}Hz - audio will play at wrong speed!", - CONF_SAMPLE_RATE, actual_clock_rate + CONF_SAMPLE_RATE, + actual_clock_rate ); } diff --git a/sipcord-bridge/src/transport/sip/ffi/looping_player.rs b/sipcord-bridge/src/transport/sip/ffi/looping_player.rs index 65631a6..976d5ab 100644 --- a/sipcord-bridge/src/transport/sip/ffi/looping_player.rs +++ b/sipcord-bridge/src/transport/sip/ffi/looping_player.rs @@ -8,8 +8,8 @@ use anyhow::Result; use parking_lot::Mutex; use pjsua::*; use std::collections::HashMap; -use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::OnceLock; +use std::sync::atomic::{AtomicBool, Ordering}; /// Global state for looping players: call_id -> LoopingPlayerState pub static LOOPING_PLAYERS: OnceLock>> = OnceLock::new(); @@ -109,7 +109,7 @@ pub unsafe extern "C" fn looping_player_on_destroy(this_port: *mut pjmedia_port) /// Creates a pjmedia_port that loops the given samples and connects it to the call. /// The loop continues until stop_loop is called. pub fn start_loop(call_id: CallId, samples: Vec) -> Result<()> { - use super::frame_utils::{create_and_connect_port, PortCallbacks}; + use super::frame_utils::{PortCallbacks, create_and_connect_port}; // Check if already looping for this call { diff --git a/sipcord-bridge/src/transport/sip/ffi/streaming_player.rs b/sipcord-bridge/src/transport/sip/ffi/streaming_player.rs index 4eb8c09..30118e3 100644 --- a/sipcord-bridge/src/transport/sip/ffi/streaming_player.rs +++ b/sipcord-bridge/src/transport/sip/ffi/streaming_player.rs @@ -153,7 +153,7 @@ pub fn start_streaming_to_call( path: &Path, hangup_on_complete: bool, ) -> Result<()> { - use super::frame_utils::{create_and_connect_port, PortCallbacks}; + use super::frame_utils::{PortCallbacks, create_and_connect_port}; // Create the streaming player let player = StreamingPlayer::new(path)?; diff --git a/sipcord-bridge/src/transport/sip/ffi/test_tone.rs b/sipcord-bridge/src/transport/sip/ffi/test_tone.rs index 3c2f398..05bb5ff 100644 --- a/sipcord-bridge/src/transport/sip/ffi/test_tone.rs +++ b/sipcord-bridge/src/transport/sip/ffi/test_tone.rs @@ -128,7 +128,7 @@ pub unsafe extern "C" fn test_tone_on_destroy(this_port: *mut pjmedia_port) -> p /// /// The tone plays indefinitely until the caller hangs up. No automatic hangup. pub fn start_test_tone_to_call(call_id: CallId) -> Result<()> { - use super::frame_utils::{create_and_connect_port, PortCallbacks}; + use super::frame_utils::{PortCallbacks, create_and_connect_port}; // Get call's conference port let call_conf_port = CALL_CONF_PORTS diff --git a/sipcord-bridge/src/transport/sip/ffi/types.rs b/sipcord-bridge/src/transport/sip/ffi/types.rs index fa279e1..2458845 100644 --- a/sipcord-bridge/src/transport/sip/ffi/types.rs +++ b/sipcord-bridge/src/transport/sip/ffi/types.rs @@ -21,9 +21,9 @@ use std::collections::{HashMap, HashSet, VecDeque}; use std::net::IpAddr; use std::ops::Deref; use std::path::PathBuf; -use std::sync::atomic::AtomicBool; use std::sync::Arc; use std::sync::OnceLock; +use std::sync::atomic::AtomicBool; use std::time::Instant; // CallId newtype @@ -390,7 +390,6 @@ pub fn queue_pjsua_op(op: PendingPjsuaOp) { mod tests { use super::*; - #[test] fn test_call_id_invalid() { assert_eq!(CallId::INVALID.get(), -1); @@ -425,7 +424,6 @@ mod tests { assert_eq!(format!("{:?}", id), "CallId(3)"); } - #[test] fn test_conf_port_invalid() { assert_eq!(ConfPort::INVALID.get(), -1); @@ -460,7 +458,6 @@ mod tests { assert_eq!(format!("{:?}", port), "ConfPort(4)"); } - #[test] fn test_digest_auth_params_default() { let params = DigestAuthParams::default(); diff --git a/sipcord-bridge/src/transport/sip/mod.rs b/sipcord-bridge/src/transport/sip/mod.rs index 0134f8d..f7105c3 100644 --- a/sipcord-bridge/src/transport/sip/mod.rs +++ b/sipcord-bridge/src/transport/sip/mod.rs @@ -15,17 +15,17 @@ pub use audio_thread::{ check_rtp_inactivity, cleanup_zombie_pjsua_calls, set_timeout_event_sender, validate_counted_calls, }; -pub use callbacks::{set_outbound_event_sender, T38_PRESOCKETS}; +pub use callbacks::{T38_PRESOCKETS, set_outbound_event_sender}; pub use channel_audio::{ cleanup_channel_port, clear_channel_stale_audio, register_call_channel, register_discord_to_sip, unregister_call_channel, unregister_discord_to_sip, }; -pub use register_handler::{set_register_event_sender, set_sip_command_sender, PendingRegisterTsx}; +pub use register_handler::{PendingRegisterTsx, set_register_event_sender, set_sip_command_sender}; use crate::config::{SipConfig, TlsConfig}; use crate::transport::discord::send_audio_to_discord_direct; use anyhow::Result; -use crossbeam_channel::{bounded, Receiver, Sender}; +use crossbeam_channel::{Receiver, Sender, bounded}; use dashmap::DashMap; use parking_lot::RwLock; use std::net::IpAddr; @@ -303,8 +303,7 @@ fn run_pjsua_loop( // No sender registered for this channel - bridge might not be ready yet trace!( "No Discord sender for channel {} (direct audio dropped, count={})", - channel_id, - count + channel_id, count ); } } diff --git a/sipcord-bridge/src/transport/sip/nat.rs b/sipcord-bridge/src/transport/sip/nat.rs index 8be097e..2af1f81 100644 --- a/sipcord-bridge/src/transport/sip/nat.rs +++ b/sipcord-bridge/src/transport/sip/nat.rs @@ -803,7 +803,6 @@ pub unsafe extern "C" fn on_rx_response_nat_fixup_cb(rdata: *mut pjsip_rx_data) mod tests { use super::*; - #[test] fn test_is_rfc1918_10_network() { assert!(is_rfc1918(Ipv4Addr::new(10, 0, 0, 1))); @@ -831,7 +830,6 @@ mod tests { assert!(!is_rfc1918(Ipv4Addr::new(1, 1, 1, 1))); } - #[test] fn test_sanitize_sdp_orphan_dynamic_pt_stripped() { let sdp = "v=0\r\n\ diff --git a/sipcord-bridge/src/transport/sip/register_handler.rs b/sipcord-bridge/src/transport/sip/register_handler.rs index a0a7777..284f874 100644 --- a/sipcord-bridge/src/transport/sip/register_handler.rs +++ b/sipcord-bridge/src/transport/sip/register_handler.rs @@ -267,7 +267,8 @@ pub unsafe extern "C" fn on_rx_request_cb(rdata: *mut pjsip_rx_data) -> pj_bool_ if result.should_log { tracing::warn!( "PERMABAN IP {} - SIPVicious scanner detected in REGISTER: User-Agent='{}'", - ip, user_agent + ip, + user_agent ); } }