comparison src/network.c @ 11213:ff728e84d59a

[gaim-migrate @ 13344] Changes by Adam Warrington Fixes a crash on UPnP timeout committer: Tailor Script <[e-mail]>

11212:46086fcc82b7

}

const char *
gaim_network_get_my_ip(int fd)
{
	const char *ip = NULL;
  const char *controlURL = 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)

	}

  /* attempt to get the ip from a NAT device */
  if ((controlURL = gaim_upnp_discover()) != NULL) {
    ip = gaim_upnp_get_public_ip(controlURL);
    if (ip != NULL)
      return ip;
  }

	/* Just fetch the IP of the local system */

static int
gaim_network_do_listen(unsigned short port)
{
	int listenfd = -1;
	const int on = 1;
  const char *controlURL = NULL;
#if HAVE_GETADDRINFO
	int errnum;
	struct addrinfo hints, *res, *next;
	char serv[6];

  if((controlURL = gaim_upnp_discover()) != NULL) {
    if(!gaim_upnp_set_port_mapping(controlURL, port, "TCP")) {
      gaim_upnp_remove_port_mapping(controlURL, port, "TCP");
      gaim_upnp_set_port_mapping(controlURL, port, "TCP");
    }
  }

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

11213:ff728e84d59a

}

const char *
gaim_network_get_my_ip(int fd)
{
  char *ip = NULL;
  char *controlURL = 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)

	}

  /* attempt to get the ip from a NAT device */
  if ((controlURL = gaim_upnp_discover()) != NULL) {
    ip = gaim_upnp_get_public_ip(controlURL);
    free(controlURL);
    if (ip != NULL)
      return ip;
  }

	/* Just fetch the IP of the local system */

static int
gaim_network_do_listen(unsigned short port)
{
	int listenfd = -1;
	const int on = 1;
  char *controlURL = NULL;
#if HAVE_GETADDRINFO
	int errnum;
	struct addrinfo hints, *res, *next;
	char serv[6];

  if((controlURL = gaim_upnp_discover()) != NULL) {
    if(!gaim_upnp_set_port_mapping(controlURL, port, "TCP")) {
      gaim_upnp_remove_port_mapping(controlURL, port, "TCP");
      gaim_upnp_set_port_mapping(controlURL, port, "TCP");
    }
    free(controlURL);
  }

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