comparison src/network.c @ 11424:e1ab173ef3b5

[gaim-migrate @ 13661] prefs for STUN adjustments for NTLM in SIP committer: Tailor Script <[e-mail]>

11423:202a3b3c5a88

const char *
gaim_network_get_my_ip(int fd)
{
  const char *ip = NULL;
  GaimUPnPControlInfo* controlInfo = NULL;

	/* Check if the user specified an IP manually */
	if (!gaim_prefs_get_bool("/core/network/auto_ip")) {
		ip = gaim_network_get_public_ip();
		if (ip != NULL)
			return ip;
	}

  /* attempt to get the ip from a NAT device */
  if ((controlInfo = gaim_upnp_discover()) != NULL) {
    ip = gaim_upnp_get_public_ip(controlInfo);
    g_free(controlInfo->controlURL);

11424:e1ab173ef3b5

const char *
gaim_network_get_my_ip(int fd)
{
  const char *ip = NULL;
  GaimUPnPControlInfo* controlInfo = NULL;
	struct stun_nattype *stun;

	/* Check if the user specified an IP manually */
	if (!gaim_prefs_get_bool("/core/network/auto_ip")) {
		ip = gaim_network_get_public_ip();
		if (ip != NULL)
			return 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;
	}	


  /* attempt to get the ip from a NAT device */
  if ((controlInfo = gaim_upnp_discover()) != NULL) {
    ip = gaim_upnp_get_public_ip(controlInfo);
    g_free(controlInfo->controlURL);