comparison libpurple/network.c @ 30578:0accc8adb18a

merge of '2f6318bd834113559a405ec68cdb178f2180b680' and '64e02b98551e11e093e4649f1516f3aceaa321e2'

30577:7b761c8601f7

	gboolean retry;
	gboolean adding;
	PurpleNetworkListenCallback cb;
	gpointer cb_data;
	UPnPMappingAddRemove *mapping_data;
};

#ifdef HAVE_NETWORKMANAGER
static NMState nm_get_network_state(void);
#endif

	PurpleNetworkListenData *listen_data;
	gint *key = g_new(gint, 1);
	gint *value = g_new(gint, 1);

	listen_data = data;

	/* add port mapping to hash table */
	*key = purple_network_get_port_from_fd(listen_data->listenfd);
	*value = listen_data->socket_type;
	g_hash_table_insert(nat_pmp_port_mappings, key, value);

	if (!purple_socket_speaks_ipv4(listenfd) || !listen_map_external ||
			!purple_prefs_get_bool("/purple/network/map_ports"))
	{
		purple_debug_info("network", "Skipping external port mapping.\n");
		/* The pmp_map_cb does what we want to do */
		purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data);
	}
	/* Attempt a NAT-PMP Mapping, which will return immediately */
	else if (purple_pmp_create_map(((socket_type == SOCK_STREAM) ? PURPLE_PMP_TYPE_TCP : PURPLE_PMP_TYPE_UDP),
							  actual_port, actual_port, PURPLE_PMP_LIFETIME))
	{
		purple_debug_info("network", "Created NAT-PMP mapping on port %i\n", actual_port);
		/* We want to return listen_data now, and on the next run loop trigger the cb and destroy listen_data */
		purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data);
	}
	else
	{
		/* Attempt a UPnP Mapping */
		listen_data->mapping_data = purple_upnp_set_port_mapping(

void purple_network_listen_cancel(PurpleNetworkListenData *listen_data)
{
	if (listen_data->mapping_data != NULL)
		purple_upnp_cancel_port_mapping(listen_data->mapping_data);

	g_free(listen_data);
}

unsigned short

	return FALSE;
}

static gboolean _print_debug_msg(gpointer data) {
	gchar *msg = data;
	purple_debug_warning("network", msg);
	g_free(msg);
	return FALSE;
}

static gpointer wpurple_network_change_thread(gpointer data)

	int port = purple_network_get_port_from_fd(fd);
	gint *protocol = g_hash_table_lookup(upnp_port_mappings, &port);

	if (protocol) {
		purple_network_upnp_mapping_remove(&port, protocol, NULL);
		g_hash_table_remove(upnp_port_mappings, protocol);
	} else {
		protocol = g_hash_table_lookup(nat_pmp_port_mappings, &port);
		if (protocol) {
			purple_network_nat_pmp_mapping_remove(&port, protocol, NULL);
			g_hash_table_remove(nat_pmp_port_mappings, protocol);
		}
	}
}

int purple_network_convert_idn_to_ascii(const gchar *in, gchar **out)

30578:0accc8adb18a

	gboolean retry;
	gboolean adding;
	PurpleNetworkListenCallback cb;
	gpointer cb_data;
	UPnPMappingAddRemove *mapping_data;
	int timer;
};

#ifdef HAVE_NETWORKMANAGER
static NMState nm_get_network_state(void);
#endif

	PurpleNetworkListenData *listen_data;
	gint *key = g_new(gint, 1);
	gint *value = g_new(gint, 1);

	listen_data = data;
	listen_data->timer = 0;

	/* add port mapping to hash table */
	*key = purple_network_get_port_from_fd(listen_data->listenfd);
	*value = listen_data->socket_type;
	g_hash_table_insert(nat_pmp_port_mappings, key, value);

	if (!purple_socket_speaks_ipv4(listenfd) || !listen_map_external ||
			!purple_prefs_get_bool("/purple/network/map_ports"))
	{
		purple_debug_info("network", "Skipping external port mapping.\n");
		/* The pmp_map_cb does what we want to do */
		listen_data->timer = purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data);
	}
	/* Attempt a NAT-PMP Mapping, which will return immediately */
	else if (purple_pmp_create_map(((socket_type == SOCK_STREAM) ? PURPLE_PMP_TYPE_TCP : PURPLE_PMP_TYPE_UDP),
							  actual_port, actual_port, PURPLE_PMP_LIFETIME))
	{
		purple_debug_info("network", "Created NAT-PMP mapping on port %i\n", actual_port);
		/* We want to return listen_data now, and on the next run loop trigger the cb and destroy listen_data */
		listen_data->timer = purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data);
	}
	else
	{
		/* Attempt a UPnP Mapping */
		listen_data->mapping_data = purple_upnp_set_port_mapping(

void purple_network_listen_cancel(PurpleNetworkListenData *listen_data)
{
	if (listen_data->mapping_data != NULL)
		purple_upnp_cancel_port_mapping(listen_data->mapping_data);

	if (listen_data->timer > 0)
		purple_timeout_remove(listen_data->timer);

	g_free(listen_data);
}

unsigned short

	return FALSE;
}

static gboolean _print_debug_msg(gpointer data) {
	gchar *msg = data;
	purple_debug_warning("network", "%s", msg);
	g_free(msg);
	return FALSE;
}

static gpointer wpurple_network_change_thread(gpointer data)

	int port = purple_network_get_port_from_fd(fd);
	gint *protocol = g_hash_table_lookup(upnp_port_mappings, &port);

	if (protocol) {
		purple_network_upnp_mapping_remove(&port, protocol, NULL);
	} else {
		protocol = g_hash_table_lookup(nat_pmp_port_mappings, &port);
		if (protocol) {
			purple_network_nat_pmp_mapping_remove(&port, protocol, NULL);
		}
	}
}

int purple_network_convert_idn_to_ascii(const gchar *in, gchar **out)