diff options
author | Andrew Victor <andrew.victor@mxit.com> | 2011-09-24 21:10:41 +0000 |
---|---|---|
committer | Andrew Victor <andrew.victor@mxit.com> | 2011-09-24 21:10:41 +0000 |
commit | eddc0224677eefece6cea7d6264231f588efefdf (patch) | |
tree | 2aaf63911326a3a204ed88c37223a678a87fcaad /libpurple/network.c | |
parent | 26ee015d3d75da7f974a92648acce0e9656d869a (diff) | |
download | pidgin-eddc0224677eefece6cea7d6264231f588efefdf.tar.gz |
Remove deprecated purple_network_listen_map_external().
Update purple_network_listen() and purple_network_listen_range() to have a boolean
parameter that indicates if the port should be mapped externally.
Diffstat (limited to 'libpurple/network.c')
-rw-r--r-- | libpurple/network.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/libpurple/network.c b/libpurple/network.c index df9875628e..4e30d17f20 100644 --- a/libpurple/network.c +++ b/libpurple/network.c @@ -391,14 +391,9 @@ purple_network_finish_pmp_map_cb(gpointer data) return FALSE; } -static gboolean listen_map_external = TRUE; -void purple_network_listen_map_external(gboolean map_external) -{ - listen_map_external = map_external; -} - static PurpleNetworkListenData * -purple_network_do_listen(unsigned short port, int socket_family, int socket_type, PurpleNetworkListenCallback cb, gpointer cb_data) +purple_network_do_listen(unsigned short port, int socket_family, int socket_type, gboolean map_external, + PurpleNetworkListenCallback cb, gpointer cb_data) { int listenfd = -1; int flags; @@ -503,7 +498,7 @@ purple_network_do_listen(unsigned short port, int socket_family, int socket_type listen_data->cb_data = cb_data; listen_data->socket_type = socket_type; - if (!purple_socket_speaks_ipv4(listenfd) || !listen_map_external || + if (!purple_socket_speaks_ipv4(listenfd) || !map_external || !purple_prefs_get_bool("/purple/network/map_ports")) { purple_debug_info("network", "Skipping external port mapping.\n"); @@ -531,19 +526,19 @@ purple_network_do_listen(unsigned short port, int socket_family, int socket_type } PurpleNetworkListenData * -purple_network_listen(unsigned short port, int socket_family, - int socket_type, PurpleNetworkListenCallback cb, +purple_network_listen(unsigned short port, int socket_family, int socket_type, + gboolean map_external, PurpleNetworkListenCallback cb, gpointer cb_data) { g_return_val_if_fail(port != 0, NULL); - return purple_network_do_listen(port, socket_family, socket_type, + return purple_network_do_listen(port, socket_family, socket_type, map_external, cb, cb_data); } PurpleNetworkListenData * purple_network_listen_range(unsigned short start, unsigned short end, - int socket_family, int socket_type, + int socket_family, int socket_type, gboolean map_external, PurpleNetworkListenCallback cb, gpointer cb_data) { @@ -558,7 +553,7 @@ purple_network_listen_range(unsigned short start, unsigned short end, } for (; start <= end; start++) { - ret = purple_network_do_listen(start, AF_UNSPEC, socket_type, cb, cb_data); + ret = purple_network_do_listen(start, AF_UNSPEC, socket_type, map_external, cb, cb_data); if (ret != NULL) break; } |