[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30856 - in gnunet-dbus: . src
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r30856 - in gnunet-dbus: . src |
|
Date: |
Sun, 24 Nov 2013 10:14:50 +0100 |
Author: canndrew
Date: 2013-11-24 10:14:50 +0100 (Sun, 24 Nov 2013)
New Revision: 30856
Added:
gnunet-dbus/AUTHORS
gnunet-dbus/COPYING
gnunet-dbus/ChangeLog
gnunet-dbus/INSTALL
gnunet-dbus/Makefile.am
gnunet-dbus/NEWS
gnunet-dbus/README
gnunet-dbus/configure.ac
gnunet-dbus/src/
gnunet-dbus/src/Makefile.am
gnunet-dbus/src/gnunet-service-dht-dbus.c
gnunet-dbus/src/gnunet-service-dht-dbus_dht.c
gnunet-dbus/src/gnunet_dbus_lib.c
gnunet-dbus/src/gnunet_dbus_lib.h
gnunet-dbus/src/gnunet_dbus_lib_pop.c
gnunet-dbus/src/gnunet_dbus_lib_pop_block.c
gnunet-dbus/src/gnunet_dbus_lib_pop_dht.c
gnunet-dbus/src/xstring.c
gnunet-dbus/src/xstring.h
Modified:
gnunet-dbus/
Log:
Code dump. None of this works yet.
Index: gnunet-dbus
===================================================================
--- gnunet-dbus 2013-11-22 23:13:09 UTC (rev 30855)
+++ gnunet-dbus 2013-11-24 09:14:50 UTC (rev 30856)
Property changes on: gnunet-dbus
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,16 ##
+*.in
+
+Makefile
+aclocal.m4
+autom4te.cache
+autoscan-2.69.log
+config.h
+config.log
+config.status
+configure
+configure.scan
+depcomp
+install-sh
+missing
+stamp-h1
+
Added: gnunet-dbus/AUTHORS
===================================================================
--- gnunet-dbus/AUTHORS (rev 0)
+++ gnunet-dbus/AUTHORS 2013-11-24 09:14:50 UTC (rev 30856)
@@ -0,0 +1,2 @@
+Andrew Cann <address@hidden>
+
Added: gnunet-dbus/COPYING
===================================================================
--- gnunet-dbus/COPYING (rev 0)
+++ gnunet-dbus/COPYING 2013-11-24 09:14:50 UTC (rev 30856)
@@ -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:
+
+ <program> Copyright (C) <year> <name of author>
+ 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>.
Added: gnunet-dbus/ChangeLog
===================================================================
Added: gnunet-dbus/INSTALL
===================================================================
--- gnunet-dbus/INSTALL (rev 0)
+++ gnunet-dbus/INSTALL 2013-11-24 09:14:50 UTC (rev 30856)
@@ -0,0 +1,370 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
+
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package. Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+ The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package, generally using the just-built uninstalled binaries.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+ 6. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 7. Often, you can also type `make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'. This
+is known as a "VPATH" build.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them. In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the `DESTDIR' variable. For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+ Some packages offer the ability to configure how verbose the
+execution of `make' will be. For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved. Use GNU `make'
+instead.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS
+ KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf limitation. Until the limitation is lifted, you can use
+this workaround:
+
+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
Added: gnunet-dbus/Makefile.am
===================================================================
--- gnunet-dbus/Makefile.am (rev 0)
+++ gnunet-dbus/Makefile.am 2013-11-24 09:14:50 UTC (rev 30856)
@@ -0,0 +1,2 @@
+SUBDIRS = src
+
Added: gnunet-dbus/NEWS
===================================================================
Added: gnunet-dbus/README
===================================================================
Added: gnunet-dbus/configure.ac
===================================================================
--- gnunet-dbus/configure.ac (rev 0)
+++ gnunet-dbus/configure.ac 2013-11-24 09:14:50 UTC (rev 30856)
@@ -0,0 +1,7 @@
+AC_INIT([gnunet-dbus],[0.9.5a],address@hidden)
+AM_INIT_AUTOMAKE([-Wall -Werror])
+AC_PROG_CC
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES([Makefile src/Makefile])
+AC_OUTPUT
+
Added: gnunet-dbus/src/Makefile.am
===================================================================
--- gnunet-dbus/src/Makefile.am (rev 0)
+++ gnunet-dbus/src/Makefile.am 2013-11-24 09:14:50 UTC (rev 30856)
@@ -0,0 +1,11 @@
+bin_PROGRAMS = \
+ gnunet-service-dht-dbus
+
+gnunet_service_dht_dbus_SOURCES = \
+ gnunet-service-dht-dbus.c \
+ gnunet_dbus_lib.c \
+ xstring.c
+
+gnunet_service_dht_dbus_LDADD = \
+ -lgnunetutil
+
Added: gnunet-dbus/src/gnunet-service-dht-dbus.c
===================================================================
--- gnunet-dbus/src/gnunet-service-dht-dbus.c (rev 0)
+++ gnunet-dbus/src/gnunet-service-dht-dbus.c 2013-11-24 09:14:50 UTC (rev
30856)
@@ -0,0 +1,228 @@
+#include "config.h"
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+#include <dbus/dbus.h>
+
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_strings_lib.h>
+#include <gnunet/gnunet_program_lib.h>
+#include <gnunet/gnunet_getopt_lib.h>
+#include <gnunet/gnunet_scheduler_lib.h>
+
+#include "gnunet_dbus_lib.h"
+
+#include "xstring.h"
+
+/*
+ * Internal representation of the DHT service.
+ */
+struct DHT
+{
+ /*
+ * The program configuration
+ */
+ GNUNET_CONFIGURATION_Handle *cfg;
+
+ /*
+ * linked list of connected clients
+ */
+ struct DHTClient *clients;
+
+ /*
+ * GNUNET_OK or GNUNET_SYSERR. Checked during exit to see if there was an
error.
+ */
+ int run_error;
+};
+
+/*
+ * Internal representation of connected dbus clients.
+ */
+struct DHTClient
+{
+ /* doubly-linked list */
+ struct DHTClient *next;
+ struct DHTClient *prev;
+
+ /*
+ * DBus client data
+ */
+ struct GNUNET_DBUS_Client *client;
+
+ /*
+ * Our connection to the dht service.
+ * Each connected client uses it's own connection.
+ */
+ struct GNUNET_DHT_Handle *dht_handle;
+};
+
+static void
+shutdown_task (
+ void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Exiting.\n");
+};
+
+/*
+ * Run whenever a new never-before-seen client starts talking to our service.
+ * @param client the new client, created and passed to us by gnunet_lib_dbus
+ * @param cls our DHT
+ */
+static int
+client_connects (
+ GNUNET_DBUS_Client *client,
+ void *cls)
+{
+ struct DHT *dht = (struct DHT *)cls;
+ struct DHTClient *dht_client = GNUNET_new (struct DHTClient);
+ if (! dht_client)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to allocate memory for
connecting client.\n");
+ return GNUNET_SYSERR;
+ };
+
+ struct GNUNET_DHT_Handle *dht_handle = GNUNET_DHT_connect (
+ dht->cfg,
+ 1);
+ if (! dht_handle)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "GNUNET_DHT_connect returned NULL\n");
+ GNUNET_free (dht_client);
+ return GNUNET_SYSERR;
+ };
+
+ dht_client->dht_handle = dht_handle;
+ dht_client->next = dht->clients;
+ dht_client->prev = NULL;
+ dht->clients = dht_client;
+};
+
+/*
+ * Main function run by the scheduler.
+ *
+ * @param cls our one and only DHT object
+ * @param args remaining program command line args
+ * @param configfile name of the config file
+ * @param cfg the program configuration
+ */
+static void
+run (
+ void *cls,
+ char *const *args,
+ const char *configfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Running.\n");
+
+ struct DHT *dht = (struct DHT *)cls;
+ dht->run_error = GNUNET_SYSERR;
+
+ struct GNUNET_DBUS_Service *service = GNUNET_DBUS_create_service("dht", cfg,
client_connects, dht);
+ if (NULL == service)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create service.\n");
+ return;
+ };
+
+ struct GNUNET_DBUS_Object *dht = GNUNET_DBUS_object_create (service, "/dht",
NULL);
+ if (! dht)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create /dht object.\n");
+ return;
+ };
+
+ int err = GNUNET_DBUS_object_add_method (dht, "org.gnunet.dht", "put",
method_dht_put);
+ if (GNUNET_OK != err)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to add org.gnunet.dht.put
method\n");
+ return;
+ };
+
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, shutdown_task,
service);
+ dht->run_error = GNUNET_OK;
+ return;
+};
+
+int
+main (int argc, char *const *argv)
+{
+ int ret;
+
+ static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+ static const char bin_name[] = "gnunet-service-dht-dbus [OPTIONS]";
+ static const char bin_help[] = gettext_noop ("DBus proxy for
gnunet-service-dht");
+
+ ret = GNUNET_log_setup ("gnunet-service-dht-dbus", "DEBUG", NULL);
+ if (GNUNET_OK != ret)
+ {
+ fprintf(stderr, "ERROR: Failed to setup logging. GNUNET_log_setup returned
%d\n", ret);
+ return 1;
+ }
+
+ struct DHT *dht = GNUNET_new (struct DHT);
+ if (! dht)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to allocate memory for
DHT\n");
+ return 1;
+ };
+ dht->run_error = GNUNET_OK;
+
+ ret = GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv);
+ if (GNUNET_OK != ret) {
+ size_t size;
+ char *error;
+ int i;
+
+ size = GNUNET_XSTRING_NEW_DEFAULT_SIZE;
+ error = GNUNET_XSTRING_new();
+ GNUNET_XSTRING_appendf(&error, &size, "Failed to utf8 encode arguments.
GNUNET_STRINGS_get_utf_args(%d, {", argc);
+ for(i = 0; i < argc; i++) {
+ GNUNET_XSTRING_appendf(&error, &size, "\"%s\"", argv[i]);
+ if(i != argc - 1)
+ GNUNET_XSTRING_appendf(&error, &size, ", ");
+ };
+ GNUNET_XSTRING_appendf(&error, &size, "}, %p, %p) returned %d\n", &argc,
&argv, ret);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", error);
+ GNUNET_free(error);
+ return 1;
+ };
+
+ ret = GNUNET_PROGRAM_run (argc, argv, bin_name, bin_help, options, run, dht);
+ if (ret != GNUNET_OK)
+ {
+ size_t size;
+ char *error;
+ int i;
+
+ size = GNUNET_XSTRING_NEW_DEFAULT_SIZE;
+ error = GNUNET_XSTRING_new();
+ GNUNET_XSTRING_appendf(&error, &size, "Failed to run program.
GUNNET_PROGRAM_run(%d, {", argc);
+ for(i = 0; i < argc; i++)
+ GNUNET_XSTRING_appendf(&error, &size, "%s\"%s\"", i ? ", " : "",
argv[i]);
+ GNUNET_XSTRING_appendf(&error, &size, "}, \"%s\", \"%s\", %p, %p, NULL)
returned %d\n", bin_name, bin_help, &options, run, ret);
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "%s", error);
+ GNUNET_free(error);
+ GNUNET_free ((void *)argv);
+ return 1;
+ };
+ if (GNUNET_OK != dht->run_error)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "run failed.\n");
+ GNUNET_free ((void *)argv);
+ return 1;
+ };
+
+ GNUNET_free ((void *)argv);
+ return ret != GNUNET_OK;
+};
+
Added: gnunet-dbus/src/gnunet-service-dht-dbus_dht.c
===================================================================
--- gnunet-dbus/src/gnunet-service-dht-dbus_dht.c
(rev 0)
+++ gnunet-dbus/src/gnunet-service-dht-dbus_dht.c 2013-11-24 09:14:50 UTC
(rev 30856)
@@ -0,0 +1,91 @@
+static const char *introspection_data_dht = \
+ DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
\
+ "<node>\n"
\
+ " <interface name=\"org.gnunet.dht\">\n"
\
+ " <method name=\"put\">\n"
\
+ " <arg name=\"key\" type=\"s\" direction=\"in\"/>\n"
\
+ " <arg name=\"desired_replication_level\" type=\"u\"
direction=\"in\"/>\n" \
+ " <arg name=\"options\" type=\"u\" direction=\"in\"/>\n"
\
+ " <arg name=\"block_type\" type=\"u\" direction=\"in\"/>\n"
\
+ " <arg name=\"socket\" type=\"s\" direction=\"in\"/>\n"
\
+ " <arg name=\"expiration_time\" type=\"s\" direction=\"in\"/>\n"
\
+ " <arg name=\"request\" type=\"o\" direction=\"out\"/>\n"
\
+ " </method>\n"
\
+ " </interface>\n"
\
+ " <interface name=\"org.freedesktop.DBus.Introspectable\">\n"
\
+ " <method name=\"Introspect\">\n"
\
+ " <arg name=\"data\" type=\"s\" direction=\"out\"/>\n"
\
+ " </method>\n"
\
+ " </interface>\n"
\
+ "</node>\n"
\
+ ;
+
+DBusMessage *
+method_dht_introspect (
+ GNUNET_DBUS_Client *client,
+ DBusMessage *message,
+ void *wrapped)
+{
+ (void)client;
+ (void)wrapped;
+
+ DBusMessage *ret = dbus_message_new_method_return (message);
+ if (! ret)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "dbus_message_new_method_return
returned NULL. Out of memory.\n");
+ return NULL;
+ }
+
+ DBusMessageIter args;
+ dbus_message_iter_init_append (ret, &args);
+ if (! dbus_message_iter_append_basic (
+ &args,
+ DBUS_TYPE_STRING,
+ &introspection_data_dht))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "dbus_message_iter_append_basic
returned NULL. Out of memory.\n");
+ return NULL;
+ };
+
+ return ret;
+};
+
+DBusMessage *
+method_dht_put (
+ GNUNET_DBUS_Client *client,
+ DBusMessage *message,
+ void *wrapped)
+{
+ DBusMessage *ret = NULL;
+
+ struct GNUNET_HashCode key;
+ uint32_t desired_replication_level;
+ enum GNUNET_DHT_RouteOption options;
+ enum GNUNET_BLOCK_Type type;
+ uint32_t size;
+ char *data;
+ struct GNUNET_TIME_Absolute expiration;
+
+ dbus_message_iter_init (message, &iter);
+ ret = ret ? ret : GNUNET_DBUS_message_iter_pop_hashcode (message, &iter,
"key", &key);
+ ret = ret ? ret : GNUNET_DBUS_message_iter_pop_uint32 (message, &iter,
"desired_replication_level", &desired_replication_level);
+ ret = ret ? ret : GNUNET_DBUS_message_iter_pop_dht_routeoption (message,
&iter, "options", &options);
+ ret = ret ? ret : GNUNET_DBUS_message_iter_pop_block_type (message, &iter,
"type", &type);
+ ret = ret ? ret : GNUNET_DBUS_message_iter_pop_uint32 (message, &iter,
"size", &size);
+ ret = ret ? ret : GNUNET_DBUS_message_iter_pop_array_byte (message, &iter,
"data", &data);
+ ret = ret ? ret : GNUNET_DBUS_message_iter_pop_absolute_time (message,
&iter, "expiration", &expiration);
+ if (ret)
+ return ret;
+
+ struct DHT *dht = (struct DHT *)wrapped;
+ struct DHTClient dht_client = dht_find_client (client);
+
+ struct GNUNET_DHT_PutHandle *ph = GNUNET_DHT_put (
+ dht_client->dht_handle,
+ key,
+ desired_replication_level,
+
+
+
+};
+
Added: gnunet-dbus/src/gnunet_dbus_lib.c
===================================================================
--- gnunet-dbus/src/gnunet_dbus_lib.c (rev 0)
+++ gnunet-dbus/src/gnunet_dbus_lib.c 2013-11-24 09:14:50 UTC (rev 30856)
@@ -0,0 +1,622 @@
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <sys/socket.h>
+
+#include <dbus/dbus.h>
+
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_scheduler_lib.h>
+
+#include "gnunet_dbus_lib.h"
+
+/*
+ * Wraps a file descriptor that needs to be watched
+ * for activity with select()
+ */
+struct Watch
+{
+ /* doubly-linked list */
+ struct Watch *next;
+ struct Watch *prev;
+
+ /*
+ * DBus watch data. Contains the actual file descritor
+ */
+ DBusWatch *watch;
+
+ /*
+ * Have we asked the scheduler to watch this?
+ * May be false because the associated task may not have been
+ * re-scheduled yet after execution or because dbus has asked
+ * us to disable this watch.
+ */
+ bool scheduled;
+
+ /*
+ * The task that is watching our file descriptor.
+ * Only valid if scheduled is true.
+ */
+ GNUNET_SCHEDULER_TaskIdentifier task;
+};
+
+/*
+ * Represents a DBus service such as "org.gnunet.dht"
+ */
+struct GNUNET_DBUS_Service
+{
+ /*
+ * Our connection to the DBus message bus.
+ */
+ DBusConnection *conn;
+
+ /*
+ * Linked list of watches
+ */
+ struct Watch *watches;
+
+ /*
+ * Callback to execute whenever a new client connects to
+ * the service.
+ */
+ GNUNET_DBUS_ClientConnects client_connects;
+};
+
+/*
+ * A container for methods that can be exposed on DBus.
+ */
+struct Method
+{
+ /* doubly-linked list */
+ struct Method *next;
+ struct Method *prev;
+
+ /* The actual method */
+ GNUNET_DBUS_Method *method;
+};
+
+/*
+ * A DBus object exposed through a service.
+ * In DBus, each service presents a set of objects and each object presents a
+ * set of methods that can be called on it.
+ */
+struct GNUNET_DBUS_Object
+{
+ /*
+ * Closure passed in to GNUNET_DBUS_object_create.
+ * Points to the actual data structure wrapped by this DBus object.
+ */
+ void *wrapped;
+
+ /*
+ * The service we are an object of
+ */
+ struct GNUNET_DBUS_Service *service;
+
+ /*
+ * The object path
+ */
+ const char *path;
+
+ /*
+ * Linked list of methods this object exposes
+ */
+ struct Method *methods;
+};
+
+static void
+handle_watch (
+ void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+static int
+watch_schedule (
+ struct Watch *w);
+
+static int
+watch_unschedule (
+ struct Watch *w);
+
+static dbus_bool_t
+watch_add (
+ DBusWatch *watch,
+ void *data);
+
+static void
+watch_remove (
+ DBusWatch *watch,
+ void *data);
+
+static void
+watch_toggle (
+ DBusWatch *watch,
+ void *data);
+
+/*
+ * Called by the scheduler when a watch has activity on it
+ *
+ * @param cls The watch
+ * @param tc the context given to us by the scheduler for this execution
+ */
+static void
+handle_watch (
+ void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct Watch *w = (struct Watch *)cls;
+
+ unsigned flags = 0;
+ if (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)
+ flags |= DBUS_WATCH_READABLE;
+ if (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY)
+ flags |= DBUS_WATCH_WRITABLE;
+ if (tc->reason & GNUNET_SCHEDULER_REASON_EXCEPTION)
+ flags |= DBUS_WATCH_ERROR;
+ if (flags)
+ dbus_watch_handle(w->watch, flags);
+
+ w->scheduled = false;
+
+ if(! (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+ {
+ int err;
+ err = watch_schedule (w);
+ if (GNUNET_OK != err)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "watch_schedule failed\n");
+ };
+};
+
+/*
+ * Ask the scheduler to watch this watch for activity.
+ *
+ * @param w The watch
+ * @return GNUNET_OK or GNUNET_SYSERR
+ */
+static int
+watch_schedule (
+ struct Watch *w)
+{
+ DBusWatch *watch = w->watch;
+ unsigned flags = dbus_watch_get_flags (w->watch);
+
+ // sanity check
+ if (! dbus_watch_get_enabled (w->watch))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Tried the schedule watch that is
disabled!\n");
+ return GNUNET_SYSERR;
+ };
+
+ if (w->scheduled)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Scheduling watch that is already
scheduled!\n");
+ return GNUNET_SYSERR;
+ };
+
+ SOCKTYPE sock = dbus_watch_get_socket (watch);
+ if (-1 != sock)
+ {
+ struct GNUNET_NETWORK_Handle *h = GNUNET_NETWORK_socket_box_native(sock);
+ if (NULL == h)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to box network socket
passed in from dbus.\n");
+ return GNUNET_SYSERR;
+ };
+ w->task = GNUNET_SCHEDULER_add_net_with_priority(
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+ (flags & DBUS_WATCH_READABLE) ? h : NULL,
+ (flags & DBUS_WATCH_WRITABLE) ? h : NULL,
+ h,
+ handle_watch,
+ w);
+ w->scheduled = true;
+ return GNUNET_OK;
+ };
+
+ int fd = dbus_watch_get_unix_fd (watch);
+ if (-1 != fd)
+ {
+ struct GNUNET_DISK_FileHandle *h = GNUNET_DISK_get_handle_from_int_fd (fd);
+ if (NULL == h)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to get handle for file
descriptor passed in from dbus.\n");
+ return GNUNET_SYSERR;
+ };
+ w->task = GNUNET_SCHEDULER_add_file_with_priority(
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+ (flags & DBUS_WATCH_READABLE) ? h : NULL,
+ (flags & DBUS_WATCH_WRITABLE) ? h : NULL,
+ h,
+ handle_watch,
+ w);
+ w->scheduled = true;
+ return GNUNET_OK;
+ };
+
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to add watch.\n");
+ return GNUNET_SYSERR;
+};
+
+/*
+ * Ask the scheduler to stop monitoring a watch either because we are shutting
+ * down or dbus has asked us to disable this watch.
+ *
+ * @param w The watch
+ * @return GNUNET_OK or GNUNET_SYSERR
+ */
+static int
+watch_unschedule (
+ struct Watch *w)
+{
+ if(w->scheduled)
+ {
+ void *cls = GNUNET_SCHEDULER_cancel (w->task);
+ if ((struct Watch *)cls != w)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to unschedule task. w ==
%p, GNUNET_SCHEDULER_cancel returned %p\n", w, cls);
+ return GNUNET_SYSERR;
+ }
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Attempting to unschedule task that
is not scheduled!\n");
+ return GNUNET_SYSERR;
+ };
+
+ return GNUNET_OK;
+};
+
+/*
+ * Called by DBus when it has a new watch that it wants us to watch.
+ *
+ * @param watch The DBus watch, created and passed to us by DBus.
+ * @param data the GNUNET_DBUS_Service we passed to
dbus_connection_set_watch_functions
+ * @return true on success, false on an unrecoverable error such as running
out of memory.
+ */
+static dbus_bool_t
+watch_add (
+ DBusWatch *watch,
+ void *data)
+{
+ struct GNUNET_DBUS_Service *service = (struct GNUNET_DBUS_Service *)data;
+ struct Watch *w = GNUNET_new(struct Watch);
+
+ if(w == NULL)
+ return false;
+
+ w->watch = watch;
+ w->scheduled= false;
+
+ w->next = service->watches;
+ w->prev = NULL;
+ service->watches = w;
+
+ if(dbus_watch_enabled(watch))
+ {
+ int err = watch_schedule (w);
+ if (GNUNET_OK != err)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to schedule watch.\n");
+ return false;
+ };
+ };
+
+ return true;
+};
+
+/*
+ * Called by DBus when it want to permanently disable and remove a watch
+ *
+ * @param watch The DBus watch, passed to us by DBus.
+ * @param data the GNUNET_DBUS_Service we passed to
dbus_connection_set_watch_functions
+ */
+static void
+watch_remove (
+ DBusWatch *watch,
+ void *data)
+{
+ struct GNUNET_DBUS_Service *service = (struct GNUNET_DBUS_Service *)data;
+ struct Watch *w = service->watches;
+
+ while(w && w->watch != watch)
+ w = w->next;
+
+ if (NULL == w)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Asked to remove watch that has not
been added\n");
+ return;
+ };
+
+ if (w->scheduled)
+ {
+ int err = watch_unschedule (w);
+ if (GNUNET_OK != err)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "watch_unschedule returned
error.\n");
+ };
+
+ if (w->next)
+ w->next->prev = w->prev;
+ if (w->prev)
+ w->prev->next = w->next;
+ else
+ service->watches = w->next;
+
+ GNUNET_free (w);
+};
+
+/*
+ * Called by DBus when it wants to enable or disable a watch.
+ * Schedules or unschedules the scheduler to monitor this watch as appropriate.
+ *
+ * @param watch The DBus watch, passed to us by DBus.
+ * @param data the GNUNET_DBUS_Service we passed to
dbus_connection_set_watch_functions
+ */
+static void
+watch_toggle (
+ DBusWatch *watch,
+ void *data)
+{
+ struct GNUNET_DBUS_Service *service = (struct GNUNET_DBUS_Service *)data;
+ struct Watch *w = service->watches;
+
+ while(w && w->watch != watch)
+ w = w->next;
+
+ if (NULL == w)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Asked to toggle watch that has not
been added\n");
+ return;
+ };
+
+ bool enabled = dbus_watch_enabled (watch);
+ bool scheduled = w->scheduled;
+
+ if (enabled && ! scheduled)
+ watch_schedule (w);
+ if (! enabled && scheduled)
+ watch_unschedule (w);
+};
+
+static void
+free_service(
+ void *service)
+{
+ GNUNET_DBUS_destroy_service((struct GNUNET_DBUS_Service *)service);
+};
+
+/*
+ * Create a new DBus service and register it with the message bus.
+ *
+ * @param service_name The name of the GNUnet service. Gets appended to
+ * "org.gnunet.`peername`" to form the name of the DBus
+ * service.
+ * @param cfg The service configuration
+ */
+struct GNUNET_DBUS_Service *
+GNUNET_DBUS_create_service (
+ const char *service_name,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ struct GNUNET_DBUS_Service *ret;
+ ret = GNUNET_new(struct GNUNET_DBUS_Service);
+ ret->watches = NULL;
+
+ DBusError err;
+ DBusConnection *conn;
+
+ dbus_error_init(&err);
+
+ conn = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err);
+ if(dbus_error_is_set(&err))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to dbus system bus
(%s)\n", err.message);
+ dbus_error_free(&err);
+ GNUNET_DBUS_destroy_service (ret);
+ return NULL;
+ };
+ if(! conn)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to dbus system bus;
dbus_bus_get returned NULL\n");
+ dbus_error_free(&err);
+ GNUNET_DBUS_destroy_service (ret);
+ return NULL;
+ };
+ ret->conn = conn;
+
+ dbus_bool_t succ = dbus_connection_set_watch_functions (conn, watch_add,
watch_remove, watch_toggle, ret, free_service);
+ if(! succ)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "dbus_connection_set_watch_functions
returned false. Out of memory.\n");
+ GNUNET_DBUS_destroy_service (ret);
+ return NULL;
+ };
+
+ char name[128];
+ snprintf(name, 128, "org.gnunet.%s", service_name);
+ int request_result = dbus_bus_request_name(conn, name,
DBUS_NAME_FLAG_DO_NOT_QUEUE, &err);
+ if(dbus_error_is_set(&err)) {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to request the bus name
(%s)\n", err.message);
+ dbus_error_free(&err);
+ GNUNET_DBUS_destroy_service (ret);
+ return NULL;
+ };
+ switch(request_result) {
+ case DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER:
+ break;
+ case DBUS_REQUEST_NAME_REPLY_EXISTS:
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to request the bus name
\"%s\"; name is already taken.\n", name);
+ GNUNET_DBUS_destroy_service (ret);
+ return NULL;
+ default:
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unable to interpret result of
dbus_request_name (%d)\n", request_result);
+ GNUNET_DBUS_destroy_service (ret);
+ return NULL;
+ };
+
+ return ret;
+};
+
+void
+GNUNET_DBUS_service_destroy (
+ struct GNUNET_DBUS_Service *service)
+{
+ struct Watch *w = service->watches;
+ while (w)
+ {
+ struct Watch *next = w->next;
+ if (w->scheduled)
+ {
+ int err = watch_unschedule (w);
+ if (GNUNET_OK != err)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to unschedule watch
that should have been scheduled while destroying service.\n");
+ };
+
+ GNUNET_free (w);
+ w = next;
+ };
+
+ GNUNET_free (service);
+};
+
+DBusHandlerResult
+handle_object_message (
+ DBusConnection *conn,
+ DBusMessage *message,
+ void *cls)
+{
+ struct GNUNET_DBUS_Object *obj = (struct GNUNET_DBUS_Object *)cls;
+
+ const char *type = dbus_message_type_to_string (dbus_message_get_type
(message));
+ const char *interface = dbus_message_get_interface (message);
+ const char *member = dbus_message_get_member (message);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Recieved DBus message for %s\n",
obj->path);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " type == %s\n", type ?
type : "(none)");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " interface == %s\n", interface ?
interface : "(none)");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " member == %s\n", member ?
member : "(none)");
+
+
+ int type = dbus_message_get_type (message);
+ if (type != DBUS_MESSAGE_TYPE_METHOD_CALL)
+ return DBUS_RESULT_HANDLER_NOT_YET_HANDLED;
+
+ Message *pos = obj->messages;
+ while (pos)
+ {
+ if (dbus_message_is_method_call (
+ message,
+ pos->interface,
+ pos->method_name))
+ {
+ DBusMessage *reply = pos->method (message, obj);
+ if (! reply)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "method returned NULL. Out of
memory.\n");
+ return DBUS_HANDLER_RESULT_NEED_MEMORY;
+ };
+ dbus_bool_t succ = dbus_connection_send (conn, reply, NULL);
+ dbus_message_unref (reply);
+ return succ ? DBUS_HANDLER_RESULT_HANDLED :
DBUS_HANDLER_RESULT_NEED_MEMORY;
+ };
+ pos = pos->next;
+ };
+
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+};
+
+void
+handle_object_unregister (
+ DBusConnection *conn.
+ void *cls)
+{
+ struct GNUNET_DBUS_Object *obj = (struct GNUNET_DBUS_Object *)cls;
+ GNUNET_free (obj);
+};
+
+struct GNUNET_DBUS_Object *
+GNUNET_DBUS_object_create (
+ struct GNUNET_DBUS_Service *service,
+ const char *path,
+ void *wrapped)
+{
+ GNUNET_DBUS_Object *ret;
+ ret = GNUNET_new (struct GNUNET_DBUS_Object);
+ ret->service = service;
+ ret->path = path;
+ ret->wrapped = wrapped;
+ ret->methods = NULL;
+
+ DBusError err;
+ dbus_error_init(&err);
+
+ DBusObjectPathVTable vtable;
+ vtable.message_function = handle_object_message;
+ vtable.unregister_function = handle_object_unregister;
+ dbus_bool_t succ = dbus_connection_try_register_object_path (
+ service->conn,
+ path,
+ &vtable,
+ ret,
+ &err);
+ if (dbus_error_is_set (&err))
+ {
+ GNUNET_log (
+ GNUNET_ERROR_TYPE_ERROR,
+ "dbus_connection_try_register failed to register path \"%s\": %s\n",
+ path,
+ err.message);
+ GNUNET_free (ret);
+ return NULL;
+ };
+ if (! succ)
+ {
+ GNUNET_log (
+ GNUNET_ERROR_TYPE_ERROR,
+ "dbus_connection_try_register returned false when registering path
\"%s\"\n",
+ path);
+ GNUNET_free (ret);
+ return NULL;
+ };
+
+ return ret;
+};
+
+int
+GNUNET_DBUS_object_destroy (
+ struct GNUNET_DBUS_Object *obj)
+{
+ /* object is freed in handle_object_unregister */
+ dbus_bool_t succ = dbus_connection_unregister_object_path (
+ obj->service->conn,
+ obj->path);
+ if (! succ)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to unregister object. Out of
memory.\n");
+ return GNUNET_SYSERR;
+ };
+ return GNUNET_OK;
+};
+
+int
+GNUNET_DBUS_object_add_method (
+ GNUNET_DBUS_Object *obj,
+ const char *interface.
+ const char *method_name,
+ GNUNET_DBUS_Method method)
+{
+ struct Method *add = GNUNET_new (struct Method);
+ if (NULL == add)
+ return GNUNET_SYSERR;
+
+ add->next = obj->methods;
+ add->prev = NULL;
+ add->interface = interface;
+ add->method_name = method_name;
+ add->method = method;
+ obj->methods = add;
+ return GNUNET_OK;
+};
+
+
+
Added: gnunet-dbus/src/gnunet_dbus_lib.h
===================================================================
--- gnunet-dbus/src/gnunet_dbus_lib.h (rev 0)
+++ gnunet-dbus/src/gnunet_dbus_lib.h 2013-11-24 09:14:50 UTC (rev 30856)
@@ -0,0 +1,27 @@
+#ifndef GNUNET_DBUS_LIB_H
+#define GNUNET_DBUS_LIB_H
+
+#include <gnunet/gnunet_configuration_lib.h>
+
+typedef DBusMessage *(*GNUNET_DBUS_Method) (
+ DBusMessage *message,
+ void *wrapped);
+
+typedef int (*GNUNET_DBUS_ClientConnects) (
+ GNUNET_DBUS_Client *client,
+ void *cls);
+
+
+struct GNUNET_DBUS_Service;
+
+struct GNUNET_DBUS_Service *
+GNUNET_DBUS_create_service (
+ const char *service_name,
+ const struct GNUNET_CONFIGURATION_Handle *cfg);
+
+void
+GNUNET_DBUS_destroy_service(
+ struct GNUNET_DBUS_Service *service);
+
+#endif
+
Added: gnunet-dbus/src/gnunet_dbus_lib_pop.c
===================================================================
--- gnunet-dbus/src/gnunet_dbus_lib_pop.c (rev 0)
+++ gnunet-dbus/src/gnunet_dbus_lib_pop.c 2013-11-24 09:14:50 UTC (rev
30856)
@@ -0,0 +1,319 @@
+DBusMessage *
+GNUNET_DBUS_message_iter_pop_basic (
+ DBusMessage *message,
+ DBusMessageIter *iter,
+ const char *arg_name,
+ int expected_type,
+ void *value)
+{
+ int arg_type = dbus_message_iter_get_arg_type (iter);
+ if (expected_type != arg_type)
+ {
+ return dbus_message_new_error_printf (
+ message,
+ DBUS_ERROR_INVALID_ARGS,
+ "Bad argument for '%s'. Expected %s. Got %s"
+ arg_name,
+ dbus_message_type_to_string (expected_type),
+ dbus_message_type_to_string (arg_type));
+ };
+ dbus_message_iter_get_basic (iter, value);
+ dbus_message_iter_next (iter);
+
+ return NULL;
+};
+
+DBusMessage *
+GNUNET_DBUS_message_iter_pop_string (
+ DBusMessage *message,
+ DBusMessageIter *iter,
+ const char *arg_name,
+ const char **val)
+{
+ return GNUNET_DBUS_message_get_basic (
+ message,
+ iter,
+ arg_name,
+ DBUS_TYPE_STRING,
+ (void *)value);
+};
+
+DBusMessage *
+GNUNET_DBUS_message_iter_pop_uint32 (
+ DBusMessage *message,
+ DBusMessageIter *iter,
+ const char *arg_name,
+ dbus_uint32_t *value)
+{
+ return GNUNET_DBUS_message_iter_pop_basic (
+ message,
+ iter,
+ arg_name,
+ DBUS_TYPE_UINT32,
+ (void *)value);
+};
+
+DBusMessage *
+GNUNET_DBUS_message_iter_pop_fixed_array (
+ DBusMessage *message,
+ DBusMessageIter *iter,
+ const char *arg_name,
+ int expected_type,
+ void *value,
+ int *n_elements)
+{
+ int arg_type = dbus_message_iter_get_arg_type (iter);
+ if (DBUS_TYPE_ARRAY != arg_type)
+ {
+ return dbus_message_new_error_printf (
+ message,
+ DBUS_ERROR_INVALID_ARGS,
+ "Bad argument for '%s'. Expected %s. Got %s",
+ arg_name,
+ dbus_message_type_to_string (DBUS_TYPE_ARRAY),
+ dbus_message_type_to_string (arg_type));
+ };
+
+ int element_type = dbus_message_iter_get_element_type (iter);
+ if (expected_type != element_type)
+ {
+ return dbus_message_new_error_printf (
+ message,
+ DBUS_ERROR_INVALID_ARGS,
+ "Bad argument for '%s'. Expected array of %s. Got array of %s",
+ arg_name,
+ dbus_message_type_to_string (expected_type),
+ dbus_message_type_to_string (element_type));
+ };
+
+ DBusMessageIter itersub;
+ dbus_message_iter_recurse (iter, &itersub);
+ dbus_message_iter_get_fixed_array (&itersub, value, n_elements);
+
+ return NULL;
+};
+
+DBusMessage *
+GNUNET_DBUS_message_iter_pop_array_byte (
+ DBusMessage *message,
+ DBusMessageIter *iter,
+ const char *arg_name,
+ const char **value,
+ int *n_elements)
+{
+ return GNUNET_DBUS_message_iter_pop_fixed_array (
+ message,
+ iter,
+ arg_name,
+ DBUS_TYPE_BYTE,
+ (void *)value,
+ n_elements);
+};
+
+/*
+ * bitfield enums can be sent across the wire in either their integer form (as
+ * an array of bit flags) or as an array of strings. Sending an int is more
+ * efficient and is what libraries built around the DBus API would use, people
+ * using the DBus API directly may want to pass human-readable strings for
+ * convenience.
+ */
+DBusMessage *
+GNUNET_DBUS_message_iter_pop_bitfield (
+ DBusMessage *message,
+ DBusMessageIter *iter,
+ const char *arg_name,
+ int *value,
+ const struct EnumName *fields)
+{
+ uint32_t flags;
+ DBusMessage *ret = GNUNET_DBUS_message_iter_pop_uint32 (message, iter,
arg_name, &flags);
+ if (! ret)
+ {
+ *value = (int)flags;
+ return NULL;
+ };
+ dbus_message_unref (ret);
+
+ char **options;
+ int num_options;
+ ret = GNUNET_DBUS_message_iter_pop_array_string (message, iter, arg_name,
&options, &num_options);
+ if (! ret)
+ {
+ *value = 0;
+ int i;
+ for (i = 0; i < num_options; i++)
+ {
+ int j;
+ for (j = 0; fields[j].name; j++)
+ {
+ if (! strcmp (options[i], fields[j].name))
+ {
+ *value |= fields[j].value;
+ break;
+ };
+ };
+ if (! fields[j].name)
+ {
+ size_t size = GNUNET_XSTRING_NEW_DEFAULT_SIZE;
+ char *errmsg = GNUNET_XSTRING_new ();
+ GNUNET_XSTRING_appendf (&errmsg, &size, "Unrecognized option '%s'.
Valid options are: [", options[i]);
+ for (j = 0; fields[j].name; j++)
+ GNUNET_XSTRING_append (&errmsg, "%s'%s'", j ? ", " : "",
fields[j].name);
+ GNUNET_XSTRING_append (&errmsg, &size, "].");
+ ret = dbus_message_new_error_printf (
+ message,
+ DBUS_ERROR_INVALID_ARGS,
+ "%s",
+ errmsg);
+ GNUNET_free (errmsg);
+ return ret;
+ };
+ };
+
+ return NULL;
+ };
+ dbus_message_unref (ret);
+
+ return dbus_message_new_error_printf (
+ message,
+ DBUS_ERROR_INVALID_ARGS,
+ "Bad argument for '%s'. Expected either a bitfield uint32 or an array of
string options.",
+ arg_name);
+};
+
+DBusMessage *
+GNUNET_DBUS_message_iter_pop_enum (
+ DBusMessage *message,
+ DBusMessageIter *iter,
+ const char *arg_name,
+ int *value,
+ const struct EnumName *names)
+{
+ uint32_t v;
+ DBusMessage *ret = GNUNET_DBUS_message_iter_pop_uint32 (message, iter,
arg_name, &flags);
+ if (! ret)
+ {
+ *value = (int)flags;
+ return NULL;
+ };
+ dbus_message_unref (ret);
+
+ const char *name;
+ ret = GNUNET_DBUS_message_iter_pop_string (message, iter, arg_name, &name);
+ if (! ret)
+ {
+ int i;
+ for (i = 0; names[i].name; i++)
+ {
+ if (! strcmp (name, names[i].name))
+ {
+ *value = names[i].value;
+ break;
+ };
+ };
+ if (! names[i].name)
+ {
+ size_t size = GNUNET_XSTRING_NEW_DEFAULT_SIZE;
+ char *errmsg = GNUNET_XSTRING_new ();
+ GNUNET_XSTRING_appendf (&errmsg, &size, "Unrecognized option '%s'. Valid
options are: [", names);
+ for (i = 0; names[i].name; i++)
+ GNUNET_XSTRING_append (&errmsg, "%s'%s'", i ? ", " : "",
names[i].name);
+ GNUNET_XSTRING_append (&errmsg, &size, "].");
+ ret = dbus_message_new_error_printf (
+ message,
+ DBUS_ERROR_INVALID_ARGS,
+ "%s",
+ errmsg);
+ GNUNET_free (errmsg);
+ return ret;
+ };
+ return NULL;
+ };
+ dbus_message_unref (ret);
+
+ return dbus_message_new_error_printf (
+ message,
+ DBUS_ERROR_INVALID_ARGS,
+ "Bad argument for '%s'. Expected either a uint32 or a string option",
+ arg_name);
+};
+
+DBusMessage *
+GNUNET_DBUS_message_iter_pop_hashcode (
+ DBusMessage *message,
+ DBusMessageIter *iter,
+ const char *arg_name,
+ struct GNUNET_HashCode *hc)
+{
+ const char *hc_in;
+ DBusMessage *ret = GNUNET_DBUS_message_iter_pop_string (message, iter,
arg_name, &hc_in);
+ if (ret)
+ return ret;
+
+ int err = GNUNET_CRYPTO_hash_from_string2 (hc_in, strlen(hc_in), hc);
+ if (GNUNET_OK != err)
+ {
+ return dbus_message_new_error_printf (
+ message,
+ DBUS_ERROR_INVALID_ARGS,
+ "Bad argument for '%s'. Malformed hash string.
GNUNET_CRYPTO_hash_from_string2 returned %d",
+ arg_name,
+ err);
+ };
+
+ return NULL;
+};
+
+DBusMessage *
+GNUNET_DBUS_message_iter_pop_socket (
+ DBusMessage *message,
+ DBusMessageIter *iter,
+ const char *arg_name,
+ struct GNUNET_NETWORK_Handle **socket_handle)
+{
+ const char *address;
+
+ DBusMessage *ret = GNUNET_DBUS_message_iter_pop_string (message, iter,
arg_name, &address);
+ if (ret)
+ return ret;
+
+ *socket_handle = GNUNET_DBUS_create_socket_from_dbus_address (address);
+ if (! *socket_handle)
+ {
+ return dbus_message_new_error_printf (
+ message,
+ DBUS_ERROR_INVALID_ARGS,
+ "Bad argument for '%s'. Malformed address",
+ arg_name);
+ };
+
+ return NULL;
+};
+
+DBusMessage *
+GNUNET_DBUS_message_iter_pop_absolute_time (
+ DBusMessage *message,
+ DBusMessageIter *iter,
+ const char *arg_name,
+ struct GNUNET_TIME_Absolute *value)
+{
+ const char *time;
+ DBusMessage *ret = GNUNET_DBUS_message_iter_pop_string (message, iter,
arg_name, &time);
+ if (ret)
+ return ret;
+
+ int err = GNUNET_STRINGS_fancy_time_to_absolute (time, value);
+ if (GNUNET_OK != err)
+ {
+ return dbus_message_new_error_printf (
+ message,
+ DBUS_ERROR_INVALID_ARGS,
+ "Bad argument for '%s'. Malformed time string.
GNUNET_STRINGS_fancy_time_to_absolute returned %d",
+ arg_name,
+ err);
+ };
+
+ return NULL;
+};
+
+
Added: gnunet-dbus/src/gnunet_dbus_lib_pop_block.c
===================================================================
--- gnunet-dbus/src/gnunet_dbus_lib_pop_block.c (rev 0)
+++ gnunet-dbus/src/gnunet_dbus_lib_pop_block.c 2013-11-24 09:14:50 UTC (rev
30856)
@@ -0,0 +1,39 @@
+DBusMessage *
+GNUNET_DBUS_message_iter_pop_block_type (
+ DBusMessage *message,
+ DBusMessageIter *iter,
+ const char *arg_name,
+ enum GNUNET_BLOCK_Type *value)
+{
+ static const struct GNUNET_DBUS_EnumName names[] = {
+ {"any", GNUNET_BLOCK_TYPE_ANY},
+ {"fs_dblock", GNUNET_BLOCK_TYPE_FS_DBLOCK},
+ {"fs_iblock", GNUNET_BLOCK_TYPE_FS_IBLOCK},
+ {"fs_kblock", GNUNET_BLOCK_TYPE_FS_KBLOCK},
+ {"fs_sblock", GNUNET_BLOCK_TYPE_FS_SBLOCK},
+ {"fs_nblock", GNUNET_BLOCK_TYPE_FS_NBLOCK},
+ {"fs_ondemand", GNUNET_BLOCK_TYPE_FS_ONDEMAND},
+ {"dht_hello", GNUNET_BLOCK_TYPE_DHT_HELLO},
+ {"test", GNUNET_BLOCK_TYPE_TEST},
+ {"fs_ublock", GNUNET_BLOCK_TYPE_FS_UBLOCK},
+ {"dns", GNUNET_BLOCK_TYPE_DNS},
+ {"gns_namerecord", GNUNET_BLOCK_TYPE_GNS_NAMERECORD},
+ {"mesh_peer", GNUNET_BLOCK_TYPE_MESH_PEER},
+ {"regex", GNUNET_BLOCK_TYPE_REGEX},
+ {"regex_accept", GNUNET_BLOCK_TYPE_REGEX_ACCEPT}
+ };
+
+ int v;
+ DBusMessage *ret = GNUNET_DBUS_message_iter_pop_enum (
+ message,
+ iter,
+ arg_name,
+ &v,
+ names);
+ if (ret)
+ return ret;
+
+ *value = (enum GNUNET_BLOCK_Type)v;
+ return NULL;
+};
+
Added: gnunet-dbus/src/gnunet_dbus_lib_pop_dht.c
===================================================================
--- gnunet-dbus/src/gnunet_dbus_lib_pop_dht.c (rev 0)
+++ gnunet-dbus/src/gnunet_dbus_lib_pop_dht.c 2013-11-24 09:14:50 UTC (rev
30856)
@@ -0,0 +1,29 @@
+DBusMessage *
+GNUNET_DBUS_message_iter_pop_dht_routeoption (
+ DBusMessage *message,
+ DBusMessageIter *iter,
+ const char *arg_name,
+ enum GNUNET_DHT_RouteOption *value)
+{
+ static const struct GNUNET_DBUS_EnumName fields[] = {
+ {"demultiplex_everywhere", GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE},
+ {"record_route", GNUNET_DHT_RO_RECORD_ROUTE},
+ {"find_peer", GNUNET_DHT_RO_FIND_PEER},
+ {"bart", GNUNET_DHT_RO_BART}
+ };
+
+ int bf;
+ DBusMessage *ret = GNUNET_DBUS_message_iter_pop_bitfield (
+ message,
+ iter,
+ arg_name,
+ &bf,
+ fields);
+ if (ret)
+ return ret;
+
+ *value = (enum GNUNET_DHT_RouteOption)bf;
+ return NULL;
+};
+
+
Added: gnunet-dbus/src/xstring.c
===================================================================
--- gnunet-dbus/src/xstring.c (rev 0)
+++ gnunet-dbus/src/xstring.c 2013-11-24 09:14:50 UTC (rev 30856)
@@ -0,0 +1,96 @@
+#include "xstring.h"
+
+#include <stdint.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <string.h>
+#include <sys/socket.h>
+
+#include <gnunet/gnunet_common.h>
+
+char *
+GNUNET_XSTRING_new()
+{
+ return (char *)GNUNET_malloc(GNUNET_XSTRING_NEW_DEFAULT_SIZE);
+};
+
+int
+GNUNET_XSTRING_append ( \
+ char **dest,
+ size_t *dest_size,
+ const char *arg)
+{
+ size_t old_len, new_len, total_len;
+ size_t newsize;
+
+ old_len = strnlen(*dest, *dest_size);
+ new_len = strlen(arg);
+ total_len = old_len + new_len;
+ newsize = *dest_size;
+
+ if(newsize == 0)
+ newsize = GNUNET_XSTRING_NEW_DEFAULT_SIZE;
+
+ while( \
+ (total_len + 1 > newsize || newsize <
GNUNET_XSTRING_NEW_DEFAULT_SIZE) \
+ && newsize != 0)
+ newsize *= 2;
+
+ if(newsize == 0)
+ return GNUNET_SYSERR;
+
+ if(newsize > *dest_size)
+ {
+ *dest_size = newsize;
+ *dest = GNUNET_realloc(*dest, *dest_size);
+ if(*dest == NULL)
+ return GNUNET_SYSERR;
+ };
+
+ memcpy(*dest + old_len, arg, new_len + 1);
+ return GNUNET_OK;
+};
+
+int
+GNUNET_XSTRING_appendf ( \
+ char **dest,
+ size_t *dest_size,
+ const char *fmt,
+ ...)
+{
+ size_t old_len;
+ va_list args;
+
+ old_len = strnlen(*dest, *dest_size);
+ va_start(args, fmt);
+
+ while(true)
+ {
+ size_t remaining;
+ char *end;
+ int written;
+
+ remaining = *dest_size - old_len;
+ end = *dest + old_len;
+ written = vsnprintf(end, remaining, fmt, args);
+
+ if(written < 0)
+ return GNUNET_SYSERR;
+
+ if((size_t)written >= remaining)
+ {
+ *dest_size *= 2;
+ *dest = GNUNET_realloc(*dest, *dest_size);
+ if(*dest == NULL)
+ return GNUNET_SYSERR;
+ continue;
+ };
+
+ break;
+ };
+ va_end(args);
+
+ return GNUNET_OK;
+};
+
+
Added: gnunet-dbus/src/xstring.h
===================================================================
--- gnunet-dbus/src/xstring.h (rev 0)
+++ gnunet-dbus/src/xstring.h 2013-11-24 09:14:50 UTC (rev 30856)
@@ -0,0 +1,26 @@
+#ifndef GNUNET_XSTRING_LIB_H
+#define GNUNET_XSTRING_LIB_H
+
+#include <stdlib.h>
+#include <stddef.h>
+
+#define GNUNET_XSTRING_NEW_DEFAULT_SIZE 64
+
+char *
+GNUNET_XSTRING_new();
+
+int
+GNUNET_XSTRING_append ( \
+ char **dest,
+ size_t *dest_size,
+ const char *arg);
+
+int
+GNUNET_XSTRING_appendf ( \
+ char **dest,
+ size_t *dest_size,
+ const char *fmt,
+ ...);
+
+#endif // GNUNET_XSTRING_LIB_H
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30856 - in gnunet-dbus: . src,
gnunet <=