comparison src/network.c @ 11411:8caea199b018

[gaim-migrate @ 13648] adding stun committer: Tailor Script <[e-mail]>

11410:bc374facaeb2

#include "debug.h"
#include "account.h"
#include "network.h"
#include "prefs.h"
#include "upnp.h"


const unsigned char *
gaim_network_ip_atoi(const char *ip)

const char *
gaim_network_get_public_ip(void)
{
	const char *ip;

	ip = gaim_prefs_get_string("/core/network/public_ip");

	if (ip == NULL || *ip == '\0')
		return NULL;

	return ip;
}

static const char *

11411:8caea199b018

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


const unsigned char *
gaim_network_ip_atoi(const char *ip)

const char *
gaim_network_get_public_ip(void)
{
	const char *ip;
	struct stun_nattype *stun;

	ip = gaim_prefs_get_string("/core/network/public_ip");

	if (ip == NULL || *ip == '\0') {
		/* Check if STUN discovery was already done */
		stun = gaim_stun_discover(NULL);
		if(stun && stun->status>1)
			return stun->publicip;
		return NULL;
	}	

	return ip;
}

static const char *