comparison libpurple/protocols/bonjour/jabber.c @ 32369:d6cc1ff0d9b7

Append interface ID only to local interfaces for IPv6 Bonjour. This should fix unsuccessful connection attempts both for two IPv6 hosts with a non-link-local address next to the link-local one or without. committer: Ethan Blanton <[e-mail]>

32367:00ea5f8ef509

	fcntl(client_socket, F_SETFD, FD_CLOEXEC);
#endif

	/* Look for the buddy that has opened the conversation and fill information */
#ifdef HAVE_INET_NTOP
	if (their_addr.ss_family == AF_INET6)
		address_text = inet_ntop(their_addr.ss_family, &((struct sockaddr_in6 *)&their_addr)->sin6_addr,
			addrstr, sizeof(addrstr));
	else
		address_text = inet_ntop(their_addr.ss_family, &((struct sockaddr_in *)&their_addr)->sin_addr,
			addrstr, sizeof(addrstr));
#else
	address_text = inet_ntoa(((struct sockaddr_in *)&their_addr)->sin_addr);

	}
#endif

	return ips;
}

32369:d6cc1ff0d9b7

	fcntl(client_socket, F_SETFD, FD_CLOEXEC);
#endif

	/* Look for the buddy that has opened the conversation and fill information */
#ifdef HAVE_INET_NTOP
	if (their_addr.ss_family == AF_INET6) {
		address_text = inet_ntop(their_addr.ss_family, &((struct sockaddr_in6 *)&their_addr)->sin6_addr,
			addrstr, sizeof(addrstr));

		append_iface_if_linklocal(addrstr,
			((struct sockaddr_in6 *)&their_addr)->sin6_scope_id);
	}
	else
		address_text = inet_ntop(their_addr.ss_family, &((struct sockaddr_in *)&their_addr)->sin_addr,
			addrstr, sizeof(addrstr));
#else
	address_text = inet_ntoa(((struct sockaddr_in *)&their_addr)->sin_addr);

	}
#endif

	return ips;
}

void
append_iface_if_linklocal(char *ip, uint32_t interface) {
	struct in6_addr in6_addr;
	int len_remain = INET6_ADDRSTRLEN - strlen(ip);

	if (len_remain <= 1)
		return;

	if (inet_pton(AF_INET6, ip, &in6_addr) != 1 ||
	    !IN6_IS_ADDR_LINKLOCAL(&in6_addr))
		return;

	snprintf(ip + strlen(ip), len_remain, "%%%d",
		 interface);
}