From: pk910 Date: Thu, 24 Jul 2014 08:48:08 +0000 (+0200) Subject: Merge remote-tracking branch 'IOMultiplexer/v2' X-Git-Url: http://git.pk910.de/?p=NextIRCd.git;a=commitdiff_plain;h=e17a8a5dc929df2a5ae6169f1955fcde7c70e04b;hp=acc7f60740ab12e2410fd3187fcb9a27995c0638 Merge remote-tracking branch 'IOMultiplexer/v2' Conflicts: src/IOHandler/IODNSLookup.c src/IOHandler/IODNSLookup.h --- diff --git a/.gitignore b/.gitignore index 946fb4a..fe1ca31 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ config.log config.status config.sub configure +compile depcomp install-sh libtool diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..a94976f --- /dev/null +++ b/AUTHORS @@ -0,0 +1,21 @@ + NextIRCd dev + +Project Admin: +pk910 + +Coders: +pk910 + +Code Testers: +- none - + +Documentation: +- none - + +Translation: +- none - + +You can find us on irc://irc.nextirc.net/#dev +If you found a bug you're welcome to report it on +http://dev.pk910.de/NextIRCd_bugtrack +or contact us on IRC. diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 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 General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is 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. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +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. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + 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 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. Use with the GNU Affero General Public License. + + 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 Affero 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 special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 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 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 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 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + 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 GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..d5c2a27 --- /dev/null +++ b/ChangeLog @@ -0,0 +1 @@ +See the git revision history for the full ChangeLog or NEWS for major releases. diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..7d1c323 --- /dev/null +++ b/INSTALL @@ -0,0 +1,365 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008, 2009 Free Software Foundation, Inc. + + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + + The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package, generally using the just-built uninstalled binaries. + + 4. Type `make install' to install the programs and any data files and + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. + + 6. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS + KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..8aa7817 --- /dev/null +++ b/NEWS @@ -0,0 +1,5 @@ + +Start of development +-------------------------------------------- +[2013-03-01] +Development has been started ;) diff --git a/README b/README new file mode 100644 index 0000000..d662a08 --- /dev/null +++ b/README @@ -0,0 +1,13 @@ + NextIRCd Readme File + +Description: +---------- +- to be continued - + +Contacts: +---------- +The AUTHORS file contains contact information for the NextIRCd Development Team. + +End of file, README. + +-pk910 (pk910@nextirc.net) diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..d6727e3 --- /dev/null +++ b/VERSION @@ -0,0 +1,3 @@ +VERSION LOG +2013-03-01 0.0 (dev) + start of development diff --git a/autogen.sh b/autogen.sh old mode 100644 new mode 100755 diff --git a/configure.ac b/configure.ac index 4275959..aa5b500 100644 --- a/configure.ac +++ b/configure.ac @@ -36,22 +36,14 @@ AC_CHECK_FUNCS([usleep select socket inet_pton inet_ntop]) AC_CHECK_HEADERS([fcntl.h sys/socket.h sys/select.h sys/time.h sys/types.h unistd.h windows.h winsock2.h errno.h sys/epoll.h sys/event.h]) AC_CHECK_LIB(ws2_32, main, [ LIBS="$LIBS -lws2_32" ], []) -have_gnutls="no" -AC_CHECK_LIB(gnutls, gnutls_init, [ - AC_CHECK_HEADERS(gnutls/gnutls.h, [ - LIBS="$LIBS -lgnutls" - have_gnutls="yes" - ]) -]) -if test x"$have_gnutls" = xno; then - AC_CHECK_LIB(ssl, SSL_read, [ - AC_CHECK_LIB(crypto, X509_new, [ - AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h openssl/rand.h, [ - LIBS="$LIBS -lssl -lcrypto" - ]) + +AC_CHECK_LIB(ssl, SSL_read, [ + AC_CHECK_LIB(crypto, X509_new, [ + AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h openssl/rand.h, [ + LIBS="$LIBS -lssl -lcrypto" ]) ]) -fi +]) AC_CHECK_LIB(pthread, pthread_create, [ AC_CHECK_HEADERS(pthread.h, [ LIBS="$LIBS -lpthread" diff --git a/ircd.conf b/ircd.conf new file mode 100644 index 0000000..e3ea6aa --- /dev/null +++ b/ircd.conf @@ -0,0 +1,5 @@ + +"port" { + "port" 6667; +} + diff --git a/src/.gitignore b/src/.gitignore index 3dda729..7b61ddf 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,2 +1,9 @@ +.deps +.libs Makefile.in Makefile +*.o +version.c +ircd.conf +nextircd +nextircd.exe \ No newline at end of file diff --git a/src/IOHandler/IOSockets.c b/src/IOHandler/IOSockets.c index 9344de5..d83d0fc 100644 --- a/src/IOHandler/IOSockets.c +++ b/src/IOHandler/IOSockets.c @@ -825,6 +825,32 @@ void iosocket_close(struct IOSocket *iosocket) { iogc_add(iosocket); } +struct IODNSAddress *iosocket_get_remote_addr(struct IOSocket *iosocket) { + struct _IOSocket *iosock = iosocket->iosocket; + if(iosock == NULL) { + iolog_trigger(IOLOG_WARNING, "called iosocket_get_remote_addr for destroyed IOSocket in %s:%d", __FILE__, __LINE__); + return NULL; + } + if(iosock->socket_flags & IOSOCKETFLAG_PENDING_DESTDNS) + return NULL; + if(!iosock->dest.addr.addresslen) + return NULL; + return &iosock->dest.addr; +} + +struct IODNSAddress *iosocket_get_local_addr(struct IOSocket *iosocket) { + struct _IOSocket *iosock = iosocket->iosocket; + if(iosock == NULL) { + iolog_trigger(IOLOG_WARNING, "called iosocket_get_local_addr for destroyed IOSocket in %s:%d", __FILE__, __LINE__); + return NULL; + } + if(iosock->socket_flags & IOSOCKETFLAG_PENDING_BINDDNS) + return NULL; + if(!iosock->bind.addr.addresslen) + return NULL; + return &iosock->bind.addr; +} + static int iosocket_try_write(struct _IOSocket *iosock) { if(!iosock->writebuf.bufpos && !(iosock->socket_flags & IOSOCKETFLAG_SSL_WRITEHS)) return 0; diff --git a/src/IOHandler/IOSockets.h b/src/IOHandler/IOSockets.h index 8a9048a..7ec23b3 100644 --- a/src/IOHandler/IOSockets.h +++ b/src/IOHandler/IOSockets.h @@ -213,5 +213,8 @@ void iosocket_send(struct IOSocket *iosocket, const char *data, size_t datalen); void iosocket_printf(struct IOSocket *iosocket, const char *text, ...); void iosocket_close(struct IOSocket *iosocket); +struct IODNSAddress *iosocket_get_remote_addr(struct IOSocket *iosocket); +struct IODNSAddress *iosocket_get_local_addr(struct IOSocket *iosocket); + #endif #endif diff --git a/src/Makefile.am b/src/Makefile.am index 2f259ff..e27e2a1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,27 @@ ##Process this file with automake to create Makefile.in ACLOCAL_AMFLAGS = -I m4 SUBDIRS = IOHandler IOHandler++ IOHandler_test + +noinst_PROGRAMS = nextircd +nextircd_LDADD = IOHandler/libiohandler.la + +BUILT_SOURCES = version.c +version.c: checkversion +checkversion: + ./version.sh + +nextircd_SOURCES = \ + version.c \ + tools.c \ + crypt_base64.c \ + crypt_keypacker.c \ + crypt_rsa.c \ + crypt_md5.c \ + ircd_config.c \ + ircd_sock.c \ + ircd_client.c \ + ircd_parse.c \ + ircd_auth.c \ + ircd_users.c \ + main.c + diff --git a/src/cmd.h b/src/cmd.h new file mode 100644 index 0000000..a2896a4 --- /dev/null +++ b/src/cmd.h @@ -0,0 +1,30 @@ +/* cmd.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _cmd_h +#define _cmd_h + +struct Client; +struct Auth; +struct Server; + + +int cmd_nick_cli(struct Client *client, char *argv[], int argc); +int cmd_nick_auth(struct Auth *auth, char *argv[], int argc); + + +#endif diff --git a/src/cmd_nick.c b/src/cmd_nick.c new file mode 100644 index 0000000..effb22f --- /dev/null +++ b/src/cmd_nick.c @@ -0,0 +1,29 @@ +/* cmd_nick.c - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "cmd.h" +#include "struct_auth.h" + +int cmd_nick_cli(struct Client *client, char *argv[], int argc) { + + return 0; +} + +int cmd_nick_auth(struct Auth *auth, char *argv[], int argc) { + + return 0; +} diff --git a/src/crypt_base64.c b/src/crypt_base64.c new file mode 100644 index 0000000..60e10ee --- /dev/null +++ b/src/crypt_base64.c @@ -0,0 +1,105 @@ +/* crypt_base64.c - NextIRCd + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "crypt_base64.h" +#include +#include + +static char encoding_table[] = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', + 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', + 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', + 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', + 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', + 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', + 'w', 'x', 'y', 'z', '0', '1', '2', '3', + '4', '5', '6', '7', '8', '9', '+', '/'}; +static char *decoding_table = NULL; +static int mod_table[] = {0, 2, 1}; + + +char *crypt_base64_encode(const unsigned char *data, size_t input_length, size_t *output_length) { + *output_length = 4 * ((input_length + 2) / 3); + + char *encoded_data = malloc(*output_length); + if (encoded_data == NULL) + return NULL; + + int i, j; + for (i = 0, j = 0; i < input_length;) { + uint32_t octet_a = i < input_length ? (unsigned char)data[i++] : 0; + uint32_t octet_b = i < input_length ? (unsigned char)data[i++] : 0; + uint32_t octet_c = i < input_length ? (unsigned char)data[i++] : 0; + + uint32_t triple = (octet_a << 0x10) + (octet_b << 0x08) + octet_c; + + encoded_data[j++] = encoding_table[(triple >> 3 * 6) & 0x3F]; + encoded_data[j++] = encoding_table[(triple >> 2 * 6) & 0x3F]; + encoded_data[j++] = encoding_table[(triple >> 1 * 6) & 0x3F]; + encoded_data[j++] = encoding_table[(triple >> 0 * 6) & 0x3F]; + } + + for (i = 0; i < mod_table[input_length % 3]; i++) + encoded_data[*output_length - 1 - i] = '='; + + return encoded_data; +} + + +unsigned char *crypt_base64_decode(const char *data, size_t input_length, size_t *output_length) { + if (decoding_table == NULL) + crypt_base64_init(); + if (input_length % 4 != 0) + return NULL; + + *output_length = input_length / 4 * 3; + if (data[input_length - 1] == '=') (*output_length)--; + if (data[input_length - 2] == '=') (*output_length)--; + + unsigned char *decoded_data = malloc(*output_length); + if (decoded_data == NULL) + return NULL; + + int i, j; + for (i = 0, j = 0; i < input_length;) { + uint32_t sextet_a = data[i] == '=' ? 0 & i++ : decoding_table[data[i++]]; + uint32_t sextet_b = data[i] == '=' ? 0 & i++ : decoding_table[data[i++]]; + uint32_t sextet_c = data[i] == '=' ? 0 & i++ : decoding_table[data[i++]]; + uint32_t sextet_d = data[i] == '=' ? 0 & i++ : decoding_table[data[i++]]; + + uint32_t triple = (sextet_a << 3 * 6) + + (sextet_b << 2 * 6) + + (sextet_c << 1 * 6) + + (sextet_d << 0 * 6); + + if (j < *output_length) decoded_data[j++] = (triple >> 2 * 8) & 0xFF; + if (j < *output_length) decoded_data[j++] = (triple >> 1 * 8) & 0xFF; + if (j < *output_length) decoded_data[j++] = (triple >> 0 * 8) & 0xFF; + } + + return decoded_data; +} + + +void crypt_base64_init() { + decoding_table = malloc(256); + int i; + for (i = 0; i < 64; i++) + decoding_table[(unsigned char) encoding_table[i]] = i; +} + +void crypt_base64_deinit() { + free(decoding_table); +} diff --git a/src/crypt_base64.h b/src/crypt_base64.h new file mode 100644 index 0000000..2892573 --- /dev/null +++ b/src/crypt_base64.h @@ -0,0 +1,28 @@ +/* crypt_base64.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _crypt_base64_h +#define _crypt_base64_h +#include + +void crypt_base64_init(); +void crypt_base64_deinit(); + +char *crypt_base64_encode(const unsigned char *data, size_t input_length, size_t *output_length); +unsigned char *crypt_base64_decode(const char *data, size_t input_length, size_t *output_length); + +#endif diff --git a/src/crypt_keypacker.c b/src/crypt_keypacker.c new file mode 100644 index 0000000..317e716 --- /dev/null +++ b/src/crypt_keypacker.c @@ -0,0 +1,81 @@ +/* crypt_keypacker.c - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "crypt_keypacker.h" +#include "tools.h" +#include + +/* Pack Key +* - remove -----xy----- lines +* - remove line breaks +*/ +char *crypt_rsa_packkey(char *key) { + char *packed = malloc(strlen(key)); + + int remove_line = 0; + int linenum = 0; + int i, j = 0; + for(i = 0; key[i]; i++) { + if(key[i] == '\r') + continue; + if(key[i] == '\n') { + if(linenum == 0) { + key[i] = 0; + if(match("*PRIVATE KEY*", key)) + packed[j++] = '1'; + else + packed[j++] = '0'; + key[i] = '\n'; + } + linenum++; + remove_line = 0; + continue; + } + if(remove_line) + continue; + if(key[i] == '-') { + remove_line = 1; + continue; + } + packed[j++] = key[i]; + } + return packed; +} + +char *crypt_rsa_unpackkey(char *packed) { + int size = strlen(packed); + char *key = malloc(size + (size/64)+1 + 128); + int kpos = 0; + if(packed[0] == '1') + kpos += sprintf(key + kpos, "-----BEGIN RSA PRIVATE KEY-----"); + else + kpos += sprintf(key + kpos, "-----BEGIN PUBLIC KEY-----"); + + int i; + for(i = 1; i < size; i++) { + if((i-1) % 64 == 0) + key[kpos++] = '\n'; + key[kpos++] = packed[i]; + } + + if(packed[0] == '1') + kpos += sprintf(key + kpos, "-----END RSA PRIVATE KEY-----\n"); + else + kpos += sprintf(key + kpos, "-----END PUBLIC KEY-----\n"); + + return key; +} diff --git a/src/crypt_keypacker.h b/src/crypt_keypacker.h new file mode 100644 index 0000000..84bf94e --- /dev/null +++ b/src/crypt_keypacker.h @@ -0,0 +1,24 @@ +/* crypt_keypacker.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _crypt_keypacker_h +#define _crypt_keypacker_h + +char *crypt_rsa_packkey(char *key); +char *crypt_rsa_unpackkey(char *key); + +#endif diff --git a/src/crypt_md5.c b/src/crypt_md5.c new file mode 100644 index 0000000..e061cc9 --- /dev/null +++ b/src/crypt_md5.c @@ -0,0 +1,51 @@ +/* crypt_md5.c - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "crypt_md5.h" +#include +#include +#include +#if defined(__APPLE__) +#define COMMON_DIGEST_FOR_OPENSSL +#include +#define SHA1 CC_SHA1 +#else +#include +#endif + +unsigned char *crypt_md5_bin(const char *str, int strlen) { + int n; + MD5_CTX c; + unsigned char *digest = (char*)malloc(17); + + MD5_Init(&c); + + while (strlen > 0) { + if (strlen > 512) { + MD5_Update(&c, str, 512); + } else { + MD5_Update(&c, str, strlen); + } + strlen -= 512; + str += 512; + } + + MD5_Final(digest, &c); + digest[16] = 0; + + return digest; +} diff --git a/src/crypt_md5.h b/src/crypt_md5.h new file mode 100644 index 0000000..2b04665 --- /dev/null +++ b/src/crypt_md5.h @@ -0,0 +1,25 @@ +/* crypt_md5.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _crypt_md5_h +#define _crypt_md5_h + +#define MDHASHLEN 16 + +unsigned char *crypt_md5_bin(const char *str, int strlen); + +#endif diff --git a/src/crypt_rsa.c b/src/crypt_rsa.c new file mode 100644 index 0000000..c78bf89 --- /dev/null +++ b/src/crypt_rsa.c @@ -0,0 +1,458 @@ +/* crypt_rsa.c - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include "../config.h" +#include "crypt_rsa.h" + +#include +#include +#include +#include + +/* +// GnuTLS Backend not working because of gnutls_pubkey_encrypt_data doesn't exists prior to GnuTLS 3.0 +// still searching for a replacement... + +#if defined(HAVE_GNUTLS_GNUTLS_H) +#include +#include +#include + +struct crypt_rsa_pubkey { + unsigned int free_crt : 1; + unsigned int free_pubkey : 1; + gnutls_x509_crt_t crt; + gnutls_pubkey_t pubkey; +}; + +struct crypt_rsa_privkey { + unsigned int free_key : 1; + unsigned int free_privkey : 1; + gnutls_x509_privkey_t key; + gnutls_privkey_t privkey; +}; + +void crypt_rsa_init() { + gnutls_global_init(); +} + +void crypt_rsa_deinit() { + gnutls_global_deinit(); +} + +struct crypt_rsa_pubkey *crypt_rsa_load_pubkey(const char *key) { + struct crypt_rsa_pubkey *pubkey = calloc(1, sizeof(*pubkey)); + int ret; + const gnutls_datum_t key_dat = {(void *)key, strlen(key)}; + + if(!pubkey) + return NULL; + + ret = gnutls_x509_crt_init(&pubkey->crt); + if(ret < 0) + goto crypt_rsa_load_pubkey_fail; + pubkey->free_crt = 1; + + ret = gnutls_x509_crt_import(pubkey->crt, &key_dat, GNUTLS_X509_FMT_PEM); + if (ret < 0) + goto crypt_rsa_load_pubkey_fail; + + ret = gnutls_pubkey_init(&pubkey->pubkey); + if(ret < 0) + goto crypt_rsa_load_pubkey_fail; + pubkey->free_pubkey = 1; + + ret = gnutls_pubkey_import_x509(pubkey->pubkey, pubkey->crt, 0); + if(ret < 0) + goto crypt_rsa_load_pubkey_fail; + + return pubkey; + crypt_rsa_load_pubkey_fail: + crypt_rsa_unload_pubkey(pubkey); + return NULL; +} + +void crypt_rsa_unload_pubkey(struct crypt_rsa_pubkey *pubkey) { + if(pubkey->free_crt) + gnutls_x509_crt_deinit(pubkey->crt); + if(pubkey->free_pubkey) + gnutls_pubkey_deinit(pubkey->pubkey); + free(pubkey); +} + +char *crypt_rsa_export_pubkey(struct crypt_rsa_pubkey *pubkey) { + size_t size = 1024; + char *buffer = malloc(size); + int ret; + + ret = gnutls_pubkey_export(pubkey->pubkey, GNUTLS_X509_FMT_PEM, buffer, &size); + if(ret == GNUTLS_E_SHORT_MEMORY_BUFFER) { + buffer = realloc(buffer, size); + ret = gnutls_pubkey_export(pubkey->pubkey, GNUTLS_X509_FMT_PEM, buffer, &size); + } + if(ret < 0) { + free(buffer); + return NULL; + } + return buffer; +} + +struct crypt_rsa_privkey *crypt_rsa_load_privkey(const char *key) { + struct crypt_rsa_privkey *privkey = calloc(1, sizeof(*privkey)); + int ret; + + const gnutls_datum_t key_dat = {(void *)key, strlen(key)}; + + ret = gnutls_x509_privkey_init(&privkey->key); + if(ret < 0) + goto crypt_rsa_load_privkey_fail; + privkey->free_key = 1; + + ret = gnutls_x509_privkey_import(privkey->key, &key_dat, GNUTLS_X509_FMT_PEM); + if (ret < 0) + goto crypt_rsa_load_privkey_fail; + + ret = gnutls_privkey_init(&privkey->privkey); + if(ret < 0) + goto crypt_rsa_load_privkey_fail; + privkey->free_privkey = 1; + + ret = gnutls_privkey_import_x509(privkey->privkey, privkey->key, 0); + if(ret < 0) + goto crypt_rsa_load_privkey_fail; + + return privkey; + crypt_rsa_load_privkey_fail: + crypt_rsa_unload_privkey(privkey); + return NULL; +} + +struct crypt_rsa_privkey *crypt_rsa_generate_privkey(const int keysize) { + struct crypt_rsa_privkey *privkey = calloc(1, sizeof(*privkey)); + int ret; + + ret = gnutls_x509_privkey_init(&privkey->key); + if(ret < 0) + goto crypt_rsa_generate_privkey_fail; + privkey->free_key = 1; + + ret = gnutls_x509_privkey_generate(privkey->key, GNUTLS_PK_RSA, keysize, 0); + if (ret < 0) + goto crypt_rsa_generate_privkey_fail; + + ret = gnutls_privkey_init(&privkey->privkey); + if(ret < 0) + goto crypt_rsa_generate_privkey_fail; + privkey->free_privkey = 1; + + ret = gnutls_privkey_import_x509(privkey->privkey, privkey->key, 0); + if(ret < 0) + goto crypt_rsa_generate_privkey_fail; + + return privkey; + crypt_rsa_generate_privkey_fail: + crypt_rsa_unload_privkey(privkey); + return NULL; +} + +char *crypt_rsa_export_privkey(struct crypt_rsa_privkey *privkey, int pubkey) { + size_t size = 1024; + char *buffer = malloc(size); + int ret; + + if(pubkey) { + gnutls_pubkey_t pkey; + ret = gnutls_pubkey_init(&pkey); + if(ret < 0) { + free(buffer); + return NULL; + } + ret = gnutls_pubkey_import_privkey(pkey, privkey->privkey, GNUTLS_KEY_KEY_ENCIPHERMENT | GNUTLS_KEY_DIGITAL_SIGNATURE, 0); + if(ret < 0) { + free(buffer); + gnutls_pubkey_deinit(pkey); + return NULL; + } + ret = gnutls_pubkey_export(pkey, GNUTLS_X509_FMT_PEM, buffer, &size); + if(ret == GNUTLS_E_SHORT_MEMORY_BUFFER) { + buffer = realloc(buffer, size); + ret = gnutls_pubkey_export(pkey, GNUTLS_X509_FMT_PEM, buffer, &size); + } + gnutls_pubkey_deinit(pkey); + } else { + ret = gnutls_x509_privkey_export(privkey->key, GNUTLS_X509_FMT_PEM, buffer, &size); + if(ret == GNUTLS_E_SHORT_MEMORY_BUFFER) { + buffer = realloc(buffer, size); + ret = gnutls_x509_privkey_export(privkey->key, GNUTLS_X509_FMT_PEM, buffer, &size); + } + } + if(ret < 0) { + free(buffer); + return NULL; + } + return buffer; +} + +void crypt_rsa_unload_privkey(struct crypt_rsa_privkey *privkey) { + if(privkey->free_key) + gnutls_x509_privkey_deinit(privkey->key); + if(privkey->free_privkey) + gnutls_privkey_deinit(privkey->privkey); + free(privkey); +} + +struct crypt_rsa_pubkey *crypt_rsa_get_pubkey(struct crypt_rsa_privkey *privkey) { + struct crypt_rsa_pubkey *pubkey = calloc(1, sizeof(*pubkey)); + if(!pubkey) + return NULL; + int ret; + + ret = gnutls_pubkey_init(&pubkey->pubkey); + if(ret < 0) + goto crypt_rsa_get_pubkey_fail; + pubkey->free_pubkey = 1; + + ret = gnutls_pubkey_import_privkey(pubkey->pubkey, privkey->privkey, GNUTLS_KEY_KEY_ENCIPHERMENT | GNUTLS_KEY_DIGITAL_SIGNATURE, 0); + if(ret < 0) + goto crypt_rsa_get_pubkey_fail; + + return pubkey; + crypt_rsa_get_pubkey_fail: + crypt_rsa_unload_pubkey(pubkey); + return NULL; +} + +int crypt_rsa_encrypt_data(struct crypt_rsa_pubkey *pubkey, const char *data, int datalen, char **encrypted) { + const gnutls_datum_t data_dat = {(void *)data, datalen}; + gnutls_datum_t out; + + int ret = gnutls_pubkey_encrypt_data(pubkey->pubkey, 0, &data_dat, &out); + if(ret < 0) + return ret; + + *encrypted = out.data; + return out.size; +} + +int crypt_rsa_decrypt_data(struct crypt_rsa_privkey *privkey, const char *encrypted, int enclen, char **data) { + const gnutls_datum_t enc_dat = {(void *)encrypted, enclen}; + gnutls_datum_t out; + + int ret = gnutls_privkey_decrypt_data(privkey->privkey, 0, &enc_dat, &out); + if(ret < 0) + return ret; + + *data = out.data; + return out.size; +} + +int crypt_rsa_encrypt_maxlen(struct crypt_rsa_pubkey *pubkey) { + //int size = (pubkey->pubkey->bits / 8) - 12; + //todo! + int size = 1024; + return size; +} + +void crypt_rsa_encrypt_free(char *encrypted) { + gnutls_free(encrypted); +} + +void crypt_rsa_decrypt_free(char *data) { + gnutls_free(data); +} + +#elif defined(HAVE_OPENSSL_SSL_H) +*/ + +#include +#include +#include +#include +#include +#include + +struct crypt_rsa_pubkey { + RSA *rsa; +}; + +struct crypt_rsa_privkey { + RSA *rsa; +}; + +void crypt_rsa_init() { + +} + +void crypt_rsa_deinit() { + +} + +RSA *createRSA(unsigned char *key, int public) { + RSA *rsa= NULL; + BIO *keybio ; + keybio = BIO_new_mem_buf(key, -1); + if(!keybio) + return NULL; + if(public) + rsa = PEM_read_bio_RSA_PUBKEY(keybio, &rsa, NULL, NULL); + else + rsa = PEM_read_bio_RSAPrivateKey(keybio, &rsa,NULL, NULL); + BIO_free(keybio); + return rsa; +} + +struct crypt_rsa_pubkey *crypt_rsa_load_pubkey(const char *key) { + struct crypt_rsa_pubkey *pubkey = calloc(1, sizeof(*pubkey)); + if(!pubkey) + return NULL; + + RSA *rsa = createRSA((unsigned char *) key, 1); + + if(!rsa) { + free(pubkey); + return NULL; + } + + pubkey->rsa = rsa; + return pubkey; +} + +void crypt_rsa_unload_pubkey(struct crypt_rsa_pubkey *pubkey) { + RSA_free(pubkey->rsa); + free(pubkey); +} + +char *crypt_rsa_export_pubkey(struct crypt_rsa_pubkey *pubkey) { + BIO *bio = BIO_new(BIO_s_mem()); + PEM_write_bio_RSA_PUBKEY(bio, pubkey->rsa); + + int keylen = BIO_pending(bio); + char *key = calloc(1, keylen+1); + BIO_read(bio, key, keylen); + + BIO_free_all(bio); + return key; +} + +struct crypt_rsa_privkey *crypt_rsa_load_privkey(const char *key) { + struct crypt_rsa_privkey *privkey = calloc(1, sizeof(*privkey)); + if(!privkey) + return NULL; + + RSA *rsa = createRSA((unsigned char *) key, 0); + + if(!rsa) { + free(privkey); + return NULL; + } + + privkey->rsa = rsa; + return privkey; +} + +struct crypt_rsa_privkey *crypt_rsa_generate_privkey(const int keysize) { + struct crypt_rsa_privkey *privkey = calloc(1, sizeof(*privkey)); + if(!privkey) + return NULL; + + BIGNUM *e = BN_new(); + RSA *rsa = RSA_new(); + + BN_set_word(e, 65537); + if (!RSA_generate_key_ex(rsa, keysize, e, NULL)) { + BN_free(e); + RSA_free(rsa); + free(privkey); + return NULL; + } + + privkey->rsa = rsa; + return privkey; +} + +char *crypt_rsa_export_privkey(struct crypt_rsa_privkey *privkey, int pubkey) { + BIO *bio = BIO_new(BIO_s_mem()); + if(pubkey) + PEM_write_bio_RSA_PUBKEY(bio, privkey->rsa); + else + PEM_write_bio_RSAPrivateKey(bio, privkey->rsa, NULL, NULL, 0, NULL, NULL); + + int keylen = BIO_pending(bio); + char *key = calloc(1, keylen+1); + BIO_read(bio, key, keylen); + + BIO_free_all(bio); + return key; +} + +void crypt_rsa_unload_privkey(struct crypt_rsa_privkey *privkey) { + RSA_free(privkey->rsa); + free(privkey); +} + +struct crypt_rsa_pubkey *crypt_rsa_get_pubkey(struct crypt_rsa_privkey *privkey) { + struct crypt_rsa_pubkey *pubkey = calloc(1, sizeof(*pubkey)); + if(!pubkey) + return NULL; + + RSA *rsa = RSA_new(); + memcpy(rsa, privkey->rsa, sizeof(*rsa)); + + pubkey->rsa = rsa; + return pubkey; +} + +int crypt_rsa_encrypt_data(struct crypt_rsa_pubkey *pubkey, const char *data, int datalen, char **encrypted) { + if(!pubkey) + return 0; + if(datalen > crypt_rsa_encrypt_maxlen(pubkey)) + return 0; + *encrypted = malloc(RSA_size(pubkey->rsa)); + if(!*encrypted) + return 0; + int ret = RSA_public_encrypt(datalen, data, *encrypted, pubkey->rsa, RSA_PKCS1_PADDING); + if(ret <= 0) + free(*encrypted); + return ret; +} + +int crypt_rsa_decrypt_data(struct crypt_rsa_privkey *privkey, const char *encrypted, int enclen, char **data) { + if(!privkey) + return 0; + if(enclen > RSA_size(privkey->rsa)) + return 0; + *data = malloc(RSA_size(privkey->rsa)); + if(!*data) + return 0; + int ret = RSA_private_decrypt(enclen, encrypted, *data, privkey->rsa, RSA_PKCS1_PADDING); + if(ret <= 0) + free(*data); + return ret; +} + +int crypt_rsa_encrypt_maxlen(struct crypt_rsa_pubkey *pubkey) { + return RSA_size(pubkey->rsa) - 12; +} + +void crypt_rsa_encrypt_free(char *encrypted) { + free(encrypted); +} + +void crypt_rsa_decrypt_free(char *data) { + free(data); +} + +//#endif diff --git a/src/crypt_rsa.h b/src/crypt_rsa.h new file mode 100644 index 0000000..7e72176 --- /dev/null +++ b/src/crypt_rsa.h @@ -0,0 +1,42 @@ +/* crypt_rsa.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _crypt_rsa_h +#define _crypt_rsa_h + +struct crypt_rsa_pubkey; +struct crypt_rsa_privkey; + +void crypt_init(); +void crypt_deinit(); + +struct crypt_rsa_pubkey *crypt_rsa_load_pubkey(const char *key); +void crypt_rsa_unload_pubkey(struct crypt_rsa_pubkey *pubkey); +char *crypt_rsa_export_pubkey(struct crypt_rsa_pubkey *privkey); +struct crypt_rsa_privkey *crypt_rsa_load_privkey(const char *key); +struct crypt_rsa_privkey *crypt_rsa_generate_privkey(const int keysize); +void crypt_rsa_unload_privkey(struct crypt_rsa_privkey *privkey); +char *crypt_rsa_export_privkey(struct crypt_rsa_privkey *privkey, int pubkey); +struct crypt_rsa_pubkey *crypt_rsa_get_pubkey(struct crypt_rsa_privkey *privkey); + +int crypt_rsa_encrypt_data(struct crypt_rsa_pubkey *pubkey, const char *data, int datalen, char **encrypted); +int crypt_rsa_decrypt_data(struct crypt_rsa_privkey *privkey, const char *encrypted, int enclen, char **data); +int crypt_rsa_encrypt_maxlen(struct crypt_rsa_pubkey *pubkey); +void crypt_rsa_encrypt_free(char *encrypted); +void crypt_rsa_decrypt_free(char *data); + +#endif diff --git a/src/ircd_auth.c b/src/ircd_auth.c new file mode 100644 index 0000000..8079db1 --- /dev/null +++ b/src/ircd_auth.c @@ -0,0 +1,85 @@ +/* ircd_auth.c - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include + +#include "struct_auth.h" +#include "struct_connection.h" +#include "ircd_client.h" +#include "IOHandler/IOSockets.h" +#include "IOHandler/IODNSLookup.h" +#include "version.h" + +static IODNS_CALLBACK(auth_dns_callback); + +static struct Auth *authlist_first = NULL; +static struct Auth *authlist_last = NULL; + +struct Auth *auth_new(struct Connection *conn) { + struct Auth *auth = calloc(1, sizeof(*auth)); + client_printf(conn, "NOTICE AUTH :*** NextIRCd v%d.%d (%s)", VERSION_NUMBER, patchlevel, revision); + + auth->conn = conn; + time(&auth->startup_time); + + auth->prev = authlist_last; + auth->next = NULL; + if(!authlist_last) + authlist_first = auth; + authlist_last = auth; + + return auth; +} + +void auth_start_dnsreverse(struct Auth *auth) { + client_printf(auth->conn, "NOTICE AUTH :*** Looking up your hostname"); + + struct IODNSAddress *sockaddr; + sockaddr = iosocket_get_remote_addr(auth->conn->socket); + if(sockaddr) { + auth->dnslookup = iodns_getnameinfo(sockaddr->address, sockaddr->addresslen, auth_dns_callback, auth); + } else { + // critical error! + } +} + +static IODNS_CALLBACK(auth_dns_callback) { + struct Auth *auth = event->query->data; + struct IODNSResult *dnsresult = event->result; + + if(event->type == IODNSEVENT_SUCCESS) { + strncpy(auth->host, dnsresult->result.host, HOSTLEN); + client_printf(auth->conn, "NOTICE AUTH :*** Found your hostname (%s)", auth->host); + } else { + struct IODNSAddress *sockaddr = iosocket_get_remote_addr(auth->conn->socket); + if(auth->conn->ipv6) + inet_ntop(AF_INET6, (void *)(&((struct sockaddr_in6 *)sockaddr->address)->sin6_addr), auth->host, HOSTLEN); + else + inet_ntop(AF_INET, (void *)(&((struct sockaddr_in *)sockaddr->address)->sin_addr), auth->host, HOSTLEN); + + client_printf(auth->conn, "NOTICE AUTH :*** Couldn't look up your hostname. Using your IP instead (%s)", auth->host); + } + if(dnsresult) + iodns_free_result(dnsresult); + + auth_try_finish(auth); +} + + +void auth_try_finish(struct Auth *auth) { + +} diff --git a/src/ircd_auth.h b/src/ircd_auth.h new file mode 100644 index 0000000..fde02c4 --- /dev/null +++ b/src/ircd_auth.h @@ -0,0 +1,25 @@ +/* ircd_auth.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _ircd_auth_h +#define _ircd_auth_h + +struct Auth *auth_new(struct Connection *conn); +void auth_start_dnsreverse(struct Auth *auth); +void auth_try_finish(struct Auth *auth); + +#endif diff --git a/src/ircd_client.c b/src/ircd_client.c new file mode 100644 index 0000000..6fddf09 --- /dev/null +++ b/src/ircd_client.c @@ -0,0 +1,52 @@ +/* ircd_client.c - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "ircd_client.h" +#include "ircd_sock.h" +#include "struct_connection.h" +#include "struct_auth.h" +#include "ircd_config.h" +#include "ircd_auth.h" + +#include +#include +#include +#define CLIENT_MAXLEN 512 + +void client_printf(struct Connection *conn, const char *text, ...) { + va_list arg_list; + char sendBuf[CLIENT_MAXLEN]; + int pos; + sendBuf[0] = '\0'; + va_start(arg_list, text); + pos = vsnprintf(sendBuf, CLIENT_MAXLEN - 2, text, arg_list); + va_end(arg_list); + if (pos < 0 || pos > (CLIENT_MAXLEN - 2)) pos = CLIENT_MAXLEN - 2; + sendBuf[pos] = '\n'; + sendBuf[pos+1] = '\0'; + socket_send(conn, sendBuf, pos+1); +} + +void client_connected(struct Connection *conn) { + struct Auth *auth = auth_new(conn); + + auth_start_dnsreverse(auth); +} + +void client_disconnected(struct Connection *conn) { + +} diff --git a/src/ircd_client.h b/src/ircd_client.h new file mode 100644 index 0000000..c4a68a0 --- /dev/null +++ b/src/ircd_client.h @@ -0,0 +1,30 @@ +/* ircd_client.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _ircd_client_h +#define _ircd_client_h + +struct Connection; + +/* -- called from ircd_sock.c */ +void client_connected(struct Connection *conn); +void client_disconnected(struct Connection *conn); +/* -- */ + +void client_printf(struct Connection *conn, const char *text, ...); + +#endif diff --git a/src/ircd_config.c b/src/ircd_config.c new file mode 100644 index 0000000..9e3184b --- /dev/null +++ b/src/ircd_config.c @@ -0,0 +1,348 @@ +/* ircd_config.c - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include "ircd_config.h" +#include "tools.h" + +static char *config_file = "ircd.conf"; + +struct GlobalConfig global_config; +static struct ConfigReloadCallback *config_reload_callbacks = NULL; + +struct ConfigReloadCallback { + confreload_callback_t *callback; + struct ConfigReloadCallback *next; +}; + +#define CONFIG_READ_BUF 512 + +struct ConfigFile { + FILE *file; + int pending_bytes; + char *content_buffer; + int return_value; +}; + +#define ENTRYTYPE_BLOCK 1 +#define ENTRYTYPE_STRING 2 +#define ENTRYTYPE_INTEGER 3 + +struct ConfigEntry { + char *name; + int type; + union { + struct ConfigEntry *elements; + char *str_value; + int int_value; + } data; + struct ConfigEntry *next; +}; + +static char *parse_config_recursive(struct ConfigEntry *centry, char *buffer, struct ConfigFile *configfile); +static void free_entry_rekursiv(struct ConfigEntry *centry); +static int parse_config_block(struct ConfigEntry *centry); + +#define PARSER_FLAG_ESCAPED 0x01 +#define PARSER_FLAG_BLOCK 0x02 +#define PARSER_FLAG_STRING 0x04 +#define PARSER_FLAG_EXPECT_END 0x08 +#define PARSER_FLAG_NEXTCHAR 0x10 +#define PARSER_FLAG_INTEGER 0x20 +#define PARSER_FLAG_EOBN 0x40 /* End of Block name */ +#define PARSER_FLAG_COMMAND 0x80 +static char *parse_config_recursive(struct ConfigEntry *centry, char *buffer, struct ConfigFile *configfile) { + int flags = 0; + int type = (centry ? 0 : ENTRYTYPE_BLOCK); + char cbuf[1024]; + int cbufpos = 0; + struct ConfigEntry *sub_entrys = NULL; + parse_config_recursive_process: + while(*buffer) { + if(flags & PARSER_FLAG_NEXTCHAR) { + buffer++; + if(*buffer == '\0') + break; + } + flags |= PARSER_FLAG_NEXTCHAR; + if(flags & PARSER_FLAG_EOBN) { + flags &= ~(PARSER_FLAG_EOBN | PARSER_FLAG_NEXTCHAR); + struct ConfigEntry *new_entry = malloc(sizeof(*new_entry)); + if (!new_entry) return buffer; + new_entry->name = strdup(cbuf); + buffer = parse_config_recursive(new_entry, buffer, configfile); + if(centry) { + if(sub_entrys) + new_entry->next = sub_entrys; + else + new_entry->next = NULL; + sub_entrys = new_entry; + centry->data.elements = sub_entrys; + } else { + configfile->return_value |= parse_config_block(new_entry); + free_entry_rekursiv(new_entry); + } + } + if(flags & PARSER_FLAG_ESCAPED) { + cbuf[cbufpos++] = *buffer; + flags &= ~PARSER_FLAG_ESCAPED; + continue; + } + if(flags & PARSER_FLAG_EXPECT_END) { + if(*buffer == ';') { + if(centry) + centry->type = type; + return (buffer+1); + } + continue; + } + if(flags & PARSER_FLAG_STRING) { + if(*buffer == '"') { + cbuf[cbufpos] = '\0'; + flags &= ~PARSER_FLAG_STRING; + if(type == ENTRYTYPE_STRING) { + flags |= PARSER_FLAG_EXPECT_END; + if(centry) + centry->data.str_value = strdup(cbuf); + } else if(type == ENTRYTYPE_BLOCK) { + flags |= PARSER_FLAG_EOBN; + } + } else if(*buffer == '\\') + flags |= PARSER_FLAG_ESCAPED; + else + cbuf[cbufpos++] = *buffer; + continue; + } + if(flags & PARSER_FLAG_INTEGER) { + if(!isdigit(*buffer)) { + cbuf[cbufpos] = '\0'; + flags &= ~PARSER_FLAG_INTEGER; + if(type == ENTRYTYPE_INTEGER) { + flags |= PARSER_FLAG_EXPECT_END; + /* a pointer should be big enough to store a int value in it ;) */ + if(centry) + centry->data.int_value = atoi(cbuf); + } + if(*buffer == ';') { + if(centry) + centry->type = type; + return (buffer+1); + } + } else + cbuf[cbufpos++] = *buffer; + continue; + } + if(flags & PARSER_FLAG_COMMAND) { + int found_command = 0; + char *tmp_buffer; + switch(*buffer) { + case '/': + tmp_buffer = buffer; + buffer = strchr(buffer, '\r'); + if(!buffer) + buffer = strchr(tmp_buffer, '\n'); + if(!buffer) + buffer = tmp_buffer + strlen(tmp_buffer)-1; + found_command = 1; + break; + case '*': + //simple search for the next */ + buffer = strstr(buffer, "*/")+1; + found_command = 1; + } + flags &= ~PARSER_FLAG_COMMAND; + if(found_command) + continue; + } + switch(*buffer) { + case '\\': + flags |= PARSER_FLAG_ESCAPED; + break; + case '/': + if(!(flags & PARSER_FLAG_STRING)) { + flags |= PARSER_FLAG_COMMAND; + } + break; + case '{': + flags |= PARSER_FLAG_BLOCK; + type = ENTRYTYPE_BLOCK; + break; + case '}': + if(flags & PARSER_FLAG_BLOCK) + flags &= ~PARSER_FLAG_BLOCK; + flags |= PARSER_FLAG_EXPECT_END; + break; + case '"': + flags |= PARSER_FLAG_STRING; + if(!type) + type = ENTRYTYPE_STRING; + cbufpos = 0; + break; + case ';': + if(centry) + centry->type = type; + return (buffer+1); + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if(!type) + type = ENTRYTYPE_INTEGER; + flags |= PARSER_FLAG_INTEGER; + cbufpos = 0; + cbuf[cbufpos++] = *buffer; + break; + default: + break; + } + } + /* try to get more data */ + if(configfile->pending_bytes) { + int read_bytes = configfile->pending_bytes; + if(read_bytes > CONFIG_READ_BUF) + read_bytes = CONFIG_READ_BUF; + read_bytes = fread(configfile->content_buffer, 1, read_bytes, configfile->file); + configfile->content_buffer[read_bytes] = '\0'; + configfile->pending_bytes -= read_bytes; + buffer = configfile->content_buffer; + goto parse_config_recursive_process; + } + if(centry) + centry->type = type; + return buffer; //end of the buffer +} + +static void free_entry_rekursiv(struct ConfigEntry *centry) { + if(centry->type == ENTRYTYPE_BLOCK) { + struct ConfigEntry *subentry, *nextentry; + for(subentry = centry->data.elements; subentry; subentry = nextentry) { + nextentry = subentry->next; + free_entry_rekursiv(subentry); + } + } else if(centry->type == ENTRYTYPE_STRING && centry->data.str_value) { + free(centry->data.str_value); + } + free(centry->name); + free(centry); +} + +static int parse_config_port_block(struct ConfigEntry *centry); + +static int parse_config_block(struct ConfigEntry *centry) { + int ret = 0; + if(!stricmp(centry->name, "Port")) + ret |= parse_config_port_block(centry); + else { + // ERROR - unknown block name + } + return ret; +} + +static int parse_config_port_block(struct ConfigEntry *centry) { + struct ConfigPortObject *port; + struct ConfigEntry *sentry; + int ret = 0; + if(centry->type != ENTRYTYPE_BLOCK) + return 1; + port = calloc(1, sizeof(*port)); + for(sentry = centry->data.elements; sentry; sentry = sentry->next) { + if(!stricmp(sentry->name, "port") && sentry->type == ENTRYTYPE_INTEGER) + port->port = sentry->data.int_value; + else if(!stricmp(sentry->name, "secure") && sentry->type == ENTRYTYPE_INTEGER) + port->secure = (sentry->data.int_value != 0); + else if(!stricmp(sentry->name, "server") && sentry->type == ENTRYTYPE_INTEGER) + port->server = (sentry->data.int_value != 0); + else if(!stricmp(sentry->name, "ip4only") && sentry->type == ENTRYTYPE_INTEGER) + port->ip4only = (sentry->data.int_value != 0); + else if(!stricmp(sentry->name, "ip6only") && sentry->type == ENTRYTYPE_INTEGER) + port->ip6only = (sentry->data.int_value != 0); + else if(!stricmp(sentry->name, "bind") && sentry->type == ENTRYTYPE_STRING) { + port->bind_addr = sentry->data.str_value; + sentry->data.str_value = NULL; //prevents freeing later + } else { + // ERROR - unknown field in port block + ret = 1; + } + } + if(port->port && !(port->ip4only && port->ip6only)) { + port->next = global_config.ports; + global_config.ports = port; + } else + ret = 1; + return ret; +} + + + + +void init_config(char *configfile) { + if(configfile) + config_file = configfile; + memset(&global_config, 0, sizeof(global_config)); + reload_config(); +} + +void reload_config() { + struct ConfigFile config; + config.file = fopen(config_file, "rb"); + if(!config.file) { + //ERROR + printf("Error loading config file.\n"); + return; + } + fseek(config.file, 0, SEEK_END); + config.pending_bytes = ftell(config.file); + rewind(config.file); + + char content_buffer[CONFIG_READ_BUF+1]; + config.content_buffer = content_buffer; + + int read_bytes = config.pending_bytes; + if(read_bytes > CONFIG_READ_BUF) + read_bytes = CONFIG_READ_BUF; + read_bytes = fread(config.content_buffer, 1, read_bytes, config.file); + config.content_buffer[read_bytes] = '\0'; + config.pending_bytes -= read_bytes; + + config.return_value = 0; + parse_config_recursive(NULL, config.content_buffer, &config); + + fclose(config.file); + + if(!config.return_value) { + //call all the callbacks + } else { + printf("Error loading config file (%d).\n", config.return_value); + } +} + +void reload_config_callback(confreload_callback_t *callback) { + struct ConfigReloadCallback *reload_callback = malloc(sizeof(*reload_callback)); + reload_callback->callback = callback; + reload_callback->next = config_reload_callbacks; + config_reload_callbacks = reload_callback; +} + diff --git a/src/ircd_config.h b/src/ircd_config.h new file mode 100644 index 0000000..0b01871 --- /dev/null +++ b/src/ircd_config.h @@ -0,0 +1,48 @@ +/* ircd_config.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _ircd_config_h +#define _ircd_config_h + +struct GlobalConfig; +struct ConfigPortObject; + +#define CONFRELOAD_CALLBACK(NAME) void NAME() +typedef CONFRELOAD_CALLBACK(confreload_callback_t); + +extern struct GlobalConfig global_config; + +struct GlobalConfig { + struct ConfigPortObject *ports; + +}; + +struct ConfigPortObject { + unsigned int port : 16; + unsigned int secure : 1; + unsigned int server : 1; + unsigned int ip4only : 1; + unsigned int ip6only : 1; + char *bind_addr; + + struct ConfigPortObject *next; +}; + +void init_config(char *configfile); +void reload_config(); + +#endif diff --git a/src/ircd_parse.c b/src/ircd_parse.c new file mode 100644 index 0000000..1bfa8b7 --- /dev/null +++ b/src/ircd_parse.c @@ -0,0 +1,313 @@ +/* ircd_client.c - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include + +#include "tools.h" +#include "IOHandler/IOSockets.h" +#include "ircd_parse.h" +struct Server; +#include "struct_client.h" +#include "struct_auth.h" +#include "struct_servermsg.h" + +typedef int cmd_client_t(struct Client *client, char *argv[], int argc); +typedef int cmd_auth_t(struct Auth *auth, char *argv[], int argc); +typedef int cmd_server_t(struct Server *server, char *argv[], int argc); + +static struct ServerMsg parse_static_srvmsg; + +#define PARSE_CLIFLAG_OPONLY 0x01 + +//include all commands +#include "cmd_nick.h" + + +struct { + struct { + const char *client; + const char *server; + } tokens; + struct { + cmd_client_t *function; + unsigned int min_argc : 8; + unsigned int max_argc : 8; + unsigned int flags : 8; + } client; + struct { + cmd_auth_t *function; + unsigned int min_argc : 8; + unsigned int max_argc : 8; + unsigned int flags : 8; + } auth; + struct { + cmd_server_t *function; + unsigned int min_argc : 8; + unsigned int max_argc : 8; + unsigned int flags : 8; + } server; + +} parse_command_list[] = { + {{"PING", "P"}, /* Ping Command */ + {NULL, 0, 1, 0}, /* Client */ + {NULL, 0, 1, 0}, /* Unauthed */ + {NULL, 0, 1, 0} /* Server */ + }, + {{"PASS", NULL}, /* PASS Command */ + {NULL, 0, 1, 0}, /* Client */ + {NULL, 0, 1, 0}, /* Unauthed */ + {NULL, 0, 1, 0} /* Server */ + }, + {{"NICK", "N"}, /* Nick Command */ + {cmd_nick_cli, 1, 1, 0}, /* Client */ + {cmd_nick_auth, 1, 1, 0}, /* Unauthed */ + {NULL, 0, 1, 0} /* Server */ + }, + {{"USER", "U"}, /* User Command */ + {NULL, 0, 1, 0}, /* Client */ + {NULL, 0, 1, 0}, /* Unauthed */ + {NULL, 0, 1, 0} /* Server */ + }, + + {{NULL, NULL},{NULL, 0, 0, 0},{NULL, 0, 0, 0},{NULL, 0, 0, 0}} +}; + +static char *parse_irc_token(char **data) { + //find next " " + int i; + char *token = *data; + for(i = 0; *data[i]; i++) { + if(*data[i] != ' ') { + *data[i] = '\0'; + *data += i+1; + break; + } + } + return token; +} + +static char **parse_irc_params(char *data, int *argc, int maxargs) { + if(maxargs == 0) { + *argc = 0; + return NULL; + } + char **argv = calloc(maxargs, sizeof(*argv)); + while(*data) { + //skip leading spaces + while (*data == ' ') + *data++ = 0; + if (*data == ':') { + //the rest is a single parameter + argv[*argc++] = data + 1; + break; + } + argv[*argc++] = data; + if (*argc >= maxargs) + break; + while (*data != ' ' && *data) + data++; + } + return argv; +} + +/* Client Data Format +* +*/ +void parse_client_data(struct Client *client, char *data) { + char *token = parse_irc_token(&data); + int found = 0; + int i; + for(i = 0; (parse_command_list[i].tokens.client || parse_command_list[i].tokens.server); i++) { + if(stricmp(parse_command_list[i].tokens.client, token)) { + found = 1; + break; + } + } + if(found && !parse_command_list[i].client.function) { + // reply 462 You may not reregister + } else if(found) { + int argc; + char **argv = parse_irc_params(data, &argc, parse_command_list[i].client.max_argc); + if(argc < parse_command_list[i].client.min_argc) { + // reply 461 Not enough parameters + } else { + int ret = parse_command_list[i].client.function(client, argv, argc); + if(ret) { + // error occurred! + // do something? + } + } + free(argv); + } else { + // reply 421 Unknown command + } +} + +void parse_unauth_data(struct Auth *auth, char *data) { + char *token = parse_irc_token(&data); + int found = 0; + int i; + for(i = 0; (parse_command_list[i].tokens.client || parse_command_list[i].tokens.server); i++) { + if(stricmp(parse_command_list[i].tokens.client, token)) { + found = 1; + break; + } + } + if(found && !parse_command_list[i].auth.function) { + // reply 451 Register first. + } else if(found) { + int argc; + char **argv = parse_irc_params(data, &argc, parse_command_list[i].auth.max_argc); + if(argc < parse_command_list[i].auth.min_argc) { + // reply 461 Not enough parameters + } else { + int ret = parse_command_list[i].auth.function(auth, argv, argc); + if(ret) { + // error occurred! + // do something? + } + } + free(argv); + } else { + // reply 421 Unknown command + } +} + +/* Unicast Multicast Broadcast +* 4 Bytes 4 Bytes 4 Bytes +* 2 Bytes 2 Bytes 2 Bytes +* 1 Byte 1 Byte 1 Byte +* x Bytes x Bytes x Bytes +* " " 1 Byte " " 1 Byte " " 1 Byte +* 4 Bytes 1 Byte 1 Byte +* 4 Bytes +* 4 Bytes +* +*/ +void parse_server_data(struct Server *server, struct IOSocketBuffer *buffer) { + struct ServerMsg *srvmsg = &parse_static_srvmsg; + unsigned char *buf = (unsigned char *)buffer->buffer; + unsigned int buflen, require_more = 0; + int i; + + while(buffer->bufpos >= 9 && !require_more) { //require at least 9 Bytes + srvmsg->source.srvnum = ((buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]); + srvmsg->resolved_source = 0; + srvmsg->msglen = ((buf[4] << 8) | buf[5]); + srvmsg->msgflags = buf[6]; + srvmsg->msgtype = (buf[6] & SERVERMSG_TYPEMASK); + + if(buffer->bufpos < srvmsg->msglen) { + require_more = 1; + break; + } + + for(i = 0; buffer->bufpos > i+7; i++) { + if(buf[i+7] == ' ') { + if(i >= MAXSERVERTOKENLEN) + srvmsg->token[MAXSERVERTOKENLEN] = '\0'; + else + srvmsg->token[i] = '\0'; + break; + } + if(i >= MAXSERVERTOKENLEN) + continue; + srvmsg->token[i] = buf[i+7]; + } + if(buf[i+7] != ' ') { + require_more = 1; + break; + } + buf += i+8; + buflen = buffer->bufpos - (i+8); + + switch(srvmsg->msgtype) { + case SERVERMSG_TYPE_UNICAST: + if(buflen < 4) { + require_more = 1; + break; + } + srvmsg->destinations = malloc(sizeof(struct ServerMsgDstMap)); + srvmsg->destinations->dstcount = 1; + srvmsg->destinations->dst[0].destination.srvnum = ((buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]); + srvmsg->destinations->dst[0].resolved_destination = 0; + break; + case SERVERMSG_TYPE_MULTICAST: + if(buflen < 5) { + require_more = 1; + break; + } + unsigned int srvcount = buf[0]; + buf++; + buflen--; + if(buflen < (srvcount * 4)) { + require_more = 1; + break; + } + srvmsg->destinations = malloc(sizeof(struct ServerMsgDstMap) + (sizeof(struct ServerMsgDestination) * (srvcount - 1))); + srvmsg->destinations->dstcount = srvcount; + for(i = 0; i < srvcount; i++) { + srvmsg->destinations->dst[i].destination.srvnum = ((buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]); + srvmsg->destinations->dst[i].resolved_destination = 0; + buf += 4; + buflen -= 4; + } + break; + case SERVERMSG_TYPE_BROADCAST: + if(buflen == 0) { + require_more = 1; + break; + } + srvmsg->destinations = NULL; + srvmsg->msgttl = buf[0]; + buf++; + buflen--; + break; + default: + // PARSE ERROR + goto parse_server_data_finish; + } + + srvmsg->arglen = srvmsg->msglen - (buf - (unsigned char *)buffer->buffer); + srvmsg->args = buf; + + int found = 0; + for(i = 0; (parse_command_list[i].tokens.client || parse_command_list[i].tokens.server); i++) { + if(stricmp(parse_command_list[i].tokens.server, srvmsg->token)) { + found = 1; + break; + } + } + if(!found) + goto parse_server_data_finish; + + //exec command function + + + parse_server_data_finish: + if(srvmsg->destinations) + free(srvmsg->destinations); + + if(srvmsg->msglen > buffer->bufpos) { + memmove(buffer->buffer, buffer->buffer + srvmsg->msglen, srvmsg->msglen - buffer->bufpos); + buffer->bufpos -= srvmsg->msglen; + } else + buffer->bufpos = 0; + } +} + diff --git a/src/ircd_parse.h b/src/ircd_parse.h new file mode 100644 index 0000000..2360273 --- /dev/null +++ b/src/ircd_parse.h @@ -0,0 +1,33 @@ +/* ircd_parse.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _ircd_parse_h +#define _ircd_parse_h + +struct Client; +struct Auth; +struct Server; +struct IOSocketBuffer; + +/* -- called from ircd_client.c */ +void parse_client_data(struct Client *client, char *data); +void parse_unauth_data(struct Auth *auth, char *data); +void parse_server_data(struct Server *server, struct IOSocketBuffer *buffer); +/* -- */ + + +#endif diff --git a/src/ircd_sock.c b/src/ircd_sock.c new file mode 100644 index 0000000..5e75008 --- /dev/null +++ b/src/ircd_sock.c @@ -0,0 +1,221 @@ +/* ircd_sock.c - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "ircd_config.h" +#include "ircd_sock.h" +#include "ircd_client.h" +#include "ircd_parse.h" +#include "struct_connection.h" + +#include "IOHandler/IOSockets.h" + +#include +#include +#include // @debug + +static struct Connection *sockets_listening = NULL; +static struct Connection *sockets_first = NULL; +static struct Connection *sockets_last = NULL; + +static CONFRELOAD_CALLBACK(sockets_config_reload); +static IOSOCKET_CALLBACK(sockets_iohandler_callback); +static void sockets_free_connection(struct Connection *sock); + +void init_sockets() { + reload_config_callback(sockets_config_reload); + sockets_config_reload(); /* open all listening sockets */ +} + + +static void sockets_append_list(struct Connection *conn) { + if(conn->listening) { + conn->next = sockets_listening; + sockets_listening = conn; + } else { + conn->next = NULL; + conn->prev = sockets_last; + if(sockets_last) + sockets_last->next = conn; + sockets_last = conn; + if(!sockets_first) + sockets_first = conn; + } +} + +static void sockets_remove_list(struct Connection *conn) { + if(conn->listening) { + struct Connection *prev; + if(sockets_listening == conn) + sockets_listening = conn->next; + else { + for(prev = sockets_listening; prev; prev = prev->next) { + if(prev->next == conn) + break; + } + if(prev) + prev->next = conn->next; + } + } else { + if(conn->next) + conn->next->prev = conn->prev; + else + sockets_last = conn->prev; + if(conn->prev) + conn->prev->next = conn->next; + else + sockets_first = conn->next; + } +} + +static void sockets_free_connection(struct Connection *conn) { + free(conn); +} + +static void sockets_close_listening() { + struct Connection *conn; + while((conn = sockets_listening)) { + sockets_remove_list(conn); + iosocket_close(conn->socket); + sockets_free_connection(conn); + } +} + +static int sockets_add_listening(struct ConfigPortObject *conf_port, char *bind_addr, char *certfile, char *keyfile, int socket_flags) { + if(!conf_port) + return -1; + + struct IOSocket *iosock; + if(!conf_port->secure) + iosock = iosocket_listen_flags(bind_addr, conf_port->port, sockets_iohandler_callback, socket_flags); + else if(certfile && keyfile) + iosock = iosocket_listen_ssl_flags(bind_addr, conf_port->port, certfile, keyfile, sockets_iohandler_callback, socket_flags); + else + return -1; + + if(!iosock) + return -1; + + printf("Added Listener Socket to Port %d.\n", conf_port->port); // @debug + + struct Connection *connection; + connection = calloc(1, sizeof(*connection)); + connection->listening = 1; + connection->socket = iosock; + connection->server = conf_port->server; + iosock->data = connection; + sockets_append_list(connection); + return 0; +} + +static void sockets_accept_client(struct IOSocket *new_client, struct Connection *listener) { + struct Connection *connection; + connection = calloc(1, sizeof(*connection)); + connection->socket = new_client; + connection->ssl = new_client->ssl; + + new_client->parse_delimiter = 1; + new_client->parse_empty = 0; + strcpy((char*) new_client->delimiters, "\r\n"); + + connection->parent = listener; + new_client->data = connection; + sockets_append_list(connection); + + client_connected(connection); +} + +static CONFRELOAD_CALLBACK(sockets_config_reload) { + struct ConfigPortObject *conf_port; + char *certfile, *keyfile; + + sockets_close_listening(); + + certfile = NULL; /* to be continued */ + keyfile = NULL; + + for(conf_port = global_config.ports; conf_port; conf_port = conf_port->next) { + printf("port: %d\n", conf_port->port); // @debug + + //add 2 listeners (IPv4 & IPv6) here + if(!conf_port->ip4only) { + char *bind_addr = conf_port->bind_addr; + if(!bind_addr) + bind_addr = "::1"; + sockets_add_listening(conf_port, bind_addr, certfile, keyfile, IOSOCKET_ADDR_IPV6); + } + + if(!conf_port->ip6only) { + char *bind_addr = conf_port->bind_addr; + if(!bind_addr) + bind_addr = "0.0.0.0"; + sockets_add_listening(conf_port, bind_addr, certfile, keyfile, IOSOCKET_ADDR_IPV4); + } + } +} + +static IOSOCKET_CALLBACK(sockets_iohandler_callback) { + struct Connection *connection = event->socket->data; + + switch(event->type) { + case IOSOCKETEVENT_ACCEPT: + sockets_accept_client(event->data.accept_socket, connection); + break; + + case IOSOCKETEVENT_NOTCONNECTED: + case IOSOCKETEVENT_CLOSED: + sockets_remove_list(connection); + if(connection->server) { + + } else { + client_disconnected(connection); + } + sockets_free_connection(connection); + break; + + case IOSOCKETEVENT_DNSFAILED: + if(connection->listening) { + // listening socket could not be opened + } else { + sockets_remove_list(connection); + client_disconnected(connection); + sockets_free_connection(connection); + } + break; + + case IOSOCKETEVENT_RECV: + if(!connection->authed) + parse_unauth_data(connection->data.auth, event->data.recv_str); + else if(connection->server) + parse_server_data(connection->data.server, event->data.recv_buf); + else + parse_client_data(connection->data.client, event->data.recv_str); + break; + + default: + break; + } +} + +void socket_send(struct Connection *conn, char *data, int len) { + iosocket_send(conn->socket, data, len); +} + +void socket_set_server(struct Connection *conn) { + struct IOSocket *iosock = conn->socket; + iosock->parse_delimiter = 0; + conn->server = 1; +} diff --git a/src/ircd_sock.h b/src/ircd_sock.h new file mode 100644 index 0000000..d0f52f4 --- /dev/null +++ b/src/ircd_sock.h @@ -0,0 +1,28 @@ +/* ircd_sock.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _ircd_sock_h +#define _ircd_sock_h + +void init_sockets(); + + +struct Connection; + +void socket_send(struct Connection *conn, char *data, int len); + +#endif diff --git a/src/ircd_users.c b/src/ircd_users.c new file mode 100644 index 0000000..ef0bc82 --- /dev/null +++ b/src/ircd_users.c @@ -0,0 +1,34 @@ +/* ircd_users.c - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include "struct_user.h" + +struct UserDictEntry { + struct User *user; + time_t lastaccess; + struct UserDict *next, *prev; +}; + +struct UserDict { + struct UserDictEntry *users[65536]; // 2^16 (first 16 bit of nickhash as identifier) +}; + + +void find_user_by_nick(char *nick) { + //calculate checksum + //search in UserDict + //ask trusted server multicast +} diff --git a/src/main.c b/src/main.c new file mode 100644 index 0000000..848023a --- /dev/null +++ b/src/main.c @@ -0,0 +1,42 @@ +/* main.c - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "ircd_config.h" +#include "ircd_sock.h" +#include "IOHandler/IOHandler.h" +#include "IOHandler/IOLog.h" + +#include +#include + +static IOLOG_CALLBACK(io_log); + +int main(int argc, char *argv[]) { + iohandler_init(); + iolog_register_callback(io_log); + + + init_config(NULL); + init_sockets(); + + iohandler_run(); + return 0; +} + +static IOLOG_CALLBACK(io_log) { + printf("%s", message); +} diff --git a/src/struct_auth.h b/src/struct_auth.h new file mode 100644 index 0000000..335917e --- /dev/null +++ b/src/struct_auth.h @@ -0,0 +1,52 @@ +/* struct_auth.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _struct_auth_h +#define _struct_auth_h +#include "struct_user.h" +#include + +#define PASSLEN 50 + +struct IODNSQuery; + +struct Auth { + struct Connection *conn; + + char nick[NICKLEN+1]; + char ident[IDENTLEN+1]; + char realname[REALLEN+1]; + char host[HOSTLEN+1]; + char passwd[PASSLEN+1]; + + unsigned int ping_probe; + time_t startup_time; + + struct IODNSQuery *dnslookup; + + unsigned int server : 1; + unsigned int have_nick : 1; + unsigned int have_user : 1; + unsigned int have_pass : 1; + + unsigned int have_dnsresolv : 1; + unsigned int have_pong : 1; + + struct Auth *prev, *next; +}; + +#endif diff --git a/src/struct_channel.h b/src/struct_channel.h new file mode 100644 index 0000000..a5c028b --- /dev/null +++ b/src/struct_channel.h @@ -0,0 +1,34 @@ +/* struct_channel.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _struct_channel_h +#define _struct_channel_h +#include "crypto_md5.h" + +#define NAMELEN 200 +#define TOPICLEN 500 +#define HOSTLEN 63 +#define REALLEN 50 + +struct Channel { + char name[NAMELEN+1]; + char namehash[MDHASHLEN]; + + struct Member *users; +}; + +#endif diff --git a/src/struct_client.h b/src/struct_client.h new file mode 100644 index 0000000..a944bb2 --- /dev/null +++ b/src/struct_client.h @@ -0,0 +1,58 @@ +/* struct_client.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _struct_client_h +#define _struct_client_h +#include "crypt_md5.h" +#include "struct_user.h" + +struct Connection; +struct User; + +struct ClientNickChange; + +#define AWAYLEN 300 + +/* Client represents a local User */ +struct Client { + struct Connection *conn; + struct User *user; + + struct ClientNickChange *nickchange; + + time_t userage; + time_t nickage; + time_t lastping; + time_t idlelen; + + char *userage_sign; + char *nickage_sign; + + char awaymsg[AWAYLEN-1]; + + unsigned int isonline : 1; + unsigned int isaway : 1; + + struct Client *prev, *next; +}; + +struct ClientNickChange { + char newnick[NICKLEN+1]; + char nickhash[MDHASHLEN]; +}; + +#endif diff --git a/src/struct_connection.h b/src/struct_connection.h new file mode 100644 index 0000000..56f1d40 --- /dev/null +++ b/src/struct_connection.h @@ -0,0 +1,43 @@ +/* struct_connection.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _struct_connection_h +#define _struct_connection_h + +struct IOSocket; +struct Auth; +struct Client; +struct Server; + +struct Connection { + struct IOSocket *socket; + struct Connection *parent; + unsigned int listening : 1; + unsigned int server : 1; + unsigned int ssl : 1; + + unsigned int authed : 1; + union { + struct Auth *auth; + struct Client *client; + struct Server *server; + } data; + + struct Connection *next, *prev; /* managed by ircd_sock.c */ +}; + +#endif diff --git a/src/struct_member.h b/src/struct_member.h new file mode 100644 index 0000000..3f723fc --- /dev/null +++ b/src/struct_member.h @@ -0,0 +1,41 @@ +/* struct_member.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _struct_member_h +#define _struct_member_h + +struct Channel; +struct User; +struct Server; + +struct Member { + struct Channel *chan; + union { + struct User *user; + struct Server *server; + } user; + + unsigned int isserver : 1; + unsigned int isowner : 1; + unsigned int hasop : 1; + unsigned int hasvoice : 1; + + struct Member *prev_user, *next_user; + struct Member *prev_chan, *next_chan; +}; + +#endif diff --git a/src/struct_servermsg.h b/src/struct_servermsg.h new file mode 100644 index 0000000..09b1460 --- /dev/null +++ b/src/struct_servermsg.h @@ -0,0 +1,64 @@ +/* struct_servermsg.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _struct_servermsg_h +#define _struct_servermsg_h + +#define MAXSERVERTOKENLEN 5 + +#define SERVERMSG_TYPE_UNICAST 0x01 +#define SERVERMSG_TYPE_MULTICAST 0x02 +#define SERVERMSG_TYPE_BROADCAST 0x03 +#define SERVERMSG_TYPEMASK 0x07 +#define SERVERMSG_FLAG_ENCRYPTED 0x08 +#define SERVERMSG_FLAGMASK 0xF8 + +struct ServerMsgDestination { + union { + struct Server *server; + unsigned int srvnum; + } destination; + unsigned int resolved_destination : 1; +}; + +struct ServerMsgDstMap { + unsigned int dstcount : 8; + struct ServerMsgDestination dst[1]; +}; + +struct ServerMsg { + union { + struct Server *server; + unsigned int srvnum; + } source; + unsigned int resolved_source : 1; + + unsigned int msgtype : 3; + unsigned int msgflags : 8; + unsigned int msglen : 16; + unsigned int arglen : 16; + unsigned int msgttl : 8; + + char token[MAXSERVERTOKENLEN+1]; + + struct ServerMsgDstMap *destinations; + + + unsigned char *args; +}; + +#endif diff --git a/src/struct_user.h b/src/struct_user.h new file mode 100644 index 0000000..57aac3d --- /dev/null +++ b/src/struct_user.h @@ -0,0 +1,44 @@ +/* struct_user.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _struct_user_h +#define _struct_user_h +#include "crypt_md5.h" + +#define NICKLEN 30 +#define IDENTLEN 15 +#define HOSTLEN 63 +#define REALLEN 50 + +struct User { + unsigned int usernum; + unsigned int servernum; + + struct Server *server; + + unsigned int islocal : 1; + + char nick[NICKLEN+1]; + char nickhash[MDHASHLEN]; + char ident[IDENTLEN+1]; + char realname[REALLEN+1]; + char hostname[HOSTLEN+1]; + + struct Member *channels; +}; + +#endif diff --git a/src/tools.c b/src/tools.c new file mode 100644 index 0000000..acf4504 --- /dev/null +++ b/src/tools.c @@ -0,0 +1,112 @@ +/* tools.c - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include "tools.h" + +int stricmp (const char *s1, const char *s2) { + return stricmplen(s1, s2, -1); +} + +int stricmplen(const char *s1, const char *s2, int len) { + if (s1 == NULL) + return (s2 == NULL ? 0 : -(*s2)); + if (s2 == NULL) + return *s1; + char c1, c2; + int i = 0; + while ((c1 = tolower(*s1)) == (c2 = tolower(*s2))) { + if (*s1 == '\0') + break; + i++; + s1++; + s2++; + if(len != -1 && i == len) break; + } + return c1 - c2; +} + +/* copied from IRCU 2.10.12 match.c */ +/* + * Compare if a given string (name) matches the given + * mask (which can contain wild cards: '*' - match any + * number of chars, '?' - match any single character. + * + * return 0, if match + * 1, if no match + * + * Originally by Douglas A Lewis (dalewis@acsu.buffalo.edu) + * Rewritten by Timothy Vogelsang (netski), net@astrolink.org + */ +int match(const char *mask, const char *name) +{ + const char *m = mask, *n = name; + const char *m_tmp = mask, *n_tmp = name; + int star_p; + + for (;;) switch (*m) { + case '\0': + if (!*n) + return 0; + backtrack: + if (m_tmp == mask) + return 1; + m = m_tmp; + n = ++n_tmp; + if (*n == '\0') + return 1; + break; + case '\\': + m++; + /* allow escaping to force capitalization */ + if (*m++ != *n++) + goto backtrack; + break; + case '*': case '?': + for (star_p = 0; ; m++) { + if (*m == '*') + star_p = 1; + else if (*m == '?') { + if (!*n++) + goto backtrack; + } else break; + } + if (star_p) { + if (!*m) + return 0; + else if (*m == '\\') { + m_tmp = ++m; + if (!*m) + return 1; + for (n_tmp = n; *n && *n != *m; n++) ; + } else { + m_tmp = m; + for (n_tmp = n; *n && tolower(*n) != tolower(*m); n++) ; + } + } + /* and fall through */ + default: + if (!*n) + return *m != '\0'; + if (tolower(*m) != tolower(*n)) + goto backtrack; + m++; + n++; + break; + } +} diff --git a/src/tools.h b/src/tools.h new file mode 100644 index 0000000..f98e06f --- /dev/null +++ b/src/tools.h @@ -0,0 +1,25 @@ +/* tools.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#ifndef _tools_h +#define _tools_h + +int stricmp (const char *s1, const char *s2); +int stricmplen (const char *s1, const char *s2, int len); + +int match(const char *mask, const char *name); + +#endif diff --git a/src/version.h b/src/version.h new file mode 100644 index 0000000..813b6eb --- /dev/null +++ b/src/version.h @@ -0,0 +1,31 @@ +/* version.h - NextIRCd + * Copyright (C) 2012-2013 Philipp Kreil (pk910) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#ifndef _version_h +#define _version_h + +#define VERSION_NUMBER 0 +#define VERSION_PATCHLEVEL 0 + +extern const char *compilation; +extern const char *creation; +extern const char *revision; +extern const char *codelines; +extern const int revision_master; +extern const char *dev_revision; +extern const int patchlevel; + +#endif diff --git a/src/version.sh b/src/version.sh new file mode 100755 index 0000000..dfda6bd --- /dev/null +++ b/src/version.sh @@ -0,0 +1,75 @@ +#! /bin/sh +echo "Extracting version.c ..." + +if test -r version.c +then + compilation=`sed -n 's/^const char \*compilation = \"\(.*\)\";/\1/p' < version.c` + if test ! "$compilation" ; then compilation=0; fi +else + compilation=0 +fi + +compilation=`expr $compilation + 1` + +creation=`date | \ +awk '{if (NF == 6) \ + { print $1 " " $2 " " $3 " " $6 " at " $4 " " $5 } \ +else \ + { print $1 " " $2 " " $3 " " $7 " at " $4 " " $5 " " $6 }}'` + +codelines=`find . -type f -regex '\./.*\.h' -or -regex '\./.*\.c' |xargs cat|wc -l` + + +git_revision_id=`git rev-list -n 1 --pretty="format:%h" --header refs/heads/master | grep '^[0-9a-f]*$'` +if test "x$git_revision_id" = "x" ; then + git_revision="0" + git_commitcount="0" + git_is_stable="1" + git_dev_rev="" +else + git_commitcount=`git rev-list --oneline --first-parent refs/heads/master | wc -l | sed "s/[ \t]//g"` + git_revision="git-$git_revision_id" + + git_real_revision_id=`git rev-list -n 1 --pretty="format:%h" --header HEAD | grep '^[0-9a-f]*$'` + if test "$git_revision_id" = "$git_real_revision_id" ; then + git_is_stable="1" + git_dev_rev="" + else + git_is_stable="0" + git_dev_rev="git-$git_real_revision_id" + fi +fi + + +/bin/cat > version.c <. + */ +//Auto generated file! + +#include "version.h" + +const char *compilation = "$compilation"; +const char *creation = "$creation"; +const char *revision = "$git_revision"; +const char *codelines = "$codelines"; +const int revision_master = $git_is_stable; +const char *dev_revision = "$git_dev_rev"; + +const int patchlevel = ($git_commitcount ? ($git_commitcount - VERSION_PATCHLEVEL) : 0); + +!SUB!THIS! +