diff options
author | Gary Kramlich <grim@reaperworld.com> | 2023-03-04 06:37:53 -0600 |
---|---|---|
committer | Gary Kramlich <grim@reaperworld.com> | 2023-03-04 06:37:53 -0600 |
commit | bef0352bc9a8636a84ec98a1c7c76a7ae99b15d5 (patch) | |
tree | ac97ebc78604354b365ff508b3daaf6ab075ac3f /libpurple/network.c | |
parent | f9b41b220e65711fcb3bdaeab1aa31eedb02ba47 (diff) | |
download | pidgin-bef0352bc9a8636a84ec98a1c7c76a7ae99b15d5.tar.gz |
Remove our stun code
I left in the preferences widgets for now as these will be wired to traversity
at some point.
Testing Done:
Opened the preferences dialog and made sure it worked as expected.
Reviewed at https://reviews.imfreedom.org/r/2309/
Diffstat (limited to 'libpurple/network.c')
-rw-r--r-- | libpurple/network.c | 85 |
1 files changed, 3 insertions, 82 deletions
diff --git a/libpurple/network.c b/libpurple/network.c index 45cfe4a63f..6fadd412bb 100644 --- a/libpurple/network.c +++ b/libpurple/network.c @@ -44,13 +44,9 @@ #include "account.h" #include "network.h" #include "prefs.h" -#include "stun.h" static gboolean force_online = FALSE; -/* Cached IP addresses for STUN and TURN servers (set globally in prefs) */ -static gchar *stun_ip = NULL; - void purple_network_set_public_ip(const char *ip) { @@ -114,7 +110,6 @@ void purple_network_discover_my_ip(void) { const char *ip = NULL; - PurpleStunNatDiscovery *stun; /* Check if the user specified an IP manually */ if (!purple_prefs_get_bool("/purple/network/auto_ip")) { @@ -124,33 +119,21 @@ purple_network_discover_my_ip(void) return; } } - - /* Check if STUN discovery was already done */ - stun = purple_stun_discover(NULL); - if (stun != NULL && stun->status == PURPLE_STUN_STATUS_DISCOVERED) { - return; - } } gchar * purple_network_get_my_ip_from_gio(GSocketConnection *sockconn) { - const gchar *ip = NULL; - PurpleStunNatDiscovery *stun; - /* Check if the user specified an IP manually */ if (!purple_prefs_get_bool("/purple/network/auto_ip")) { + const gchar *ip = NULL; + ip = purple_network_get_public_ip(); + /* Make sure the IP address entered by the user is valid */ if ((ip != NULL) && (purple_network_is_ipv4(ip))) { return g_strdup(ip); } - } else { - /* Check if STUN discovery was already done */ - stun = purple_stun_discover(NULL); - if ((stun != NULL) && (stun->status == PURPLE_STUN_STATUS_DISCOVERED)) { - return g_strdup(stun->publicip); - } } /* Just fetch the IP of the local system */ @@ -173,58 +156,6 @@ purple_network_force_online(void) force_online = TRUE; } -static void -purple_network_ip_lookup_cb(GObject *sender, GAsyncResult *result, gpointer data) { - GError *error = NULL; - GList *addresses = NULL; - GInetAddress *address = NULL; - const gchar **ip_address = (const gchar **)data; - - addresses = g_resolver_lookup_by_name_finish(G_RESOLVER(sender), - result, &error); - if(error) { - purple_debug_info("network", "lookup of IP address failed: %s\n", error->message); - - g_error_free(error); - - return; - } - - address = G_INET_ADDRESS(addresses->data); - - *ip_address = g_inet_address_to_string(address); - - g_resolver_free_addresses(addresses); -} - -void -purple_network_set_stun_server(const gchar *stun_server) -{ - if (stun_server && stun_server[0] != '\0') { - if (purple_network_is_available()) { - GResolver *resolver = g_resolver_get_default(); - g_resolver_lookup_by_name_async(resolver, - stun_server, - NULL, - purple_network_ip_lookup_cb, - &stun_ip); - g_object_unref(resolver); - } else { - purple_debug_info("network", - "network is unavailable, don't try to update STUN IP"); - } - } else { - g_free(stun_ip); - stun_ip = NULL; - } -} - -const gchar * -purple_network_get_stun_ip(void) -{ - return stun_ip; -} - gboolean _purple_network_set_common_socket_flags(int fd) { @@ -256,25 +187,15 @@ void purple_network_init(void) { purple_prefs_add_none ("/purple/network"); - purple_prefs_add_string("/purple/network/stun_server", ""); - purple_prefs_add_string("/purple/network/turn_server", ""); - purple_prefs_add_int ("/purple/network/turn_port", 3478); - purple_prefs_add_int ("/purple/network/turn_port_tcp", 3478); - purple_prefs_add_string("/purple/network/turn_username", ""); - purple_prefs_add_string("/purple/network/turn_password", ""); purple_prefs_add_bool ("/purple/network/auto_ip", TRUE); purple_prefs_add_string("/purple/network/public_ip", ""); purple_prefs_add_bool ("/purple/network/map_ports", TRUE); purple_prefs_add_bool ("/purple/network/ports_range_use", FALSE); purple_prefs_add_int ("/purple/network/ports_range_start", 1024); purple_prefs_add_int ("/purple/network/ports_range_end", 2048); - - purple_network_set_stun_server( - purple_prefs_get_string("/purple/network/stun_server")); } void purple_network_uninit(void) { - g_free(stun_ip); } |