comparison libpurple/protocols/bonjour/mdns_win32.c @ 30583:9c8b28dc6656

The hostname used for a bonjour account should always be the current machine name. This fixes our behavior so the previous statement is always the case. Unfortunately, this means that if the hostname was previously not the current machine name, the bonjour jid ends up looking like "username\40otherhost@hostname". Fixes #12674

30582:014a58e994da

#include "buddy.h"
#include "mdns_interface.h"
#include "dns_sd_proxy.h"
#include "mdns_common.h"

static GSList *pending_buddies = NULL;

typedef struct _dnssd_service_ref_handler {
	DNSServiceRef sdRef;

	if (errorCode != kDNSServiceErr_NoError)
		purple_debug_error("bonjour", "service browser - callback error (%d)\n", errorCode);
	else if (flags & kDNSServiceFlagsAdd) {
		/* A presence service instance has been discovered... check it isn't us! */
		if (purple_utf8_strcasecmp(serviceName, account->username) != 0) {
			DNSServiceErrorType resErrorCode;
			/* OK, lets go ahead and resolve it to add to the buddy list */
			ResolveCallbackArgs *args = g_new0(ResolveCallbackArgs, 1);
			DNSServiceRef resolver_sr;

 * mdns_interface functions *
 ****************************/

gboolean _mdns_init_session(BonjourDnsSd *data) {
	data->mdns_impl_data = g_new0(Win32SessionImplData, 1);
	return TRUE;
}

gboolean _mdns_publish(BonjourDnsSd *data, PublishType type, GSList *records) {
	TXTRecordRef dns_data;

		switch (type) {
			case PUBLISH_START:
				purple_debug_info("bonjour", "Registering presence on port %d\n", data->port_p2pj);
				errorCode = DNSServiceRegister(&presence_sr, kDNSServiceInterfaceIndexAny,
					0, purple_account_get_username(data->account), LINK_LOCAL_RECORD_NAME,
					NULL, NULL, htons(data->port_p2pj), TXTRecordGetLength(&dns_data), TXTRecordGetBytesPtr(&dns_data),
					_mdns_service_register_callback, NULL);
				break;

			case PUBLISH_UPDATE:

30583:9c8b28dc6656

#include "buddy.h"
#include "mdns_interface.h"
#include "dns_sd_proxy.h"
#include "mdns_common.h"
#include "bonjour.h"

static GSList *pending_buddies = NULL;

typedef struct _dnssd_service_ref_handler {
	DNSServiceRef sdRef;

	if (errorCode != kDNSServiceErr_NoError)
		purple_debug_error("bonjour", "service browser - callback error (%d)\n", errorCode);
	else if (flags & kDNSServiceFlagsAdd) {
		/* A presence service instance has been discovered... check it isn't us! */
		if (purple_utf8_strcasecmp(serviceName, bonjour_get_jid(account)) != 0) {
			DNSServiceErrorType resErrorCode;
			/* OK, lets go ahead and resolve it to add to the buddy list */
			ResolveCallbackArgs *args = g_new0(ResolveCallbackArgs, 1);
			DNSServiceRef resolver_sr;

 * mdns_interface functions *
 ****************************/

gboolean _mdns_init_session(BonjourDnsSd *data) {
	data->mdns_impl_data = g_new0(Win32SessionImplData, 1);

	bonjour_dns_sd_set_jid(data->account, purple_get_host_name());

	return TRUE;
}

gboolean _mdns_publish(BonjourDnsSd *data, PublishType type, GSList *records) {
	TXTRecordRef dns_data;

		switch (type) {
			case PUBLISH_START:
				purple_debug_info("bonjour", "Registering presence on port %d\n", data->port_p2pj);
				errorCode = DNSServiceRegister(&presence_sr, kDNSServiceInterfaceIndexAny,
					0, bonjour_get_jid(data->account), LINK_LOCAL_RECORD_NAME,
					NULL, NULL, htons(data->port_p2pj), TXTRecordGetLength(&dns_data), TXTRecordGetBytesPtr(&dns_data),
					_mdns_service_register_callback, NULL);
				break;

			case PUBLISH_UPDATE: