diff --git a/.gitignore b/.gitignore index acf56c4..2d0cf32 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ bin .vscode +*.txt +*.cfg +digitalocean.py +__pycache__ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0ad25db --- /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/Makefile b/Makefile index 4c6a788..61c9df9 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,8 @@ # Build options # ################# +OSX_INTEL ?= 0 +OSX_ARM ?= 0 OSX_BUILD ?= 0 LOGGING ?= 0 @@ -35,20 +37,25 @@ ifeq ($(OS),Windows_NT) LIB_DIR := lib/win32 CXXFLAGS += -Wno-error=format endif -else ifeq ($(OSX_BUILD),1) - # macOS defines sprintf as unsafe, and refuses to compile further, so add this flag to ignore it - CXXFLAGS += -DOSX_BUILD=1 -Wno-error=deprecated-declarations - ifeq ($(shell arch),arm64) - LIB_DIR := lib/mac-arm +else + ifeq ($(OSX_BUILD),1) + ifeq ($(OSX_ARM),1) + LIB_DIR := ./lib/mac_arm + CXXFLAGS += -arch arm64 + LDFLAGS += -arch arm64 + else + LIB_DIR := ./lib/mac_intel + CXXFLAGS += -arch x86_64 + LDFLAGS += -arch x86_64 + endif + CXXFLAGS += -DOSX_BUILD=1 + DYNLIB_NAME := libcoopnet.dylib + LIBS := -l juice.1.6.2 + LDFLAGS += -rpath . -dynamiclib -install_name @rpath/$(DYNLIB_NAME) else - LIB_DIR := lib/mac-intel + CXXFLAGS += -Wno-nonnull-compare + LIB_DIR := lib/linux endif - DYNLIB_NAME := libcoopnet.dylib - LIBS := -ljuice - LDFLAGS += -rpath . -dynamiclib -install_name @rpath/$(DYNLIB_NAME) -else - CXXFLAGS += -Wno-nonnull-compare - LIB_DIR := lib/linux endif ifeq ($(LOGGING),1) diff --git a/README.md b/README.md new file mode 100644 index 0000000..dcf4200 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +Signaling server / lobby manager for P2P connections diff --git a/client/cmain.cpp b/client/cmain.cpp index 5b7f701..214826c 100644 --- a/client/cmain.cpp +++ b/client/cmain.cpp @@ -12,11 +12,21 @@ std::thread sThreadRecv; +static uint64_t sLastLobbyId = 0; + static void sOnDisconnected(bool aIntentional) { exit(0); } +static void sOnReceive(uint64_t aFromUserId, const uint8_t* aData, uint64_t aSize) { + std::string msg((const char*)aData, (size_t)aSize); + LOG_INFO("Received from %" PRIu64 ": %s", aFromUserId, msg.c_str()); +} + +static void sOnLobbyListGot(uint64_t aLobbyId, uint64_t aOwnerId, uint16_t aConnections, uint16_t aMaxConnections, const char* aGame, const char* aVersion, const char* aHostName, const char* aMode, const char* aDescription) { + sLastLobbyId = aLobbyId; +} static void sReceive(void) { while (coopnet_is_connected()) { - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(10)); coopnet_update(); } } @@ -26,9 +36,61 @@ static uint64_t stru64(const char* s) { return strtoull(s, &end, 10); } +static void process_command(const std::vector& words) { + if (words[0] == "create" || words[0] == "c") { + if (words.size() == 2) { + coopnet_lobby_create("sm64coopdx2", "beta 34", "Host's Name", "Super Mario 64", 16, words[1].c_str(), "description!"); + } else if (words.size() == 6) { + coopnet_lobby_create(words[1].c_str(), words[2].c_str(), words[3].c_str(), words[4].c_str(), (uint16_t)atoi(words[5].c_str()), "", "description!"); + } else if (words.size() == 7) { + coopnet_lobby_create(words[1].c_str(), words[2].c_str(), words[3].c_str(), words[4].c_str(), (uint16_t)atoi(words[5].c_str()), words[6].c_str(), "description!"); + } else { + coopnet_lobby_create("sm64coopdx2", "beta 34", "Host's Name", "Super Mario 64", 16, "", "description!"); + } + } else if (words[0] == "join" || words[0] == "j") { + if (words.size() == 1 && sLastLobbyId != 0) { + coopnet_lobby_join(sLastLobbyId, ""); + } else if (words.size() == 2) { + coopnet_lobby_join((uint64_t)stru64(words[1].c_str()), ""); + } else if (words.size() == 3) { + coopnet_lobby_join((uint64_t)stru64(words[1].c_str()), words[2].c_str()); + } + } else if (words[0] == "leave" || words[0] == "l") { + if (words.size() == 2) { + coopnet_lobby_leave((uint64_t)stru64(words[1].c_str())); + } + } else if (words[0] == "list" || words[0] == "ls") { + if (words.size() == 3) { + coopnet_lobby_list_get(words[1].c_str(), words[2].c_str()); + } else if (words.size() == 2) { + coopnet_lobby_list_get("sm64coopdx2", words[1].c_str()); + } else { + coopnet_lobby_list_get("sm64coopdx2", ""); + } + } else if (words[0] == "send" || words[0] == "s") { + if (words.size() == 2) { + coopnet_send((const uint8_t*)words[1].c_str(), words[1].length() + 1); + } + } else if (words[0] == "connect") { + gCoopNetCallbacks.OnDisconnected = sOnDisconnected; + coopnet_begin(HOST, PORT, "example", 0); + sThreadRecv = std::thread(sReceive); + sThreadRecv.detach(); + } else if (words[0] == "disconnect") { + gCoopNetCallbacks.OnDisconnected = nullptr; + coopnet_shutdown(); + } else if (words[0] == "unpeer") { + if (words.size() == 2) { + coopnet_unpeer((uint64_t)stru64(words[1].c_str())); + } + } +} + int main(int argc, char const *argv[]) { // setup callbacks gCoopNetCallbacks.OnDisconnected = sOnDisconnected; + gCoopNetCallbacks.OnReceive = sOnReceive; + gCoopNetCallbacks.OnLobbyListGot = sOnLobbyListGot; if (coopnet_begin(HOST, PORT, "example", 999) != COOPNET_OK) { LOG_ERROR("Failed to begin client"); @@ -38,6 +100,23 @@ int main(int argc, char const *argv[]) { sThreadRecv = std::thread(sReceive); sThreadRecv.detach(); + std::vector words; + words.push_back("list"); + process_command(words); + words.clear(); + + if (argc > 1) { + for(int i = 1; i < argc; ++i) { + words.push_back(argv[i]); + } + if (words[0][0] == 'j') { + std::this_thread::sleep_for(std::chrono::milliseconds(500)); + } + process_command(words); + } + + //coopnet_lobby_create("sm64coopdx2", "beta 34", "Host's Name", "Super Mario 64", 16, "", "description!"); + while (true) { std::string input; std::getline(std::cin, input); @@ -50,56 +129,12 @@ int main(int argc, char const *argv[]) { words.push_back(word); } - if (words.size() == 0) { + if (words.empty()) { continue; } - if (words[0] == "create" || words[0] == "c") { - if (words.size() == 2) { - coopnet_lobby_create("sm64ex-coop", "beta 34", "Host's Name", "Super Mario 64", 16, words[1].c_str(), "description!"); - } else if (words.size() == 6) { - coopnet_lobby_create(words[1].c_str(), words[2].c_str(), words[3].c_str(), words[4].c_str(), (uint16_t)atoi(words[5].c_str()), "", "description!"); - } else if (words.size() == 7) { - coopnet_lobby_create(words[1].c_str(), words[2].c_str(), words[3].c_str(), words[4].c_str(), (uint16_t)atoi(words[5].c_str()), words[6].c_str(), "description!"); - } else { - coopnet_lobby_create("sm64ex-coop", "beta 34", "Host's Name", "Super Mario 64", 16, "", "description!"); - } - } else if (words[0] == "join" || words[0] == "j") { - if (words.size() == 2) { - coopnet_lobby_join((uint64_t)stru64(words[1].c_str()), ""); - } else if (words.size() == 3) { - coopnet_lobby_join((uint64_t)stru64(words[1].c_str()), words[2].c_str()); - } - } else if (words[0] == "leave" || words[0] == "l") { - if (words.size() == 2) { - coopnet_lobby_leave((uint64_t)stru64(words[1].c_str())); - } - } else if (words[0] == "list" || words[0] == "ls") { - if (words.size() == 3) { - coopnet_lobby_list_get(words[1].c_str(), words[2].c_str()); - } else if (words.size() == 2) { - coopnet_lobby_list_get("sm64ex-coop", words[1].c_str()); - } else { - coopnet_lobby_list_get("sm64ex-coop", ""); - } - } else if (words[0] == "send" || words[0] == "s") { - if (words.size() == 2) { - coopnet_send((const uint8_t*)words[1].c_str(), words[1].length() + 1); - } - } else if (words[0] == "connect") { - gCoopNetCallbacks.OnDisconnected = sOnDisconnected; - coopnet_begin(HOST, PORT, "example", 0); - sThreadRecv = std::thread(sReceive); - sThreadRecv.detach(); - } else if (words[0] == "disconnect") { - gCoopNetCallbacks.OnDisconnected = nullptr; - coopnet_shutdown(); - } else if (words[0] == "unpeer") { - if (words.size() == 2) { - coopnet_unpeer((uint64_t)stru64(words[1].c_str())); - } - } + process_command(words); } return 0; -} \ No newline at end of file +} diff --git a/common/client.cpp b/common/client.cpp index e95fd2f..6f375b4 100644 --- a/common/client.cpp +++ b/common/client.cpp @@ -44,7 +44,7 @@ bool Client::Begin(std::string aHost, uint32_t aPort, std::string aName, uint64_ if (rc == EINPROGRESS || rc == 0) { // Setup the timeout duration struct timeval timeout; - timeout.tv_sec = 3; + timeout.tv_sec = 6; timeout.tv_usec = 0; // Setup the file descriptors to watch for write readiness diff --git a/common/connection.cpp b/common/connection.cpp index f82eccd..4259292 100644 --- a/common/connection.cpp +++ b/common/connection.cpp @@ -9,8 +9,8 @@ #include "libcoopnet.h" #include "logging.hpp" #include "mpacket.hpp" - -#define CONNECTION_KEEP_ALIVE_SECS (60 * 3) +#include "peer.hpp" +#include "server.hpp" Connection::Connection(uint64_t id) { mId = id; @@ -44,6 +44,7 @@ void Connection::Begin(uint64_t (*aDestIdFunction)(uint64_t aInput)) { std::chrono::system_clock::time_point nowTp = std::chrono::system_clock::now(); uint64_t now = std::chrono::system_clock::to_time_t(nowTp); mLastSendTime = now; + mLastReceiveTime = now; LOG_INFO("[%" PRIu64 "] Connection accepted: %s :: %" PRIu64 "", mId, mAddressStr.c_str(), mDestinationId); } @@ -71,6 +72,25 @@ void Connection::Update() { if ((mLastSendTime + CONNECTION_KEEP_ALIVE_SECS) < now) { MPacketKeepAlive({ 0 }).Send(*this); } + + // check up on peers + if (mActive && gServer) { + if (!mLobby) { + mPeerTimeouts.clear(); + } else { + for (auto it = mPeerTimeouts.begin(); it != mPeerTimeouts.end();) { + uint64_t peerId = it->first; + uint64_t timeout = it->second; + if (now <= timeout) { ++it; continue; } + it = mPeerTimeouts.erase(it); + + Connection* other = gServer->ConnectionGet(peerId); + if (!other || !other->mActive) { continue; } + if (!mLobby || mLobby != other->mLobby) { continue; } + gServer->ReputationIncrease(mDestinationId); + } + } + } } void Connection::Receive() { @@ -124,6 +144,32 @@ void Connection::Receive() { } printf("\n");*/ + if (ret > 0) { + std::chrono::system_clock::time_point nowTp = std::chrono::system_clock::now(); + uint64_t now = std::chrono::system_clock::to_time_t(nowTp); + mLastReceiveTime = now; + } + mDataSize += ret; MPacket::Read(this, mData, &mDataSize, MPACKET_MAX_SIZE); } + +void Connection::PeerBegin(uint64_t aPeerId) { + if (mPeerTimeouts.count(aPeerId) > 0) { return; } + if (aPeerId == mDestinationId) { return; } + std::chrono::system_clock::time_point nowTp = std::chrono::system_clock::now(); + uint64_t now = std::chrono::system_clock::to_time_t(nowTp); + mPeerTimeouts[aPeerId] = now + PEER_TIMEOUT * 2; +} + +void Connection::PeerFail(uint64_t aPeerId) { + if (mPeerTimeouts.count(aPeerId) > 0) { + mPeerTimeouts.erase(aPeerId); + } + if (gServer && mActive) { + Connection* other = gServer->ConnectionGet(aPeerId); + if (!other || !other->mActive) { return; } + if (!mLobby || mLobby != other->mLobby) { return; } + gServer->ReputationDecrease(mDestinationId); + } +} \ No newline at end of file diff --git a/common/connection.hpp b/common/connection.hpp index a708192..570910a 100644 --- a/common/connection.hpp +++ b/common/connection.hpp @@ -4,13 +4,18 @@ #include "socket.hpp" #include "mpacket.hpp" #include "lobby.hpp" +#include class Lobby; +#define CONNECTION_KEEP_ALIVE_SECS (60 * 3) +#define CONNECTION_DEAD_SECS (60 * 4) + class Connection { private: uint8_t mData[MPACKET_MAX_SIZE] = { 0 }; int64_t mDataSize = 0; + std::map mPeerTimeouts; public: bool mActive = false; @@ -24,7 +29,9 @@ class Connection { Lobby* mLobby = nullptr; uint32_t mPriority = 0; uint64_t mLastSendTime = 0; + uint64_t mLastReceiveTime = 0; std::string mAddressStr; + uint64_t mHash; Connection(uint64_t id); ~Connection(); @@ -32,4 +39,7 @@ class Connection { void Disconnect(bool aIntentional); void Update(); void Receive(); + + void PeerBegin(uint64_t aPeerId); + void PeerFail(uint64_t aPeerId); }; diff --git a/common/libcoopnet.cpp b/common/libcoopnet.cpp index 98cdafd..a016028 100644 --- a/common/libcoopnet.cpp +++ b/common/libcoopnet.cpp @@ -13,7 +13,7 @@ CoopNetRc coopnet_begin(const char* aHost, uint32_t aPort, const char* aName, ui gClient = new Client(); bool ret = gClient->Begin(aHost, aPort, aName, aDestId); - + if (!ret) { coopnet_shutdown(); coopnet_update(); diff --git a/common/libcoopnet.h b/common/libcoopnet.h index 433ccab..8fff4ca 100644 --- a/common/libcoopnet.h +++ b/common/libcoopnet.h @@ -5,6 +5,7 @@ #include extern "C" { class Connection; +class Lobby; #endif #include @@ -43,7 +44,8 @@ typedef struct { uint64_t (*DestIdFunction)(uint64_t aInput); #if defined(__cplusplus) bool (*ConnectionIsAllowed)(Connection*, bool); - void (*OnReceiveInfoBits)(Connection* aConnection, uint64_t aDestId, uint64_t aInfoBits, const char* aName); + bool (*LobbyConnectionIsAllowed)(Connection*, Lobby*); + void (*OnReceiveInfoBits)(Connection* aConnection, uint64_t aDestId, uint64_t aInfoBits, uint64_t aHash, const char* aName); #endif } CoopNetCallbacks; diff --git a/common/mpacket.cpp b/common/mpacket.cpp index e7d21d2..0cd7dda 100644 --- a/common/mpacket.cpp +++ b/common/mpacket.cpp @@ -277,7 +277,7 @@ void MPacket::Read(Connection* connection, uint8_t* aData, int64_t* aDataSize, i } bool MPacketJoined::Receive(Connection* connection) { - LOG_INFO("MPACKET_JOINED received: userID %" PRIu64 ", version %u", mData.userId, mData.version); + LOG_INFO("[%" PRIu64 "] MPACKET_JOINED received: userID %" PRIu64 ", version %u", connection->mId, mData.userId, mData.version); if (mData.version != MPACKET_PROTOCOL_VERSION) { if (gCoopNetCallbacks.OnError) { gCoopNetCallbacks.OnError(MERR_COOPNET_VERSION, mData.version); @@ -303,8 +303,8 @@ bool MPacketLobbyCreate::Receive(Connection* connection) { std::string password = mStringData[4].substr(0, 64); std::string description = mStringData[5].substr(0, 256); - LOG_INFO("MPACKET_LOBBY_CREATE received: game '%s', version '%s', hostName '%s', mode '%s', maxconnections %u, password '%s'", - game.c_str(), version.c_str(), hostName.c_str(), mode.c_str(), mData.maxConnections, password.c_str()); + LOG_INFO("[%" PRIu64 "] MPACKET_LOBBY_CREATE received: game '%s', version '%s', hostName '%s', mode '%s', maxconnections %u, password '%s'", + connection->mId, game.c_str(), version.c_str(), hostName.c_str(), mode.c_str(), mData.maxConnections, password.c_str()); gServer->LobbyCreate(connection, game, version, hostName, mode, mData.maxConnections, password, description); return true; @@ -316,8 +316,8 @@ bool MPacketLobbyCreated::Receive(Connection* connection) { std::string hostName = mStringData[2].substr(0, 32); std::string mode = mStringData[3].substr(0, 32); - LOG_INFO("MPACKET_LOBBY_CREATED received: lobbyId %" PRIu64 ", game '%s', version '%s', hostName '%s', mode '%s', maxConnections %" PRIu64 "", - mData.lobbyId, game.c_str(), version.c_str(), hostName.c_str(), mode.c_str(), mData.maxConnections); + LOG_INFO("[%" PRIu64 "] MPACKET_LOBBY_CREATED received: lobbyId %" PRIu64 ", game '%s', version '%s', hostName '%s', mode '%s', maxConnections %" PRIu64 "", + connection->mId, mData.lobbyId, game.c_str(), version.c_str(), hostName.c_str(), mode.c_str(), mData.maxConnections); if (gCoopNetCallbacks.OnLobbyCreated) { gCoopNetCallbacks.OnLobbyCreated(mData.lobbyId, game.c_str(), version.c_str(), hostName.c_str(), mode.c_str(), mData.maxConnections); @@ -333,15 +333,15 @@ bool MPacketLobbyUpdate::Receive(Connection* connection) { std::string mode = mStringData[3].substr(0, 32); std::string description = mStringData[4].substr(0, 256); - LOG_INFO("MPACKET_LOBBY_UPDATE received: lobbyId %" PRIu64 ", game '%s', version '%s', hostName '%s', mode '%s'", - mData.lobbyId, game.c_str(), version.c_str(), hostName.c_str(), mode.c_str()); + LOG_INFO("[%" PRIu64 "] MPACKET_LOBBY_UPDATE received: lobbyId %" PRIu64 ", game '%s', version '%s', hostName '%s', mode '%s'", + connection->mId, mData.lobbyId, game.c_str(), version.c_str(), hostName.c_str(), mode.c_str()); gServer->LobbyUpdate(connection, mData.lobbyId, game, version, hostName, mode, description); return true; } bool MPacketLobbyJoin::Receive(Connection* connection) { - LOG_INFO("MPACKET_LOBBY_JOIN received: lobbyId %" PRIu64 "", mData.lobbyId); + LOG_INFO("[%" PRIu64 "] MPACKET_LOBBY_JOIN received: lobbyId %" PRIu64 "", connection->mId, mData.lobbyId); std::string password = mStringData[0].substr(0, 64); @@ -361,8 +361,8 @@ bool MPacketLobbyJoin::Receive(Connection* connection) { } bool MPacketLobbyJoined::Receive(Connection* connection) { - LOG_INFO("MPACKET_LOBBY_JOINED received: lobbyId %" PRIu64 ", userId %" PRIu64 ", priority %u, ownerId %" PRIu64 ", destId %" PRIu64 "", - mData.lobbyId, mData.userId, mData.priority, mData.ownerId, mData.destId); + LOG_INFO("[%" PRIu64 "] MPACKET_LOBBY_JOINED received: lobbyId %" PRIu64 ", userId %" PRIu64 ", priority %u, ownerId %" PRIu64 ", destId %" PRIu64 "", + connection->mId, mData.lobbyId, mData.userId, mData.priority, mData.ownerId, mData.destId); if (mData.userId == gClient->mCurrentUserId) { gClient->mCurrentLobbyId = mData.lobbyId; @@ -382,7 +382,7 @@ bool MPacketLobbyJoined::Receive(Connection* connection) { } bool MPacketLobbyLeave::Receive(Connection* connection) { - LOG_INFO("MPACKET_LOBBY_LEAVE received: lobbyId %" PRIu64 "", mData.lobbyId); + LOG_INFO("[%" PRIu64 "] MPACKET_LOBBY_LEAVE received: lobbyId %" PRIu64 "", connection->mId, mData.lobbyId); Lobby* lobby = gServer->LobbyGet(mData.lobbyId); if (!lobby) { @@ -396,7 +396,7 @@ bool MPacketLobbyLeave::Receive(Connection* connection) { } bool MPacketLobbyLeft::Receive(Connection* connection) { - LOG_INFO("MPACKET_LOBBY_LEFT received: lobbyId %" PRIu64 ", userId %" PRIu64 "", mData.lobbyId, mData.userId); + LOG_INFO("[%" PRIu64 "] MPACKET_LOBBY_LEFT received: lobbyId %" PRIu64 ", userId %" PRIu64 "", connection->mId, mData.lobbyId, mData.userId); if (mData.userId == gClient->mCurrentUserId) { gClient->mCurrentLobbyId = 0; @@ -418,7 +418,7 @@ bool MPacketLobbyLeft::Receive(Connection* connection) { bool MPacketLobbyListGet::Receive(Connection* connection) { std::string game = mStringData[0].substr(0, 32); std::string password = mStringData[1].substr(0, 64); - LOG_INFO("MPACKET_LOBBY_LIST_GET received: game '%s'", game.c_str()); + LOG_INFO("[%" PRIu64 "] MPACKET_LOBBY_LIST_GET received: game '%s'", connection->mId, game.c_str()); gServer->LobbyListGet(*connection, game, password); return true; } @@ -429,8 +429,8 @@ bool MPacketLobbyListGot::Receive(Connection* connection) { std::string hostName = mStringData[2].substr(0, 32); std::string mode = mStringData[3].substr(0, 32); std::string description = mStringData[4].substr(0, 256); - LOG_INFO("MPACKET_LOBBY_LIST_GOT received: lobbyId %" PRIu64 ", ownerId %" PRIu64 ", connections %u/%u, game '%s', version '%s', hostname '%s', mode '%s'", - mData.lobbyId, mData.ownerId, mData.connections, mData.maxConnections, game.c_str(), version.c_str(), hostName.c_str(), mode.c_str()); + LOG_INFO("[%" PRIu64 "] MPACKET_LOBBY_LIST_GOT received: lobbyId %" PRIu64 ", ownerId %" PRIu64 ", connections %u/%u, game '%s', version '%s', hostname '%s', mode '%s'", + connection->mId, mData.lobbyId, mData.ownerId, mData.connections, mData.maxConnections, game.c_str(), version.c_str(), hostName.c_str(), mode.c_str()); if (gCoopNetCallbacks.OnLobbyListGot) { gCoopNetCallbacks.OnLobbyListGot(mData.lobbyId, mData.ownerId, mData.connections, mData.maxConnections, game.c_str(), version.c_str(), hostName.c_str(), mode.c_str(), description.c_str()); @@ -440,7 +440,7 @@ bool MPacketLobbyListGot::Receive(Connection* connection) { } bool MPacketLobbyListFinish::Receive(Connection* connection) { - LOG_INFO("MPACKET_LOBBY_LIST_FINISH received"); + LOG_INFO("[%" PRIu64 "] MPACKET_LOBBY_LIST_FINISH received", connection->mId); if (gCoopNetCallbacks.OnLobbyListFinish) { gCoopNetCallbacks.OnLobbyListFinish(); @@ -451,7 +451,7 @@ bool MPacketLobbyListFinish::Receive(Connection* connection) { bool MPacketPeerSdp::Receive(Connection *connection) { std::string& sdp = mStringData[0]; - LOG_INFO("MPACKET_PEER_SDP received: lobbyId %" PRIu64 ", userId %" PRIu64 ", sdp '%s'", mData.lobbyId, mData.userId, sdp.c_str()); + LOG_INFO("[%" PRIu64 "] MPACKET_PEER_SDP received: lobbyId %" PRIu64 ", userId %" PRIu64 ", sdp '%s'", connection->mId, mData.lobbyId, mData.userId, sdp.c_str()); if (gServer) { Connection* other = gServer->ConnectionGet(mData.userId); @@ -465,6 +465,9 @@ bool MPacketPeerSdp::Receive(Connection *connection) { .userId = connection->mId }, mStringData).Send(*other); + connection->PeerBegin(other->mId); + other->PeerBegin(connection->mId); + return true; } @@ -486,7 +489,7 @@ bool MPacketPeerSdp::Receive(Connection *connection) { bool MPacketPeerCandidate::Receive(Connection *connection) { std::string& sdp = mStringData[0]; - LOG_INFO("MPACKET_PEER_CANDIDATE received: lobbyId %" PRIu64 ", userId %" PRIu64 ", sdp '%s'", mData.lobbyId, mData.userId, sdp.c_str()); + LOG_INFO("[%" PRIu64 "] MPACKET_PEER_CANDIDATE received: lobbyId %" PRIu64 ", userId %" PRIu64 ", sdp '%s'", connection->mId, mData.lobbyId, mData.userId, sdp.c_str()); if (gServer) { Connection* other = gServer->ConnectionGet(mData.userId); @@ -520,7 +523,7 @@ bool MPacketPeerCandidate::Receive(Connection *connection) { } bool MPacketPeerCandidateDone::Receive(Connection *connection) { - LOG_INFO("MPACKET_PEER_CANDIDATE_DONE received: lobbyId %" PRIu64 ", userId %" PRIu64 "", mData.lobbyId, mData.userId); + LOG_INFO("[%" PRIu64 "] MPACKET_PEER_CANDIDATE_DONE received: lobbyId %" PRIu64 ", userId %" PRIu64 "", connection->mId, mData.lobbyId, mData.userId); if (gServer) { Connection* other = gServer->ConnectionGet(mData.userId); @@ -554,7 +557,7 @@ bool MPacketPeerCandidateDone::Receive(Connection *connection) { } bool MPacketPeerFailed::Receive(Connection *connection) { - LOG_INFO("MPACKET_PEER_FAILED received: lobbyId %" PRIu64 ", peerId %" PRIu64 "", mData.lobbyId, mData.peerId); + LOG_INFO("[%" PRIu64 "] MPACKET_PEER_FAILED received: lobbyId %" PRIu64 ", peerId %" PRIu64 "", connection->mId, mData.lobbyId, mData.peerId); // make sure client is still in this lobby if (!connection->mLobby || connection->mLobby->mId != mData.lobbyId) { LOG_ERROR("Peer failed, but the one that saw the failure is no longer in the lobby"); @@ -574,11 +577,31 @@ bool MPacketPeerFailed::Receive(Connection *connection) { return false; } + Lobby* lobby = connection->mLobby; + connection->PeerFail(peer->mId); + peer->PeerFail(connection->mId); + + int32_t connectionRep = gServer->ReputationGet(connection->mDestinationId); + int32_t peerRep = gServer->ReputationGet(peer->mDestinationId); + + LOG_INFO("[%" PRIu64 "] MPACKET_PEER_FAILED reputation [%" PRIu64 "] (%d), [%" PRIu64 "] (%d)", connection->mId, connection->mId, connectionRep, peer->mId, peerRep); + + Connection* failedPeer = (connectionRep < peerRep) ? connection : peer; + Connection* otherPeer = (connectionRep < peerRep) ? peer : connection; + + if (lobby->mOwner == connection) { + failedPeer = peer; + otherPeer = connection; + } else if (lobby->mOwner == peer) { + failedPeer = connection; + otherPeer = peer; + } + // inform them - MPacketError({ .errorNumber = MERR_PEER_FAILED, .tag = connection->mId }).Send(*peer); + MPacketError({ .errorNumber = MERR_PEER_FAILED, .tag = otherPeer->mDestinationId }).Send(*failedPeer); // kick them - connection->mLobby->Leave(peer); + lobby->Leave(failedPeer); return true; } @@ -587,7 +610,7 @@ bool MPacketStunTurn::Receive(Connection* connection) { std::string host = mStringData[0]; std::string username = mStringData[1]; std::string password = mStringData[2]; - LOG_INFO("MPACKET_STUN_TURN received: isStun %u, host '%s', port %u, username '%s', password '%s'", mData.isStun, host.c_str(), mData.port, username.c_str(), password.c_str()); + LOG_INFO("[%" PRIu64 "] MPACKET_STUN_TURN received: isStun %u, host '%s', port %u, username '%s', password '%s'", connection->mId, mData.isStun, host.c_str(), mData.port, username.c_str(), password.c_str()); if (mData.isStun) { gClient->mStunServer.host = host; @@ -605,7 +628,7 @@ bool MPacketStunTurn::Receive(Connection* connection) { } bool MPacketError::Receive(Connection* connection) { - LOG_INFO("MPACKET_ERROR received: errno %u", mData.errorNumber); + LOG_INFO("[%" PRIu64 "] MPACKET_ERROR received: errno %u", connection->mId, mData.errorNumber); if (gCoopNetCallbacks.OnError) { gCoopNetCallbacks.OnError((enum MPacketErrorNumber)mData.errorNumber, mData.tag); } @@ -621,14 +644,14 @@ bool MPacketInfo::Receive(Connection *connection) { std::string name = mStringData[0]; LOG_INFO("[%" PRIu64 "] MPACKET_INFO received: name '%s', destId %" PRIu64 ", infoBits %" PRIu64 "", connection->mId, name.c_str(), mData.destId, mData.infoBits); if (gCoopNetCallbacks.OnReceiveInfoBits) { - gCoopNetCallbacks.OnReceiveInfoBits(connection, mData.destId, mData.infoBits, name.c_str()); + gCoopNetCallbacks.OnReceiveInfoBits(connection, mData.destId, mData.infoBits, mData.hash, name.c_str()); } return true; } bool MPacketLoadBalance::Receive(Connection *connection) { std::string host = mStringData[0]; - LOG_INFO("MPACKET_LOAD_BALANCE received: host %s, port %u", host.c_str(), mData.port); + LOG_INFO("[%" PRIu64 "] MPACKET_LOAD_BALANCE received: host %s, port %u", connection->mId, host.c_str(), mData.port); if (gCoopNetCallbacks.OnLoadBalance) { gCoopNetCallbacks.OnLoadBalance(host.c_str(), mData.port); } diff --git a/common/peer.cpp b/common/peer.cpp index 40bf980..f0ee5ac 100644 --- a/common/peer.cpp +++ b/common/peer.cpp @@ -11,7 +11,8 @@ #include "logging.hpp" #include "utils.hpp" -#define PEER_TIMEOUT 45.0f /* 45 seconds */ +// Set to true to force TURN / relay usage for testing +static bool sForceRelay = false; static void sOnCandidate(juice_agent_t *agent, const char *sdp, void *user_ptr) { reinterpret_cast(user_ptr)->OnCandidate(sdp); } static void sOnGatheringDone(juice_agent_t *agent, void *user_ptr) { reinterpret_cast(user_ptr)->OnGatheringDone(); } @@ -58,7 +59,11 @@ Peer::Peer(Client* aClient, uint64_t aId, uint32_t aPriority) { mTimeout = clock_elapsed() + PEER_TIMEOUT; mControlling = (gClient->mCurrentUserId < mId); +#ifdef LOGGING + juice_set_log_level(JUICE_LOG_LEVEL_DEBUG); +#else juice_set_log_level(JUICE_LOG_LEVEL_NONE); +#endif // Agent 1: Create agent juice_config_t config; @@ -70,7 +75,7 @@ Peer::Peer(Client* aClient, uint64_t aId, uint32_t aPriority) { LOG_INFO("STUN server: %s, %u", config.stun_server_host, config.stun_server_port); // TURN server example (use your own server in production) - if (mControlling) { + if (aClient->mTurnServers.size() > 0) { mTurnServers = (juice_turn_server_t*)calloc(aClient->mTurnServers.size(), sizeof(juice_turn_server_t)); if (!mTurnServers) { config.turn_servers = nullptr; @@ -106,6 +111,13 @@ Peer::Peer(Client* aClient, uint64_t aId, uint32_t aPriority) { } } +Peer::~Peer() { + if (mTurnServers) { + free(mTurnServers); + mTurnServers = nullptr; + } +} + void Peer::Update() { // Check for peer connection fail if (!mConnected && mPriority >= gClient->mCurrentPriority) { @@ -123,6 +135,7 @@ void Peer::Update() { } void Peer::Connect(const char* aSdp) { + LOG_INFO("\n\nReceive SDP (%" PRIu64 "):\n------------------\n%s\n------------------\n", mId, aSdp); juice_set_remote_description(mAgent, aSdp); if (mControlling) { juice_gather_candidates(mAgent); @@ -136,7 +149,7 @@ void Peer::Connect(const char* aSdp) { void Peer::SendSdp() { juice_get_local_description(mAgent, mSdp, JUICE_MAX_SDP_STRING_LEN); - LOG_INFO("Local description (%" PRIu64 "):\n%s\n", mId, mSdp); + LOG_INFO("\n\nSend SDP (%" PRIu64 "):\n------------------\n%s\n------------------\n", mId, mSdp); MPacketPeerSdp( { .lobbyId = gClient->mCurrentLobbyId, .userId = mId }, @@ -158,12 +171,16 @@ void Peer::Disconnect() { LOG_INFO("Peer disconnect %" PRIu64 "", mId); juice_destroy(mAgent); mAgent = nullptr; - mTurnServers = nullptr; + if (mTurnServers) { + free(mTurnServers); + mTurnServers = nullptr; + } mConnected = false; } } void Peer::CandidateAdd(const char* aSdp) { + LOG_INFO("\n\nReceive Candidate (%" PRIu64 "):\n------------------\n%s\n------------------\n", mId, aSdp); juice_add_remote_candidate(mAgent, aSdp); } @@ -192,9 +209,7 @@ void Peer::OnStateChanged(juice_state_t aState) { LOG_INFO("Local candidate : %s\n", local); LOG_INFO("Remote candidate: %s\n", remote); - if (mControlling && strstr(local, "relay") != NULL) { - LOG_INFO("Using TURN relay server"); - } else if (!mControlling && strstr(remote, "relay") != NULL) { + if (strstr(local, "relay") != NULL || strstr(remote, "relay") != NULL) { LOG_INFO("Using TURN relay server"); } } @@ -217,20 +232,21 @@ void Peer::OnStateChanged(juice_state_t aState) { void Peer::OnCandidate(const char* aSdp) { LOG_INFO("Candidate (%" PRIu64 "): %s", mId, aSdp); - // Uncomment to force a TURN connection - /* - if (mControlling) { - if (!strstr(aSdp, "relay")) { - LOG_INFO("Rejecting non-relay!"); - return; - } - } else { - if (!strstr(aSdp, "srflx")) { - LOG_INFO("Rejecting non-srflx!"); - return; + if (sForceRelay) { + if (mControlling) { + if (!strstr(aSdp, "relay")) { + LOG_INFO("Rejecting non-relay!"); + return; + } + } else { + if (!strstr(aSdp, "srflx")) { + LOG_INFO("Rejecting non-srflx!"); + return; + } } - }*/ + } + LOG_INFO("\n\nSend Candidate (%" PRIu64 "):\n------------------\n%s\n------------------\n", mId, aSdp); MPacketPeerCandidate( { .lobbyId = gClient->mCurrentLobbyId, .userId = mId }, { aSdp } diff --git a/common/peer.hpp b/common/peer.hpp index fa3e8ee..38784fb 100644 --- a/common/peer.hpp +++ b/common/peer.hpp @@ -5,6 +5,8 @@ class Client; +#define PEER_TIMEOUT 45.0f /* 45 seconds */ + typedef enum { PEER_EVENT_STATE_CHANGED, PEER_EVENT_RECV, @@ -48,6 +50,7 @@ class Peer { char mSdp[JUICE_MAX_SDP_STRING_LEN]; Peer(Client* client, uint64_t aId, uint32_t aPriority); + ~Peer(); void Update(); diff --git a/common/server.cpp b/common/server.cpp index 0e01d6a..54c1037 100644 --- a/common/server.cpp +++ b/common/server.cpp @@ -23,6 +23,11 @@ StunTurnServer sStunServer = { .port = 19302, }; +template +const T& clamp(const T& v, const T& lo, const T& hi) { + return (v < lo) ? lo : (hi < v) ? hi : v; +} + static void sOnLobbyJoin(Lobby* lobby, Connection* connection) { gServer->OnLobbyJoin(lobby, connection); } static void sOnLobbyLeave(Lobby* lobby, Connection* connection) { gServer->OnLobbyLeave(lobby, connection); } static void sOnLobbyDestroy(Lobby* lobby) { gServer->OnLobbyDestroy(lobby); } @@ -41,6 +46,7 @@ void Server::ReadTurnServers() { std::size_t pos2 = line.find(":", pos1 + 1); std::size_t pos3 = line.find(":", pos2 + 1); if (pos1 == std::string::npos || pos2 == std::string::npos || pos3 == std::string::npos) { continue; } + if (line.empty() || line[0] == '#') { continue; } StunTurnServer turn = { .host = line.substr(0, pos1), @@ -62,6 +68,10 @@ bool Server::Begin(uint32_t aPort) { // read TURN servers ReadTurnServers(); + // Use a PRNG to generate a random seed + mPrng1 = std::mt19937_64(std::chrono::steady_clock::now().time_since_epoch().count() + 100); + mPrng2 = std::mt19937_64(std::chrono::steady_clock::now().time_since_epoch().count() + 500); + // create a master socket mSocket = SocketInitialize(AF_INET, SOCK_STREAM, IPPROTO_TCP); if (mSocket <= 0) { @@ -71,7 +81,7 @@ bool Server::Begin(uint32_t aPort) { // set master socket to allow multiple connections , // this is just a good habit, it will work without this - socklen_t opt; + socklen_t opt = { 0 }; if (setsockopt(mSocket, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, sizeof(opt)) != 0) { LOG_ERROR("Master socket failed to setsockopt!"); return false; @@ -115,13 +125,10 @@ void Server::Receive() { LOG_INFO("Waiting for connections..."); while (true) { - // Use a PRNG to generate a random seed - mPrng = std::mt19937_64(std::chrono::steady_clock::now().time_since_epoch().count()); - // Get random connection id - uint64_t connectionId = mRng(mPrng); + uint64_t connectionId = mRng(mPrng1); while (connectionId == 0 || mConnections.count(connectionId) > 0) { - connectionId = mRng(mPrng); + connectionId = mRng(mPrng1); } // accept the incoming connection @@ -156,7 +163,7 @@ void Server::Receive() { ).Send(*connection); // send turn servers - std::shuffle(mTurnServers.begin(), mTurnServers.end(), mPrng); + std::shuffle(mTurnServers.begin(), mTurnServers.end(), mPrng1); for (auto& it : mTurnServers) { MPacketStunTurn( { .isStun = false, .port = it.port }, @@ -180,35 +187,58 @@ void Server::Update() { for (auto it = mConnections.begin(); it != mConnections.end(); ) { Connection* connection = it->second; // erase the connection if it's inactive, otherwise receive packets - if (connection != nullptr) { - if (connection->mActive && connection->mLobby != nullptr) { + if (connection == nullptr) { + it = mConnections.erase(it); + continue; + } + + if (!connection->mActive) { + LOG_INFO("[%" PRIu64 "] Connection removed, count: %" PRIu64 "", connection->mId, (uint64_t)mConnections.size()); + delete connection; + it = mConnections.erase(it); + continue; + } else { + connection->Receive(); + connection->Update(); + if (connection->mLobby != nullptr) { players++; } - if (mRefreshBans && gCoopNetCallbacks.ConnectionIsAllowed && !gCoopNetCallbacks.ConnectionIsAllowed(connection, false)) { - connection->Disconnect(true); - } - if (!connection->mActive) { - LOG_INFO("[%" PRIu64 "] Connection removed, count: %" PRIu64 "", connection->mId, (uint64_t)mConnections.size()); - delete connection; - it = mConnections.erase(it); - continue; - } else if (connection != nullptr) { - connection->Receive(); - connection->Update(); - } - if (mQueueDisconnects.count(connection->mId) > 0) { - connection->Disconnect(true); - } } + + std::chrono::system_clock::time_point nowTp = std::chrono::system_clock::now(); + uint64_t now = std::chrono::system_clock::to_time_t(nowTp); + + if (mRefreshBans && gCoopNetCallbacks.ConnectionIsAllowed && !gCoopNetCallbacks.ConnectionIsAllowed(connection, false)) { + connection->Disconnect(true); + } else if (mQueueDisconnects.count(connection->mId) > 0) { + connection->Disconnect(true); + } else if ((now - connection->mLastReceiveTime) > CONNECTION_DEAD_SECS) { + LOG_INFO("[%" PRIu64 "] Connection timeout", connection->mId); + connection->Disconnect(true); + } + ++it; } if (queueDisconnectCount == mQueueDisconnects.size()) { mQueueDisconnects.clear(); } - mRefreshBans = false; + mRefreshBans = false; mPlayerCount = players; + + // clear null lobbies + for (auto it = mLobbies.begin(); it != mLobbies.end(); ) { + Lobby* lobby = it->second; + if (!lobby) { + it = mLobbies.erase(it); + continue; + } + ++it; + } + + ReputationUpdate(); + fflush(stdout); fflush(stderr); } @@ -245,6 +275,8 @@ void Server::LobbyListGet(Connection& aConnection, std::string aGame, std::strin } void Server::OnLobbyJoin(Lobby* aLobby, Connection* aConnection) { + if (!aLobby || !aConnection) { return; } + if (gCoopNetCallbacks.LobbyConnectionIsAllowed && !gCoopNetCallbacks.LobbyConnectionIsAllowed(aConnection, aLobby)) { return; } MPacketLobbyJoined({ .lobbyId = aLobby->mId, .userId = aConnection->mId, @@ -288,13 +320,13 @@ void Server::LobbyCreate(Connection* aConnection, std::string& aGame, std::strin } // Get random lobby id - uint64_t lobbyId = mRng(mPrng); + uint64_t lobbyId = mRng(mPrng2); while (lobbyId == 0 || mLobbies.count(lobbyId) > 0) { - lobbyId = mRng(mPrng); + lobbyId = mRng(mPrng2); } // limit the lobby size - if (aMaxConnections > MAX_LOBBY_SIZE) { + if (aPassword == "" && aMaxConnections > MAX_LOBBY_SIZE) { aMaxConnections = MAX_LOBBY_SIZE; } @@ -369,3 +401,55 @@ void Server::RefreshBans() { std::lock_guard guard(mConnectionsMutex); mRefreshBans = true; } + +void Server::ReputationIncrease(uint64_t aDestinationId) { + std::chrono::system_clock::time_point nowTp = std::chrono::system_clock::now(); + uint64_t now = std::chrono::system_clock::to_time_t(nowTp); + + if (mReputation.count(aDestinationId) == 0) { + mReputation[aDestinationId] = { 1, now }; + } else { + mReputation[aDestinationId].value = clamp(mReputation[aDestinationId].value + 1, -16, 16); + mReputation[aDestinationId].timestamp = now; + } + LOG_INFO("Reputation increase: destId %" PRIu64 " -> %d", aDestinationId, mReputation[aDestinationId].value); +} + +void Server::ReputationDecrease(uint64_t aDestinationId) { + std::chrono::system_clock::time_point nowTp = std::chrono::system_clock::now(); + uint64_t now = std::chrono::system_clock::to_time_t(nowTp); + + if (mReputation.count(aDestinationId) == 0) { + mReputation[aDestinationId] = { -2, now }; + } else { + mReputation[aDestinationId].value = clamp(mReputation[aDestinationId].value - 2, -16, 16); + mReputation[aDestinationId].timestamp = now; + } + LOG_INFO("Reputation decrease: destId %" PRIu64 " -> %d", aDestinationId, mReputation[aDestinationId].value); +} + +int32_t Server::ReputationGet(uint64_t aDestinationId) { + if (mReputation.count(aDestinationId) == 0) { + return 0; + } else { + return mReputation[aDestinationId].value; + } +} + +void Server::ReputationUpdate() { + static uint64_t sNextRepUpdateTime = 0; + std::chrono::system_clock::time_point nowTp = std::chrono::system_clock::now(); + uint64_t now = std::chrono::system_clock::to_time_t(nowTp); + + if (now < sNextRepUpdateTime) { return; } + sNextRepUpdateTime = now + 60 * 60 * 1; + + for (auto it = mReputation.begin(); it != mReputation.end(); ) { + uint64_t timestamp = it->second.timestamp; + if ((now - timestamp) > 60 * 60 * 24) { + it = mReputation.erase(it); + continue; + } + ++it; + } +} diff --git a/common/server.hpp b/common/server.hpp index feb8c20..3845d2b 100644 --- a/common/server.hpp +++ b/common/server.hpp @@ -12,6 +12,11 @@ #include "connection.hpp" #include "lobby.hpp" +struct Reptuation { + int32_t value; + uint64_t timestamp; +}; + class Server { private: std::thread mThreadRecv; @@ -20,15 +25,18 @@ class Server { std::map mConnections; std::mutex mConnectionsMutex; std::map mLobbies; - std::mt19937_64 mPrng; + std::mt19937_64 mPrng1; + std::mt19937_64 mPrng2; std::uniform_int_distribution mRng; std::vector mTurnServers; std::set mQueueDisconnects; + std::map mReputation; int mLobbyCount = 0; int mPlayerCount = 0; bool mRefreshBans = false; void ReadTurnServers(); + void ReputationUpdate(); public: @@ -53,6 +61,10 @@ class Server { void QueueDisconnect(uint64_t aUserId, bool aLockMutex); void RefreshBans(); + + void ReputationIncrease(uint64_t aDestinationId); + void ReputationDecrease(uint64_t aDestinationId); + int32_t ReputationGet(uint64_t aDestinationId); }; extern Server* gServer; diff --git a/common/utils.cpp b/common/utils.cpp index 1345ba7..f2f12f2 100755 --- a/common/utils.cpp +++ b/common/utils.cpp @@ -1,3 +1,7 @@ +#ifdef OSX_BUILD +#include +#endif + #include #include #include diff --git a/dev/deploy.sh b/dev/deploy.sh deleted file mode 100755 index 7324f39..0000000 --- a/dev/deploy.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -e # Abort if any command returns a non-zero exit status - -make clean -make LOGGING=1 -j -cp ./bin/libcoopnet.a ~/sm64ex-coop/lib/coopnet/linux/libcoopnet.a -cp common/libcoopnet.h ~/sm64ex-coop/lib/coopnet/include/libcoopnet.h -ssh root@143.244.214.139 "systemctl stop coopnet" -scp ./bin/server coopnet@143.244.214.139:/coopnet/server -ssh root@143.244.214.139 "systemctl restart coopnet" diff --git a/lib/include/juice/juice.h b/lib/include/juice/juice.h index 06bcc13..1416dd9 100644 --- a/lib/include/juice/juice.h +++ b/lib/include/juice/juice.h @@ -17,28 +17,32 @@ extern "C" { #include #include -#ifdef JUICE_HAS_EXPORT_HEADER -#include "juice_export.h" -#else // no export header -#ifdef JUICE_STATIC -#define JUICE_EXPORT -#else // dynamic library -#ifdef _WIN32 -#if defined(JUICE_EXPORTS) || defined(juice_EXPORTS) -#define JUICE_EXPORT __declspec(dllexport) // building the library -#else -#define JUICE_EXPORT __declspec(dllimport) // using the library -#endif -#else // not WIN32 -#define JUICE_EXPORT -#endif +#ifndef JUICE_STATIC // dynamic library +# ifdef _WIN32 +# ifdef JUICE_EXPORTS +# define JUICE_EXPORT __declspec(dllexport) // building the library +# else +# define JUICE_EXPORT __declspec(dllimport) // using the library +# endif +# else // not WIN32 +# if defined(__has_attribute) +# if __has_attribute(visibility) +# define JUICE_EXPORT __attribute__((visibility("default"))) +# endif +# endif +# endif #endif +#ifndef JUICE_EXPORT +# define JUICE_EXPORT #endif #define JUICE_ERR_SUCCESS 0 #define JUICE_ERR_INVALID -1 // invalid argument #define JUICE_ERR_FAILED -2 // runtime error #define JUICE_ERR_NOT_AVAIL -3 // element not available +#define JUICE_ERR_IGNORED -4 // ignored +#define JUICE_ERR_AGAIN -5 // buffer full +#define JUICE_ERR_TOO_LARGE -6 // datagram too large // ICE Agent @@ -63,6 +67,16 @@ typedef void (*juice_cb_gathering_done_t)(juice_agent_t *agent, void *user_ptr); typedef void (*juice_cb_recv_t)(juice_agent_t *agent, const char *data, size_t size, void *user_ptr); +typedef struct juice_mux_binding_request { + const char *local_ufrag; + const char *remote_ufrag; + + const char *address; + uint16_t port; +} juice_mux_binding_request_t; + +typedef void (*juice_cb_mux_incoming_t)(const juice_mux_binding_request_t *info, void *user_ptr); + typedef struct juice_turn_server { const char *host; const char *username; @@ -106,6 +120,7 @@ JUICE_EXPORT int juice_gather_candidates(juice_agent_t *agent); JUICE_EXPORT int juice_get_local_description(juice_agent_t *agent, char *buffer, size_t size); JUICE_EXPORT int juice_set_remote_description(juice_agent_t *agent, const char *sdp); JUICE_EXPORT int juice_add_remote_candidate(juice_agent_t *agent, const char *sdp); +JUICE_EXPORT int juice_add_turn_server(juice_agent_t *agent, const juice_turn_server_t *turn_server); JUICE_EXPORT int juice_set_remote_gathering_done(juice_agent_t *agent); JUICE_EXPORT int juice_send(juice_agent_t *agent, const char *data, size_t size); JUICE_EXPORT int juice_send_diffserv(juice_agent_t *agent, const char *data, size_t size, int ds); @@ -114,7 +129,9 @@ JUICE_EXPORT int juice_get_selected_candidates(juice_agent_t *agent, char *local char *remote, size_t remote_size); JUICE_EXPORT int juice_get_selected_addresses(juice_agent_t *agent, char *local, size_t local_size, char *remote, size_t remote_size); +JUICE_EXPORT int juice_set_local_ice_attributes(juice_agent_t *agent, const char *ufrag, const char *pwd); JUICE_EXPORT const char *juice_state_to_string(juice_state_t state); +JUICE_EXPORT int juice_mux_listen(const char *bind_address, int local_port, juice_cb_mux_incoming_t cb, void *user_ptr); // ICE server diff --git a/lib/mac_arm/libjuice.1.6.2.dylib b/lib/mac_arm/libjuice.1.6.2.dylib new file mode 100644 index 0000000..4883637 Binary files /dev/null and b/lib/mac_arm/libjuice.1.6.2.dylib differ diff --git a/lib/mac_intel/libjuice.1.6.2.dylib b/lib/mac_intel/libjuice.1.6.2.dylib new file mode 100644 index 0000000..7734ce9 Binary files /dev/null and b/lib/mac_intel/libjuice.1.6.2.dylib differ diff --git a/lib/win32/libjuice.a b/lib/win32/libjuice.a index 8e7d880..43cfd48 100644 Binary files a/lib/win32/libjuice.a and b/lib/win32/libjuice.a differ diff --git a/lib/win64/libjuice.a b/lib/win64/libjuice.a index 1bee9d6..0bd1972 100644 Binary files a/lib/win64/libjuice.a and b/lib/win64/libjuice.a differ diff --git a/server/smain.cpp b/server/smain.cpp index 50f8f9f..0436121 100644 --- a/server/smain.cpp +++ b/server/smain.cpp @@ -12,8 +12,8 @@ int main(int argc, char *argv[]) { gServer = new Server(); - server_extra_init(); gCoopNetCallbacks.DestIdFunction = sha224_u64; + server_extra_init(); if (!gServer->Begin(PORT)) { exit(EXIT_FAILURE); @@ -22,8 +22,8 @@ int main(int argc, char *argv[]) { while (true) { metrics.Update(gServer->LobbyCount(), gServer->PlayerCount()); server_extra_update(); - std::this_thread::sleep_for(std::chrono::milliseconds(60 * 1000)); + std::this_thread::sleep_for(std::chrono::milliseconds(20 * 1000)); } return 0; -} \ No newline at end of file +}