pidgin.yaz: src/protocols/bonjour/dns

comparison src/protocols/bonjour/dns_sd.c @ 13909:8264f52a1142

[gaim-migrate @ 16406] More of sf patch #1490646, from Jonty Wareing & Jono Cole "The screen name + hostname of the sending user is sent in the outgoing jabber message, fixing a sporadic problem with iChat. The port in use has been fixed to the one described in the Bonjour specification and can no longer be changed in the prpl preferences - modifiying this just stops the client from being able to start a chat. The option for a buddy icon has been removed for now as no code actually uses it yet - we plan to change this in the future. This update also introduces automatic local port retry for up to ten attempts if the port is in use (e.g. if multiple instances of gaim are running)." committer: Tailor Script <tailor@pidgin.im>

author	Mark Doliner <mark@kingant.net>
date	Mon, 03 Jul 2006 00:37:41 +0000
parents	b986b6e2441b
children

comparison

equal deleted inserted replaced

-:cab785a7c766
+:8264f52a1142
 #include "dns_sd.h"
 #include "bonjour.h"
 #include "buddy.h"
 #include "debug.h"
-/* Private data */
-typedef struct _dns_sd_packet
-{
-	gchar *name;
-	gchar *txtvers;
-	gchar *version;
-	gchar *first;
-	gchar *last;
-	gint port_p2pj;
-	gchar *phsh;
-	gchar *status;
-	gchar *message;
-	gchar *email;
-	gchar *vc;
-	gchar *jid;
-	gchar *AIM;
-} dns_sd_packet;
-/* End private data */
 /* Private functions */
 static sw_result HOWL_API
 _publish_reply(sw_discovery discovery, sw_discovery_oid oid,
 			   sw_discovery_publish_status status, sw_opaque extra)
 	BonjourBuddy *buddy;
 	GaimAccount *account = (GaimAccount*)extra;
 	gchar *txtvers = NULL;
 	gchar *version = NULL;
 	gchar *first = NULL;
-	gint port_p2pj = -1;
 	gchar *phsh = NULL;
 	gchar *status = NULL;
 	gchar *email = NULL;
 	gchar *last = NULL;
 	gchar *jid = NULL;
 				txtvers = g_strdup(value);
 			} else if (strcmp(key, "version") == 0) {
 				version = g_strdup(value);
 			} else if (strcmp(key, "1st") == 0) {
 				first = g_strdup(value);
-			} else if (strcmp(key, "port.p2pj") == 0) {
-				port_p2pj = atoi(value);
 			} else if (strcmp(key, "status") == 0) {
 				status = g_strdup(value);
 			} else if (strcmp(key, "email") == 0) {
 				email = g_strdup(value);
 			} else if (strcmp(key, "last") == 0) {
 		}
 	}
 	/* Put the parameters of the text_record in a buddy and add the buddy to */
 	/* the buddy list */
-	buddy = bonjour_buddy_new(name, first, port_p2pj, phsh,
+	buddy = bonjour_buddy_new(name, first, port, phsh,
 							  status, email, last, jid, AIM, vc, ip, msg);
 	if (bonjour_buddy_check(buddy) == FALSE)
 	{
 		bonjour_buddy_delete(buddy);
 			break;
 		case SW_DISCOVERY_BROWSE_REMOVE_DOMAIN:
 			gaim_debug_warning("bonjour", "_browser_reply --> Remove domain\n");
 			break;
 		case SW_DISCOVERY_BROWSE_ADD_SERVICE:
-			/* A new peer has join the network and uses iChat bonjour */
+			/* A new peer has joined the network and uses iChat bonjour */
 			gaim_debug_info("bonjour", "_browser_reply --> Add service\n");
 			if (g_ascii_strcasecmp(name, account->username) != 0)
 			{
 				if (sw_discovery_resolve(discovery, interface_index, name, type,
 						domain, _resolve_reply, extra, &rid) != SW_OKAY)
 static int
 _dns_sd_publish(BonjourDnsSd *data, PublishType type)
 {
 	sw_text_record dns_data;
 	sw_result publish_result = SW_OKAY;
+	char portstring[6];
 	/* Fill the data for the service */
 	if (sw_text_record_init(&dns_data) != SW_OKAY)
 	{
 		gaim_debug_error("bonjour", "Unable to initialize the data for the mDNS.\n");
 		return -1;
 	}
+	/* Convert the port to a string */
+	snprintf(portstring, sizeof(portstring), "%d", data->port_p2pj);
+	/* Publish standard records */
 	sw_text_record_add_key_and_string_value(dns_data, "txtvers", data->txtvers);
 	sw_text_record_add_key_and_string_value(dns_data, "version", data->version);
 	sw_text_record_add_key_and_string_value(dns_data, "1st", data->first);
 	sw_text_record_add_key_and_string_value(dns_data, "last", data->last);
-	/* sw_text_record_add_key_and_string_value(dns_data, "port.p2pj", itoa(data->port_p2pj)); */
+	sw_text_record_add_key_and_string_value(dns_data, "port.p2pj", portstring);
-	sw_text_record_add_key_and_string_value(dns_data, "port.p2pj", BONJOUR_DEFAULT_PORT);
 	sw_text_record_add_key_and_string_value(dns_data, "phsh", data->phsh);
 	sw_text_record_add_key_and_string_value(dns_data, "status", data->status);
 	sw_text_record_add_key_and_string_value(dns_data, "vc", data->vc);
+	/* Publish extra records */
 	if ((data->email != NULL) && (*data->email != '\0'))
 		sw_text_record_add_key_and_string_value(dns_data, "email", data->email);
 	if ((data->jid != NULL) && (*data->jid != '\0'))
 		sw_text_record_add_key_and_string_value(dns_data, "jid", data->jid);
 								sw_text_record_bytes(dns_data), sw_text_record_len(dns_data));
 			break;
 	}
 	if (publish_result != SW_OKAY)
 	{
-		gaim_debug_error("bonjour", "Unable to publish or change the status of the _presence._tcp service.");
+		gaim_debug_error("bonjour", "Unable to publish or change the status of the _presence._tcp service.\n");
 		return -1;
 	}
 	/* Free the memory used by temp data */
 	sw_text_record_fina(dns_data);

Mercurial > pidgin.yaz

comparison src/protocols/bonjour/dns_sd.c @ 13909:8264f52a1142