comparison libpurple/network.c @ 15646:552be3958d6a

Added nat-pmp implementation and #ifdef'd out changes to network.c which would utilize it.

15645:61b42cf81aa4

#include "network.h"
#include "prefs.h"
#include "stun.h"
#include "upnp.h"

/*
 * Calling sizeof(struct ifreq) isn't always correct on
 * Mac OS X (and maybe others).
 */
#ifdef _SIZEOF_ADDR_IFREQ

	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

	/* Attempt to get the IP from a NAT device using UPnP */
	ip = gaim_upnp_get_public_ip();
	if (ip != NULL)
	  return ip;

	/* Just fetch the IP of the local system */
	return gaim_network_get_local_system_ip(fd);
}

gaim_network_do_listen(unsigned short port, int socket_type, GaimNetworkListenCallback cb, gpointer cb_data)
{
	int listenfd = -1;
	const int on = 1;
	GaimNetworkListenData *listen_data;
#ifdef HAVE_GETADDRINFO
	int errnum;
	struct addrinfo hints, *res, *next;
	char serv[6];

		close(listenfd);
		return NULL;
	}
	fcntl(listenfd, F_SETFL, O_NONBLOCK);

	gaim_debug_info("network", "Listening on port: %hu\n", gaim_network_get_port_from_fd(listenfd));

	listen_data = g_new0(GaimNetworkListenData, 1);
	listen_data->listenfd = listenfd;
	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;
}

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

15646:552be3958d6a

#include "network.h"
#include "prefs.h"
#include "stun.h"
#include "upnp.h"

#ifdef ENABLE_NAT_PMP
#include "nat-pmp.h"
#endif

/*
 * Calling sizeof(struct ifreq) isn't always correct on
 * Mac OS X (and maybe others).
 */
#ifdef _SIZEOF_ADDR_IFREQ

	gboolean retry;
	gboolean adding;
	GaimNetworkListenCallback cb;
	gpointer cb_data;
	UPnPMappingAddRemove *mapping_data;
#ifdef ENABLE_NAT_PMP
	gboolean has_pmp_mapping;
#endif
};

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

	/* Attempt to get the IP from a NAT device using UPnP */
	ip = gaim_upnp_get_public_ip();
	if (ip != NULL)
	  return ip;

#ifdef ENABLE_NAT_PMP
	/* Attempt to ge tthe IP from a NAT device using NAT-PMP */
	ip = gaim_pmp_get_public_ip();
	if (ip != NULL)
		return ip;
#endif

	/* Just fetch the IP of the local system */
	return gaim_network_get_local_system_ip(fd);
}

gaim_network_do_listen(unsigned short port, int socket_type, GaimNetworkListenCallback cb, gpointer cb_data)
{
	int listenfd = -1;
	const int on = 1;
	GaimNetworkListenData *listen_data;
	unsigned short actual_port;
#ifdef HAVE_GETADDRINFO
	int errnum;
	struct addrinfo hints, *res, *next;
	char serv[6];

		close(listenfd);
		return NULL;
	}
	fcntl(listenfd, F_SETFL, O_NONBLOCK);

	actual_port = gaim_network_get_port_from_fd(listenfd);

	gaim_debug_info("network", "Listening on port: %hu\n", actual_port);
	
	listen_data = g_new0(GaimNetworkListenData, 1);
	listen_data->listenfd = listenfd;
	listen_data->adding = TRUE;
	listen_data->retry = TRUE;
	listen_data->cb = cb;
	listen_data->cb_data = cb_data;

#ifdef ENABLE_NAT_PMP
	/* Attempt a NAT-PMP Mapping, which will return immediately */
	listen_data->has_pmp_mapping = (gaim_pmp_create_map(((socket_type == SOCK_STREAM) ? GAIM_PMP_TYPE_TCP : GAIM_PMP_TYPE_UDP),
														actual_port, actual_port, GAIM_PMP_LIFETIME) != NULL);	
#endif
	
	/* Attempt a UPnP Mapping */
	listen_data->mapping_data = gaim_upnp_set_port_mapping(
					actual_port,
					(socket_type == SOCK_STREAM) ? "TCP" : "UDP",
					gaim_network_set_upnp_port_mapping_cb, listen_data);

	return listen_data;
}

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

#ifdef ENABLE_NAT_PMP
	if (listen_data->has_pmp_mapping)
		gaim_pmp_destroy_map(((listen_data->socket_type == SOCK_STREAM) ? GAIM_PMP_TYPE_TCP : GAIM_PMP_TYPE_UDP),
							 gaim_network_get_port_from_fd(listen_data->listenfd));
#endif

	g_free(listen_data);
}

unsigned short