diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..36ab0a13c3b57085e584fe77f253f939ed7946ef
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. {http://fsf.org/}
+ 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.
+
+ {one line to give the program's name and a brief idea of what it does.}
+ Copyright (C) {year} {name of author}
+
+ 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 {http://www.gnu.org/licenses/}.
+
+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:
+
+ solace-test Copyright (C) 2013 Eduardo Luis Buratti
+ 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
+{http://www.gnu.org/licenses/}.
+
+ 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
+{http://www.gnu.org/philosophy/why-not-lgpl.html}.
diff --git a/include/agent/windows/get_time.h b/include/agent/windows/get_time.h
index 94e12d885c9a4e88bc77b931d7b49448b8e06d30..ad4ee9fd5f1748da64b53b1b8cd3838bcaedd664 100644
--- a/include/agent/windows/get_time.h
+++ b/include/agent/windows/get_time.h
@@ -1,5 +1,5 @@
#pragma once
#include <time.h>
-#include <string.h>
+#include <string>
std::string get_time();
diff --git a/src/linux/get_date.cpp b/src/linux/get_date.cpp
index ab435517b7ef61a2eef11acfa8da2a0f2be9a1a9..ac47db77ae1adcf6a8cd40a67b2d032c34d25d3a 100644
--- a/src/linux/get_date.cpp
+++ b/src/linux/get_date.cpp
@@ -1,3 +1,24 @@
+/* Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+ * Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+ *
+ * This file is part of simmc-agent
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
#include <agent/linux/get_date.h>
std::string get_date() {
@@ -5,13 +26,13 @@ std::string get_date() {
time_t rawtime;
struct tm * timeinfo;
- char buffer [20];
+ char buffer[20];
- time (&rawtime);
- timeinfo = localtime (&rawtime);
+ time(&rawtime);
+ localtime_r(&rawtime, timeinfo);
// YYYY-MM-DD
- strftime (buffer,20,"%Y-%m-%d",timeinfo);
+ strftime(buffer, 20, "%Y-%m-%d", timeinfo);
res = buffer;
return res;
diff --git a/src/linux/get_distro.cpp b/src/linux/get_distro.cpp
index 9597ce2924432ad6696cd2b0f359702da30b36a6..77cd662c45f2689bd7f8096c501eff8b868ee649 100644
--- a/src/linux/get_distro.cpp
+++ b/src/linux/get_distro.cpp
@@ -1,116 +1,138 @@
+/* Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+ * Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+ *
+ * This file is part of simmc-agent
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
#include "agent/linux/get_distro.h"
-int open_file(std::string name, std::ifstream& fstream){
- fstream.open(name);
- if (fstream.is_open())
- return 1;
- else
- return 0;
+int open_file(std::string name, std::ifstream& fstream) {
+ fstream.open(name);
+ if (fstream.is_open())
+ return 1;
+ else
+ return 0;
}
-std::string get_distro(){
- /* in Linux: distro name + version + release
- the year is 2016 and we have 2 "unified" ways to identify distros
- and a couple regex to find the distro name files
- update: I used to complain about Linux, then I tried coding for
- Windows... */
-
- /* current recorded distros are
- * Ubuntu
- * Debian
- * Linux Comunicações
- * Linux Educacional
- all of which should have the lsb-release file, but I added a couple more
- common distros just in case */
-
- std::ifstream release_file;
- std::string line;
-
- // lsb compliant
- if (open_file("/etc/lsb-release", release_file)) {
- const std::string key = "DISTRIB_DESCRIPTION=";
- std::size_t found;
-
- while (getline(release_file, line)) {
- found = line.find(key);
- if (found!=std::string::npos) {
- return (line.substr(found+key.length()+1,
- // remove key and quotes at the beginning
- line.length()-(found+key.length()+1)-1));
- // remove quotes at the end
- }
- }
- }
-
- // openSuSE
- else if (open_file("/etc/os-release", release_file)){
- const std::string name_key = "NAME=";
- const std::string version_key = "VERSION=";
-
- std::string name;
- std::string version;
-
- std::size_t found_name;
- std::size_t found_version;
-
- while (getline(release_file, line)) {
- found_name = line.find(name_key);
- found_version = line.find(version_key);
- if (found_name < line.length()) {
- name = line.substr(found_name+name_key.length()+1,
- // remove key and quotes at the beginning
- line.length()-(found_name+name_key.length()+1)-1);
- // remove quotes at the end
- }
-
- if (found_version < line.length()) {
- version = line.substr(found_version+version_key.length()+1,
- // remove key and quotes at the beginning
- line.length()-(found_version+version_key.length()+1)-1);
- // remove quotes at the end
- }
-
- if (name.length() && version.length()) {
- return name + version;
- }
- }
-
- if (name.length()) {
- return name;
- }
- else {
- return "unknown";
- }
- }
-
- else if (open_file("/etc/novell-release", release_file)){
- getline(release_file, line);
- return line;
- }
-
- else if (open_file("/etc/sles-release", release_file)){
- getline(release_file, line);
- return line;
- }
-
- // fedora
- else if (open_file("/etc/redhat-release", release_file)){
- getline(release_file, line);
- return line;
- }
-
- // debian -- leave this at the end, otherwise debian-based distros
- // will find the debian_version file instead of the actual
- // distro name
- else if (open_file("/etc/debian-release", release_file)){
- getline(release_file, line);
- return line;
- }
-
- else if (open_file("/etc/debian-version", release_file)){
- getline(release_file, line);
- return line;
- }
-
- return "unknown";
+std::string get_distro() {
+ /* in Linux: distro name + version + release
+ the year is 2016 and we have 2 "unified" ways to identify distros
+ and a couple regex to find the distro name files
+ update: I used to complain about Linux, then I tried coding for
+ Windows... */
+
+ /* currently recorded distros are
+ * Ubuntu
+ * Debian
+ * Linux Comunicações
+ * Linux Educacional
+ all of which should have the lsb-release file, but I added a couple more
+ common distros just in case */
+
+ std::ifstream release_file;
+ std::string line;
+
+ // lsb compliant
+ if (open_file("/etc/lsb-release", release_file)) {
+ const std::string key = "DISTRIB_DESCRIPTION=";
+ std::size_t found;
+
+ while (getline(release_file, line)) {
+ found = line.find(key);
+ if (found != std::string::npos) {
+ return (line.substr(found+key.length()+1,
+ // remove key and quotes at the beginning
+ line.length()-(found+key.length()+1)-1));
+ // remove quotes at the end
+ }
+ }
+
+ // openSuSE
+ } else if (open_file("/etc/os-release", release_file)) {
+
+ const std::string name_key = "NAME=";
+ const std::string version_key = "VERSION=";
+
+ std::string name;
+ std::string version;
+
+ std::size_t found_name;
+ std::size_t found_version;
+
+ while (getline(release_file, line)) {
+ found_name = line.find(name_key);
+ found_version = line.find(version_key);
+ if (found_name < line.length()) {
+ name = line.substr(found_name+name_key.length()+1,
+ // remove key and quotes at the beginning
+ line.length()-(found_name+name_key.length()+1)-1);
+ // remove quotes at the end
+ }
+
+ if (found_version < line.length()) {
+ version = line.substr(found_version+version_key.length()+1,
+ // remove key and quotes at the beginning
+ line.length()-
+ (found_version+version_key.length()+1)-1);
+ // remove quotes at the end
+ }
+
+ if (name.length() && version.length()) {
+ return name + version;
+ }
+ }
+
+ if (name.length()) {
+ return name;
+ } else {
+ return "unknown";
+ }
+
+ } else if (open_file("/etc/novell-release", release_file)) {
+
+ getline(release_file, line);
+ return line;
+
+ } else if (open_file("/etc/sles-release", release_file)) {
+
+ getline(release_file, line);
+ return line;
+
+ // fedora
+ } else if (open_file("/etc/redhat-release", release_file)) {
+
+ getline(release_file, line);
+ return line;
+
+ // debian -- leave this at the end, otherwise debian-based distros
+ // will find the debian_version file instead of the actual
+ // distro name
+ } else if (open_file("/etc/debian-release", release_file)) {
+
+ getline(release_file, line);
+ return line;
+
+ } else if (open_file("/etc/debian-version", release_file)) {
+
+ getline(release_file, line);
+ return line;
+
+ }
+
+ return "unknown";
}
diff --git a/src/linux/get_macaddr.cpp b/src/linux/get_macaddr.cpp
index a1fbcef762f1c80bc9221847e1b65797e8995254..8070215b18a9f23fe955561fc83bc2da7bf970e8 100644
--- a/src/linux/get_macaddr.cpp
+++ b/src/linux/get_macaddr.cpp
@@ -1,6 +1,28 @@
+/* Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+ * Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+ *
+ * This file is part of simmc-agent
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
#include <agent/linux/get_macaddr.h>
-std::string get_macaddr(){
+std::string get_macaddr() {
+
std::fstream file;
std::string macaddr;
@@ -17,4 +39,5 @@ std::string get_macaddr(){
file.close();
return macaddr;
+
}
diff --git a/src/linux/get_machine_type.cpp b/src/linux/get_machine_type.cpp
index 9f4ba3cdf381fbe4c73778553bb35974876bbb08..aa1faca9b19eab9995bbbb8d257583caee29b7df 100644
--- a/src/linux/get_machine_type.cpp
+++ b/src/linux/get_machine_type.cpp
@@ -1,6 +1,27 @@
+/* Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+ * Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+ *
+ * This file is part of simmc-agent
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
#include <agent/linux/get_machine_type.h>
-std::string get_machine_type () {
+std::string get_machine_type() {
struct addrinfo hints, *info, *p;
int gai_result;
@@ -20,15 +41,15 @@ std::string get_machine_type () {
return "unknown";
}
- for(p = info; p; p = p->ai_next) {
- if (!p->ai_canonname) {
- continue;
- }
- if (!strcmp(p->ai_canonname,"server.telecentro.net")) {;
+ for (p = info; p; p = p->ai_next) {
+ if (!p->ai_canonname) {
+ continue;
+ }
+ if (!strcmp(p->ai_canonname, "server.telecentro.net")) {;
freeaddrinfo(info);
return "server";
}
- }
+ }
freeaddrinfo(info);
diff --git a/src/linux/get_time.cpp b/src/linux/get_time.cpp
index b3e6472a25dc9267cf5564d0b54e9ffa8905487b..24caafe930f8ed0e176a3c3677e248b51b76464e 100644
--- a/src/linux/get_time.cpp
+++ b/src/linux/get_time.cpp
@@ -1,3 +1,24 @@
+/* Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+ * Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+ *
+ * This file is part of simmc-agent
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
#include "agent/linux/get_time.h"
// get current time
@@ -6,13 +27,13 @@ std::string get_time() {
time_t rawtime;
struct tm * timeinfo;
- char buffer [20];
+ char buffer[20];
- time (&rawtime);
- timeinfo = localtime (&rawtime);
+ time(&rawtime);
+ localtime_r(&rawtime, timeinfo);
// HH:MM:SS
- strftime (buffer,20,"%H:%M:%S",timeinfo);
+ strftime(buffer, 20, "%H:%M:%S", timeinfo);
res = buffer;
return res;
diff --git a/src/linux/get_user_count.cpp b/src/linux/get_user_count.cpp
index ec430899efaf7310c776d954ab4dbab521e2baa9..f58a2ea097ee9212d0facb5ac81b8d025209e7bb 100644
--- a/src/linux/get_user_count.cpp
+++ b/src/linux/get_user_count.cpp
@@ -1,29 +1,33 @@
-/*
- * last.c Re-implementation of the 'last' command, this time
- * for Linux. Yes I know there is BSD last, but I
- * just felt like writing this. No thanks :-).
- * Also, this version gives lots more info (especially with -x)
+/* Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+ * Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+ *
+ * This file is part of simmc-agent
*
- * Author: Miquel van Smoorenburg, miquels@cistron.nl
+ * last.c Re-implementation of the 'last' command, this time
+ * for Linux. Yes I know there is BSD last, but I
+ * just felt like writing this. No thanks :-).
+ * Also, this version gives lots more info (especially with -x)
*
- * Version: @(#)last 2.85 30-Jul-2004 miquels@cistron.nl
+ * Author: Miquel van Smoorenburg, miquels@cistron.nl
*
- * This file is part of the sysvinit suite,
- * Copyright (C) 1991-2004 Miquel van Smoorenburg.
+ * Version: @(#)last 2.85 30-Jul-2004 miquels@cistron.nl
*
- * 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 2 of the License, or
- * (at your option) any later version.
+ * This file is part of the sysvinit suite,
+ * Copyright (C) 1991-2004 Miquel van Smoorenburg.
*
- * 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.
+ * 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 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "agent/linux/get_user_count.h"
@@ -43,7 +47,7 @@ time_t lastdate; /* Last date we've seen */
* Read one utmp entry, return in new format.
* Automatically reposition file pointer.
*/
-static int uread (FILE *fp, struct utmp *u, int *quit) {
+static int uread(FILE *fp, struct utmp *u, int *quit) {
static int utsize;
static char buf[UCHUNKSIZE];
char tmp[1024];
@@ -72,7 +76,7 @@ static int uread (FILE *fp, struct utmp *u, int *quit) {
fprintf(stderr, "ERROR: seek failed!\n");
return 0;
}
- bpos = (int)(fpos - o);
+ bpos = static_cast<int>(fpos - o);
if (fread(buf, bpos, 1, fp) != 1) {
fprintf(stderr, "ERROR: read failed!\n");
return 0;
@@ -130,7 +134,7 @@ static int uread (FILE *fp, struct utmp *u, int *quit) {
/*
* Get the basename of a filename
*/
-static char *mybasename (char *s) {
+static char *mybasename(char *s) {
char *p;
if ((p = strrchr(s, '/')) != NULL)
@@ -141,94 +145,95 @@ static char *mybasename (char *s) {
}
-static void month_number (char *orig,char*dest){
- char mon[] = {orig[4],orig[5],orig[6],'\0'};
+static void month_number(char *orig, char*dest) {
+ char mon[] = {orig[4], orig[5], orig[6], '\0'};
- if(!strcmp(mon,"Jan")){
+ if (!strcmp(mon, "Jan")) {
dest[2] = '0';
dest[3] = '1';
return;
}
- if(!strcmp(mon,"Feb")){
+ if (!strcmp(mon, "Feb")) {
dest[2] = '0';
dest[3] = '2';
return;
}
- if(!strcmp(mon,"Mar")){
+ if (!strcmp(mon, "Mar")) {
dest[2] = '0';
dest[3] = '3';
return;
}
- if(!strcmp(mon,"Apr")){
+ if (!strcmp(mon, "Apr")) {
dest[2] = '0';
dest[3] = '4';
return;
}
- if(!strcmp(mon,"May")){
+ if (!strcmp(mon, "May")) {
dest[2] = '0';
dest[3] = '5';
return;
}
- if(!strcmp(mon,"Jun")){
+ if (!strcmp(mon, "Jun")) {
dest[2] = '0';
dest[3] = '6';
return;
}
- if(!strcmp(mon,"Jul")){
+ if (!strcmp(mon, "Jul")) {
dest[2] = '0';
dest[3] = '7';
return;
}
- if(!strcmp(mon,"Aug")){
+ if (!strcmp(mon, "Aug")) {
dest[2] = '0';
dest[3] = '8';
return;
}
- if(!strcmp(mon,"Sep")){
+ if (!strcmp(mon, "Sep")) {
dest[2] = '0';
dest[3] = '9';
return;
}
- if(!strcmp(mon,"Oct")){
+ if (!strcmp(mon, "Oct")) {
dest[2] = '1';
dest[3] = '0';
return;
}
- if(!strcmp(mon,"Nov")){
+ if (!strcmp(mon, "Nov")) {
dest[2] = '1';
dest[3] = '1';
return;
}
- if(!strcmp(mon,"Dec")){
+ if (!strcmp(mon, "Dec")) {
dest[2] = '1';
dest[3] = '2';
return;
}
}
+
/*
* Show one line of information on screen
*/
-static struct user_log *list (struct utmp *p, time_t t, int what) {
+static struct user_log *list(struct utmp *p, time_t t, int what) {
time_t tmp;
struct user_log * u = (struct user_log *)malloc(sizeof(struct user_log));
- char login[25],logout[25];
-
+ char login[25], logout[25];
+
/*
* Calculate times
*/
tmp = (time_t)p->ut_time;
- strcpy(u->user,p->ut_name);
- strcpy(login,ctime(&tmp));
- month_number(login,u->login);
+ strcpy(u->user, p->ut_name);
+ strcpy(login, ctime(&tmp));
+ month_number(login, u->login);
u->login[0] = login[22];
u->login[1] = login[23];
u->login[4] = login[8] == ' '?'0':login[8];
u->login[5] = login[9];
u->login[6] = '\0';
- switch(what) {
+ switch (what) {
case R_NOW:
sprintf(u->logout, "999999");
break;
@@ -237,7 +242,7 @@ static struct user_log *list (struct utmp *p, time_t t, int what) {
break;
case R_NORMAL:
strcpy(logout, ctime(&t));
- month_number(logout,u->logout);
+ month_number(logout, u->logout);
u->logout[0] = logout[22];
u->logout[1] = logout[23];
u->logout[4] = logout[8] == ' '?'0':logout[8];
@@ -251,7 +256,7 @@ static struct user_log *list (struct utmp *p, time_t t, int what) {
return u;
}
-static struct user_log * last_modified () {
+static struct user_log * last_modified() {
FILE *fp; /* Filepointer of wtmp file */
struct utmp ut; /* Current utmp entry */
@@ -277,7 +282,7 @@ static struct user_log * last_modified () {
/*
* Which file do we want to read?
*/
- ufile = (char *)WTMP_FILE;
+ ufile = (char *)(WTMP_FILE);
time(&lastdown);
/*
@@ -305,9 +310,9 @@ static struct user_log * last_modified () {
/*
* Read first structure to capture the time field
*/
- if (uread(fp, &ut, NULL) == 1)
+ if (uread(fp, &ut, NULL) == 1) {
begintime = ut.ut_time;
- else {
+ } else {
fstat(fileno(fp), &st);
begintime = st.st_ctime;
quit = 1;
@@ -342,13 +347,12 @@ static struct user_log * last_modified () {
ut.ut_type = BOOT_TIME;
else if (strncmp(ut.ut_user, "runlevel", 8) == 0)
ut.ut_type = RUN_LVL;
- }
/*def COMPAT*/
/*
* For stupid old applications that don't fill in
* ut_type correctly.
*/
- else {
+ } else {
if (ut.ut_type != DEAD_PROCESS &&
ut.ut_name[0] && ut.ut_line[0] &&
strcmp(ut.ut_name, "LOGIN") != 0)
@@ -404,17 +408,19 @@ static struct user_log * last_modified () {
*/
if (c == 0) {
c = R_NOW;
+
/* Is process still alive? */
if (ut.ut_pid > 0 &&
kill(ut.ut_pid, 0) != 0 &&
errno == ESRCH)
c = R_PHANTOM;
- quit = 0;
- u = list(&ut, lastboot, c);
- v = u;
- v->next = NULL;
- }
- /* FALLTHRU */
+
+ quit = 0;
+ u = list(&ut, lastboot, c);
+ v = u;
+ v->next = NULL;
+ }
+ /* FALLTHRU */
case DEAD_PROCESS:
/*
@@ -423,10 +429,13 @@ static struct user_log * last_modified () {
*/
if (ut.ut_line[0] == 0)
break;
- if ((p = (struct utmplist *)malloc(sizeof(struct utmplist))) == NULL) {
+
+ p = (struct utmplist *)malloc(sizeof(struct utmplist));
+ if (p == NULL) {
fprintf(stderr, "ERROR: out of memory\n");
return NULL;
}
+
memcpy(&p->ut, &ut, sizeof(struct utmp));
p->next = utmplist;
p->prev = NULL;
@@ -437,7 +446,7 @@ static struct user_log * last_modified () {
}
}
- while(!quit) {
+ while (!quit) {
if (uread(fp, &ut, &quit) != 1)
break;
@@ -456,13 +465,12 @@ static struct user_log * last_modified () {
ut.ut_type = BOOT_TIME;
else if (strncmp(ut.ut_user, "runlevel", 8) == 0)
ut.ut_type = RUN_LVL;
- }
/*def COMPAT*/
/*
* For stupid old applications that don't fill in
* ut_type correctly.
*/
- else {
+ } else {
if (ut.ut_type != DEAD_PROCESS &&
ut.ut_name[0] && ut.ut_line[0] &&
strcmp(ut.ut_name, "LOGIN") != 0)
@@ -519,6 +527,7 @@ static struct user_log * last_modified () {
*/
if (c == 0) {
c = R_NOW;
+
/* Is process still alive? */
if (ut.ut_pid > 0 &&
kill(ut.ut_pid, 0) != 0 &&
@@ -540,7 +549,8 @@ static struct user_log * last_modified () {
*/
if (ut.ut_line[0] == 0)
break;
- if ((p = (struct utmplist *)malloc(sizeof(struct utmplist))) == NULL) {
+ p = (struct utmplist *)malloc(sizeof(struct utmplist));
+ if (p == NULL) {
fprintf(stderr, "ERROR: out of memory\n");
return NULL;
}
@@ -558,7 +568,7 @@ static struct user_log * last_modified () {
return u;
}
-int get_user_count () {
+int get_user_count() {
struct user_log * u = last_modified();
struct user_log * i;
int count;
@@ -568,24 +578,24 @@ int get_user_count () {
char yesterday[7];
set<string> users;
- time (&rawtime);
- timeinfo = localtime (&rawtime);
+ time(&rawtime);
+ timeinfo = localtime(&rawtime); // NOLINT(runtime/threadsafe_fn)
timeinfo->tm_mday--;
mktime(timeinfo);
- strftime (yesterday,7,"%y%m%d",timeinfo);
+ strftime(yesterday, 7, "%y%m%d", timeinfo);
yesterday[6] = '\0';
- for(i = u; i; i = u){
- if(!strcmp(i->logout,"999999")){
- if(strcmp(i->login,yesterday) <= 0){
+ for (i = u; i; i = u) {
+ if (!strcmp(i->logout, "999999")) {
+ if (strcmp(i->login, yesterday) <= 0) {
users.insert(i->user);
}
- }else{
- if(!strcmp(i->login,yesterday)){
+ } else {
+ if (!strcmp(i->login, yesterday)) {
users.insert(i->user);
- }else
- if(strcmp(i->login,yesterday) < 0 && strcmp(i->logout,yesterday) >= 0){
+ } else if (strcmp(i->login, yesterday) < 0 &&
+ strcmp(i->logout, yesterday) >= 0) {
users.insert(i->user);
}
}
diff --git a/src/linux/inventory.cpp b/src/linux/inventory.cpp
index deb719c6c46110978d52c9a801e71b1a17f8489f..bab587c5fc8cfbfdd62d66a7631af432256bf22f 100644
--- a/src/linux/inventory.cpp
+++ b/src/linux/inventory.cpp
@@ -1,49 +1,67 @@
-#include "agent/linux/inventory.h"
+/* Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+ * Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+ *
+ * This file is part of simmc-agent
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
-/*******************************
- * INVENTORY *
- *******************************/
+#include "agent/linux/inventory.h"
-std::string get_processor_model(){
- return "unknown";
+std::string get_processor_model() {
+ return "unknown";
}
-Json::Value get_inventory(){
+Json::Value get_inventory() {
- Json::Value inv;
+ Json::Value inv;
- // os info
+ // os info
- struct utsname sysinfo;
+ struct utsname sysinfo;
uname(&sysinfo);
- inv["os_type"] = "Linux";
- inv["os_distro"] = get_distro();
- inv["os_kernel"] = sysinfo.release;
- inv["mirror_timestamp"] = sysinfo.version;
-
- // hw info
- /*
- inv["processor"] =
- inv["memory"] =
- inv["disk1_model"] =
- inv["disk1_size"] =
- inv["disk1_used"] =
- inv["disk2_model"] =
- inv["disk2_size"] =
- inv["disk2_used"] =
- inv["extra_hds"] =
- */
-
- // other
- /*
- inv["agent_version"] =
- inv["contact_date"] =
- */
-
- inv["machine_type"] = get_machine_type();
- inv["amount_users"] = get_user_count();
- inv["mac_address"] = get_macaddr();
-
- return inv;
+ inv["os_type"] = "Linux";
+ inv["os_distro"] = get_distro();
+ inv["os_kernel"] = sysinfo.release;
+ inv["mirror_timestamp"] = sysinfo.version;
+
+ // hw info
+ /*
+ inv["processor"] =
+ inv["memory"] =
+ inv["disk1_model"] =
+ inv["disk1_size"] =
+ inv["disk1_used"] =
+ inv["disk2_model"] =
+ inv["disk2_size"] =
+ inv["disk2_used"] =
+ inv["extra_hds"] =
+ */
+
+ // other
+ /*
+ inv["agent_version"] =
+ inv["contact_date"] =
+ */
+
+ inv["machine_type"] = get_machine_type();
+ inv["amount_users"] = get_user_count();
+ inv["mac_address"] = get_macaddr();
+
+ return inv;
+
}
diff --git a/src/main.cpp b/src/main.cpp
index 3e72ecadf16949a43b9117e03257a8875cad1d51..3bdd5da8d37a37ef2df4dd149c102be9426cd873 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,14 +1,35 @@
-#include <iostream>
+/* Copyright (C) 2004-2016 Centro de Computacao Cientifica e Software Livre
+ * Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+ *
+ * This file is part of simmc-agent
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
#include <sys/utsname.h>
#include <cpr/cpr.h>
+#include <iostream>
#include <fstream>
#include "agent/post.h"
-int main(){
+int main() {
- send_inventory();
- send_net_bandwidth();
- send_user_history();
+ send_inventory();
+ send_net_bandwidth();
+ send_user_history();
- return 0;
+ return 0;
}
diff --git a/src/network_bandwidth.cpp b/src/network_bandwidth.cpp
index 9ff07d5397340f1fe6c9138adde724e7ff6c6f83..50920762d45c8c40a08b661a4884d4c540a37309 100644
--- a/src/network_bandwidth.cpp
+++ b/src/network_bandwidth.cpp
@@ -1 +1,22 @@
+/* Copyright (C) 2004-2016 Centro de Computacao Cientifica e Software Livre
+ * Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+ *
+ * This file is part of simmc-agent
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
#include "agent/network_bandwidth.h"
diff --git a/src/post.cpp b/src/post.cpp
index dac86f2207c1edb843355d96f19fb0d03f769ebb..fc20d8cd4c4a114c5cae0b5eeb2b3126778d3f2d 100644
--- a/src/post.cpp
+++ b/src/post.cpp
@@ -1,60 +1,82 @@
+/* Copyright (C) 2004-2016 Centro de Computacao Cientifica e Software Livre
+ * Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+ *
+ * This file is part of simmc-agent
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
#include "agent/post.h"
/*******************************
* INVENTORY *
*******************************/
-int send_inventory(){
- Json::Value inventory = get_inventory();
- Json::FastWriter fastWriter;
+int send_inventory() {
+
+ Json::Value inventory = get_inventory();
+ Json::FastWriter fastWriter;
-#ifdef PRINT_JSON
- Json::StyledWriter styledWriter;
- if (!inventory.isNull())
- std::cout << styledWriter.write(inventory);
- else
- std::cout << "Empty inventory object" << std::endl;
+#ifdef PRINT_JSON
+ Json::StyledWriter styledWriter;
+ if (!inventory.isNull())
+ std::cout << styledWriter.write(inventory);
+ else
+ std::cout << "Empty inventory object" << std::endl;
#endif
- auto p = cpr::Post(cpr::Url{base_url + "/api/v1/collect"},
+ auto p = cpr::Post(cpr::Url{base_url + "/api/v1/collect"},
cpr::Parameters{{"type", "inventory"}},
cpr::Body{fastWriter.write(inventory)},
cpr::Header{{"content-type", "application/json"}});
-
- if (p.status_code == 200) {
- return 1;
- }
- return 0;
-
+ if (p.status_code == 200) {
+ return 1;
+ }
+
+ return 0;
+
}
/***************************************
* NETWORK BANDWIDTH *
***************************************/
-int send_net_bandwidth(){
- Json::Value net;
- Json::FastWriter fastWriter;
+int send_net_bandwidth() {
+ Json::Value net;
+ Json::FastWriter fastWriter;
-#ifdef PRINT_JSON
- Json::StyledWriter styledWriter;
- if (!net.isNull())
- std::cout << styledWriter.write(net);
- else
- std::cout << "Empty network_bandwidth object" << std::endl;
+#ifdef PRINT_JSON
+ Json::StyledWriter styledWriter;
+ if (!net.isNull())
+ std::cout << styledWriter.write(net);
+ else
+ std::cout << "Empty network_bandwidth object" << std::endl;
#endif
- auto p = cpr::Post(cpr::Url{base_url + "/api/v1/collect"},
+ auto p = cpr::Post(cpr::Url{base_url + "/api/v1/collect"},
cpr::Parameters{{"type", "network_bandwidth"}},
cpr::Body{fastWriter.write(net)},
cpr::Header{{"content-type", "application/json"}});
- if (p.status_code == 200) {
- return 1;
- }
-
- return 0;
+ if (p.status_code == 200) {
+ return 1;
+ }
+
+ return 0;
}
@@ -62,27 +84,27 @@ int send_net_bandwidth(){
* USER HISTORY *
**********************************/
-int send_user_history(){
- Json::Value u_h;
- Json::FastWriter fastWriter;
-
-#ifdef PRINT_JSON
- Json::StyledWriter styledWriter;
- if (!u_h.isNull())
- std::cout << styledWriter.write(u_h);
- else
- std::cout << "Empty user_history object" << std::endl;
+int send_user_history() {
+ Json::Value u_h;
+ Json::FastWriter fastWriter;
+
+#ifdef PRINT_JSON
+ Json::StyledWriter styledWriter;
+ if (!u_h.isNull())
+ std::cout << styledWriter.write(u_h);
+ else
+ std::cout << "Empty user_history object" << std::endl;
#endif
- auto p = cpr::Post(cpr::Url{base_url + "/api/v1/collect"},
+ auto p = cpr::Post(cpr::Url{base_url + "/api/v1/collect"},
cpr::Parameters{{"type", "user_history"}},
cpr::Body{fastWriter.write(u_h)},
cpr::Header{{"content-type", "application/json"}});
-
- if (p.status_code == 200) {
- return 1;
- }
- return 0;
+ if (p.status_code == 200) {
+ return 1;
+ }
+
+ return 0;
}
diff --git a/src/user_history.cpp b/src/user_history.cpp
index c42b72f1e471e208b22108b42c8617116c416294..ce1dabdc2923efcc9d392cf8c1b676ac20dd7f45 100644
--- a/src/user_history.cpp
+++ b/src/user_history.cpp
@@ -1 +1,22 @@
+/* Copyright (C) 2004-2016 Centro de Computacao Cientifica e Software Livre
+ * Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+ *
+ * This file is part of simmc-agent
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
#include "agent/user_history.h"
diff --git a/src/windows/get_date.cpp b/src/windows/get_date.cpp
index ee6d0ce36658f49f3807fa742b99de6cb14aa113..7e919c9c8ba459d199c9c24d093930904ff29b06 100644
--- a/src/windows/get_date.cpp
+++ b/src/windows/get_date.cpp
@@ -1,3 +1,24 @@
+/* Copyright (C) 2004-2016 Centro de Computacao Cientifica e Software Livre
+ * Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+ *
+ * This file is part of simmc-agent
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
#include <agent/windows/get_date.h>
std::string get_date() {
@@ -5,13 +26,13 @@ std::string get_date() {
time_t rawtime;
struct tm * timeinfo;
- char buffer [20];
+ char buffer[20];
- time (&rawtime);
- timeinfo = localtime (&rawtime);
+ time(&rawtime);
+ localtime_r(&rawtime, timeinfo);
// YYYY-MM-DD
- strftime (buffer,20,"%Y-%m-%d",timeinfo);
+ strftime(buffer, 20, "%Y-%m-%d", timeinfo);
res = buffer;
return res;
diff --git a/src/windows/get_macaddr.cpp b/src/windows/get_macaddr.cpp
index bce36442ea87e19d7da72b58a0d7c24167a338b0..83454c8263118b302388681eadc9e28b1c854831 100644
--- a/src/windows/get_macaddr.cpp
+++ b/src/windows/get_macaddr.cpp
@@ -1,6 +1,27 @@
+/* Copyright (C) 2004-2016 Centro de Computacao Cientifica e Software Livre
+ * Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+ *
+ * This file is part of simmc-agent
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
#include <agent/windows/get_macaddr.h>
-string get_macaddr(){
+string get_macaddr() {
PIP_ADAPTER_INFO AdapterInfo;
DWORD dwBufLen = sizeof(AdapterInfo);
char *mac_addr = (char*)malloc(17);
@@ -10,7 +31,8 @@ string get_macaddr(){
printf("Error allocating memory needed to call GetAdaptersinfo\n");
}
- // Make an initial call to GetAdaptersInfo to get the necessary size into the dwBufLen variable
+ // Initial call to GetAdaptersInfo to get the necessary size into
+ // the dwBufLen variable
if (GetAdaptersInfo(AdapterInfo, &dwBufLen) == ERROR_BUFFER_OVERFLOW) {
AdapterInfo = (IP_ADAPTER_INFO *) malloc(dwBufLen);
@@ -20,7 +42,9 @@ string get_macaddr(){
}
if (GetAdaptersInfo(AdapterInfo, &dwBufLen) == NO_ERROR) {
- PIP_ADAPTER_INFO pAdapterInfo = AdapterInfo;// Contains pointer to current adapter info
+
+ // Contains pointer to current adapter info
+ PIP_ADAPTER_INFO pAdapterInfo = AdapterInfo;
sprintf(mac_addr, "%02X:%02X:%02X:%02X:%02X:%02X",
pAdapterInfo->Address[0], pAdapterInfo->Address[1],
diff --git a/src/windows/get_machine_type.cpp b/src/windows/get_machine_type.cpp
index c8734a065dc5e99c3ebb5fcda4e1216a8b128931..a45ce78548d3141af7be20ff64e5099ba28b9e9e 100644
--- a/src/windows/get_machine_type.cpp
+++ b/src/windows/get_machine_type.cpp
@@ -1,3 +1,24 @@
+/* Copyright (C) 2004-2016 Centro de Computacao Cientifica e Software Livre
+ * Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+ *
+ * This file is part of simmc-agent
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
#include <agent/windows/get_machine_type.h>
string get_machine_type(void) {
@@ -10,7 +31,7 @@ string get_machine_type(void) {
return "unknow";
}
- if (!strcmp(buffer,"server.telecentro.net")) {
+ if (!strcmp(buffer, "server.telecentro.net")) {
dwSize = _countof(buffer);
ZeroMemory(buffer, dwSize);
return "server";
diff --git a/src/windows/get_time.cpp b/src/windows/get_time.cpp
index 2e405288f3c4cb4fc75938fbb7b8b4b9b82535bd..4bef83fa213fdd0f1dbcdf754f4a6a6aa4ac05f2 100644
--- a/src/windows/get_time.cpp
+++ b/src/windows/get_time.cpp
@@ -1,6 +1,25 @@
-#pragma once
-#include <time.h>
-#include <string.h>
+/* Copyright (C) 2004-2016 Centro de Computacao Cientifica e Software Livre
+ * Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+ *
+ * This file is part of simmc-agent
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
+#include "agent/windows/get_time.h"
// get current time
std::string get_time() {
@@ -8,13 +27,14 @@ std::string get_time() {
time_t rawtime;
struct tm * timeinfo;
- char buffer [20];
+ char buffer[20];
- time (&rawtime);
- timeinfo = localtime (&rawtime);
+ time(&rawtime);
+ timeinfo = localtime(&rawtime);
// HH:MM:SS
- strftime (buffer,20,"%H:%M:%S",timeinfo);
+ strftime(buffer, 20, "%H:%M:%S", timeinfo);
res = buffer;
return res;
+}
diff --git a/src/windows/inventory.cpp b/src/windows/inventory.cpp
index 3fe31119e265374f3962250e1ec029e073a8721f..024c20c9f865314b36008dc6e0672651854293e4 100644
--- a/src/windows/inventory.cpp
+++ b/src/windows/inventory.cpp
@@ -1,52 +1,73 @@
+/* Copyright (C) 2004-2016 Centro de Computacao Cientifica e Software Livre
+ * Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+ *
+ * This file is part of simmc-agent
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
#include "agent/windows/inventory.h"
/*******************************
* INVENTORY *
*******************************/
-std::string get_distro(){
- // use dtwinver
+std::string get_distro() {
+ // use dtwinver
- return "unknown";
+ return "unknown";
}
-std::string get_processor_model(){
- return "unknown";
+std::string get_processor_model() {
+ return "unknown";
}
-Json::Value get_inventory(){
-
- Json::Value inv;
-
- // os info
-
- inv["os_type"] = "Windows";
- inv["os_distro"] = "Windows"; //TODO: replace with dtwinver thing
- inv["os_kernel"] = "Windows";
- inv["mirror_timestamp"] = "Windows";
-
- // hw info
- /*
- inv["processor"] =
- inv["memory"] =
- inv["disk1_model"] =
- inv["disk1_size"] =
- inv["disk1_used"] =
- inv["disk2_model"] =
- inv["disk2_size"] =
- inv["disk2_used"] =
- inv["extra_hds"] =
- */
-
- // other
- /*
- inv["agent_version"] =
- inv["contact_date"] =
- inv["amount_users"] =
- */
-
- inv["machine_type"] = get_machine_type();
- inv["mac_address"] = get_macaddr();
-
- return inv;
+Json::Value get_inventory() {
+
+ Json::Value inv;
+
+ // os info
+
+ inv["os_type"] = "Windows";
+ inv["os_distro"] = get_distro();
+ inv["os_kernel"] = "Windows";
+ inv["mirror_timestamp"] = "Windows";
+
+ // hw info
+ /*
+ inv["processor"] =
+ inv["memory"] =
+ inv["disk1_model"] =
+ inv["disk1_size"] =
+ inv["disk1_used"] =
+ inv["disk2_model"] =
+ inv["disk2_size"] =
+ inv["disk2_used"] =
+ inv["extra_hds"] =
+ */
+
+ // other
+ /*
+ inv["agent_version"] =
+ inv["contact_date"] =
+ inv["amount_users"] =
+ */
+
+ inv["machine_type"] = get_machine_type();
+ inv["mac_address"] = get_macaddr();
+
+ return inv;
}
diff --git a/test/test.sh b/test/test.sh
index 2394c71c4783c41b12fa74d23dc30e473bb1911f..00d822e79303538c0937c138c9b79716d019f012 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -1,5 +1,8 @@
#!/bin/bash
+# allow for improved pattern recognition
+shopt -s extglob
+
# is docker installed?
command -v docker >/dev/null 2>&1 || { echo >&2 "It seems docker is not installed. Aborting."; exit 1; }
@@ -11,6 +14,7 @@ command -v docker >/dev/null 2>&1 || { echo >&2 "It seems docker is not installe
# -q - redirect stdout of rsync and docker build to specified file / log.txt if
# no argument is provided
+LINT=true
EXECUTE_ALL=true
RSYNC=false
BUILD_DOCKER_IMAGES=false
@@ -112,7 +116,11 @@ fi
# rsync
if ($RSYNC)
then
- printf "**********\n* COPY *\n**********\n\n"
+ printf "******************\n* LINT and COPY *\n******************\n\n"
+
+ printf "Applying linter to /agent/src/*.cpp\n"
+ cpplint.py --filter=-whitespace/blank_line,-build/include_what_you_use ../src/!(jsoncpp).cpp ../src/linux/*.cpp ../src/windows/*.cpp
+ shopt -u extglob
for i in "${!IMAGES_LIST[@]}"
do