From ce52b2a412383c7958cbd6f0dc8251fbf28b3c08 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 24 Feb 2015 03:13:01 +0000 Subject: [PATCH] moved jako16 door daemon and firmware to jk16_door at github --- checkcard.pl | 79 ----- door_daemon/AUTHORS | 1 - door_daemon/LICENSE | 694 ------------------------------------------- door_daemon/Makefile | 70 ----- door_daemon/client_list.c | 117 -------- door_daemon/client_list.h | 42 --- door_daemon/command_queue.c | 118 -------- door_daemon/command_queue.h | 46 --- door_daemon/configure | 107 ------- door_daemon/daemon.h | 173 ----------- door_daemon/datatypes.h | 49 --- door_daemon/door_daemon.c | 635 --------------------------------------- door_daemon/log.c | 259 ---------------- door_daemon/log.h | 90 ------ door_daemon/log_targets.h | 363 ---------------------- door_daemon/options.c | 262 ---------------- door_daemon/options.h | 50 ---- door_daemon/sig_handler.c | 166 ----------- door_daemon/sig_handler.h | 43 --- door_daemon/string_list.c | 113 ------- door_daemon/string_list.h | 56 ---- firmware-messages.txt | 48 --- firmware/Makefile | 217 -------------- firmware/README | 19 -- firmware/tuer.pde | 641 --------------------------------------- mifare-read/Makefile | 30 -- mifare-read/mifare-read.c | 93 ------ reset_openpcd.sh | 10 - 28 files changed, 4591 deletions(-) delete mode 100755 checkcard.pl delete mode 100644 door_daemon/AUTHORS delete mode 100644 door_daemon/LICENSE delete mode 100644 door_daemon/Makefile delete mode 100644 door_daemon/client_list.c delete mode 100644 door_daemon/client_list.h delete mode 100644 door_daemon/command_queue.c delete mode 100644 door_daemon/command_queue.h delete mode 100755 door_daemon/configure delete mode 100644 door_daemon/daemon.h delete mode 100644 door_daemon/datatypes.h delete mode 100644 door_daemon/door_daemon.c delete mode 100644 door_daemon/log.c delete mode 100644 door_daemon/log.h delete mode 100644 door_daemon/log_targets.h delete mode 100644 door_daemon/options.c delete mode 100644 door_daemon/options.h delete mode 100644 door_daemon/sig_handler.c delete mode 100644 door_daemon/sig_handler.h delete mode 100644 door_daemon/string_list.c delete mode 100644 door_daemon/string_list.h delete mode 100644 firmware-messages.txt delete mode 100755 firmware/Makefile delete mode 100644 firmware/README delete mode 100644 firmware/tuer.pde delete mode 100755 mifare-read/Makefile delete mode 100644 mifare-read/mifare-read.c delete mode 100755 reset_openpcd.sh diff --git a/checkcard.pl b/checkcard.pl deleted file mode 100755 index 4e3816f..0000000 --- a/checkcard.pl +++ /dev/null @@ -1,79 +0,0 @@ -#!/usr/bin/perl -w - -use Socket; -use strict; -my $fh; - -my $socketfile = $ARGV[0] || "/var/run/tuer/door_cmd.socket"; -my $keysfile = '/flash/keys'; - -sleep(1) while (! -S $socketfile); -my $socketaddr = sockaddr_un($socketfile); - -my %good; -my $keys_last_read=0; - -sub read_keys -{ - %good=(); - my $keys; - open $keys,$keysfile; - while (<$keys>) - { - chomp; - if ($_ =~ /^([0-9A-Fa-f]{8})\s+(.+)$/) - { - $good{$1}=$2; - } - } - close $keys; - $keys_last_read = -M ($keysfile); -} - -sub send_to_fifo -{ - socket(my $conn, PF_UNIX, SOCK_STREAM,0) || die "socket: $!"; - connect($conn, $socketaddr) || die "socket connect: $!"; - print $conn shift(@_)."\n"; - close($conn); -} - -read_keys(); - - -while (sleep 2) -{ - send_to_fifo("log starting mifare-read"); - open $fh,'/flash/tuer/mifare-read 0 2>&1 |'; - - read_keys() unless ($keys_last_read == -M ($keysfile)); - - READLOOP: while (<$fh>) - { - unless (/UID/) - { - close($fh); - system("/usr/bin/killall -9 mifare-read"); - send_to_fifo("log restarting mifare-read after invalid output"); - last READLOOP; - } - my ($id) = /UID=(\S+)\s+/; - if ($good{$id}) - { - send_to_fifo("toggle Card ".$good{$id}); - } else { - send_to_fifo("log InvalidCard $id"); - } - } -} - -############################################################### -# mifare-read -# -# writes: -# UID=<4 byte in hex, upper-case> -# -# -############################################################### -# -# diff --git a/door_daemon/AUTHORS b/door_daemon/AUTHORS deleted file mode 100644 index 6762c7c..0000000 --- a/door_daemon/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Christian Pointner diff --git a/door_daemon/LICENSE b/door_daemon/LICENSE deleted file mode 100644 index 2b197f8..0000000 --- a/door_daemon/LICENSE +++ /dev/null @@ -1,694 +0,0 @@ -/* - * door_daemon - * - * Copyright (C) 2009 Christian Pointner - * - * This file is part of door_daemon. - * - * door_daemon 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 - * any later version. - * - * door_daemon 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 door_daemon. If not, see . - */ - 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/door_daemon/Makefile b/door_daemon/Makefile deleted file mode 100644 index 95ba1aa..0000000 --- a/door_daemon/Makefile +++ /dev/null @@ -1,70 +0,0 @@ -## -## door_daemon -## -## Copyright (C) 2009 Christian Pointner -## -## This file is part of door_daemon. -## -## door_daemon 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 -## any later version. -## -## door_daemon 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 door_daemon. If not, see . -## - -ifneq ($(MAKECMDGOALS),distclean) -include include.mk -endif - -EXECUTABLE := door_daemon - -OBJ := log.o \ - sig_handler.o \ - options.o \ - string_list.o \ - command_queue.o \ - client_list.o \ - door_daemon.o - - -SRC := $(OBJ:%.o=%.c) - -.PHONY: clean distclean - -all: $(EXECUTABLE) - -%.d: %.c - @set -e; rm -f $@; \ - $(CC) -MM $(CFLAGS) $< > $@.$$$$; \ - sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \ - rm -f $@.$$$$; echo '(re)building $@' - -ifneq ($(MAKECMDGOALS),distclean) --include $(SRC:%.c=%.d) -endif - -door_daemon: $(OBJ) - $(CC) $(OBJ) -o $@ $(LDFLAGS) - -%.o: %.c - $(CC) $(CFLAGS) -c $< - - -distclean: clean - find . -name *.o -exec rm -f {} \; - find . -name "*.\~*" -exec rm -rf {} \; - rm -f include.mk - -clean: - rm -f *.o - rm -f *.d - rm -f *.d.* - rm -f $(EXECUTABLE) - diff --git a/door_daemon/client_list.c b/door_daemon/client_list.c deleted file mode 100644 index 06beb95..0000000 --- a/door_daemon/client_list.c +++ /dev/null @@ -1,117 +0,0 @@ -/* - * door_daemon - * - * Copyright (C) 2009 Christian Pointner - * - * This file is part of door_daemon. - * - * door_daemon 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 - * any later version. - * - * door_daemon 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 door_daemon. If not, see . - */ - -#include - -#include "client_list.h" -#include "datatypes.h" - -client_t* client_get_last(client_t* first) -{ - if(!first) - return NULL; - - while(first->next) { - first = first->next; - } - - return first; -} - -int client_add(client_t** first, int fd) -{ - if(!first) - return -1; - - client_t* new_client = malloc(sizeof(client_t)); - if(!new_client) - return -2; - - new_client->fd = fd; - new_client->status_listener = 0; - new_client->error_listener = 0; - new_client->request_listener = 0; - new_client->next = NULL; - new_client->buffer.offset = 0; - - if(!(*first)) { - *first = new_client; - return 0; - } - - client_get_last(*first)->next = new_client; - - return 0; -} - -void client_remove(client_t** first, int fd) -{ - if(!first || !(*first)) - return; - - client_t* deletee = *first; - if((*first)->fd == fd) { - *first = (*first)->next; - close(deletee->fd); - free(deletee); - return; - } - - client_t* prev = deletee; - deletee = deletee->next; - while(deletee) { - if(deletee->fd == fd) { - prev->next = deletee->next; - close(deletee->fd); - free(deletee); - return; - } - prev = deletee; - deletee = deletee->next; - } -} - -client_t* client_find(client_t* first, int fd) -{ - if(!first) - return NULL; - - while(first) { - if(first->fd == fd) - return first; - - first = first->next; - } - return NULL; -} - -void client_clear(client_t** first) -{ - if(!first || !(*first)) - return; - - while(*first) { - client_t* deletee = *first; - *first = (*first)->next; - close(deletee->fd); - free(deletee); - } -} diff --git a/door_daemon/client_list.h b/door_daemon/client_list.h deleted file mode 100644 index 819362b..0000000 --- a/door_daemon/client_list.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * door_daemon - * - * Copyright (C) 2009 Christian Pointner - * - * This file is part of door_daemon. - * - * door_daemon 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 - * any later version. - * - * door_daemon 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 door_daemon. If not, see . - */ - -#ifndef DOOR_DAEMON_client_list_h_INCLUDED -#define DOOR_DAEMON_client_list_h_INCLUDED - -#include "datatypes.h" - -struct client_struct { - int fd; - int status_listener; - int error_listener; - int request_listener; - struct client_struct* next; - read_buffer_t buffer; -}; -typedef struct client_struct client_t; - -int client_add(client_t** first, int fd); -void client_remove(client_t** first, int fd); -client_t* client_find(client_t* first, int fd); -void client_clear(client_t** first); - -#endif diff --git a/door_daemon/command_queue.c b/door_daemon/command_queue.c deleted file mode 100644 index 0351f5c..0000000 --- a/door_daemon/command_queue.c +++ /dev/null @@ -1,118 +0,0 @@ -/* - * door_daemon - * - * Copyright (C) 2009 Christian Pointner - * - * This file is part of door_daemon. - * - * door_daemon 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 - * any later version. - * - * door_daemon 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 door_daemon. If not, see . - */ - -#include -#include - -#include "command_queue.h" -#include "datatypes.h" - -cmd_t* cmd_get_last(cmd_t* first) -{ - if(!first) - return NULL; - - while(first->next) { - first = first->next; - } - - return first; -} - -int cmd_push(cmd_t** first, int fd, cmd_id_t cmd, const char* param) -{ - if(!first) - return -1; - - cmd_t* new_cmd = malloc(sizeof(cmd_t)); - if(!new_cmd) - return -2; - - new_cmd->fd = fd; - new_cmd->cmd = cmd; - if(param) { - new_cmd->param = strdup(param); - if(!new_cmd->param) { - free(new_cmd); - return -2; - } - } - else - new_cmd->param = NULL; - new_cmd->sent = 0; - new_cmd->tv_start.tv_sec = 0; - new_cmd->tv_start.tv_usec = 0; - new_cmd->next = NULL; - - if(!(*first)) { - *first = new_cmd; - return 0; - } - - cmd_get_last(*first)->next = new_cmd; - - return 0; -} - -void cmd_sent(cmd_t* cmd) -{ - if(!cmd) - return; - - cmd->sent = 1; - gettimeofday(&cmd->tv_start, NULL); -} - -int cmd_has_expired(cmd_t cmd) -{ - struct timeval now; - timerclear(&now); - gettimeofday(&now, NULL); - cmd.tv_start.tv_sec++; - - return timercmp(&cmd.tv_start, &now, <); -} - -void cmd_pop(cmd_t** first) -{ - if(!first || !(*first)) - return; - - cmd_t* deletee = *first; - *first = (*first)->next; - if(deletee->param) - free(deletee->param); - free(deletee); -} - -void cmd_clear(cmd_t** first) -{ - if(!first || !(*first)) - return; - - while(*first) { - cmd_t* deletee = *first; - *first = (*first)->next; - if(deletee->param) - free(deletee->param); - free(deletee); - } -} diff --git a/door_daemon/command_queue.h b/door_daemon/command_queue.h deleted file mode 100644 index 707b4c3..0000000 --- a/door_daemon/command_queue.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * door_daemon - * - * Copyright (C) 2009 Christian Pointner - * - * This file is part of door_daemon. - * - * door_daemon 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 - * any later version. - * - * door_daemon 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 door_daemon. If not, see . - */ - -#ifndef DOOR_DAEMON_command_queue_h_INCLUDED -#define DOOR_DAEMON_command_queue_h_INCLUDED - -#include - -enum cmd_id_enum { OPEN, CLOSE, TOGGLE, RESET, STATUS, LOG , LISTEN }; -typedef enum cmd_id_enum cmd_id_t; - -struct cmd_struct { - int fd; - cmd_id_t cmd; - char* param; - int sent; - struct timeval tv_start; - struct cmd_struct* next; -}; -typedef struct cmd_struct cmd_t; - -int cmd_push(cmd_t** first, int fd, cmd_id_t cmd, const char* param); -void cmd_sent(cmd_t* cmd); -int cmd_has_expired(cmd_t cmd); -void cmd_pop(cmd_t** first); -void cmd_clear(cmd_t** first); - -#endif diff --git a/door_daemon/configure b/door_daemon/configure deleted file mode 100755 index a511c6d..0000000 --- a/door_daemon/configure +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh -# -# -# door_daemon -# -# Copyright (C) 2009 Christian Pointner -# -# This file is part of door_daemon. -# -# door_daemon 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 -# any later version. -# -# door_daemon 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 door_daemon. If not, see . -# - -TARGET=`uname -s` - -CFLAGS='-g -O2' -LDFLAGS='-g -Wall -O2' - -PREFIX='/usr/local' -USERNAME='uanytun' -USERHOME='/var/run/uanytun' - -print_usage() { - echo "configure --help print this" - echo " --target= build target i.e. Linux (default: autodetect)" - echo " --prefix= the installation prefix (default: /usr/local)" - echo " --username= create this user when installing (default: uanytun)" - echo " --userhome= the home directory of the user to be created (default: /var/run/uanytun)" -} - -for arg -do - case $arg in - --target=*) - TARGET=${arg#--target=} - ;; - --prefix=*) - PREFIX=${arg#--prefix=} - ;; - --username=*) - USERNAME=${arg#--username=} - ;; - --userhome=*) - USERHOME=${arg#--userhome=} - ;; - --help) - print_usage - exit 0 - ;; - *) - echo "Unknown argument: $arg" - print_usage - exit 1 - ;; - esac -done - -rm -f include.mk -case $TARGET in - Linux) - echo "Linux specific build options" - ;; - OpenBSD|FreeBSD|NetBSD) - echo "BSD specific build options" - CFLAGS=$CFLAGS' -I/usr/local/include' - LDFLAGS=$LDFLAGS' -L/usr/local/lib' - ;; - *) - echo "Plattform not supported" - exit 1; - ;; -esac - -if [ "x$PREFIX" = "x/usr" ]; then - ETCDIR=/etc -else - ETCDIR=$PREFIX/etc -fi - -cat >> include.mk < - * - * This file is part of uAnytun. - * - * uAnytun 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 - * any later version. - * - * uAnytun 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 uAnytun. If not, see . - */ - -#ifndef UANYTUN_daemon_h_INCLUDED -#define UANYTUN_daemon_h_INCLUDED - -#include -#include -#include -#include -#include -#include -#include - -struct priv_info_struct { - struct passwd* pw_; - struct group* gr_; -}; -typedef struct priv_info_struct priv_info_t; - -int priv_init(priv_info_t* priv, const char* username, const char* groupname) -{ - if(!priv) - return -1; - - priv->pw_ = NULL; - priv->gr_ = NULL; - - priv->pw_ = getpwnam(username); - if(!priv->pw_) { - log_printf(ERROR, "unkown user %s", username); - return -1; - } - - if(groupname) - priv->gr_ = getgrnam(groupname); - else - priv->gr_ = getgrgid(priv->pw_->pw_gid); - - if(!priv->gr_) { - log_printf(ERROR, "unkown group %s", groupname); - return -1; - } - - return 0; -} - -int priv_drop(priv_info_t* priv) -{ - if(!priv || !priv->pw_ || !priv->gr_) { - log_printf(ERROR, "privileges not initialized properly"); - return -1; - } - - if(setgid(priv->gr_->gr_gid)) { - log_printf(ERROR, "setgid('%s') failed: %s", priv->gr_->gr_name, strerror(errno)); - return -1; - } - - gid_t gr_list[1]; - gr_list[0] = priv->gr_->gr_gid; - if(setgroups (1, gr_list)) { - log_printf(ERROR, "setgroups(['%s']) failed: %s", priv->gr_->gr_name, strerror(errno)); - return -1; - } - - if(setuid(priv->pw_->pw_uid)) { - log_printf(ERROR, "setuid('%s') failed: %s", priv->pw_->pw_name, strerror(errno)); - return -1; - } - - log_printf(NOTICE, "dropped privileges to %s:%s", priv->pw_->pw_name, priv->gr_->gr_name); - return 0; -} - - -int do_chroot(const char* chrootdir) -{ - if(getuid() != 0) { - log_printf(ERROR, "this programm has to be run as root in order to run in a chroot"); - return -1; - } - - if(chroot(chrootdir)) { - log_printf(ERROR, "can't chroot to %s: %s", chrootdir, strerror(errno)); - return -1; - } - log_printf(NOTICE, "we are in chroot jail (%s) now", chrootdir); - if(chdir("/")) { - log_printf(ERROR, "can't change to /: %s", strerror(errno)); - return -1; - } -} - -void daemonize() -{ - pid_t pid; - - pid = fork(); - if(pid < 0) { - log_printf(ERROR, "daemonizing failed at fork(): %s, exitting", strerror(errno)); - exit(-1); - } - if(pid) exit(0); - - umask(0); - - if(setsid() < 0) { - log_printf(ERROR, "daemonizing failed at setsid(): %s, exitting", strerror(errno)); - exit(-1); - } - - pid = fork(); - if(pid < 0) { - log_printf(ERROR, "daemonizing failed at fork(): %s, exitting", strerror(errno)); - exit(-1); - } - if(pid) exit(0); - - if ((chdir("/")) < 0) { - log_printf(ERROR, "daemonizing failed at chdir(): %s, exitting", strerror(errno)); - exit(-1); - } - - int fd; - for (fd=0;fd<=2;fd++) // close all file descriptors - close(fd); - fd = open("/dev/null",O_RDWR); // stdin - if(fd == -1) - log_printf(WARNING, "can't open stdin (chroot and no link to /dev/null?)"); - else { - if(dup(fd) == -1) // stdout - log_printf(WARNING, "can't open stdout"); - if(dup(fd) == -1) // stderr - log_printf(WARNING, "can't open stderr"); - } - umask(027); -} - -#endif - diff --git a/door_daemon/datatypes.h b/door_daemon/datatypes.h deleted file mode 100644 index cfac0c4..0000000 --- a/door_daemon/datatypes.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * door_daemon - * - * Copyright (C) 2009 Christian Pointner - * - * This file is part of door_daemon. - * - * door_daemon 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 - * any later version. - * - * door_daemon 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 door_daemon. If not, see . - */ - -#ifndef DOOR_DAEMON_datatypes_h_INCLUDED -#define DOOR_DAEMON_datatypes_h_INCLUDED - -#include -#include - -typedef uint8_t u_int8_t; -typedef uint16_t u_int16_t; -typedef uint32_t u_int32_t; -typedef uint64_t u_int64_t; -/* typedef int8_t int8_t; */ -/* typedef int16_t int16_t; */ -/* typedef int32_t int32_t; */ -/* typedef int64_t int64_t; */ - -struct buffer_struct { - u_int32_t length_; - u_int8_t* buf_; -}; -typedef struct buffer_struct buffer_t; - -struct read_buffer_struct { - u_int32_t offset; - u_int8_t buf[100]; -}; -typedef struct read_buffer_struct read_buffer_t; - -#endif diff --git a/door_daemon/door_daemon.c b/door_daemon/door_daemon.c deleted file mode 100644 index bddb28f..0000000 --- a/door_daemon/door_daemon.c +++ /dev/null @@ -1,635 +0,0 @@ -/* - * door_daemon - * - * Copyright (C) 2009 Christian Pointner - * - * This file is part of door_daemon. - * - * door_daemon 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 - * any later version. - * - * door_daemon 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 door_daemon. If not, see . - */ - -#include "datatypes.h" - -#include -#include - -#include -#include -#include -#include - -#include - -#include "log.h" -#include "sig_handler.h" -#include "options.h" - -#include "command_queue.h" -#include "client_list.h" - -#include "daemon.h" - -int init_command_socket(const char* path) -{ - int fd = socket(AF_UNIX, SOCK_STREAM, 0); - if(fd < 0) { - log_printf(ERROR, "unable to open socket: %s", strerror(errno)); - return -1; - } - - struct sockaddr_un local; - local.sun_family = AF_UNIX; - if(sizeof(local.sun_path) <= strlen(path)) { - log_printf(ERROR, "socket path is to long (max %d)", sizeof(local.sun_path)-1); - return -1; - } - strcpy(local.sun_path, path); - unlink(local.sun_path); - int len = SUN_LEN(&local); - int ret = bind(fd, (struct sockaddr*)&local, len); - if(ret) { - log_printf(ERROR, "unable to bind to '%s': %s", local.sun_path, strerror(errno)); - return -1; - } - - ret = listen(fd, 4); - if(ret) { - log_printf(ERROR, "unable to listen on command socket: %s", local.sun_path, strerror(errno)); - return -1; - } - - log_printf(INFO, "now listening on %s for incoming commands", path); - - return fd; -} - -int send_command(int door_fd, cmd_t* cmd) -{ - if(!cmd) - return -1; - - char c; - switch(cmd->cmd) { - case OPEN: c = 'o'; break; - case CLOSE: c = 'c'; break; - case TOGGLE: c = 't'; break; - case STATUS: c = 's'; break; - case RESET: c = 'r'; break; - case LOG: return 0; - } - - int ret; - do { - ret = write(door_fd, &c, 1); - } while(!ret || (ret == -1 && errno == EINTR)); - - if(ret > 0) { - cmd_sent(cmd); - return 0; - } - - return ret; -} - -int send_response(int fd, const char* response) -{ - if(!response) - return -1; - - int len = strlen(response); - int offset = 0; - int ret; - for(;;) { - ret = write(fd, &response[offset], len - offset); - if(ret < 0) { - if(errno != EINTR) - return ret; - - ret = 0; - } - - offset += ret; - if(offset+1 >= len) - break; - } - do { - ret = write(fd, "\n", 1); - } while(!ret || (ret == -1 && errno == EINTR)); - - if(ret > 0) - return 0; - - return ret; -} - -int process_cmd(const char* cmd, int fd, cmd_t **cmd_q, client_t* client_lst) -{ - log_printf(DEBUG, "processing command from %d", fd); - - if(!cmd_q || !cmd) - return -1; - - cmd_id_t cmd_id; - if(!strncmp(cmd, "open", 4)) - cmd_id = OPEN; - else if(!strncmp(cmd, "close", 5)) - cmd_id = CLOSE; - else if(!strncmp(cmd, "toggle", 6)) - cmd_id = TOGGLE; - else if(!strncmp(cmd, "reset", 5)) - cmd_id = RESET; - else if(!strncmp(cmd, "status", 6)) - cmd_id = STATUS; - else if(!strncmp(cmd, "log", 3)) - cmd_id = LOG; - else if(!strncmp(cmd, "listen", 6)) { - cmd_id = LISTEN; - } - else { - log_printf(WARNING, "unknown command '%s'", cmd); - return 0; - } - char* param = strchr(cmd, ' '); - if(param) - param++; - - if(cmd_id == OPEN || cmd_id == CLOSE || cmd_id == TOGGLE) { - char* resp; - asprintf(&resp, "Request: %s", cmd); - if(resp) { - char* linefeed = strchr(resp, '\n'); - if(linefeed) linefeed[0] = 0; - client_t* client; - int listener_cnt = 0; - for(client = client_lst; client; client = client->next) - if(client->request_listener && client->fd != fd) { - send_response(client->fd, resp); - listener_cnt++; - } - free(resp); - log_printf(DEBUG, "sent request to %d additional listeners", listener_cnt); - } -// else silently ignore memory alloc error - } - - switch(cmd_id) { - case OPEN: - case CLOSE: - case TOGGLE: - case STATUS: - case RESET: { - int ret = cmd_push(cmd_q, fd, cmd_id, param); - if(ret) - return ret; - - log_printf(NOTICE, "command: %s", cmd); - break; - } - case LOG: { - if(param && param[0]) - log_printf(NOTICE, "ext msg: %s", param); - else - log_printf(DEBUG, "ignoring empty ext log message"); - break; - } - case LISTEN: { - client_t* listener = client_find(client_lst, fd); - if(listener) { - if(!param) { - listener->status_listener = 1; - listener->error_listener = 1; - listener->request_listener = 1; - } - else { - if(!strncmp(param, "status", 6)) - listener->status_listener = 1; - else if(!strncmp(param, "error", 5)) - listener->error_listener = 1; - else if(!strncmp(param, "request", 7)) - listener->request_listener = 1; - else { - log_printf(DEBUG, "unkown listener type '%s'", param); - break; - } - } - log_printf(DEBUG, "listener %d requests %s messages", fd, param ? param:"all"); - } - else { - log_printf(ERROR, "unable to add listener %d", fd); - } - break; - } - } - - return 0; -} - -int nonblock_recvline(read_buffer_t* buffer, int fd, cmd_t** cmd_q, client_t* client_lst) -{ - int ret = 0; - for(;;) { - ret = recv(fd, &buffer->buf[buffer->offset], 1, 0); - if(!ret) - return 2; - if(ret == -1 && errno == EAGAIN) - return 0; - else if(ret < 0) - break; - - if(buffer->buf[buffer->offset] == '\n') { - buffer->buf[buffer->offset] = 0; - ret = process_cmd(buffer->buf, fd, cmd_q, client_lst); - buffer->offset = 0; - break; - } - - buffer->offset++; - if(buffer->offset >= sizeof(buffer->buf)) { - log_printf(DEBUG, "string too long (fd=%d)", fd); - buffer->offset = 0; - return 0; - } - } - - return ret; -} - -int process_door(read_buffer_t* buffer, int door_fd, cmd_t **cmd_q, client_t* client_lst) -{ - int ret = 0; - struct timeval tv; - fd_set fds; - FD_ZERO(&fds); - FD_SET(door_fd, &fds); - - for(;;) { - tv.tv_sec = 0; - tv.tv_usec = 0; - ret = select(door_fd+1, &fds, NULL, NULL, &tv); - if(!ret) - return 0; - else if(ret < 0) - return ret; - - ret = read(door_fd, &buffer->buf[buffer->offset], 1); - if(!ret) - return 2; - if(ret == -1 && errno == EAGAIN) - return 0; - else if(ret < 0) - break; - - if(buffer->buf[buffer->offset] == '\n') { - buffer->buf[buffer->offset] = 0; - - if(buffer->offset > 0 && buffer->buf[buffer->offset-1] == '\r') - buffer->buf[buffer->offset-1] = 0; - - log_printf(NOTICE, "door-firmware: %s", buffer->buf); - - int cmd_fd = -1; - if(cmd_q && (*cmd_q)) { - cmd_fd = (*cmd_q)->fd; - send_response(cmd_fd, buffer->buf); - } - - if(!strncmp(buffer->buf, "Status:", 7)) { - client_t* client; - int listener_cnt = 0; - for(client = client_lst; client; client = client->next) - if(client->status_listener && client->fd != cmd_fd) { - send_response(client->fd, buffer->buf); - listener_cnt++; - } - log_printf(DEBUG, "sent status to %d additional listeners", listener_cnt); - } - - if(!strncmp(buffer->buf, "Error:", 6)) { - client_t* client; - int listener_cnt = 0; - for(client = client_lst; client; client = client->next) - if(client->error_listener && client->fd != cmd_fd) { - send_response(client->fd, buffer->buf); - listener_cnt++; - } - log_printf(DEBUG, "sent error to %d additional listeners", listener_cnt); - } - - cmd_pop(cmd_q); - buffer->offset = 0; - return 0; - } - - buffer->offset++; - if(buffer->offset >= sizeof(buffer->buf)) { - log_printf(DEBUG, "string too long (fd=%d)", door_fd); - buffer->offset = 0; - return 0; - } - } - - return ret; -} - -int main_loop(int door_fd, int cmd_listen_fd) -{ - log_printf(NOTICE, "entering main loop"); - - fd_set readfds, tmpfds; - FD_ZERO(&readfds); - FD_SET(door_fd, &readfds); - FD_SET(cmd_listen_fd, &readfds); - int max_fd = door_fd > cmd_listen_fd ? door_fd : cmd_listen_fd; - cmd_t* cmd_q = NULL; - client_t* client_lst = NULL; - - read_buffer_t door_buffer; - door_buffer.offset = 0; - - int sig_fd = signal_init(); - if(sig_fd < 0) - return -1; - FD_SET(sig_fd, &readfds); - max_fd = (max_fd < sig_fd) ? sig_fd : max_fd; - - struct timeval timeout; - int return_value = 0; - while(!return_value) { - memcpy(&tmpfds, &readfds, sizeof(tmpfds)); - - timeout.tv_sec = 0; - timeout.tv_usec = 200000; - int ret = select(max_fd+1, &tmpfds, NULL, NULL, &timeout); - if(ret == -1 && errno != EINTR) { - log_printf(ERROR, "select returned with error: %s", strerror(errno)); - return_value = -1; - break; - } - if(ret == -1) - continue; - if(!ret) { - if(cmd_q && cmd_has_expired(*cmd_q)) { - log_printf(ERROR, "last command expired"); - cmd_pop(&cmd_q); - } - else - continue; - } - - if(FD_ISSET(sig_fd, &tmpfds)) { - if(signal_handle()) { - return_value = 1; - break; - } - } - - if(FD_ISSET(door_fd, &tmpfds)) { - return_value = process_door(&door_buffer, door_fd, &cmd_q, client_lst); - if(return_value) - break; - } - - if(FD_ISSET(cmd_listen_fd, &tmpfds)) { - int new_fd = accept(cmd_listen_fd, NULL, NULL); - if(new_fd < 0) { - log_printf(ERROR, "accept returned with error: %s", strerror(errno)); - return_value = -1; - break; - } - log_printf(DEBUG, "new command connection (fd=%d)", new_fd); - FD_SET(new_fd, &readfds); - max_fd = (max_fd < new_fd) ? new_fd : max_fd; - fcntl(new_fd, F_SETFL, O_NONBLOCK); - client_add(&client_lst, new_fd); - } - - client_t* lst = client_lst; - while(lst) { - if(FD_ISSET(lst->fd, &tmpfds)) { - return_value = nonblock_recvline(&(lst->buffer), lst->fd, &cmd_q, client_lst); - if(return_value == 2) { - log_printf(DEBUG, "removing closed command connection (fd=%d)", lst->fd); - client_t* deletee = lst; - lst = lst->next; - FD_CLR(deletee->fd, &readfds); - client_remove(&client_lst, deletee->fd); - return_value = 0; - continue; - } - if(return_value) - break; - - } - if(lst) - lst = lst->next; - } - - if(cmd_q && !cmd_q->sent) - send_command(door_fd, cmd_q); - } - - cmd_clear(&cmd_q); - client_clear(&client_lst); - signal_stop(); - return return_value; -} - -int setup_tty(int fd) -{ - struct termios tmio; - - int ret = tcgetattr(fd, &tmio); - if(ret) { - log_printf(ERROR, "Error on tcgetattr(): %s", strerror(errno)); - return ret; - } - - ret = cfsetospeed(&tmio, B9600); - if(ret) { - log_printf(ERROR, "Error on cfsetospeed(): %s", strerror(errno)); - return ret; - } - - ret = cfsetispeed(&tmio, B9600); - if(ret) { - log_printf(ERROR, "Error on cfsetispeed(): %s", strerror(errno)); - return ret; - } - - tmio.c_lflag &= ~ECHO; - - ret = tcsetattr(fd, TCSANOW, &tmio); - if(ret) { - log_printf(ERROR, "Error on tcsetattr(): %s", strerror(errno)); - return ret; - } - - ret = tcflush(fd, TCIFLUSH); - if(ret) { - log_printf(ERROR, "Error on tcflush(): %s", strerror(errno)); - return ret; - } - - fd_set fds; - struct timeval tv; - FD_ZERO(&fds); - FD_SET(fd, &fds); - tv.tv_sec = 0; - tv.tv_usec = 50000; - for(;;) { - ret = select(fd+1, &fds, NULL, NULL, &tv); - if(ret > 0) { - char buffer[100]; - ret = read(fd, buffer, sizeof(buffer)); - } - else - break; - } - - return 0; -} - -int main(int argc, char* argv[]) -{ - log_init(); - - options_t opt; - int ret = options_parse(&opt, argc, argv); - if(ret) { - if(ret > 0) { - fprintf(stderr, "syntax error near: %s\n\n", argv[ret]); - } - if(ret == -2) { - fprintf(stderr, "memory error on options_parse, exiting\n"); - } - - if(ret != -2) - options_print_usage(); - - options_clear(&opt); - log_close(); - exit(ret); - } - string_list_element_t* tmp = opt.log_targets_.first_; - if(!tmp) { - log_add_target("syslog:3,door_daemon,daemon"); - } - else { - while(tmp) { - ret = log_add_target(tmp->string_); - if(ret) { - switch(ret) { - case -2: fprintf(stderr, "memory error on log_add_target, exitting\n"); break; - case -3: fprintf(stderr, "unknown log target: '%s', exitting\n", tmp->string_); break; - case -4: fprintf(stderr, "this log target is only allowed once: '%s', exitting\n", tmp->string_); break; - default: fprintf(stderr, "syntax error near: '%s', exitting\n", tmp->string_); break; - } - - options_clear(&opt); - log_close(); - exit(ret); - } - tmp = tmp->next_; - } - } - log_printf(NOTICE, "just started..."); - options_parse_post(&opt); - - priv_info_t priv; - if(opt.username_) - if(priv_init(&priv, opt.username_, opt.groupname_)) { - options_clear(&opt); - log_close(); - exit(-1); - } - - FILE* pid_file = NULL; - if(opt.pid_file_) { - pid_file = fopen(opt.pid_file_, "w"); - if(!pid_file) { - log_printf(WARNING, "unable to open pid file: %s", strerror(errno)); - } - } - - if(opt.chroot_dir_) - if(do_chroot(opt.chroot_dir_)) { - options_clear(&opt); - log_close(); - exit(-1); - } - if(opt.username_) - if(priv_drop(&priv)) { - options_clear(&opt); - log_close(); - exit(-1); - } - - if(opt.daemonize_) { - pid_t oldpid = getpid(); - daemonize(); - log_printf(INFO, "running in background now (old pid: %d)", oldpid); - } - - if(pid_file) { - pid_t pid = getpid(); - fprintf(pid_file, "%d", pid); - fclose(pid_file); - } - - int cmd_listen_fd = init_command_socket(opt.command_sock_); - if(cmd_listen_fd < 0) { - options_clear(&opt); - log_close(); - exit(-1); - } - - int door_fd = 0; - for(;;) { - door_fd = open(opt.door_dev_, O_RDWR | O_NOCTTY); - if(door_fd < 0) - ret = 2; - else { - ret = setup_tty(door_fd); - if(ret) - ret = 2; - else - ret = main_loop(door_fd, cmd_listen_fd); - } - - if(ret == 2) { - log_printf(ERROR, "%s error, trying to reopen in 5 seconds..", opt.door_dev_); - if(door_fd > 0) - close(door_fd); - sleep(5); - } - else - break; - } - - close(cmd_listen_fd); - if(door_fd > 0) - close(door_fd); - - if(!ret) - log_printf(NOTICE, "normal shutdown"); - else if(ret < 0) - log_printf(NOTICE, "shutdown after error"); - else - log_printf(NOTICE, "shutdown after signal"); - - options_clear(&opt); - log_close(); - - return ret; -} diff --git a/door_daemon/log.c b/door_daemon/log.c deleted file mode 100644 index 43a0a5a..0000000 --- a/door_daemon/log.c +++ /dev/null @@ -1,259 +0,0 @@ -/* - * uAnytun - * - * uAnytun is a tiny implementation of SATP. Unlike Anytun which is a full - * featured implementation uAnytun has no support for multiple connections - * or synchronisation. It is a small single threaded implementation intended - * to act as a client on small platforms. - * The secure anycast tunneling protocol (satp) defines a protocol used - * for communication between any combination of unicast and anycast - * tunnel endpoints. It has less protocol overhead than IPSec in Tunnel - * mode and allows tunneling of every ETHER TYPE protocol (e.g. - * ethernet, ip, arp ...). satp directly includes cryptography and - * message authentication based on the methodes used by SRTP. It is - * intended to deliver a generic, scaleable and secure solution for - * tunneling and relaying of packets of any protocol. - * - * - * Copyright (C) 2007-2008 Christian Pointner - * - * This file is part of uAnytun. - * - * uAnytun 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 - * any later version. - * - * uAnytun 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 uAnytun. If not, see . - */ - -#include "datatypes.h" - -#include -#include -#include -#include - -#define SYSLOG_NAMES -#include - -#include "log.h" - -log_t stdlog; - -#include "log_targets.h" - -const char* log_prio_to_string(log_prio_t prio) -{ - switch(prio) { - case ERROR: return "ERROR"; - case WARNING: return "WARNING"; - case NOTICE: return "NOTICE"; - case INFO: return "INFO"; - case DEBUG: return "DEBUG"; - } - return "UNKNOWN"; -} - -log_target_type_t log_target_parse_type(const char* conf) -{ - if(!conf) - return TARGET_UNKNOWN; - - if(!strncmp(conf, "syslog", 6)) return TARGET_SYSLOG; - if(!strncmp(conf, "file", 4)) return TARGET_FILE; - if(!strncmp(conf, "stdout", 6)) return TARGET_STDOUT; - if(!strncmp(conf, "stderr", 6)) return TARGET_STDERR; - - return TARGET_UNKNOWN; -} - -int log_targets_target_exists(log_targets_t* targets, log_target_type_t type) -{ - if(!targets && !targets->first_) - return 0; - - log_target_t* tmp = targets->first_; - while(tmp) { - if(tmp->type_ == type) - return 1; - tmp = tmp->next_; - } - return 0; -} - -int log_targets_add(log_targets_t* targets, const char* conf) -{ - if(!targets) - return -1; - - log_target_t* new_target = NULL; - int duplicates_allowed = 0; - switch(log_target_parse_type(conf)) { - case TARGET_SYSLOG: new_target = log_target_syslog_new(); break; - case TARGET_FILE: new_target = log_target_file_new(); duplicates_allowed = 1; break; - case TARGET_STDOUT: new_target = log_target_stdout_new(); break; - case TARGET_STDERR: new_target = log_target_stderr_new(); break; - default: return -3; - } - if(!new_target) - return -2; - - if(!duplicates_allowed && log_targets_target_exists(targets, new_target->type_)) { - free(new_target); - return -4; - } - - const char* prioptr = strchr(conf, ':'); - if(!prioptr || prioptr[1] == 0) { - free(new_target); - return -1; - } - prioptr++; - if(!isdigit(prioptr[0]) || (prioptr[1] != 0 && prioptr[1] != ',')) { - free(new_target); - return -1; - } - new_target->max_prio_ = prioptr[0] - '0'; - if(new_target->max_prio_ > 0) - new_target->enabled_ = 1; - - if(new_target->init != NULL) { - const char* confptr = NULL; - if(prioptr[1] != 0) - confptr = prioptr+2; - - int ret = (*new_target->init)(new_target, confptr); - if(ret) { - free(new_target); - return ret; - } - } - - if(new_target->open != NULL) - (*new_target->open)(new_target); - - - if(!targets->first_) { - targets->first_ = new_target; - } - else { - log_target_t* tmp = targets->first_; - while(tmp->next_) - tmp = tmp->next_; - - tmp->next_ = new_target; - } - return 0; -} - -void log_targets_log(log_targets_t* targets, log_prio_t prio, const char* msg) -{ - if(!targets) - return; - - log_target_t* tmp = targets->first_; - while(tmp) { - if(tmp->log != NULL && tmp->enabled_ && tmp->max_prio_ >= prio) - (*tmp->log)(tmp, prio, msg); - - tmp = tmp->next_; - } -} - -void log_targets_clear(log_targets_t* targets) -{ - if(!targets) - return; - - while(targets->first_) { - log_target_t* tmp = targets->first_; - targets->first_ = tmp->next_; - if(tmp->close != NULL) - (*tmp->close)(tmp); - if(tmp->clear != NULL) - (*tmp->clear)(tmp); - free(tmp); - } -} - - -void log_init() -{ - stdlog.max_prio_ = 0; - stdlog.targets_.first_ = NULL; -} - -void log_close() -{ - log_targets_clear(&stdlog.targets_); -} - -void update_max_prio() -{ - log_target_t* tmp = stdlog.targets_.first_; - while(tmp) { - if(tmp->enabled_ && tmp->max_prio_ > stdlog.max_prio_) - stdlog.max_prio_ = tmp->max_prio_; - - tmp = tmp->next_; - } -} - -int log_add_target(const char* conf) -{ - if(!conf) - return -1; - - int ret = log_targets_add(&stdlog.targets_, conf); - if(!ret) update_max_prio(); - return ret; -} - -void log_printf(log_prio_t prio, const char* fmt, ...) -{ - if(stdlog.max_prio_ < prio) - return; - - static char msg[MSG_LENGTH_MAX]; - va_list args; - - va_start(args, fmt); - vsnprintf(msg, MSG_LENGTH_MAX, fmt, args); - va_end(args); - - log_targets_log(&stdlog.targets_, prio, msg); -} - -void log_print_hex_dump(log_prio_t prio, const u_int8_t* buf, u_int32_t len) -{ - if(stdlog.max_prio_ < prio) - return; - - static char msg[MSG_LENGTH_MAX]; - - if(!buf) { - snprintf(msg, MSG_LENGTH_MAX, "(NULL)"); - } - else { - u_int32_t i; - int offset = snprintf(msg, MSG_LENGTH_MAX, "dump(%d): ", len); - if(offset < 0) - return; - u_int8_t* ptr = &msg[offset]; - - for(i=0; i < len; i++) { - if(((i+1)*3) >= (MSG_LENGTH_MAX - offset)) - break; - snprintf(ptr, 3, "%02X ", buf[i]); - ptr+=3; - } - } - log_targets_log(&stdlog.targets_, prio, msg); -} diff --git a/door_daemon/log.h b/door_daemon/log.h deleted file mode 100644 index 2717622..0000000 --- a/door_daemon/log.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * uAnytun - * - * uAnytun is a tiny implementation of SATP. Unlike Anytun which is a full - * featured implementation uAnytun has no support for multiple connections - * or synchronisation. It is a small single threaded implementation intended - * to act as a client on small platforms. - * The secure anycast tunneling protocol (satp) defines a protocol used - * for communication between any combination of unicast and anycast - * tunnel endpoints. It has less protocol overhead than IPSec in Tunnel - * mode and allows tunneling of every ETHER TYPE protocol (e.g. - * ethernet, ip, arp ...). satp directly includes cryptography and - * message authentication based on the methodes used by SRTP. It is - * intended to deliver a generic, scaleable and secure solution for - * tunneling and relaying of packets of any protocol. - * - * - * Copyright (C) 2007-2008 Christian Pointner - * - * This file is part of uAnytun. - * - * uAnytun 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 - * any later version. - * - * uAnytun 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 uAnytun. If not, see . - */ - -#ifndef UANYTUN_log_h_INCLUDED -#define UANYTUN_log_h_INCLUDED - -#define MSG_LENGTH_MAX 150 - -enum log_prio_enum { ERROR = 1, WARNING = 2, NOTICE = 3, - INFO = 4, DEBUG = 5 }; -typedef enum log_prio_enum log_prio_t; - -const char* log_prio_to_string(log_prio_t prio); - -enum log_target_type_enum { TARGET_SYSLOG , TARGET_STDOUT, TARGET_STDERR, TARGET_FILE , TARGET_UNKNOWN }; -typedef enum log_target_type_enum log_target_type_t; - -struct log_target_struct { - log_target_type_t type_; - int (*init)(struct log_target_struct* self, const char* conf); - void (*open)(struct log_target_struct* self); - void (*log)(struct log_target_struct* self, log_prio_t prio, const char* msg); - void (*close)(struct log_target_struct* self); - void (*clear)(struct log_target_struct* self); - int opened_; - int enabled_; - log_prio_t max_prio_; - void* param_; - struct log_target_struct* next_; -}; -typedef struct log_target_struct log_target_t; - - -struct log_targets_struct { - log_target_t* first_; -}; -typedef struct log_targets_struct log_targets_t; - -int log_targets_target_exists(log_targets_t* targets, log_target_type_t type); -int log_targets_add(log_targets_t* targets, const char* conf); -void log_targets_log(log_targets_t* targets, log_prio_t prio, const char* msg); -void log_targets_clear(log_targets_t* targets); - - -struct log_struct { - log_prio_t max_prio_; - log_targets_t targets_; -}; -typedef struct log_struct log_t; - -void log_init(); -void log_close(); -void update_max_prio(); -int log_add_target(const char* conf); -void log_printf(log_prio_t prio, const char* fmt, ...); -void log_print_hex_dump(log_prio_t prio, const u_int8_t* buf, u_int32_t len); - -#endif diff --git a/door_daemon/log_targets.h b/door_daemon/log_targets.h deleted file mode 100644 index 8db3812..0000000 --- a/door_daemon/log_targets.h +++ /dev/null @@ -1,363 +0,0 @@ -/* - * uAnytun - * - * uAnytun is a tiny implementation of SATP. Unlike Anytun which is a full - * featured implementation uAnytun has no support for multiple connections - * or synchronisation. It is a small single threaded implementation intended - * to act as a client on small platforms. - * The secure anycast tunneling protocol (satp) defines a protocol used - * for communication between any combination of unicast and anycast - * tunnel endpoints. It has less protocol overhead than IPSec in Tunnel - * mode and allows tunneling of every ETHER TYPE protocol (e.g. - * ethernet, ip, arp ...). satp directly includes cryptography and - * message authentication based on the methodes used by SRTP. It is - * intended to deliver a generic, scaleable and secure solution for - * tunneling and relaying of packets of any protocol. - * - * - * Copyright (C) 2007-2008 Christian Pointner - * - * This file is part of uAnytun. - * - * uAnytun 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 - * any later version. - * - * uAnytun 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 uAnytun. If not, see . - */ - -#ifndef UANYTUN_log_targets_h_INCLUDED -#define UANYTUN_log_targets_h_INCLUDED - -#include - -static char* get_time_formatted() -{ - char* time_string; - time_t t = time(NULL); - if(t < 0) - time_string = "