traversity/traversity
Initial revision
Currently just sends a UPnP search-request but doesn't process the response yet
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore Mon Oct 03 00:56:58 2022 -0500
@@ -0,0 +1,3 @@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.reviewboardrc Mon Oct 03 00:56:58 2022 -0500
@@ -0,0 +1,6 @@
+REVIEWBOARD_URL = "https://reviews.imfreedom.org/" +REPOSITORY = "traversity/traversity" +REPOSITORY_TYPE = "mercurial" +LAND_DEST_BRANCH = "default" --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AUTHORS Mon Oct 03 00:56:58 2022 -0500
@@ -0,0 +1,2 @@
+Gary Kramlich <grim@reaperworld.com> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/COPYING Mon Oct 03 00:56:58 2022 -0500
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to + 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 +this service 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 make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. 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 + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + The precise terms and conditions for copying, distribution and + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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, + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + 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 +convey 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 2 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +Also add information on how to contact you by electronic and paper mail. +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + Gnomovision version 69, Copyright (C) year name of author + Gnomovision 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, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice +This 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. --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/README.md Mon Oct 03 00:56:58 2022 -0500
@@ -0,0 +1,10 @@
+Traversity is a GObject based library to help with NAT traversal. +It is currently a work in progress, but we are looking to support UPnP, +NAT-PMP, and STUN at the least. +The API is highly volatile, and you need to bother looking unless you're going --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/meson.build Mon Oct 03 00:56:58 2022 -0500
@@ -0,0 +1,13 @@
+project('libtraversity', 'C', version : '0.0.1') +GLIB = dependency('glib-2.0', version : '>=2.70.0') +GOBJECT = dependency('gobject-2.0', version : '>=2.70.0') +TEMPLATE_GLIB = dependency('template-glib-1.0', version : '>=3.35.0') +toplevel_inc = include_directories('.') +subdir('traversity-test') --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/traversity-test/meson.build Mon Oct 03 00:56:58 2022 -0500
@@ -0,0 +1,8 @@
+executable('traversity-test', + dependencies : [traversity_dep, GLIB, GOBJECT, TEMPLATE_GLIB], --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/traversity-test/traversity-test.c Mon Oct 03 00:56:58 2022 -0500
@@ -0,0 +1,55 @@
+traversity_test_output_address(const gchar *label, GInetAddress *address) { + if(G_IS_INET_ADDRESS(address)) { + str = g_inet_address_to_string(address); + g_message("%s: %s", label, str ? str : "(none)"); +traversity_test_ready_cb(GObject *obj, GAsyncResult *result, gpointer data) { + TraversityDiscoverer *discoverer = TRAVERSITY_DISCOVERER(obj); + GMainLoop *loop = data; + gboolean success = FALSE; + success = traversity_discoverer_discover_finish(discoverer, result, &error); + g_message("success: %d", success); + g_message("error: %s", error ? error->message : "none"); + traversity_test_output_address("local ipv4", + traversity_discoverer_get_local_ipv4(discoverer)); + traversity_test_output_address("local ipv6", + traversity_discoverer_get_local_ipv6(discoverer)); + traversity_test_output_address("public ipv4", + traversity_discoverer_get_public_ipv4(discoverer)); + traversity_test_output_address("public ipv4", + traversity_discoverer_get_public_ipv6(discoverer)); + g_main_loop_quit(loop); +main(gint argc, gchar *argv[]) { + TraversityDiscoverer *discoverer = NULL; + GMainLoop *loop = NULL; + loop = g_main_loop_new(NULL, FALSE); + discoverer = g_object_new(TRAVERSITY_TYPE_UPNP_DISCOVERER, NULL); + traversity_discoverer_discover_async(discoverer, NULL, traversity_test_ready_cb, loop); --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/traversity/meson.build Mon Oct 03 00:56:58 2022 -0500
@@ -0,0 +1,53 @@
+ 'traversitydiscoverer.c', + 'traversityupnpdiscoverer.c', + 'traversitydiscoverer.h', + 'traversityupnpdiscoverer.h', +TRAVERSITY_BUILT_SOURCES = [] +TRAVERSITY_BUILT_HEADERS = [] +traversity_filebase = 'traversity-1' +TRAVERSITY_H_INCLUDES = [] +foreach header : TRAVERSITY_HEADERS + TRAVERSITY_H_INCLUDES += '#include <traversity/@0@>'.format(header) +traversity_h_conf = configuration_data() +traversity_h_conf.set('TRAVERSITY_H_INCLUDES', '\n'.join(TRAVERSITY_H_INCLUDES)) +traversity_h = configure_file( + input : 'traversity.h.in', + output : 'traversity.h', + configuration : traversity_h_conf, + install_dir : get_option('includedir') / traversity_filebase) +TRAVERSITY_BUILT_HEADERS += traversity_h +traversity_resources = gnome.compile_resources('traversityresources', + 'resources/traversity.gresource.xml', + source_dir : 'resources', +TRAVERSITY_BUILT_SOURCES += traversity_resources +traversity_inc = include_directories('.') +libtraversity = library('traversity', + TRAVERSITY_SOURCES + TRAVERSITY_HEADERS + TRAVERSITY_BUILT_SOURCES + TRAVERSITY_BUILT_HEADERS, + dependencies : [GLIB, GOBJECT, TEMPLATE_GLIB], + c_args : ['-DTRAVERSITY_COMPILATION'], + include_directories : [toplevel_inc, traversity_inc], +traversity_dep = declare_dependency( + # Ensure headers built before any dependencies: + sources : TRAVERSITY_BUILT_SOURCES, + include_directories : [toplevel_inc, traversity_inc], + link_with : libtraversity, + dependencies : [GLIB, GOBJECT, TEMPLATE_GLIB]) +meson.override_dependency(traversity_filebase, traversity_dep) \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/traversity/resources/traversity.gresource.xml Mon Oct 03 00:56:58 2022 -0500
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?> + <gresource prefix="/org/imfreedom/keep/traversity/traversity"> + <file compressed="true">upnp/search-request</file> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/traversity/resources/upnp/search-request Mon Oct 03 00:56:58 2022 -0500
@@ -0,0 +1,6 @@
+HOST: {{ httpmu_host_address }}:{{ httpmu_host_port }} +ST: urn:schemas-upnp-org:service:{{ service_type }} --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/traversity/traversity.h.in Mon Oct 03 00:56:58 2022 -0500
@@ -0,0 +1,20 @@
+#ifndef TRAVERSITY_TRAVERSITY_H +#define TRAVERSITY_TRAVERSITY_H +#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */ +# ifdef TRAVERSITY_COMPILATION +# error "traversity source files should not be including traversity.h" +# endif /* TRAVERSITY_COMPILATION */ +#endif /* __GI_SCANNER__ */ +#ifndef TRAVERSITY_GLOBAL_HEADER_INSIDE +# define TRAVERSITY_GLOBAL_HEADER_INSIDE +#endif /* TRAVERSITY_GLOBAL_HEADER_INSIDE */ +#undef TRAVERSITY_GLOBAL_HEADER_INSIDE +#endif /* TRAVERSITY_PURPLE_H */ --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/traversity/traversitycore.h Mon Oct 03 00:56:58 2022 -0500
@@ -0,0 +1,17 @@
+#if !defined(TRAVERSITY_GLOBAL_HEADER_INSIDE) && !defined(TRAVERSITY_COMPILATION) +# error "only <traversity.h> may be included directly" +#ifndef TRAVERSITY_CORE_H +#define TRAVERSITY_CORE_H +#define TRAVERSITY_DOMAIN (g_quark_from_static_string("traversity")) +#endif /* TRAVERSITY_CORE_H */ --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/traversity/traversitydiscoverer.c Mon Oct 03 00:56:58 2022 -0500
@@ -0,0 +1,278 @@
+#include "traversitydiscoverer.h" + GInetAddress *local_ipv4; + GInetAddress *local_ipv6; + GInetAddress *public_ipv4; + GInetAddress *public_ipv6; +} TraversityDiscovererPrivate; +static GParamSpec *properties[N_PROPERTIES] = {NULL, }; +G_DEFINE_TYPE_WITH_PRIVATE(TraversityDiscoverer, traversity_discoverer, G_TYPE_OBJECT) +/****************************************************************************** + * GObject Implementation + *****************************************************************************/ +traversity_discoverer_get_property(GObject *obj, guint param_id, GValue *value, + TraversityDiscoverer *discoverer = TRAVERSITY_DISCOVERER(obj); + g_value_set_object(value, + traversity_discoverer_get_local_ipv4(discoverer)); + g_value_set_object(value, + traversity_discoverer_get_local_ipv6(discoverer)); + g_value_set_object(value, + traversity_discoverer_get_public_ipv4(discoverer)); + g_value_set_object(value, + traversity_discoverer_get_public_ipv6(discoverer)); + G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, param_id, pspec); +traversity_discoverer_set_property(GObject *obj, guint param_id, const GValue *value, + TraversityDiscoverer *discoverer = TRAVERSITY_DISCOVERER(obj); + traversity_discoverer_set_local_ipv4(discoverer, + g_value_get_object(value)); + traversity_discoverer_set_local_ipv6(discoverer, + g_value_get_object(value)); + traversity_discoverer_set_public_ipv4(discoverer, + g_value_get_object(value)); + traversity_discoverer_set_public_ipv6(discoverer, + g_value_get_object(value)); + G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, param_id, pspec); +traversity_discoverer_dispose(GObject *obj) { + TraversityDiscoverer *discoverer = TRAVERSITY_DISCOVERER(obj); + TraversityDiscovererPrivate *priv = NULL; + priv = traversity_discoverer_get_instance_private(discoverer); + g_clear_object(&priv->local_ipv4); + g_clear_object(&priv->local_ipv6); + g_clear_object(&priv->public_ipv4); + g_clear_object(&priv->public_ipv6); + G_OBJECT_CLASS(traversity_discoverer_parent_class)->dispose(obj); +traversity_discoverer_init(TraversityDiscoverer *discoverer) { +traversity_discoverer_class_init(TraversityDiscovererClass *klass) { + GObjectClass *obj_class = G_OBJECT_CLASS(klass); + obj_class->get_property = traversity_discoverer_get_property; + obj_class->set_property = traversity_discoverer_set_property; + obj_class->dispose = traversity_discoverer_dispose; + properties[PROP_LOCAL_IPV4] = g_param_spec_object( + "local-ipv4", "local-ipv4", + "The discovered local ipv4 address", + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + properties[PROP_LOCAL_IPV6] = g_param_spec_object( + "local-ipv6", "local-ipv6", + "The discovered local ipv6 address", + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + properties[PROP_PUBLIC_IPV4] = g_param_spec_object( + "public-ipv4", "public-ipv4", + "The discovered public ipv4 address", + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + properties[PROP_PUBLIC_IPV6] = g_param_spec_object( + "public-ipv6", "public-ipv6", + "The discovered public ipv6 address", + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + g_object_class_install_properties(obj_class, N_PROPERTIES, properties); +/****************************************************************************** + *****************************************************************************/ +traversity_discoverer_discover_async(TraversityDiscoverer *discoverer, + GCancellable *cancellable, + GAsyncReadyCallback callback, + TraversityDiscovererClass *klass = NULL; + g_return_if_fail(TRAVERSITY_IS_DISCOVERER(discoverer)); + klass = TRAVERSITY_DISCOVERER_GET_CLASS(discoverer); + if(klass != NULL && klass->discover_async != NULL) { + klass->discover_async(discoverer, cancellable, callback, data); +traversity_discoverer_discover_finish(TraversityDiscoverer *discoverer, + GAsyncResult *result, GError **error) + TraversityDiscovererClass *klass = NULL; + g_return_val_if_fail(TRAVERSITY_IS_DISCOVERER(discoverer), FALSE); + klass = TRAVERSITY_DISCOVERER_GET_CLASS(discoverer); + if(klass != NULL && klass->discover_finish) { + return klass->discover_finish(discoverer, result, error); +traversity_discoverer_get_local_ipv4(TraversityDiscoverer *discoverer) { + TraversityDiscovererPrivate *priv = NULL; + g_return_val_if_fail(TRAVERSITY_IS_DISCOVERER(discoverer), NULL); + priv = traversity_discoverer_get_instance_private(discoverer); + return priv->local_ipv4; +traversity_discoverer_set_local_ipv4(TraversityDiscoverer *discoverer, + GInetAddress *local_ipv4) + TraversityDiscovererPrivate *priv = NULL; + g_return_if_fail(TRAVERSITY_IS_DISCOVERER(discoverer)); + priv = traversity_discoverer_get_instance_private(discoverer); + if(g_set_object(&priv->local_ipv4, local_ipv4)) { + g_object_notify_by_pspec(G_OBJECT(discoverer), + properties[PROP_LOCAL_IPV4]); +traversity_discoverer_get_local_ipv6(TraversityDiscoverer *discoverer) { + TraversityDiscovererPrivate *priv = NULL; + g_return_val_if_fail(TRAVERSITY_IS_DISCOVERER(discoverer), NULL); + priv = traversity_discoverer_get_instance_private(discoverer); + return priv->local_ipv6; +traversity_discoverer_set_local_ipv6(TraversityDiscoverer *discoverer, + GInetAddress *local_ipv6) + TraversityDiscovererPrivate *priv = NULL; + g_return_if_fail(TRAVERSITY_IS_DISCOVERER(discoverer)); + priv = traversity_discoverer_get_instance_private(discoverer); + if(g_set_object(&priv->local_ipv6, local_ipv6)) { + g_object_notify_by_pspec(G_OBJECT(discoverer), + properties[PROP_LOCAL_IPV6]); +traversity_discoverer_get_public_ipv4(TraversityDiscoverer *discoverer) { + TraversityDiscovererPrivate *priv = NULL; + g_return_val_if_fail(TRAVERSITY_IS_DISCOVERER(discoverer), NULL); + priv = traversity_discoverer_get_instance_private(discoverer); + return priv->public_ipv4; +traversity_discoverer_set_public_ipv4(TraversityDiscoverer *discoverer, + GInetAddress *public_ipv4) + TraversityDiscovererPrivate *priv = NULL; + g_return_if_fail(TRAVERSITY_IS_DISCOVERER(discoverer)); + priv = traversity_discoverer_get_instance_private(discoverer); + if(g_set_object(&priv->public_ipv4, public_ipv4)) { + g_object_notify_by_pspec(G_OBJECT(discoverer), + properties[PROP_PUBLIC_IPV4]); +traversity_discoverer_get_public_ipv6(TraversityDiscoverer *discoverer) { + TraversityDiscovererPrivate *priv = NULL; + g_return_val_if_fail(TRAVERSITY_IS_DISCOVERER(discoverer), NULL); + priv = traversity_discoverer_get_instance_private(discoverer); + return priv->public_ipv6; +traversity_discoverer_set_public_ipv6(TraversityDiscoverer *discoverer, + GInetAddress *public_ipv6) + TraversityDiscovererPrivate *priv = NULL; + g_return_if_fail(TRAVERSITY_IS_DISCOVERER(discoverer)); + priv = traversity_discoverer_get_instance_private(discoverer); + if(g_set_object(&priv->public_ipv6, public_ipv6)) { + g_object_notify_by_pspec(G_OBJECT(discoverer), + properties[PROP_PUBLIC_IPV6]); --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/traversity/traversitydiscoverer.h Mon Oct 03 00:56:58 2022 -0500
@@ -0,0 +1,48 @@
+#if !defined(TRAVERSITY_GLOBAL_HEADER_INSIDE) && !defined(TRAVERSITY_COMPILATION) +# error "only <traversity.h> may be included directly" +#ifndef TRAVERSITY_DISCOVERER_H +#define TRAVERSITY_DISCOVERER_H +#include <glib-object.h> +#define TRAVERSITY_TYPE_DISCOVERER (traversity_discoverer_get_type()) +G_DECLARE_DERIVABLE_TYPE(TraversityDiscoverer, traversity_discoverer, TRAVERSITY, DISCOVERER, +struct _TraversityDiscovererClass { + void (*discover_async)(TraversityDiscoverer *discoverer, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer data); + gboolean (*discover_finish)(TraversityDiscoverer *discoverer, GAsyncResult *result, GError **error); +void traversity_discoverer_discover_async(TraversityDiscoverer *discoverer, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer data); +gboolean traversity_discoverer_discover_finish(TraversityDiscoverer *discoverer, GAsyncResult *result, GError **error); +GInetAddress *traversity_discoverer_get_local_ipv4(TraversityDiscoverer *discoverer); +void traversity_discoverer_set_local_ipv4(TraversityDiscoverer *discoverer, GInetAddress *local_ipv4); +GInetAddress *traversity_discoverer_get_local_ipv6(TraversityDiscoverer *discoverer); +void traversity_discoverer_set_local_ipv6(TraversityDiscoverer *discoverer, GInetAddress *local_ipv6); +GInetAddress *traversity_discoverer_get_public_ipv4(TraversityDiscoverer *discoverer); +void traversity_discoverer_set_public_ipv4(TraversityDiscoverer *discoverer, GInetAddress *public_ipv4); +GInetAddress *traversity_discoverer_get_public_ipv6(TraversityDiscoverer *discoverer); +void traversity_discoverer_set_public_ipv6(TraversityDiscoverer *discoverer, GInetAddress *public_ipv6); +#endif /* TRAVERSITY_DISCOVERER_H */ --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/traversity/traversityupnpdiscoverer.c Mon Oct 03 00:56:58 2022 -0500
@@ -0,0 +1,192 @@
+#include "traversityupnpdiscoverer.h" +#include "traversitycore.h" +#define TRAVERSITY_UPNP_DISCOVERER_HTTPMU_HOST_ADDRESS "239.255.255.250" +#define TRAVERSITY_UPNP_DISCOVERER_HTTPMU_HOST_PORT 1900 +#define TRAVERSITY_UPNP_DISCOVER_WAN_IP_SERVICE "WANIPConnection:1" +#define TRAVERSITY_UPNP_DISCOVER_WAN_PPP_SERVICE "WANPPPConnection:1" +struct _TraversityUpnpDiscoverer { + TraversityDiscoverer parent; + GSocketAddress *address; +G_DEFINE_TYPE(TraversityUpnpDiscoverer, traversity_upnp_discoverer, TRAVERSITY_TYPE_DISCOVERER) +/****************************************************************************** + *****************************************************************************/ +traversity_upnp_build_search_request(TraversityUpnpDiscoverer *upnp, + const gchar *service_type, + TmplScope *scope = NULL; + TmplSymbol *symbol = NULL; + TmplTemplate *template = NULL; + gboolean success = FALSE; + const gchar *path = "/org/imfreedom/keep/traversity/traversity/upnp/search-request"; + template = tmpl_template_new(NULL); + success = tmpl_template_parse_resource(template, path, NULL, error); + scope = tmpl_scope_new(); + symbol = tmpl_scope_get(scope, "httpmu_host_address"); + tmpl_symbol_assign_string(symbol, TRAVERSITY_UPNP_DISCOVERER_HTTPMU_HOST_ADDRESS); + symbol = tmpl_scope_get(scope, "httpmu_host_port"); + tmpl_symbol_assign_string(symbol, G_STRINGIFY(TRAVERSITY_UPNP_DISCOVERER_HTTPMU_HOST_PORT)); + symbol = tmpl_scope_get(scope, "service_type"); + tmpl_symbol_assign_string(symbol, service_type); + ret = tmpl_template_expand_string(template, scope, error); + g_clear_object(&template); +traversity_upnp_discoverer_udp_read(GSocket *socket, GIOCondition condition, + TraversityUpnpDiscoverer *upnp = data; + length = g_socket_receive(upnp->socket, buffer, sizeof(buffer) - 1, NULL, + buffer[length - 1] = '\0'; + g_source_remove(upnp->source); + g_message("buffer: %s", buffer); +traversity_upnp_discoverer_broadcast(TraversityUpnpDiscoverer *upnp, GTask *task) { + GSource *source = NULL; + body = traversity_upnp_build_search_request(upnp, TRAVERSITY_UPNP_DISCOVER_WAN_IP_SERVICE, &error); + g_message("sending body (%d)\n%s", length, body); + sent = g_socket_send_to(upnp->socket, upnp->address, body, length, NULL, &error); + g_task_return_error(task, error); + source = g_socket_create_source(upnp->socket, G_IO_IN, NULL); + g_source_set_callback(source, + G_SOURCE_FUNC(traversity_upnp_discoverer_udp_read), + upnp->source = g_source_attach(source, NULL); + g_source_unref(source); + //g_task_return_boolean(task, TRUE); +/****************************************************************************** + * TraversityDiscoverer Implementation + *****************************************************************************/ +traversity_upnp_discoverer_discover_async(TraversityDiscoverer *discoverer, + GCancellable *cancellable, + GAsyncReadyCallback callback, + TraversityUpnpDiscoverer *upnp = NULL; + g_return_if_fail(TRAVERSITY_IS_UPNP_DISCOVERER(discoverer)); + upnp = TRAVERSITY_UPNP_DISCOVERER(discoverer); + task = g_task_new(discoverer, cancellable, callback, data); + if(!G_IS_SOCKET(upnp->socket)) { + upnp->socket = g_socket_new(G_SOCKET_FAMILY_IPV4, + G_SOCKET_TYPE_DATAGRAM, + G_SOCKET_PROTOCOL_DEFAULT, &error); + g_task_return_error(task, error); + if(!G_IS_SOCKET(upnp->socket)) { + g_task_return_new_error(task, TRAVERSITY_DOMAIN, 0, + "failed to create control socket: unknown " + upnp->address = g_inet_socket_address_new_from_string(TRAVERSITY_UPNP_DISCOVERER_HTTPMU_HOST_ADDRESS, + TRAVERSITY_UPNP_DISCOVERER_HTTPMU_HOST_PORT); + traversity_upnp_discoverer_broadcast(upnp, task); +traversity_upnp_discoverer_discover_finish(TraversityDiscoverer *discoverer, +/****************************************************************************** + * GObject Implementation + *****************************************************************************/ +traversity_upnp_discoverer_dispose(GObject *obj) { + TraversityUpnpDiscoverer *discoverer = TRAVERSITY_UPNP_DISCOVERER(obj); + g_clear_object(&discoverer->socket); + G_OBJECT_CLASS(traversity_upnp_discoverer_parent_class)->dispose(obj); +traversity_upnp_discoverer_init(TraversityUpnpDiscoverer *discoverer) { +traversity_upnp_discoverer_class_init(TraversityUpnpDiscovererClass *klass) { + GObjectClass *obj_class = G_OBJECT_CLASS(klass); + TraversityDiscovererClass *discoverer_class = TRAVERSITY_DISCOVERER_CLASS(klass); + obj_class->dispose = traversity_upnp_discoverer_dispose; + discoverer_class->discover_async = traversity_upnp_discoverer_discover_async; + discoverer_class->discover_finish = traversity_upnp_discoverer_discover_finish; --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/traversity/traversityupnpdiscoverer.h Mon Oct 03 00:56:58 2022 -0500
@@ -0,0 +1,24 @@
+#if !defined(TRAVERSITY_GLOBAL_HEADER_INSIDE) && !defined(TRAVERSITY_COMPILATION) +# error "only <traversity.h> may be included directly" +#ifndef TRAVERSITY_UPNP_DISCOVERER_H +#define TRAVERSITY_UPNP_DISCOVERER_H +#include <glib-object.h> +#include <traversity/traversitydiscoverer.h> +#define TRAVERSITY_TYPE_UPNP_DISCOVERER (traversity_upnp_discoverer_get_type()) +G_DECLARE_FINAL_TYPE(TraversityUpnpDiscoverer, traversity_upnp_discoverer, TRAVERSITY, + UPNP_DISCOVERER, TraversityDiscoverer) +TraversityDiscoverer *traversity_upnp_discoverer_new(void); +#endif /* TRAVERSITY_UPNP_DISCOVERER_H */
