comparison libpurple/network.c @ 15441:56a2a0bb290a

Fix a crash when a network_listen_range process is canceled before its UPnP port mapping completes, which occurs regularly on certain routers when file transfers are initiated and then quickly finished. Much thanks to Elliott Harris and Eric Richie for their hard work with me hunting this down and fixing it.

15439:a415922e2882

	int socket_type;
	gboolean retry;
	gboolean adding;
	GaimNetworkListenCallback cb;
	gpointer cb_data;
};

#ifdef HAVE_LIBNM
void nm_callback_func(libnm_glib_ctx* ctx, gpointer user_data);
#endif

	if (!success) {
		gaim_debug_info("network", "Couldn't create UPnP mapping\n");
		if (listen_data->retry) {
			listen_data->retry = FALSE;
			listen_data->adding = FALSE;
			/* TODO: Need to keep track of this return value! */
			gaim_upnp_remove_port_mapping(
				gaim_network_get_port_from_fd(listen_data->listenfd),
				(listen_data->socket_type == SOCK_STREAM) ? "TCP" : "UDP",
				gaim_network_set_upnp_port_mapping_cb, listen_data);
			return;
		}
	} else if (!listen_data->adding) {
		/* We've tried successfully to remove the port mapping.
		 * Try to add it again */
		listen_data->adding = TRUE;
		/* TODO: Need to keep track of this return value! */
		gaim_upnp_set_port_mapping(
			gaim_network_get_port_from_fd(listen_data->listenfd),
			(listen_data->socket_type == SOCK_STREAM) ? "TCP" : "UDP",
			gaim_network_set_upnp_port_mapping_cb, listen_data);
		return;
	}

	if (listen_data->cb)
		listen_data->cb(listen_data->listenfd, listen_data->cb_data);

	gaim_network_listen_cancel(listen_data);
}


static GaimNetworkListenData *

	listen_data->adding = TRUE;
	listen_data->retry = TRUE;
	listen_data->cb = cb;
	listen_data->cb_data = cb_data;

	/* TODO: Need to keep track of this return value! */
	gaim_upnp_set_port_mapping(
			gaim_network_get_port_from_fd(listenfd),
			(socket_type == SOCK_STREAM) ? "TCP" : "UDP",
			gaim_network_set_upnp_port_mapping_cb, listen_data);

	return listen_data;
}

GaimNetworkListenData *

	return ret;
}

void gaim_network_listen_cancel(GaimNetworkListenData *listen_data)
{
	g_free(listen_data);
}

unsigned short
gaim_network_get_port_from_fd(int fd)

15441:56a2a0bb290a

	int socket_type;
	gboolean retry;
	gboolean adding;
	GaimNetworkListenCallback cb;
	gpointer cb_data;
	UPnPMappingAddRemove *mapping_data;
};

#ifdef HAVE_LIBNM
void nm_callback_func(libnm_glib_ctx* ctx, gpointer user_data);
#endif

	if (!success) {
		gaim_debug_info("network", "Couldn't create UPnP mapping\n");
		if (listen_data->retry) {
			listen_data->retry = FALSE;
			listen_data->adding = FALSE;
			listen_data->mapping_data = gaim_upnp_remove_port_mapping(
						gaim_network_get_port_from_fd(listen_data->listenfd),
						(listen_data->socket_type == SOCK_STREAM) ? "TCP" : "UDP",
						gaim_network_set_upnp_port_mapping_cb, listen_data);
			return;
		}
	} else if (!listen_data->adding) {
		/* We've tried successfully to remove the port mapping.
		 * Try to add it again */
		listen_data->adding = TRUE;
		listen_data->mapping_data = gaim_upnp_set_port_mapping(
					gaim_network_get_port_from_fd(listen_data->listenfd),
					(listen_data->socket_type == SOCK_STREAM) ? "TCP" : "UDP",
					gaim_network_set_upnp_port_mapping_cb, listen_data);
		return;
	}

	if (listen_data->cb)
		listen_data->cb(listen_data->listenfd, listen_data->cb_data);

	/* Clear the UPnP mapping data, since it's complete and gaim_netweork_listen_cancel() will try to cancel
	 * it otherwise. */
	listen_data->mapping_data = NULL;
	gaim_network_listen_cancel(listen_data);
}


static GaimNetworkListenData *

	listen_data->adding = TRUE;
	listen_data->retry = TRUE;
	listen_data->cb = cb;
	listen_data->cb_data = cb_data;

	listen_data->mapping_data = gaim_upnp_set_port_mapping(
					gaim_network_get_port_from_fd(listenfd),
					(socket_type == SOCK_STREAM) ? "TCP" : "UDP",
					gaim_network_set_upnp_port_mapping_cb, listen_data);

	return listen_data;
}

GaimNetworkListenData *

	return ret;
}

void gaim_network_listen_cancel(GaimNetworkListenData *listen_data)
{
	if (listen_data->mapping_data != NULL)
		gaim_upnp_cancel_port_mapping(listen_data->mapping_data);

	g_free(listen_data);
}

unsigned short
gaim_network_get_port_from_fd(int fd)