comparison src/ft.c @ 6269:0a902bd3e170

[gaim-migrate @ 6766] I'm going to be boiled alive for this.. Changing gaim_xfers_get_local_system_ip() to use a static buffer that it returns instead of a g_strdup()'d copy of the buffer... but that's rarely of use, because I don't think the IP will be changing often enough where this will screw up code :P Also, fixed a function's name, because I broke compiling again. committer: Tailor Script <[e-mail]>

6268:084e1f6610a8

	xfer->type    = type;
	xfer->account = account;
	xfer->who     = g_strdup(who);
	xfer->ui_ops  = gaim_get_xfer_ui_ops();

	xfer->local_ip = gaim_xfers_get_ip_for_account(account);

	ui_ops = gaim_xfer_get_ui_ops(xfer);

	if (ui_ops != NULL && ui_ops->new_xfer != NULL)
		ui_ops->new_xfer(xfer);

		return NULL;

	return ip;
}

char *
gaim_xfers_get_local_system_ip(void)
{
	struct hostent *host;
	char localhost[129];
	long unsigned add;
	char ip[46];

	if (gethostname(localhost, 128) < 0)
		return NULL;

	if ((host = gethostbyname(localhost)) == NULL)

	memcpy(&add, host->h_addr_list[0], 4);
	add = htonl(add);

	g_snprintf(ip, 11, "%lu", add);

	return g_strdup(ip);
}

char *
gaim_xfers_get_ip_for_account(const GaimAccount *account)
{
	g_return_val_if_fail(account != NULL, NULL);

	if (gaim_account_get_public_ip(account) != NULL)
		return g_strdup(gaim_account_get_public_ip(account));
	else if (gaim_xfers_get_local_ip() != NULL)
		return g_strdup(gaim_xfers_get_local_ip());
	else
		return gaim_xfers_get_local_system_ip();
}

void

6269:0a902bd3e170

	xfer->type    = type;
	xfer->account = account;
	xfer->who     = g_strdup(who);
	xfer->ui_ops  = gaim_get_xfer_ui_ops();

	xfer->local_ip = g_strdup(gaim_xfers_get_ip_for_account(account));

	ui_ops = gaim_xfer_get_ui_ops(xfer);

	if (ui_ops != NULL && ui_ops->new_xfer != NULL)
		ui_ops->new_xfer(xfer);

		return NULL;

	return ip;
}

const char *
gaim_xfers_get_local_system_ip(void)
{
	struct hostent *host;
	char localhost[129];
	long unsigned add;
	static char ip[46];

	if (gethostname(localhost, 128) < 0)
		return NULL;

	if ((host = gethostbyname(localhost)) == NULL)

	memcpy(&add, host->h_addr_list[0], 4);
	add = htonl(add);

	g_snprintf(ip, 11, "%lu", add);

	return ip;
}

const char *
gaim_xfers_get_ip_for_account(const GaimAccount *account)
{
	g_return_val_if_fail(account != NULL, NULL);

	if (gaim_account_get_public_ip(account) != NULL)
		return gaim_account_get_public_ip(account);
	else if (gaim_xfers_get_local_ip() != NULL)
		return gaim_xfers_get_local_ip();
	else
		return gaim_xfers_get_local_system_ip();
}

void