Mercurial > pidgin > pidgin / changeset

--- a/libpurple/protocols/bonjour/bonjour.c	Tue Apr 09 23:11:12 2024 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,796 +0,0 @@
-/*
- * purple - Bonjour Protocol Plugin
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
-
-#include <glib/gi18n-lib.h>
-
-#include <glib.h>
-#ifndef _WIN32
-#include <pwd.h>
-#else
-#define UNICODE
-#include <winsock2.h>
-#include <windows.h>
-#include <lm.h>
-#endif
-
-#include <gplugin.h>
-#include <gplugin-native.h>
-
-#include <purple.h>
-
-#include "bonjour.h"
-#include "mdns_common.h"
-#include "buddy.h"
-#include "bonjour_ft.h"
-#include "xmpp.h"
-
-struct _BonjourProtocol {
-	PurpleProtocol parent;
-};
-
-static PurpleProtocol *my_protocol = NULL;
-
-static char *default_firstname;
-static char *default_lastname;
-
-const char *
-bonjour_get_jid(PurpleAccount *account)
-{
-	PurpleConnection *conn = purple_account_get_connection(account);
-	BonjourData *bd = purple_connection_get_protocol_data(conn);
-	return bd->jid;
-}
-
-const gchar *
-bonjour_get_group_name(void) {
-	return _("Bonjour");
-}
-
-static void
-bonjour_removeallfromlocal(PurpleConnection *conn, PurpleGroup *bonjour_group)
-{
-	PurpleAccount *account = purple_connection_get_account(conn);
-	PurpleBlistNode *cnode, *cnodenext, *bnode, *bnodenext;
-	PurpleBuddy *buddy;
-
-	if (bonjour_group == NULL)
-		return;
-
-	/* Go through and remove all buddies that belong to this account */
-	for (cnode = purple_blist_node_get_first_child((PurpleBlistNode *) bonjour_group); cnode; cnode = cnodenext) {
-		cnodenext = purple_blist_node_get_sibling_next(cnode);
-		if (!PURPLE_IS_META_CONTACT(cnode))
-			continue;
-		for (bnode = purple_blist_node_get_first_child(cnode); bnode; bnode = bnodenext) {
-			bnodenext = purple_blist_node_get_sibling_next(bnode);
-			if (!PURPLE_IS_BUDDY(bnode))
-				continue;
-			buddy = (PurpleBuddy *) bnode;
-			if (purple_buddy_get_account(buddy) != account)
-				continue;
-			purple_account_remove_buddy(account, buddy, NULL);
-			purple_blist_remove_buddy(buddy);
-		}
-	}
-
-}
-
-static void
-bonjour_login(G_GNUC_UNUSED PurpleProtocol *protocol, PurpleAccount *account) {
-	PurpleConnection *gc = purple_account_get_connection(account);
-	BonjourData *bd;
-	PurpleStatus *status;
-	PurplePresence *presence;
-
-	if (!mdns_available()) {
-		purple_connection_error(gc,
-				PURPLE_CONNECTION_ERROR_OTHER_ERROR,
-				_("Unable to find Apple's \"Bonjour for Windows\" toolkit, see "
-				  "https://developer.pidgin.im/BonjourWindows for more information."));
-		return;
-	}
-
-	purple_connection_set_flags(gc, PURPLE_CONNECTION_FLAG_HTML |
-		PURPLE_CONNECTION_FLAG_NO_IMAGES);
-	bd = g_new0(BonjourData, 1);
-	purple_connection_set_protocol_data(gc, bd);
-
-	/* Start waiting for xmpp connections (iChat style) */
-	bd->xmpp_data = g_new0(BonjourXMPP, 1);
-	bd->xmpp_data->port = purple_account_get_int(account, "port", BONJOUR_DEFAULT_PORT);
-	bd->xmpp_data->account = account;
-
-	if (bonjour_xmpp_start(bd->xmpp_data) == -1) {
-		/* Send a message about the connection error */
-		purple_connection_error (gc,
-				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Unable to listen for incoming IM connections"));
-		return;
-	}
-
-	/* Connect to the mDNS daemon looking for buddies in the LAN */
-	bd->dns_sd_data = bonjour_dns_sd_new();
-	bd->dns_sd_data->first = g_strdup(purple_account_get_string(account, "first", default_firstname));
-	bd->dns_sd_data->last = g_strdup(purple_account_get_string(account, "last", default_lastname));
-	bd->dns_sd_data->port_p2pj = bd->xmpp_data->port;
-	/* Not engaged in AV conference */
-	bd->dns_sd_data->vc = g_strdup("!");
-
-	status = purple_account_get_active_status(account);
-	presence = purple_account_get_presence(account);
-	if (purple_presence_is_available(presence))
-		bd->dns_sd_data->status = g_strdup("avail");
-	else if (purple_presence_is_idle(presence))
-		bd->dns_sd_data->status = g_strdup("away");
-	else
-		bd->dns_sd_data->status = g_strdup("dnd");
-	bd->dns_sd_data->msg = g_strdup(purple_status_get_attr_string(status, "message"));
-
-	bd->dns_sd_data->account = account;
-	if (!bonjour_dns_sd_start(bd->dns_sd_data))
-	{
-		purple_connection_error (gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Unable to establish connection with the local mDNS server.  Is it running?"));
-		return;
-	}
-
-	bonjour_dns_sd_update_buddy_icon(bd->dns_sd_data);
-
-	/* Show the buddy list by telling Purple we have already connected */
-	purple_connection_set_state(gc, PURPLE_CONNECTION_STATE_CONNECTED);
-}
-
-static void
-bonjour_close(G_GNUC_UNUSED PurpleProtocol *protocol,
-              PurpleConnection *connection)
-{
-	PurpleGroup *bonjour_group;
-	BonjourData *bd = purple_connection_get_protocol_data(connection);
-
-	bonjour_group = purple_blist_find_group(BONJOUR_GROUP_NAME);
-
-	/* Remove all the bonjour buddies */
-	bonjour_removeallfromlocal(connection, bonjour_group);
-
-	/* Stop looking for buddies in the LAN */
-	if (bd != NULL && bd->dns_sd_data != NULL)
-	{
-		bonjour_dns_sd_stop(bd->dns_sd_data);
-		bonjour_dns_sd_free(bd->dns_sd_data);
-	}
-
-	if (bd != NULL && bd->xmpp_data != NULL)
-	{
-		/* Stop waiting for conversations */
-		bonjour_xmpp_stop(bd->xmpp_data);
-		g_free(bd->xmpp_data);
-	}
-
-	/* Delete the bonjour group
-	 * (purple_blist_remove_group will bail out if the group isn't empty)
-	 */
-	if (bonjour_group != NULL)
-		purple_blist_remove_group(bonjour_group);
-
-	/* Cancel any file transfers */
-	while (bd != NULL && bd->xfer_lists) {
-		purple_xfer_cancel_local(bd->xfer_lists->data);
-	}
-
-	if (bd != NULL)
-		g_free(bd->jid);
-	g_free(bd);
-	purple_connection_set_protocol_data(connection, NULL);
-}
-
-static GList *
-bonjour_protocol_get_account_options(G_GNUC_UNUSED PurpleProtocol *protocol) {
-	PurpleAccountOption *option;
-	GList *opts = NULL;
-
-	/* Creating the options for the protocol */
-	option = purple_account_option_int_new(_("Local Port"), "port",
-	                                       BONJOUR_DEFAULT_PORT);
-	opts = g_list_append(opts, option);
-
-	option = purple_account_option_string_new(_("First name"), "first",
-	                                          default_firstname);
-	opts = g_list_append(opts, option);
-
-	option = purple_account_option_string_new(_("Last name"), "last",
-	                                          default_lastname);
-	opts = g_list_append(opts, option);
-
-	option = purple_account_option_string_new(_("Email"), "email", "");
-	opts = g_list_append(opts, option);
-
-	option = purple_account_option_string_new(_("AIM Account"), "AIM", "");
-	opts = g_list_append(opts, option);
-
-	option = purple_account_option_string_new(_("XMPP Account"), "jid", "");
-	opts = g_list_append(opts, option);
-
-	return opts;
-}
-
-static PurpleBuddyIconSpec *
-bonjour_protocol_get_buddy_icon_spec(G_GNUC_UNUSED PurpleProtocol *protocol) {
-	return purple_buddy_icon_spec_new("png,gif,jpeg",
-	                                  0, 0, 96, 96, 65535,
-	                                  PURPLE_ICON_SCALE_DISPLAY);
-}
-
-static void
-bonjour_conversation_send_message_async(PurpleProtocolConversation *protocol,
-                                        PurpleConversation *conversation,
-                                        PurpleMessage *message,
-                                        GCancellable *cancellable,
-                                        GAsyncReadyCallback callback,
-                                        gpointer data)
-{
-	GTask *task = NULL;
-	const char *target = NULL;
-
-	task = g_task_new(protocol, cancellable, callback, data);
-
-	target = purple_conversation_get_name(conversation);
-	if(purple_strempty(target)) {
-		target = purple_message_get_recipient(message);
-	}
-
-	if(purple_message_is_empty(message) || purple_strempty(target)) {
-		g_task_return_boolean(task, TRUE);
-	} else {
-		BonjourData *bd = NULL;
-		PurpleAccount *account = NULL;
-		PurpleConnection *connection = NULL;
-		int result = 0;
-
-		account = purple_conversation_get_account(conversation);
-		connection = purple_account_get_connection(account);
-		bd = purple_connection_get_protocol_data(connection);
-
-		result = bonjour_xmpp_send_message(bd->xmpp_data, target,
-		                                   purple_message_get_contents(message));
-
-		purple_conversation_write_message(conversation, message);
-
-		if(result >= 0) {
-			g_task_return_boolean(task, TRUE);
-		} else {
-			g_task_return_new_error(task, BONJOUR_DOMAIN, 0, "unknown error");
-		}
-	}
-
-	g_clear_object(&task);
-}
-
-static gboolean
-bonjour_conversation_send_message_finish(G_GNUC_UNUSED PurpleProtocolConversation *protocol,
-                                         GAsyncResult *result,
-                                         GError **error)
-{
-	return g_task_propagate_boolean(G_TASK(result), error);
-}
-
-static void
-bonjour_set_status(G_GNUC_UNUSED PurpleProtocolServer *protocol_server,
-                   PurpleAccount *account, PurpleStatus *status)
-{
-	PurpleConnection *gc;
-	BonjourData *bd;
-	PurplePresence *presence;
-	const char *message, *bonjour_status;
-	gchar *stripped;
-
-	gc = purple_account_get_connection(account);
-	bd = purple_connection_get_protocol_data(gc);
-	presence = purple_account_get_presence(account);
-
-	message = purple_status_get_attr_string(status, "message");
-	if (message == NULL)
-		message = "";
-	stripped = purple_markup_strip_html(message);
-
-	/*
-	 * The three possible status for Bonjour are
-	 *   -available ("avail")
-	 *   -idle ("away")
-	 *   -away ("dnd")
-	 * Each of them can have an optional message.
-	 */
-	if (purple_presence_is_available(presence))
-		bonjour_status = "avail";
-	else if (purple_presence_is_idle(presence))
-		bonjour_status = "away";
-	else
-		bonjour_status = "dnd";
-
-	bonjour_dns_sd_send_status(bd->dns_sd_data, bonjour_status, stripped);
-	g_free(stripped);
-}
-
-/*
- * The add_buddy callback removes the buddy from the local list.
- * Bonjour manages buddies for you, and adding someone locally by
- * hand is stupid.  Perhaps we should change libpurple not to allow adding
- * if there is no add_buddy callback.
- */
-static void
-bonjour_fake_add_buddy(G_GNUC_UNUSED PurpleProtocolServer *protocol_server,
-                       G_GNUC_UNUSED PurpleConnection *connection,
-                       PurpleBuddy *buddy,
-                       G_GNUC_UNUSED PurpleGroup *group,
-                       G_GNUC_UNUSED const gchar *message)
-{
-	purple_debug_error("bonjour", "Buddy '%s' manually added; removing.  "
-				      "Bonjour buddies must be discovered and not manually added.\n",
-			   purple_buddy_get_name(buddy));
-
-	/* I suppose we could alert the user here, but it seems unnecessary. */
-
-	/* If this causes problems, it can be moved to an idle callback */
-	purple_blist_remove_buddy(buddy);
-}
-
-
-static void
-bonjour_remove_buddy(G_GNUC_UNUSED PurpleProtocolServer *protocol_server,
-                     G_GNUC_UNUSED PurpleConnection *connection,
-                     PurpleBuddy *buddy,
-                     G_GNUC_UNUSED PurpleGroup *group)
-{
-	BonjourBuddy *bb = purple_buddy_get_protocol_data(buddy);
-	if (bb) {
-		bonjour_buddy_delete(bb);
-		purple_buddy_set_protocol_data(buddy, NULL);
-	}
-}
-
-static GList *
-bonjour_status_types(G_GNUC_UNUSED PurpleProtocol *protocol,
-                     PurpleAccount *account)
-{
-	GList *status_types = NULL;
-	PurpleStatusType *type;
-
-	g_return_val_if_fail(account != NULL, NULL);
-
-	type = purple_status_type_new_with_attrs(PURPLE_STATUS_AVAILABLE,
-										   BONJOUR_STATUS_ID_AVAILABLE,
-										   NULL, TRUE, TRUE, FALSE,
-										   "message", _("Message"),
-										   purple_value_new(G_TYPE_STRING), NULL);
-	status_types = g_list_append(status_types, type);
-
-	type = purple_status_type_new_with_attrs(PURPLE_STATUS_AWAY,
-										   BONJOUR_STATUS_ID_AWAY,
-										   NULL, TRUE, TRUE, FALSE,
-										   "message", _("Message"),
-										   purple_value_new(G_TYPE_STRING), NULL);
-	status_types = g_list_append(status_types, type);
-
-	type = purple_status_type_new_full(PURPLE_STATUS_OFFLINE,
-									 BONJOUR_STATUS_ID_OFFLINE,
-									 NULL, TRUE, TRUE, FALSE);
-	status_types = g_list_append(status_types, type);
-
-	return status_types;
-}
-
-static void
-bonjour_convo_closed(G_GNUC_UNUSED PurpleProtocolClient *client,
-                     PurpleConnection *connection, const char *who)
-{
-	PurpleAccount *account = NULL;
-	PurpleContact *contact = NULL;
-	PurpleContactManager *manager = NULL;
-	BonjourBuddy *bb;
-
-	account = purple_connection_get_account(connection);
-	manager = purple_contact_manager_get_default();
-	contact = purple_contact_manager_find_with_username(manager, account, who);
-
-	if(!PURPLE_IS_CONTACT(contact) ||
-	   (bb = g_object_get_data(G_OBJECT(contact), "bonjour-buddy")) == NULL)
-	{
-		/*
-		 * This buddy is not in our buddy list, and therefore does not really
-		 * exist, so we won't have any data about them.
-		 */
-		g_clear_object(&contact);
-
-		return;
-	}
-
-	bonjour_xmpp_close_conversation(bb->conversation);
-	bb->conversation = NULL;
-	g_clear_object(&contact);
-}
-
-static void
-bonjour_set_buddy_icon(G_GNUC_UNUSED PurpleProtocolServer *protocol_server,
-                       PurpleConnection *conn,
-                       G_GNUC_UNUSED PurpleImage *img)
-{
-	BonjourData *bd = purple_connection_get_protocol_data(conn);
-	bonjour_dns_sd_update_buddy_icon(bd->dns_sd_data);
-}
-
-static void
-bonjour_do_group_change(PurpleBuddy *buddy, const char *new_group)
-{
-	if (buddy == NULL)
-		return;
-
-	/* If we're moving them out of the bonjour group, make them persistent */
-	if (purple_strequal(new_group, BONJOUR_GROUP_NAME))
-		purple_blist_node_set_transient(PURPLE_BLIST_NODE(buddy), TRUE);
-	else
-		purple_blist_node_set_transient(PURPLE_BLIST_NODE(buddy),
-				!purple_blist_node_is_transient(PURPLE_BLIST_NODE(buddy)));
-
-}
-
-static void
-bonjour_group_buddy(G_GNUC_UNUSED PurpleProtocolServer *protocol_server,
-                    PurpleConnection *connection, const char *who,
-                    G_GNUC_UNUSED const char *old_group, const char *new_group)
-{
-	PurpleBuddy *buddy = purple_blist_find_buddy(purple_connection_get_account(connection), who);
-
-	bonjour_do_group_change(buddy, new_group);
-}
-
-static void
-bonjour_rename_group(G_GNUC_UNUSED PurpleProtocolServer *protocol_server,
-                     G_GNUC_UNUSED PurpleConnection *connection,
-                     G_GNUC_UNUSED const char *old_name, PurpleGroup *group,
-                     GList *moved_buddies)
-{
-	const gchar *new_group;
-
-	new_group = purple_group_get_name(group);
-
-	g_list_foreach(moved_buddies, (GFunc)bonjour_do_group_change, (gpointer)new_group);
-}
-
-static gboolean
-bonjour_can_receive_file(G_GNUC_UNUSED PurpleProtocolXfer *prplxfer,
-                         PurpleConnection *connection, const char *who)
-{
-	PurpleAccount *account = NULL;
-	PurpleContact *contact = NULL;
-	PurpleContactManager *manager = NULL;
-	gboolean ret = FALSE;
-
-	account = purple_connection_get_account(connection);
-	manager = purple_contact_manager_get_default();
-	contact = purple_contact_manager_find_with_username(manager, account, who);
-
-	if(PURPLE_IS_CONTACT(contact)) {
-		BonjourBuddy *bb = g_object_get_data(G_OBJECT(contact), "bonjour-buddy");
-
-		ret = (bb != NULL);
-	}
-
-	g_clear_object(&contact);
-
-	return ret;
-}
-
-static gssize
-bonjour_get_max_message_size(G_GNUC_UNUSED PurpleProtocolClient *client,
-                             G_GNUC_UNUSED PurpleConversation *conv)
-{
-	return -1; /* 5MB successfully tested. */
-}
-
-#ifdef WIN32
-static void
-_set_default_name_cb(G_GNUC_UNUSED GObject *source, GAsyncResult *result,
-                     G_GNUC_UNUSED gpointer data)
-{
-	gchar *fullname = NULL;
-	const char *splitpoint;
-	GError *error = NULL;
-
-	fullname = g_task_propagate_pointer(G_TASK(result), &error);
-	if (fullname == NULL) {
-		purple_debug_info("bonjour",
-		                  "Unable to look up First and Last name or Username "
-		                  "from system (%s); using defaults.",
-		                  error ? error->message : "unknown reason");
-		g_clear_error(&error);
-		return;
-	}
-
-	g_free(default_firstname);
-	g_free(default_lastname);
-
-	/* Split the real name into a first and last name */
-	splitpoint = strchr(fullname, ' ');
-	if (splitpoint != NULL) {
-		default_firstname = g_strndup(fullname, splitpoint - fullname);
-		default_lastname = g_strdup(&splitpoint[1]);
-	} else {
-		default_firstname = g_strdup(fullname);
-		default_lastname = g_strdup("");
-	}
-	g_free(fullname);
-}
-
-static void
-_win32_name_lookup_thread(GTask *task, G_GNUC_UNUSED gpointer source,
-                          G_GNUC_UNUSED gpointer data,
-                          G_GNUC_UNUSED GCancellable *cancellable)
-{
-	gchar *fullname = NULL;
-	wchar_t username[UNLEN + 1];
-	DWORD dwLenUsername = UNLEN + 1;
-
-	GetUserNameW((LPWSTR) &username, &dwLenUsername);
-
-	if (*username != '\0') {
-		LPBYTE servername = NULL;
-		LPBYTE info = NULL;
-
-		NetGetDCName(NULL, NULL, &servername);
-
-		/* purple_debug_info("bonjour", "Looking up the full name from the %s.\n", (servername ? "domain controller" : "local machine")); */
-
-		if (NetUserGetInfo((LPCWSTR) servername, username, 10, &info) == NERR_Success
-				&& info != NULL && ((LPUSER_INFO_10) info)->usri10_full_name != NULL
-				&& *(((LPUSER_INFO_10) info)->usri10_full_name) != '\0') {
-			fullname = g_utf16_to_utf8(
-				((LPUSER_INFO_10) info)->usri10_full_name,
-				-1, NULL, NULL, NULL);
-		}
-		/* Fall back to the local machine if we didn't get the full name from the domain controller */
-		else if (servername != NULL) {
-			/* purple_debug_info("bonjour", "Looking up the full name from the local machine"); */
-
-			if (info != NULL) NetApiBufferFree(info);
-			info = NULL;
-
-			if (NetUserGetInfo(NULL, username, 10, &info) == NERR_Success
-					&& info != NULL && ((LPUSER_INFO_10) info)->usri10_full_name != NULL
-					&& *(((LPUSER_INFO_10) info)->usri10_full_name) != '\0') {
-				fullname = g_utf16_to_utf8(
-					((LPUSER_INFO_10) info)->usri10_full_name,
-					-1, NULL, NULL, NULL);
-			}
-		}
-
-		if (info != NULL) NetApiBufferFree(info);
-		if (servername != NULL) NetApiBufferFree(servername);
-
-		if (!fullname)
-			fullname = g_utf16_to_utf8(username, -1, NULL, NULL, NULL);
-	}
-
-	g_task_return_pointer(task, fullname, g_free);
-}
-#endif
-
-static void
-initialize_default_account_values(void)
-{
-#ifndef _WIN32
-	struct passwd *info;
-#else
-	GTask *lookup;
-#endif
-	const char *fullname = NULL, *splitpoint, *tmp;
-	gchar *conv = NULL;
-
-#ifndef _WIN32
-	/* Try to figure out the user's real name */
-	info = getpwuid(getuid());
-	if ((info != NULL) && (info->pw_gecos != NULL) && (info->pw_gecos[0] != '\0'))
-		fullname = info->pw_gecos;
-	else if ((info != NULL) && (info->pw_name != NULL) && (info->pw_name[0] != '\0'))
-		fullname = info->pw_name;
-	else if (((fullname = getlogin()) != NULL) && (fullname[0] == '\0'))
-		fullname = NULL;
-#else
-	/* The Win32 username lookup functions are synchronous so we do it in a thread */
-	lookup = g_task_new(my_protocol, NULL, _set_default_name_cb, NULL);
-	g_task_run_in_thread(lookup, _win32_name_lookup_thread);
-	g_object_unref(lookup);
-#endif
-
-	/* Make sure fullname is valid UTF-8.  If not, try to convert it. */
-	if (fullname != NULL && !g_utf8_validate(fullname, -1, NULL)) {
-		fullname = conv = g_locale_to_utf8(fullname, -1, NULL, NULL, NULL);
-		if (conv == NULL || *conv == '\0')
-			fullname = NULL;
-	}
-
-	if (fullname == NULL)
-		fullname = _("Purple Person");
-
-	/* Split the real name into a first and last name */
-	splitpoint = strchr(fullname, ' ');
-	if (splitpoint != NULL) {
-		default_firstname = g_strndup(fullname, splitpoint - fullname);
-		tmp = &splitpoint[1];
-
-		/* The last name may be followed by a comma and additional data.
-		 * Only use the last name itself.
-		 */
-		splitpoint = strchr(tmp, ',');
-		if (splitpoint != NULL)
-			default_lastname = g_strndup(tmp, splitpoint - tmp);
-		else
-			default_lastname = g_strdup(tmp);
-	} else {
-		default_firstname = g_strdup(fullname);
-		default_lastname = g_strdup("");
-	}
-
-	g_free(conv);
-}
-
-static void
-bonjour_protocol_init(G_GNUC_UNUSED BonjourProtocol *self)
-{
-}
-
-static void
-bonjour_protocol_class_init(BonjourProtocolClass *klass)
-{
-	PurpleProtocolClass *protocol_class = PURPLE_PROTOCOL_CLASS(klass);
-
-	protocol_class->login = bonjour_login;
-	protocol_class->close = bonjour_close;
-	protocol_class->status_types = bonjour_status_types;
-
-	protocol_class->get_account_options = bonjour_protocol_get_account_options;
-	protocol_class->get_buddy_icon_spec = bonjour_protocol_get_buddy_icon_spec;
-}
-
-static void
-bonjour_protocol_class_finalize(G_GNUC_UNUSED BonjourProtocolClass *klass)
-{
-}
-
-static void
-bonjour_protocol_client_iface_init(PurpleProtocolClientInterface *client_iface)
-{
-	client_iface->convo_closed         = bonjour_convo_closed;
-	client_iface->get_max_message_size = bonjour_get_max_message_size;
-}
-
-static void
-bonjour_protocol_server_iface_init(PurpleProtocolServerInterface *server_iface)
-{
-	server_iface->add_buddy      = bonjour_fake_add_buddy;
-	server_iface->remove_buddy   = bonjour_remove_buddy;
-	server_iface->group_buddy    = bonjour_group_buddy;
-	server_iface->rename_group   = bonjour_rename_group;
-	server_iface->set_buddy_icon = bonjour_set_buddy_icon;
-	server_iface->set_status     = bonjour_set_status;
-}
-
-static void
-bonjour_protocol_conversation_iface_init(PurpleProtocolConversationInterface *iface)
-{
-	iface->send_message_async = bonjour_conversation_send_message_async;
-	iface->send_message_finish = bonjour_conversation_send_message_finish;
-}
-
-static void
-bonjour_protocol_xfer_iface_init(PurpleProtocolXferInterface *xfer_iface)
-{
-	xfer_iface->can_receive = bonjour_can_receive_file;
-	xfer_iface->send_file   = bonjour_send_file;
-	xfer_iface->new_xfer    = bonjour_new_xfer;
-}
-
-G_DEFINE_DYNAMIC_TYPE_EXTENDED(
-	BonjourProtocol,
-	bonjour_protocol,
-	PURPLE_TYPE_PROTOCOL,
-	G_TYPE_FLAG_FINAL,
-	G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CLIENT,
-	                              bonjour_protocol_client_iface_init)
-	G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_SERVER,
-	                              bonjour_protocol_server_iface_init)
-	G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CONVERSATION,
-	                              bonjour_protocol_conversation_iface_init)
-	G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_XFER,
-	                              bonjour_protocol_xfer_iface_init))
-
-static PurpleProtocol *
-bonjour_protocol_new(void) {
-	return g_object_new(
-		BONJOUR_TYPE_PROTOCOL,
-		"id", "prpl-bonjour",
-		"name", "Bonjour (Deprecated)",
-		"description", _("Bonjour is a serverless protocol for local "
-		                 "networks."),
-		"icon-name", "im-bonjour",
-		"icon-resource-path", "/im/pidgin/libpurple/bonjour/icons",
-		"options", OPT_PROTO_NO_PASSWORD,
-		NULL);
-}
-
-static GPluginPluginInfo *
-bonjour_query(G_GNUC_UNUSED GError **error)
-{
-	return purple_plugin_info_new(
-		"id",           "prpl-bonjour",
-		"name",         "Bonjour Protocol",
-		"version",      DISPLAY_VERSION,
-		"category",     N_("Protocol"),
-		"summary",      N_("Bonjour Protocol Plugin"),
-		"description",  N_("Bonjour Protocol Plugin"),
-		"website",      PURPLE_WEBSITE,
-		"abi-version",  PURPLE_ABI_VERSION,
-		"flags",        PURPLE_PLUGIN_INFO_FLAGS_INTERNAL |
-		                PURPLE_PLUGIN_INFO_FLAGS_AUTO_LOAD,
-		NULL
-	);
-}
-
-static gboolean
-bonjour_load(GPluginPlugin *plugin, GError **error)
-{
-	PurpleProtocolManager *manager = purple_protocol_manager_get_default();
-
-	bonjour_protocol_register_type(G_TYPE_MODULE(plugin));
-
-	xep_xfer_register(G_TYPE_MODULE(plugin));
-
-	my_protocol = bonjour_protocol_new();
-	if(!purple_protocol_manager_register(manager, my_protocol, error)) {
-		g_clear_object(&my_protocol);
-
-		return FALSE;
-	}
-
-	initialize_default_account_values();
-
-	return TRUE;
-}
-
-static gboolean
-bonjour_unload(G_GNUC_UNUSED GPluginPlugin *plugin,
-               G_GNUC_UNUSED gboolean shutdown, GError **error)
-{
-	PurpleProtocolManager *manager = purple_protocol_manager_get_default();
-
-	if(!purple_protocol_manager_unregister(manager, my_protocol, error)) {
-		return FALSE;
-	}
-
-	g_clear_object(&my_protocol);
-
-	g_free(default_firstname);
-	g_free(default_lastname);
-
-	return TRUE;
-}
-
-GPLUGIN_NATIVE_PLUGIN_DECLARE(bonjour)

--- a/libpurple/protocols/bonjour/bonjour.h	Tue Apr 09 23:11:12 2024 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/**
- * @file bonjour.h The Purple interface to mDNS and peer to peer XMPP.
- *
- * purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- *
- */
-
-#ifndef PURPLE_BONJOUR_BONJOUR_H
-#define PURPLE_BONJOUR_BONJOUR_H
-
-#include <gmodule.h>
-
-#include <purple.h>
-
-#include "mdns_common.h"
-#include "xmpp.h"
-
-#define BONJOUR_GROUP_NAME (bonjour_get_group_name())
-#define BONJOUR_PROTOCOL_NAME "bonjour"
-
-#define BONJOUR_STATUS_ID_OFFLINE   "offline"
-#define BONJOUR_STATUS_ID_AVAILABLE "available"
-#define BONJOUR_STATUS_ID_AWAY      "away"
-
-#define BONJOUR_DEFAULT_PORT 5298
-
-#define BONJOUR_DOMAIN (g_quark_from_static_string("bonjour"))
-
-#define BONJOUR_TYPE_PROTOCOL (bonjour_protocol_get_type())
-
-G_MODULE_EXPORT
-G_DECLARE_FINAL_TYPE(BonjourProtocol, bonjour_protocol, BONJOUR, PROTOCOL,
-                     PurpleProtocol)
-
-typedef struct
-{
-	BonjourDnsSd *dns_sd_data;
-	BonjourXMPP *xmpp_data;
-	GSList *xfer_lists;
-	gchar *jid;
-} BonjourData;
-
-/**
- *  This will always be username@machinename
- */
-const char *bonjour_get_jid(PurpleAccount *account);
-
-const gchar *bonjour_get_group_name(void);
-
-#endif /* PURPLE_BONJOUR_BONJOUR_H */

--- a/libpurple/protocols/bonjour/bonjour_ft.c	Tue Apr 09 23:11:12 2024 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1228 +0,0 @@
-/*
- * purple - Bonjour Protocol Plugin
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
- */
-
-#include <purpleconfig.h>
-
-#include <sys/types.h>
-
-#include <purple.h>
-
-#include "bonjour.h"
-#include "bonjour_ft.h"
-
-static void
-bonjour_bytestreams_init(PurpleXfer *xfer);
-static void
-bonjour_bytestreams_connect(PurpleXfer *xfer);
-static void
-bonjour_xfer_init(PurpleXfer *xfer);
-static void
-bonjour_xfer_receive(PurpleConnection *pc, const char *id, const char *sid, const char *from,
-		     goffset filesize, const char *filename, int option);
-
-/* Look for specific xfer handle */
-static unsigned int next_id = 0;
-
-struct _XepXfer
-{
-	PurpleXfer parent;
-
-	GCancellable *cancellable;
-	void *data;
-	char *filename;
-	int filesize;
-	char *iq_id;
-	char *sid;
-	char *recv_id;
-	char *buddy_ip;
-	int mode;
-	GSocketClient *client;
-	GSocketService *service;
-	GSocketConnection *conn;
-	char rx_buf[0x500];
-	char tx_buf[0x500];
-	char *jid;
-	char *proxy_host;
-	int proxy_port;
-	PurpleXmlNode *streamhost;
-	PurpleContact *contact;
-};
-
-G_DEFINE_DYNAMIC_TYPE_EXTENDED(XepXfer, xep_xfer, PURPLE_TYPE_XFER,
-                               G_TYPE_FLAG_FINAL, {})
-
-static void
-xep_ft_si_reject(BonjourData *bd, const char *id, const char *to, const char *error_code, const char *error_type)
-{
-	PurpleXmlNode *error_node;
-	XepIq *iq;
-
-	g_return_if_fail(error_code != NULL);
-	g_return_if_fail(error_type != NULL);
-
-	if(!to || !id) {
-		purple_debug_info("bonjour", "xep file transfer stream initialization error.\n");
-		return;
-	}
-
-	iq = xep_iq_new(bd, XEP_IQ_ERROR, to, bonjour_get_jid(bd->xmpp_data->account), id);
-	if(iq == NULL)
-		return;
-
-	error_node = purple_xmlnode_new_child(iq->node, "error");
-	purple_xmlnode_set_attrib(error_node, "code", error_code);
-	purple_xmlnode_set_attrib(error_node, "type", error_type);
-
-	/* TODO: Make this better */
-	if (purple_strequal(error_code, "403")) {
-		PurpleXmlNode *tmp_node = purple_xmlnode_new_child(error_node, "forbidden");
-		purple_xmlnode_set_namespace(tmp_node, "urn:ietf:params:xml:ns:xmpp-stanzas");
-
-		tmp_node = purple_xmlnode_new_child(error_node, "text");
-		purple_xmlnode_set_namespace(tmp_node, "urn:ietf:params:xml:ns:xmpp-stanzas");
-		purple_xmlnode_insert_data(tmp_node, "Offer Declined", -1);
-	} else if (purple_strequal(error_code, "404")) {
-		PurpleXmlNode *tmp_node = purple_xmlnode_new_child(error_node, "item-not-found");
-		purple_xmlnode_set_namespace(tmp_node, "urn:ietf:params:xml:ns:xmpp-stanzas");
-	}
-
-	xep_iq_send_and_free(iq);
-}
-
-static void bonjour_xfer_cancel_send(PurpleXfer *xfer)
-{
-	XepXfer *xf = XEP_XFER(xfer);
-
-	purple_debug_info("bonjour", "Bonjour-xfer-cancel-send.\n");
-	g_cancellable_cancel(xf->cancellable);
-}
-
-static void bonjour_xfer_request_denied(PurpleXfer *xfer)
-{
-	XepXfer *xf = XEP_XFER(xfer);
-
-	purple_debug_info("bonjour", "Bonjour-xfer-request-denied.\n");
-
-	if(xf) {
-		xep_ft_si_reject(xf->data, xf->sid, purple_xfer_get_remote_user(xfer), "403", "cancel");
-	}
-}
-
-static void bonjour_xfer_cancel_recv(PurpleXfer *xfer)
-{
-	XepXfer *xf = XEP_XFER(xfer);
-
-	purple_debug_info("bonjour", "Bonjour-xfer-cancel-recv.\n");
-	g_cancellable_cancel(xf->cancellable);
-}
-
-static void bonjour_xfer_end(PurpleXfer *xfer)
-{
-	purple_debug_info("bonjour", "Bonjour-xfer-end for xfer %p", xfer);
-
-	/* We can't allow the server side to close the connection until the client is complete,
-	 * otherwise there is a RST resulting in an error on the client side */
-	if (purple_xfer_get_xfer_type(xfer) == PURPLE_XFER_TYPE_SEND && purple_xfer_is_completed(xfer)) {
-		XepXfer *xf = XEP_XFER(xfer);
-		g_io_stream_close_async(G_IO_STREAM(xf->conn), G_PRIORITY_DEFAULT, xf->cancellable, NULL, NULL);
-		purple_xfer_set_fd(xfer, -1);
-	}
-}
-
-static PurpleXfer*
-bonjour_si_xfer_find(BonjourData *bd, const char *sid, const char *from)
-{
-	GSList *xfers;
-	PurpleXfer *xfer;
-	XepXfer *xf;
-
-	if(!sid || !from || !bd)
-		return NULL;
-
-	purple_debug_info("bonjour", "Look for sid=%s from=%s xferlists.\n",
-			  sid, from);
-
-	for(xfers = bd->xfer_lists; xfers; xfers = xfers->next) {
-		xfer = xfers->data;
-		if(xfer == NULL)
-			break;
-		xf = XEP_XFER(xfer);
-		if(xf == NULL)
-			break;
-		if(xf->sid && purple_xfer_get_remote_user(xfer) && purple_strequal(xf->sid, sid) &&
-				purple_strequal(purple_xfer_get_remote_user(xfer), from))
-			return xfer;
-	}
-
-	purple_debug_info("bonjour", "Look for xfer list fail\n");
-
-	return NULL;
-}
-
-static void
-xep_ft_si_offer(PurpleXfer *xfer, const gchar *to)
-{
-	PurpleXmlNode *si_node, *feature, *field, *file, *x;
-	XepIq *iq;
-	XepXfer *xf = XEP_XFER(xfer);
-	BonjourData *bd = NULL;
-	char buf[32];
-
-	if(!xf)
-		return;
-
-	bd = xf->data;
-	if(!bd)
-		return;
-
-	purple_debug_info("bonjour", "xep file transfer stream initialization offer-id=%d.\n", next_id);
-
-	/* Assign stream id. */
-	g_free(xf->iq_id);
-	xf->iq_id = g_strdup_printf("%u", next_id++);
-	iq = xep_iq_new(xf->data, XEP_IQ_SET, to, bonjour_get_jid(bd->xmpp_data->account), xf->iq_id);
-	if(iq == NULL)
-		return;
-
-	/*Construct Stream initialization offer message.*/
-	si_node = purple_xmlnode_new_child(iq->node, "si");
-	purple_xmlnode_set_namespace(si_node, "http://jabber.org/protocol/si");
-	purple_xmlnode_set_attrib(si_node, "profile", "http://jabber.org/protocol/si/profile/file-transfer");
-	g_free(xf->sid);
-	xf->sid = g_strdup(xf->iq_id);
-	purple_xmlnode_set_attrib(si_node, "id", xf->sid);
-
-	file = purple_xmlnode_new_child(si_node, "file");
-	purple_xmlnode_set_namespace(file, "http://jabber.org/protocol/si/profile/file-transfer");
-	purple_xmlnode_set_attrib(file, "name", purple_xfer_get_filename(xfer));
-	g_snprintf(buf, sizeof(buf), "%" G_GOFFSET_FORMAT, purple_xfer_get_size(xfer));
-	purple_xmlnode_set_attrib(file, "size", buf);
-
-	feature = purple_xmlnode_new_child(si_node, "feature");
-	purple_xmlnode_set_namespace(feature, "http://jabber.org/protocol/feature-neg");
-
-	x = purple_xmlnode_new_child(feature, "x");
-	purple_xmlnode_set_namespace(x, "jabber:x:data");
-	purple_xmlnode_set_attrib(x, "type", "form");
-
-	field = purple_xmlnode_new_child(x, "field");
-	purple_xmlnode_set_attrib(field, "var", "stream-method");
-	purple_xmlnode_set_attrib(field, "type", "list-single");
-
-	if (xf->mode & XEP_BYTESTREAMS) {
-		PurpleXmlNode *option = purple_xmlnode_new_child(field, "option");
-		PurpleXmlNode *value = purple_xmlnode_new_child(option, "value");
-		purple_xmlnode_insert_data(value, "http://jabber.org/protocol/bytestreams", -1);
-	}
-	if (xf->mode & XEP_IBB) {
-		PurpleXmlNode *option = purple_xmlnode_new_child(field, "option");
-		PurpleXmlNode *value = purple_xmlnode_new_child(option, "value");
-		purple_xmlnode_insert_data(value, "http://jabber.org/protocol/ibb", -1);
-	}
-
-	xep_iq_send_and_free(iq);
-}
-
-static void
-xep_ft_si_result(PurpleXfer *xfer, const char *to)
-{
-	PurpleXmlNode *si_node, *feature, *field, *value, *x;
-	XepIq *iq;
-	XepXfer *xf;
-	BonjourData *bd;
-
-	if(!to || !xfer)
-		return;
-	xf = XEP_XFER(xfer);
-
-	bd = xf->data;
-
-	purple_debug_info("bonjour", "xep file transfer stream initialization result.\n");
-	iq = xep_iq_new(bd, XEP_IQ_RESULT, to, bonjour_get_jid(bd->xmpp_data->account), xf->iq_id);
-	if(iq == NULL)
-		return;
-
-	si_node = purple_xmlnode_new_child(iq->node, "si");
-	purple_xmlnode_set_namespace(si_node, "http://jabber.org/protocol/si");
-	/*purple_xmlnode_set_attrib(si_node, "profile", "http://jabber.org/protocol/si/profile/file-transfer");*/
-
-	feature = purple_xmlnode_new_child(si_node, "feature");
-	purple_xmlnode_set_namespace(feature, "http://jabber.org/protocol/feature-neg");
-
-	x = purple_xmlnode_new_child(feature, "x");
-	purple_xmlnode_set_namespace(x, "jabber:x:data");
-	purple_xmlnode_set_attrib(x, "type", "submit");
-
-	field = purple_xmlnode_new_child(x, "field");
-	purple_xmlnode_set_attrib(field, "var", "stream-method");
-
-	value = purple_xmlnode_new_child(field, "value");
-	purple_xmlnode_insert_data(value, "http://jabber.org/protocol/bytestreams", -1);
-
-	xep_iq_send_and_free(iq);
-}
-
-/**
- * Frees the whole tree of an xml node
- *
- * First determines the root of the xml tree and then frees the whole tree
- * from there.
- *
- * @param node	The node to free the tree from
- */
-static void
-purple_xmlnode_free_tree(PurpleXmlNode *node)
-{
-	g_return_if_fail(node != NULL);
-
-	while(purple_xmlnode_get_parent(node))
-		node = purple_xmlnode_get_parent(node);
-
-	purple_xmlnode_free(node);
-}
-
-PurpleXfer *
-bonjour_new_xfer(G_GNUC_UNUSED PurpleProtocolXfer *prplxfer,
-                 PurpleConnection *gc, const char *who)
-{
-	PurpleXfer *xfer;
-	XepXfer *xep_xfer;
-	BonjourData *bd;
-
-	if(who == NULL || gc == NULL)
-		return NULL;
-
-	purple_debug_info("bonjour", "Bonjour-new-xfer to %s.\n", who);
-	bd = purple_connection_get_protocol_data(gc);
-	if(bd == NULL)
-		return NULL;
-
-	/* Build the file transfer handle */
-	xep_xfer = g_object_new(
-		XEP_TYPE_XFER,
-		"account", purple_connection_get_account(gc),
-		"type", PURPLE_XFER_TYPE_SEND,
-		"remote-user", who,
-		NULL
-	);
-	xfer = PURPLE_XFER(xep_xfer);
-	xep_xfer->data = bd;
-
-	purple_debug_info("bonjour", "Bonjour-new-xfer bd=%p data=%p.\n", bd, xep_xfer->data);
-
-	/* We don't support IBB yet */
-	/*xep_xfer->mode = XEP_BYTESTREAMS | XEP_IBB;*/
-	xep_xfer->mode = XEP_BYTESTREAMS;
-	xep_xfer->sid = NULL;
-
-	bd->xfer_lists = g_slist_append(bd->xfer_lists, xfer);
-
-	return xfer;
-}
-
-void
-bonjour_send_file(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who, const char *file)
-{
-	PurpleXfer *xfer;
-
-	g_return_if_fail(gc != NULL);
-	g_return_if_fail(who != NULL);
-
-	purple_debug_info("bonjour", "Bonjour-send-file to=%s.\n", who);
-
-	xfer = bonjour_new_xfer(prplxfer, gc, who);
-
-	if (file)
-		purple_xfer_request_accepted(xfer, file);
-	else
-		purple_xfer_request(xfer);
-
-}
-
-static void
-bonjour_xfer_init(PurpleXfer *xfer)
-{
-	PurpleContact *contact = NULL;
-	PurpleContactManager *manager = NULL;
-	BonjourBuddy *bb;
-	XepXfer *xf;
-
-	xf = XEP_XFER(xfer);
-
-	purple_debug_info("bonjour", "Bonjour-xfer-init.\n");
-
-	manager = purple_contact_manager_get_default();
-	contact = purple_contact_manager_find_with_username(manager,
-	                                                    purple_xfer_get_account(xfer),
-	                                                    purple_xfer_get_remote_user(xfer));
-
-	/* this buddy is offline. */
-	if(!PURPLE_IS_CONTACT(contact) ||
-	   (bb = g_object_get_data(G_OBJECT(contact), "bonjour-buddy")) == NULL)
-	{
-		g_clear_object(&contact);
-
-		return;
-	}
-
-	/* Assume it is the first IP. We could do something like keep track of which one is in use or something. */
-	if (bb->ips)
-		xf->buddy_ip = g_strdup(bb->ips->data);
-	if (purple_xfer_get_xfer_type(xfer) == PURPLE_XFER_TYPE_SEND) {
-		/* initiate file transfer, send SI offer. */
-		purple_debug_info("bonjour", "Bonjour xfer type is PURPLE_XFER_TYPE_SEND.\n");
-		xep_ft_si_offer(xfer, purple_xfer_get_remote_user(xfer));
-	} else {
-		/* accept file transfer request, send SI result. */
-		xep_ft_si_result(xfer, purple_xfer_get_remote_user(xfer));
-		purple_debug_info("bonjour", "Bonjour xfer type is PURPLE_XFER_TYPE_RECEIVE.\n");
-	}
-
-	g_clear_object(&contact);
-}
-
-void
-xep_si_parse(PurpleConnection *pc, PurpleXmlNode *packet,
-             PurpleContact *contact)
-{
-	const char *type, *id;
-	BonjourData *bd;
-	PurpleXfer *xfer;
-	const gchar *name = NULL;
-
-	g_return_if_fail(pc != NULL);
-	g_return_if_fail(packet != NULL);
-	g_return_if_fail(PURPLE_IS_CONTACT(contact));
-
-	bd = purple_connection_get_protocol_data(pc);
-	if(bd == NULL) {
-		return;
-	}
-
-	purple_debug_info("bonjour", "xep-si-parse.\n");
-
-	name = purple_contact_info_get_username(PURPLE_CONTACT_INFO(contact));
-
-	type = purple_xmlnode_get_attrib(packet, "type");
-	id = purple_xmlnode_get_attrib(packet, "id");
-	if(!type)
-		return;
-
-	if(purple_strequal(type, "set")) {
-		PurpleXmlNode *si;
-		gboolean parsed_receive = FALSE;
-
-		si = purple_xmlnode_get_child(packet, "si");
-
-		purple_debug_info("bonjour", "si offer Message type - SET.\n");
-		if (si) {
-			const char *profile;
-
-			profile = purple_xmlnode_get_attrib(si, "profile");
-
-			if (purple_strequal(profile, "http://jabber.org/protocol/si/profile/file-transfer")) {
-				const char *filename = NULL, *filesize_str = NULL;
-				goffset filesize = 0;
-				PurpleXmlNode *file;
-
-				const char *sid = purple_xmlnode_get_attrib(si, "id");
-
-				if ((file = purple_xmlnode_get_child(si, "file"))) {
-					filename = purple_xmlnode_get_attrib(file, "name");
-					if((filesize_str = purple_xmlnode_get_attrib(file, "size")))
-						filesize = g_ascii_strtoll(filesize_str, NULL, 10);
-				}
-
-				/* TODO: Make sure that it is advertising a bytestreams transfer */
-
-				if (filename) {
-					bonjour_xfer_receive(pc, id, sid, name, filesize, filename, XEP_BYTESTREAMS);
-
-					parsed_receive = TRUE;
-				}
-			}
-		}
-
-		if (!parsed_receive) {
-			BonjourData *bd = purple_connection_get_protocol_data(pc);
-
-			purple_debug_info("bonjour", "rejecting unrecognized si SET offer.\n");
-			xep_ft_si_reject(bd, id, name, "403", "cancel");
-			/*TODO: Send Cancel (501) */
-		}
-	} else if(purple_strequal(type, "result")) {
-		purple_debug_info("bonjour", "si offer Message type - RESULT.\n");
-
-		xfer = bonjour_si_xfer_find(bd, id, name);
-
-		if(xfer == NULL) {
-			BonjourData *bd = purple_connection_get_protocol_data(pc);
-			purple_debug_info("bonjour", "xfer find fail.\n");
-			xep_ft_si_reject(bd, id, name, "403", "cancel");
-		} else
-			bonjour_bytestreams_init(xfer);
-
-	} else if(purple_strequal(type, "error")) {
-		purple_debug_info("bonjour", "si offer Message type - ERROR.\n");
-
-		xfer = bonjour_si_xfer_find(bd, id, name);
-
-		if(xfer == NULL)
-			purple_debug_info("bonjour", "xfer find fail.\n");
-		else
-			purple_xfer_cancel_remote(xfer);
-	} else
-		purple_debug_info("bonjour", "si offer Message type - Unknown-%s.\n", type);
-}
-
-/**
- * Will compare a host with a buddy_ip.
- *
- * Additionally to a common 'purple_strequal(host, buddy_ip)', it will also return TRUE
- * if 'host' is a link local IPv6 address without an appended interface
- * identifier and 'buddy_ip' string is "host" + "%iface".
- *
- * Note: This may theoretically result in the attempt to connect to the wrong
- * host, because we do not know for sure which interface the according link
- * local IPv6 address might relate to and RFC4862 for instance only ensures the
- * uniqueness of this address on a given link. So we could possibly have two
- * distinct buddies with the same ipv6 link local address on two distinct
- * interfaces. Unfortunately XEP-0065 does not seem to specify how to deal with
- * link local ip addresses properly...
- * However, in practice the possibility for such a conflict is relatively low
- * (2011 - might be different in the future though?).
- *
- * @param host		ipv4 or ipv6 address string
- * @param buddy_ip	ipv4 or ipv6 address string
- * @return		TRUE if they match, FALSE otherwise
- */
-static gboolean
-xep_cmp_addr(const char *host, const char *buddy_ip)
-{
-	GInetAddress *addr = NULL;
-
-	addr = g_inet_address_new_from_string(host);
-	if (addr != NULL &&
-	    g_inet_address_get_family(addr) == G_SOCKET_FAMILY_IPV6 &&
-	    g_inet_address_get_is_link_local(addr)) {
-		g_clear_object(&addr);
-
-		if (strlen(buddy_ip) <= strlen(host) || buddy_ip[strlen(host)] != '%') {
-			return FALSE;
-		}
-
-		return !strncmp(host, buddy_ip, strlen(host));
-	} else {
-		g_clear_object(&addr);
-		return purple_strequal(host, buddy_ip);
-	}
-}
-
-static inline gint
-xep_addr_differ(const char *buddy_ip, const char *host)
-{
-	return !xep_cmp_addr(host, buddy_ip);
-}
-
-/**
- * Create and insert an identical twin
- *
- * Creates a copy of the specified node and inserts it right after
- * this original node.
- *
- * @param node	The node to clone
- * @return	A pointer to the new, cloned twin if successful
- *		or NULL otherwise.
- */
-static PurpleXmlNode *
-purple_xmlnode_insert_twin_copy(PurpleXmlNode *node) {
-	PurpleXmlNode *copy;
-
-	g_return_val_if_fail(node != NULL, NULL);
-
-	copy = purple_xmlnode_copy(node);
-	g_return_val_if_fail(copy != NULL, NULL);
-
-	copy->next = node->next;
-	node->next = copy;
-
-	return copy;
-}
-
-/**
- * Tries to append an interface scope to an IPv6 link local address.
- *
- * If the given address is a link local IPv6 address (with no
- * interface scope) then we try to determine all fitting interfaces
- * from our Bonjour IP address list.
- *
- * For any such found matches we insert a copy of our current xml
- * streamhost entry right after this streamhost entry and append
- * the determined interface to the host address of this copy.
- *
- * @param cur_streamhost	The XML streamhost node we examine
- * @param host	The host address to examine in text form
- * @param pb	Buddy to get the list of link local IPv6 addresses
- *		and their interface from
- * @return	Returns TRUE if the specified 'host' address is a
- *		link local IPv6 address with no interface scope.
- *		Otherwise returns FALSE.
- */
-static gboolean
-add_ipv6_link_local_ifaces(PurpleXmlNode *cur_streamhost, const char *host,
-                           PurpleContact *contact)
-{
-	PurpleXmlNode *new_streamhost = NULL;
-	GInetAddress *addr;
-	BonjourBuddy *bb;
-	GSList *ip_elem;
-
-	addr = g_inet_address_new_from_string(host);
-	if (addr == NULL ||
-	    g_inet_address_get_family(addr) != G_SOCKET_FAMILY_IPV6 ||
-	    !g_inet_address_get_is_link_local(addr) ||
-	    strchr(host, '%'))
-	{
-		g_clear_object(&addr);
-		return FALSE;
-	}
-	g_clear_object(&addr);
-
-	bb = g_object_get_data(G_OBJECT(contact), "bonjour-buddy");
-
-	for (ip_elem = bb->ips;
-	     (ip_elem = g_slist_find_custom(ip_elem, host, (GCompareFunc)&xep_addr_differ));
-	     ip_elem = ip_elem->next) {
-		purple_debug_info("bonjour", "Inserting an PurpleXmlNode twin copy for %s with new host address %s\n",
-				  host, (char*)ip_elem->data);
-		new_streamhost = purple_xmlnode_insert_twin_copy(cur_streamhost);
-		purple_xmlnode_set_attrib(new_streamhost, "host", ip_elem->data);
-	}
-
-	if (!new_streamhost)
-		purple_debug_info("bonjour", "No interface for this IPv6 link local address found: %s\n",
-				  host);
-
-	return TRUE;
-}
-
-static gboolean
-__xep_bytestreams_parse(PurpleContact *contact, PurpleXfer *xfer,
-                        PurpleXmlNode *streamhost, const char *iq_id)
-{
-	char *tmp_iq_id;
-	const char *jid, *host, *port;
-	int portnum;
-	XepXfer *xf = XEP_XFER(xfer);
-
-	for(; streamhost; streamhost = purple_xmlnode_get_next_twin(streamhost)) {
-		if(!(jid = purple_xmlnode_get_attrib(streamhost, "jid")) ||
-		   !(host = purple_xmlnode_get_attrib(streamhost, "host")) ||
-		   !(port = purple_xmlnode_get_attrib(streamhost, "port")) ||
-		   !(portnum = atoi(port))) {
-			purple_debug_info("bonjour", "bytestream offer Message parse error.\n");
-			continue;
-		}
-
-		/* skip IPv6 link local addresses with no interface scope
-		 * (but try to add a new one with an interface scope then) */
-		if(add_ipv6_link_local_ifaces(streamhost, host, contact))
-			continue;
-
-		tmp_iq_id = g_strdup(iq_id);
-		g_free(xf->iq_id);
-		g_free(xf->jid);
-		g_free(xf->proxy_host);
-
-		xf->iq_id = tmp_iq_id;
-		xf->jid = g_strdup(jid);
-		xf->proxy_host = g_strdup(host);
-		xf->proxy_port = portnum;
-		xf->streamhost = streamhost;
-		xf->contact = contact;
-		purple_debug_info("bonjour", "bytestream offer parse"
-				  "jid=%s host=%s port=%d.\n", jid, host, portnum);
-		bonjour_bytestreams_connect(xfer);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-void
-xep_bytestreams_parse(PurpleConnection *pc, PurpleXmlNode *packet,
-                      PurpleContact *contact)
-{
-	const char *type, *from, *iq_id, *sid;
-	PurpleXmlNode *query, *streamhost;
-	BonjourData *bd;
-	PurpleXfer *xfer;
-
-	g_return_if_fail(pc != NULL);
-	g_return_if_fail(packet != NULL);
-	g_return_if_fail(PURPLE_IS_CONTACT(contact));
-
-	bd = purple_connection_get_protocol_data(pc);
-	if(bd == NULL) {
-		return;
-	}
-
-	purple_debug_info("bonjour", "xep-bytestreams-parse.\n");
-
-	type = purple_xmlnode_get_attrib(packet, "type");
-	from = purple_contact_info_get_username(PURPLE_CONTACT_INFO(contact));
-	query = purple_xmlnode_get_child(packet,"query");
-	if(!type)
-		return;
-
-	query = purple_xmlnode_copy(query);
-	if (!query)
-		return;
-
-	if(!purple_strequal(type, "set")) {
-		purple_debug_info("bonjour", "bytestream offer Message type - Unknown-%s.\n", type);
-		return;
-	}
-
-	purple_debug_info("bonjour", "bytestream offer Message type - SET.\n");
-
-	iq_id = purple_xmlnode_get_attrib(packet, "id");
-
-	sid = purple_xmlnode_get_attrib(query, "sid");
-	xfer = bonjour_si_xfer_find(bd, sid, from);
-	streamhost = purple_xmlnode_get_child(query, "streamhost");
-
-	if(xfer && streamhost && __xep_bytestreams_parse(contact, xfer, streamhost, iq_id))
-		return; /* success */
-
-	purple_debug_error("bonjour", "Didn't find an acceptable streamhost.\n");
-
-	if (iq_id && xfer != NULL)
-		xep_ft_si_reject(bd, iq_id, purple_xfer_get_remote_user(xfer), "404", "cancel");
-}
-
-static void
-bonjour_xfer_receive(PurpleConnection *pc, const char *id, const char *sid,
-                     const char *from, goffset filesize, const char *filename,
-                     G_GNUC_UNUSED int option)
-{
-	PurpleXfer *xfer;
-	XepXfer *xf;
-	BonjourData *bd;
-
-	if(pc == NULL || id == NULL || from == NULL)
-		return;
-
-	bd = purple_connection_get_protocol_data(pc);
-	if(bd == NULL)
-		return;
-
-	purple_debug_info("bonjour", "bonjour-xfer-receive.\n");
-
-	/* Build the file transfer handle */
-	xf = g_object_new(
-		XEP_TYPE_XFER,
-		"account", purple_connection_get_account(pc),
-		"type", PURPLE_XFER_TYPE_RECEIVE,
-		"remote-user", from,
-		NULL
-	);
-
-	xfer = PURPLE_XFER(xf);
-
-	xf->data = bd;
-	purple_xfer_set_filename(xfer, filename);
-	xf->iq_id = g_strdup(id);
-	xf->sid = g_strdup(sid);
-
-	if(filesize > 0)
-		purple_xfer_set_size(xfer, filesize);
-
-	bd->xfer_lists = g_slist_append(bd->xfer_lists, xfer);
-
-	purple_xfer_request(xfer);
-}
-
-static void
-bonjour_sock5_request_cb(GObject *source, GAsyncResult *result,
-                         gpointer user_data)
-{
-	PurpleXfer *xfer = PURPLE_XFER(user_data);
-	XepXfer *xf = XEP_XFER(xfer);
-	gsize bytes_written = 0;
-	GError *error = NULL;
-	GSocket *sock = NULL;
-	gint fd = -1;
-
-	purple_debug_info("bonjour", "bonjour_sock5_request_cb");
-
-	if (!g_output_stream_write_all_finish(G_OUTPUT_STREAM(source), result,
-	                                      &bytes_written, &error)) {
-		if (error->code != G_IO_ERROR_CANCELLED) {
-			purple_xfer_cancel_remote(xfer);
-		}
-		g_clear_error(&error);
-		return;
-	}
-
-	sock = g_socket_connection_get_socket(xf->conn);
-	fd = g_socket_get_fd(sock);
-	purple_debug_info("bonjour", "Accepted SOCKS5 ft connection - fd=%d", fd);
-
-	_purple_network_set_common_socket_flags(fd);
-	purple_xfer_start(xfer, fd, NULL, -1);
-}
-
-static void
-bonjour_sock5_read_connect_cb(GObject *source, GAsyncResult *result,
-                              gpointer user_data)
-{
-	PurpleXfer *xfer = PURPLE_XFER(user_data);
-	XepXfer *xf = XEP_XFER(xfer);
-	GOutputStream *output = NULL;
-	gsize bytes_read = 0;
-	GError *error = NULL;
-
-	purple_debug_info("bonjour", "bonjour_sock5_request_state4_cb");
-
-	if (!g_input_stream_read_all_finish(G_INPUT_STREAM(source), result,
-	                                    &bytes_read, &error)) {
-		if (error->code != G_IO_ERROR_CANCELLED) {
-			purple_xfer_cancel_remote(xfer);
-		}
-		g_clear_error(&error);
-		return;
-	}
-
-	xf->tx_buf[0] = 0x05;
-	xf->tx_buf[1] = 0x00;
-	xf->tx_buf[2] = 0x00;
-	xf->tx_buf[3] = 0x03;
-	xf->tx_buf[4] = strlen(xf->buddy_ip);
-	memcpy(xf->tx_buf + 5, xf->buddy_ip, strlen(xf->buddy_ip));
-	xf->tx_buf[5 + strlen(xf->buddy_ip)] = 0x00;
-	xf->tx_buf[6 + strlen(xf->buddy_ip)] = 0x00;
-	output = g_io_stream_get_output_stream(G_IO_STREAM(xf->conn));
-	g_output_stream_write_all_async(
-	        output, xf->tx_buf, 7 + strlen(xf->buddy_ip), G_PRIORITY_DEFAULT,
-	        xf->cancellable, bonjour_sock5_request_cb, xfer);
-}
-
-static void
-bonjour_sock5_write_server_method_cb(GObject *source, GAsyncResult *result,
-                                     gpointer user_data)
-{
-	PurpleXfer *xfer = PURPLE_XFER(user_data);
-	XepXfer *xf = XEP_XFER(xfer);
-	GInputStream *input = NULL;
-	gsize bytes_written = 0;
-	GError *error = NULL;
-
-	purple_debug_info("bonjour", "bonjour_sock5_request_state3_cb");
-
-	if (!g_output_stream_write_all_finish(G_OUTPUT_STREAM(source), result,
-	                                      &bytes_written, &error)) {
-		if (error->code != G_IO_ERROR_CANCELLED) {
-			purple_xfer_cancel_remote(xfer);
-		}
-		g_clear_error(&error);
-		return;
-	}
-
-	input = g_io_stream_get_input_stream(G_IO_STREAM(xf->conn));
-	g_input_stream_read_all_async(input, xf->rx_buf, 20, G_PRIORITY_DEFAULT,
-	                              xf->cancellable,
-	                              bonjour_sock5_read_connect_cb, xfer);
-}
-
-static void
-bonjour_sock5_read_client_version_cb(GObject *source, GAsyncResult *result,
-                                     gpointer user_data)
-{
-	PurpleXfer *xfer = PURPLE_XFER(user_data);
-	XepXfer *xf = XEP_XFER(xfer);
-	GOutputStream *output = NULL;
-	gsize bytes_read = 0;
-	GError *error = NULL;
-
-	purple_debug_info("bonjour", "bonjour_sock5_read_client_version_cb");
-
-	if (!g_input_stream_read_all_finish(G_INPUT_STREAM(source), result,
-	                                    &bytes_read, &error)) {
-		if (error->code != G_IO_ERROR_CANCELLED) {
-			purple_xfer_cancel_remote(xfer);
-		}
-		g_clear_error(&error);
-		return;
-	}
-
-	xf->tx_buf[0] = 0x05;
-	xf->tx_buf[1] = 0x00;
-	output = g_io_stream_get_output_stream(G_IO_STREAM(xf->conn));
-	g_output_stream_write_all_async(output, xf->tx_buf, 2, G_PRIORITY_DEFAULT,
-	                                xf->cancellable,
-	                                bonjour_sock5_write_server_method_cb, xfer);
-}
-
-static void
-bonjour_sock5_incoming_cb(G_GNUC_UNUSED GSocketService *service,
-                          GSocketConnection *connection, GObject *source_object,
-                          G_GNUC_UNUSED gpointer data)
-{
-	PurpleXfer *xfer = PURPLE_XFER(source_object);
-	XepXfer *xf = XEP_XFER(xfer);
-	GInputStream *input = NULL;
-
-	if (xf == NULL) {
-		return;
-	}
-
-	purple_debug_info("bonjour", "bonjour_sock5_incoming_cb");
-
-	xf->conn = g_object_ref(connection);
-	g_socket_service_stop(xf->service);
-	g_clear_object(&xf->service);
-
-	purple_debug_info("bonjour", "Accepted SOCKS5 ft connection");
-	input = g_io_stream_get_input_stream(G_IO_STREAM(xf->conn));
-
-	g_input_stream_read_all_async(input, xf->rx_buf, 3, G_PRIORITY_DEFAULT,
-	                              xf->cancellable,
-	                              bonjour_sock5_read_client_version_cb, xfer);
-}
-
-static void
-bonjour_bytestreams_init(PurpleXfer *xfer)
-{
-	XepXfer *xf;
-	XepIq *iq;
-	PurpleXmlNode *query, *streamhost;
-	guint16 port;
-	gchar *port_str;
-	GList *local_ips;
-	BonjourData *bd;
-	GError *error = NULL;
-
-	if (xfer == NULL) {
-		return;
-	}
-
-	purple_debug_info("bonjour", "Bonjour-bytestreams-init.\n");
-	xf = XEP_XFER(xfer);
-
-	xf->service = g_socket_service_new();
-	port = purple_socket_listener_add_any_inet_port(
-	        G_SOCKET_LISTENER(xf->service), G_OBJECT(xfer), &error);
-	if (port == 0) {
-		purple_debug_error("bonjour",
-		                   "Unable to open port for file transfer: %s",
-		                   error->message);
-		purple_xfer_cancel_local(xfer);
-		g_error_free(error);
-		return;
-	}
-
-	g_signal_connect(xf->service, "incoming",
-	                 G_CALLBACK(bonjour_sock5_incoming_cb), NULL);
-
-	bd = xf->data;
-
-	iq = xep_iq_new(bd, XEP_IQ_SET, purple_xfer_get_remote_user(xfer), bonjour_get_jid(bd->xmpp_data->account), xf->sid);
-
-	query = purple_xmlnode_new_child(iq->node, "query");
-	purple_xmlnode_set_namespace(query, "http://jabber.org/protocol/bytestreams");
-	purple_xmlnode_set_attrib(query, "sid", xf->sid);
-	purple_xmlnode_set_attrib(query, "mode", "tcp");
-
-	purple_xfer_set_local_port(xfer, port);
-
-	#pragma message("Need to figure out how to get the local ip addresses")
-	local_ips = NULL;
-
-	port_str = g_strdup_printf("%hu", port);
-	while(local_ips) {
-		streamhost = purple_xmlnode_new_child(query, "streamhost");
-		purple_xmlnode_set_attrib(streamhost, "jid", xf->sid);
-		purple_xmlnode_set_attrib(streamhost, "host", local_ips->data);
-		purple_xmlnode_set_attrib(streamhost, "port", port_str);
-		g_free(local_ips->data);
-		local_ips = g_list_delete_link(local_ips, local_ips);
-	}
-	g_free(port_str);
-
-	xep_iq_send_and_free(iq);
-}
-
-static void
-bonjour_bytestreams_handle_failure(PurpleXfer *xfer, const gchar *error_message)
-{
-	XepXfer *xf = XEP_XFER(xfer);
-	PurpleXmlNode *tmp_node;
-	gboolean ret;
-
-	purple_debug_error("bonjour", "Error connecting via SOCKS5 to %s - %s",
-	                   xf->proxy_host, error_message);
-
-	tmp_node = purple_xmlnode_get_next_twin(xf->streamhost);
-	ret = __xep_bytestreams_parse(xf->contact, xfer, tmp_node, xf->iq_id);
-
-	if (!ret) {
-		xep_ft_si_reject(xf->data, xf->iq_id, purple_xfer_get_remote_user(xfer),
-		                 "404", "cancel");
-		/* Cancel the connection */
-		purple_xfer_cancel_local(xfer);
-	}
-}
-
-static void
-bonjour_bytestreams_connect_cb(GObject *source, GAsyncResult *result,
-                               gpointer user_data)
-{
-	PurpleXfer *xfer = PURPLE_XFER(user_data);
-	XepXfer *xf = XEP_XFER(xfer);
-	GIOStream *stream;
-	GError *error = NULL;
-	GSocket *socket;
-	XepIq *iq;
-	PurpleXmlNode *q_node, *tmp_node;
-	BonjourData *bd;
-
-	stream = g_proxy_connect_finish(G_PROXY(source), result, &error);
-	if (stream == NULL) {
-		if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-			purple_debug_error("bonjour",
-			                   "Unable to connect to destination host: %s",
-			                   error->message);
-			bonjour_bytestreams_handle_failure(
-			        xfer, "Unable to connect to destination host.");
-		}
-
-		g_clear_error(&error);
-		return;
-	}
-
-	if (!G_IS_SOCKET_CONNECTION(stream)) {
-		purple_debug_error("bonjour",
-		                   "GProxy didn't return a GSocketConnection.");
-		bonjour_bytestreams_handle_failure(
-		        xfer, "GProxy didn't return a GSocketConnection.");
-		g_object_unref(stream);
-		return;
-	}
-
-	purple_debug_info("bonjour", "Connected successfully via SOCKS5, starting transfer.\n");
-
-	bd = xf->data;
-
-	/* Here, start the file transfer.*/
-
-	/* Notify Initiator of Connection */
-	iq = xep_iq_new(bd, XEP_IQ_RESULT, purple_xfer_get_remote_user(xfer), bonjour_get_jid(bd->xmpp_data->account), xf->iq_id);
-	q_node = purple_xmlnode_new_child(iq->node, "query");
-	purple_xmlnode_set_namespace(q_node, "http://jabber.org/protocol/bytestreams");
-	tmp_node = purple_xmlnode_new_child(q_node, "streamhost-used");
-	purple_xmlnode_set_attrib(tmp_node, "jid", xf->jid);
-	xep_iq_send_and_free(iq);
-
-	xf->conn = G_SOCKET_CONNECTION(stream);
-	socket = g_socket_connection_get_socket(xf->conn);
-	purple_xfer_start(xfer, g_socket_get_fd(socket), NULL, -1);
-}
-
-/* This is called when we connect to the SOCKS5 proxy server (through any
- * relevant account proxy)
- */
-static void
-bonjour_bytestreams_socks5_connect_to_host_cb(GObject *source,
-                                              GAsyncResult *result,
-                                              gpointer user_data)
-{
-	PurpleXfer *xfer = PURPLE_XFER(user_data);
-	XepXfer *xf = XEP_XFER(xfer);
-	GSocketConnection *conn;
-	GProxy *proxy;
-	GSocketAddress *addr;
-	GInetSocketAddress *inet_addr;
-	GSocketAddress *proxy_addr;
-	PurpleContact *contact = NULL;
-	gchar *hash_input;
-	gchar *dstaddr;
-	GError *error = NULL;
-
-	conn = g_socket_client_connect_to_host_finish(G_SOCKET_CLIENT(source),
-	                                              result, &error);
-	if (conn == NULL) {
-		if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-			purple_debug_error("bonjour",
-			                   "Unable to connect to SOCKS5 host: %s",
-			                   error->message);
-			bonjour_bytestreams_handle_failure(
-			        xfer, "Unable to connect to SOCKS5 host.");
-		}
-
-		g_clear_error(&error);
-		return;
-	}
-
-	proxy = g_proxy_get_default_for_protocol("socks5");
-	if (proxy == NULL) {
-		purple_debug_error("bonjour", "SOCKS5 proxy backend missing.");
-		bonjour_bytestreams_handle_failure(xfer,
-		                                   "SOCKS5 proxy backend missing.");
-		g_object_unref(conn);
-		return;
-	}
-
-	addr = g_socket_connection_get_remote_address(conn, &error);
-	if (addr == NULL) {
-		purple_debug_error(
-		        "bonjour",
-		        "Unable to retrieve SOCKS5 host address from connection: %s",
-		        error->message);
-		bonjour_bytestreams_handle_failure(
-		        xfer, "Unable to retrieve SOCKS5 host address from connection");
-		g_object_unref(conn);
-		g_object_unref(proxy);
-		g_clear_error(&error);
-		return;
-	}
-
-	contact = xf->contact;
-	hash_input = g_strdup_printf("%s%s%s", xf->sid,
-	                             purple_contact_info_get_username(PURPLE_CONTACT_INFO(contact)),
-	                             bonjour_get_jid(purple_contact_get_account(contact)));
-	dstaddr = g_compute_checksum_for_string(G_CHECKSUM_SHA1, hash_input, -1);
-	g_free(hash_input);
-
-	purple_debug_info("bonjour", "Connecting to %s using SOCKS5 proxy %s:%d",
-	                  dstaddr, xf->proxy_host, xf->proxy_port);
-
-	inet_addr = G_INET_SOCKET_ADDRESS(addr);
-	proxy_addr =
-	        g_proxy_address_new(g_inet_socket_address_get_address(inet_addr),
-	                            g_inet_socket_address_get_port(inet_addr),
-	                            "socks5", dstaddr, 0, NULL, NULL);
-	g_object_unref(inet_addr);
-
-	g_proxy_connect_async(proxy, G_IO_STREAM(conn), G_PROXY_ADDRESS(proxy_addr),
-	                      xf->cancellable, bonjour_bytestreams_connect_cb,
-	                      xfer);
-	g_object_unref(proxy_addr);
-	g_object_unref(conn);
-	g_object_unref(proxy);
-	g_free(dstaddr);
-}
-
-static void
-bonjour_bytestreams_connect(PurpleXfer *xfer)
-{
-	PurpleAccount *account = NULL;
-	XepXfer *xf;
-	GError *error = NULL;
-
-	if (xfer == NULL) {
-		return;
-	}
-
-	purple_debug_info("bonjour", "bonjour-bytestreams-connect.");
-
-	xf = XEP_XFER(xfer);
-	account = purple_contact_get_account(xf->contact);
-
-	xf->client = purple_gio_socket_client_new(account, &error);
-	if (xf->client == NULL) {
-		/* Cancel the connection */
-		purple_debug_error("bonjour",
-		                   "Failed to connect to SOCKS5 streamhost proxy: %s",
-		                   error->message);
-		g_clear_error(&error);
-		xep_ft_si_reject(xf->data, xf->iq_id, purple_xfer_get_remote_user(xfer),
-		                 "404", "cancel");
-		purple_xfer_cancel_local(xfer);
-		return;
-	}
-
-	purple_debug_info("bonjour", "Connecting to SOCKS5 proxy %s:%d",
-	                  xf->proxy_host, xf->proxy_port);
-
-	g_socket_client_connect_to_host_async(
-	        xf->client, xf->proxy_host, xf->proxy_port, xf->cancellable,
-	        bonjour_bytestreams_socks5_connect_to_host_cb, xfer);
-}
-
-static void
-xep_xfer_init(XepXfer *xf)
-{
-	xf->cancellable = g_cancellable_new();
-}
-
-static void
-xep_xfer_finalize(GObject *obj) {
-	XepXfer *xf = XEP_XFER(obj);
-	BonjourData *bd = (BonjourData*)xf->data;
-
-	if(bd != NULL) {
-		bd->xfer_lists = g_slist_remove(bd->xfer_lists, PURPLE_XFER(xf));
-		purple_debug_misc("bonjour", "B free xfer from lists(%p).\n", bd->xfer_lists);
-	}
-	g_cancellable_cancel(xf->cancellable);
-	g_clear_object(&xf->cancellable);
-	g_clear_object(&xf->client);
-	if (xf->service) {
-		g_socket_service_stop(xf->service);
-	}
-	g_clear_object(&xf->service);
-	g_clear_object(&xf->conn);
-
-	g_free(xf->iq_id);
-	g_free(xf->jid);
-	g_free(xf->proxy_host);
-	g_free(xf->buddy_ip);
-	g_free(xf->sid);
-
-	g_clear_pointer(&xf->streamhost, purple_xmlnode_free_tree);
-
-	G_OBJECT_CLASS(xep_xfer_parent_class)->finalize(obj);
-}
-
-static void
-xep_xfer_class_finalize(G_GNUC_UNUSED XepXferClass *klass) {
-}
-
-static void
-xep_xfer_class_init(XepXferClass *klass) {
-	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
-	PurpleXferClass *xfer_class = PURPLE_XFER_CLASS(klass);
-
-	obj_class->finalize = xep_xfer_finalize;
-
-	xfer_class->init = bonjour_xfer_init;
-	xfer_class->request_denied = bonjour_xfer_request_denied;
-	xfer_class->cancel_recv = bonjour_xfer_cancel_recv;
-	xfer_class->cancel_send = bonjour_xfer_cancel_send;
-	xfer_class->end = bonjour_xfer_end;
-}
-
-void
-xep_xfer_register(GTypeModule *module) {
-	xep_xfer_register_type(module);
-}

--- a/libpurple/protocols/bonjour/bonjour_ft.h	Tue Apr 09 23:11:12 2024 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
- * purple - Bonjour Protocol Plugin
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
- */
-#ifndef PURPLE_BONJOUR_BONJOUR_FT_H
-#define PURPLE_BONJOUR_BONJOUR_FT_H
-
-#include <purple.h>
-
-G_BEGIN_DECLS
-
-#define XEP_TYPE_XFER (xep_xfer_get_type())
-G_DECLARE_FINAL_TYPE(XepXfer, xep_xfer, XEP, XFER, PurpleXfer);
-
-typedef enum {
-	XEP_BYTESTREAMS = 1,
-	XEP_IBB = 2,
-	XEP_UNKNOWN = 4
-} XepSiMode;
-
-/**
- * Create a new PurpleXfer
- *
- * @param gc The PurpleConnection handle.
- * @param who Who will we be sending it to?
- */
-PurpleXfer *bonjour_new_xfer(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who);
-
-/**
- * Send a file.
- *
- * @param gc The PurpleConnection handle.
- * @param who Who are we sending it to?
- * @param file What file? If NULL, user will choose after this call.
- */
-void bonjour_send_file(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who, const char *file);
-
-void xep_si_parse(PurpleConnection *pc, PurpleXmlNode *packet, PurpleContact *contact);
-void xep_bytestreams_parse(PurpleConnection *pc, PurpleXmlNode *packet, PurpleContact *contact);
-
-void xep_xfer_register(GTypeModule *module);
-
-G_END_DECLS
-
-#endif /* PURPLE_BONJOUR_BONJOUR_FT_H */

--- a/libpurple/protocols/bonjour/buddy.c	Tue Apr 09 23:11:12 2024 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,307 +0,0 @@
-/*
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
- */
-
-#include <glib.h>
-#include <stdlib.h>
-
-#include <purple.h>
-
-#include "buddy.h"
-#include "bonjour.h"
-#include "glibcompat.h"
-
-/**
- * Creates a new buddy.
- */
-BonjourBuddy *
-bonjour_buddy_new(const gchar *name, PurpleAccount* account)
-{
-	BonjourBuddy *buddy = g_new0(BonjourBuddy, 1);
-
-	buddy->account = account;
-	buddy->name = g_strdup(name);
-
-	_mdns_init_buddy(buddy);
-
-	return buddy;
-}
-
-void
-clear_bonjour_buddy_values(BonjourBuddy *buddy)
-{
-	g_clear_pointer(&buddy->first, g_free);
-	g_clear_pointer(&buddy->email, g_free);
-	g_clear_pointer(&buddy->ext, g_free);
-	g_clear_pointer(&buddy->jid, g_free);
-	g_clear_pointer(&buddy->last, g_free);
-	g_clear_pointer(&buddy->msg, g_free);
-	g_clear_pointer(&buddy->nick, g_free);
-	g_clear_pointer(&buddy->node, g_free);
-	g_clear_pointer(&buddy->phsh, g_free);
-	g_clear_pointer(&buddy->status, g_free);
-	g_clear_pointer(&buddy->vc, g_free);
-	g_clear_pointer(&buddy->ver, g_free);
-	g_clear_pointer(&buddy->AIM, g_free);
-}
-
-void
-set_bonjour_buddy_value(BonjourBuddy* buddy, const char *record_key, const char *value, guint32 len){
-	gchar **fld = NULL;
-
-	g_return_if_fail(record_key != NULL);
-
-	if (purple_strequal(record_key, "1st"))
-		fld = &buddy->first;
-	else if(purple_strequal(record_key, "email"))
-		fld = &buddy->email;
-	else if(purple_strequal(record_key, "ext"))
-		fld = &buddy->ext;
-	else if(purple_strequal(record_key, "jid"))
-		fld = &buddy->jid;
-	else if(purple_strequal(record_key, "last"))
-		fld = &buddy->last;
-	else if(purple_strequal(record_key, "msg"))
-		fld = &buddy->msg;
-	else if(purple_strequal(record_key, "nick"))
-		fld = &buddy->nick;
-	else if(purple_strequal(record_key, "node"))
-		fld = &buddy->node;
-	else if(purple_strequal(record_key, "phsh"))
-		fld = &buddy->phsh;
-	else if(purple_strequal(record_key, "status"))
-		fld = &buddy->status;
-	else if(purple_strequal(record_key, "vc"))
-		fld = &buddy->vc;
-	else if(purple_strequal(record_key, "ver"))
-		fld = &buddy->ver;
-	else if(purple_strequal(record_key, "AIM"))
-		fld = &buddy->AIM;
-
-	if(fld == NULL)
-		return;
-
-	g_free(*fld);
-	*fld = NULL;
-	*fld = g_strndup(value, len);
-}
-
-/**
- * Check if all the compulsory buddy data is present.
- */
-gboolean
-bonjour_buddy_check(BonjourBuddy *buddy)
-{
-	if (buddy->account == NULL)
-		return FALSE;
-
-	if (buddy->name == NULL)
-		return FALSE;
-
-	return TRUE;
-}
-
-/**
- * If the buddy does not yet exist, then create it and add it to
- * our buddy list.  In either case we set the correct status for
- * the buddy.
- */
-void
-bonjour_buddy_add_to_purple(BonjourBuddy *bonjour_buddy)
-{
-	PurpleAccount *account = bonjour_buddy->account;
-	PurpleContact *contact = NULL;
-	PurpleContactManager *manager = NULL;
-	PurplePerson *person = NULL;
-	PurplePresence *presence = NULL;
-	PurplePresencePrimitive primitive = PURPLE_PRESENCE_PRIMITIVE_AVAILABLE;
-
-	/* Translate between the Bonjour status and the Purple status */
-	if(bonjour_buddy->status != NULL &&
-	   g_ascii_strcasecmp("dnd", bonjour_buddy->status) == 0)
-	{
-		primitive = PURPLE_PRESENCE_PRIMITIVE_AWAY;
-	}
-
-	/*
-	 * TODO: Figure out the idle time by getting the "away"
-	 * field from the DNS SD.
-	 */
-
-	/* Determine if we already know about this contact. */
-	manager = purple_contact_manager_get_default();
-	contact = purple_contact_manager_find_with_username(manager, account,
-	                                                    bonjour_buddy->name);
-
-	/* If not, create the contact and add them to the manager. */
-	if(!PURPLE_IS_CONTACT(contact)) {
-		PurpleTags *tags = NULL;
-
-		contact = purple_contact_new(account, NULL);
-		purple_contact_manager_add(manager, contact);
-
-		purple_contact_info_set_username(PURPLE_CONTACT_INFO(contact),
-		                                 bonjour_buddy->name);
-
-		tags = purple_contact_info_get_tags(PURPLE_CONTACT_INFO(contact));
-		purple_tags_add_with_value(tags, "group", BONJOUR_GROUP_NAME);
-	}
-
-	/* Make sure we have a person for this contact as we want them to appear in
-	 * the contact list.
-	 */
-	person = purple_contact_info_get_person(PURPLE_CONTACT_INFO(contact));
-	if(!PURPLE_IS_PERSON(person)) {
-		person = g_object_new(PURPLE_TYPE_PERSON, "id", bonjour_buddy->name,
-		                      NULL);
-		purple_contact_info_set_person(PURPLE_CONTACT_INFO(contact), person);
-		purple_person_add_contact_info(person, PURPLE_CONTACT_INFO(contact));
-
-		/* We remove our reference as the pointer is valid and we're treating
-		 * it just like if we had called _get_person above but with the new
-		 * instance.
-		 */
-		g_object_unref(person);
-	}
-
-	/* Set the alias. */
-	if(!purple_strempty(bonjour_buddy->nick)) {
-		purple_contact_info_set_alias(PURPLE_CONTACT_INFO(contact),
-		                              bonjour_buddy->nick);
-	} else {
-		GStrvBuilder *builder = NULL;
-		GStrv parts = NULL;
-		gchar *alias = NULL;
-
-		builder = g_strv_builder_new();
-
-		if(!purple_strempty(bonjour_buddy->first)) {
-			g_strv_builder_add(builder, bonjour_buddy->first);
-		}
-
-		if(!purple_strempty(bonjour_buddy->last)) {
-			g_strv_builder_add(builder, bonjour_buddy->last);
-		}
-
-		parts = g_strv_builder_end(builder);
-
-		alias = g_strjoinv(" ", parts);
-		g_strfreev(parts);
-
-		if(!purple_strempty(alias)) {
-			purple_contact_info_set_alias(PURPLE_CONTACT_INFO(contact), alias);
-		} else {
-			purple_contact_info_set_alias(PURPLE_CONTACT_INFO(contact), NULL);
-		}
-		g_free(alias);
-	}
-
-	g_object_set_data(G_OBJECT(contact), "bonjour-buddy", bonjour_buddy);
-
-	/* Set the user's status */
-	presence = purple_contact_info_get_presence(PURPLE_CONTACT_INFO(contact));
-	purple_presence_set_primitive(presence, primitive);
-	purple_presence_set_message(presence, bonjour_buddy->msg);
-	purple_presence_set_idle(presence, FALSE, NULL);
-
-	/* TODO: Because we don't save Bonjour buddies in blist.xml,
-	 * we will always have to look up the buddy icon at login time.
-	 * I think we should figure out a way to do something about this. */
-
-#if 0
-	/* Deal with the buddy icon */
-	old_hash = purple_buddy_icons_get_checksum_for_user(buddy);
-	new_hash = (bonjour_buddy->phsh && *(bonjour_buddy->phsh)) ? bonjour_buddy->phsh : NULL;
-	if (new_hash && !purple_strequal(old_hash, new_hash)) {
-		/* Look up the new icon data */
-		/* TODO: Make sure the hash assigned to the retrieved buddy icon is the same
-		 * as what we looked up. */
-		bonjour_dns_sd_retrieve_buddy_icon(bonjour_buddy);
-	} else if (!new_hash)
-		purple_buddy_icons_set_for_user(account, name, NULL, 0, NULL);
-#endif
-
-	g_clear_object(&contact);
-}
-
-/**
- * The buddy has signed off Bonjour.
- * If the buddy is being saved, mark as offline, otherwise delete
- */
-void bonjour_buddy_signed_off(PurpleContact *contact) {
-	BonjourBuddy *bb = NULL;
-	PurplePresence *presence = NULL;
-
-	presence = purple_contact_info_get_presence(PURPLE_CONTACT_INFO(contact));
-	purple_presence_set_primitive(presence, PURPLE_PRESENCE_PRIMITIVE_OFFLINE);
-
-	bb = g_object_get_data(G_OBJECT(contact), "bonjour-buddy");
-	if(bb != NULL) {
-		bonjour_buddy_delete(bb);
-	}
-	g_object_set_data(G_OBJECT(contact), "bonjour-buddy", NULL);
-}
-
-/**
- * We got the buddy icon data; deal with it
- */
-void bonjour_buddy_got_buddy_icon(BonjourBuddy *buddy, gconstpointer data, gsize len) {
-	/* Recalculate the hash instead of using the current phsh to make sure it is accurate for the icon. */
-	gchar *hash;
-
-	if (data == NULL || len == 0)
-		return;
-
-	hash = g_compute_checksum_for_data(G_CHECKSUM_SHA1, data, len);
-
-	purple_debug_info("bonjour", "Got buddy icon for %s icon hash='%s' phsh='%s'.\n", buddy->name,
-			  hash, buddy->phsh ? buddy->phsh : "(null)");
-
-	purple_buddy_icons_set_for_user(buddy->account, buddy->name,
-		g_memdup2(data, len), len, hash);
-
-	g_free(hash);
-}
-
-/**
- * Deletes a buddy from memory.
- */
-void
-bonjour_buddy_delete(BonjourBuddy *buddy)
-{
-	g_free(buddy->name);
-	g_slist_free_full(buddy->ips, g_free);
-	g_free(buddy->first);
-	g_free(buddy->phsh);
-	g_free(buddy->status);
-	g_free(buddy->email);
-	g_free(buddy->last);
-	g_free(buddy->jid);
-	g_free(buddy->AIM);
-	g_free(buddy->vc);
-	g_free(buddy->msg);
-	g_free(buddy->ext);
-	g_free(buddy->nick);
-	g_free(buddy->node);
-	g_free(buddy->ver);
-
-	bonjour_xmpp_close_conversation(buddy->conversation);
-	buddy->conversation = NULL;
-
-	/* Clean up any mdns implementation data */
-	_mdns_delete_buddy(buddy);
-
-	g_free(buddy);
-}

--- a/libpurple/protocols/bonjour/buddy.h	Tue Apr 09 23:11:12 2024 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/*
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
- */
-
-#ifndef PURPLE_BONJOUR_BUDDY_H
-#define PURPLE_BONJOUR_BUDDY_H
-
-#include <glib.h>
-
-#include <purple.h>
-
-#include "xmpp.h"
-
-typedef struct
-{
-	PurpleAccount *account;
-
-	gchar *name;
-	GSList *ips;
-	gint port_p2pj;
-
-	gchar *first;
-	gchar *phsh;
-	gchar *status;
-	gchar *email;
-	gchar *last;
-	gchar *jid;
-	gchar *AIM;
-	gchar *vc;
-	gchar *msg;
-	gchar *ext;
-	gchar *nick;
-	gchar *node;
-	gchar *ver;
-
-	BonjourXMPPConversation *conversation;
-
-	gpointer mdns_impl_data;
-} BonjourBuddy;
-
-static const char *const buddy_TXT_records[] = {
-	"1st",
-	"email",
-	"ext",
-	"jid",
-	"last",
-	"msg",
-	"nick",
-	"node",
-	"phsh",
-/*	"port.p2pj", Deprecated - MUST ignore */
-	"status",
-/*	"txtvers", Deprecated - hardcoded to 1 */
-	"vc",
-	"ver",
-	"AIM", /* non standard */
-	NULL
-};
-
-/**
- * Creates a new buddy.
- */
-BonjourBuddy *bonjour_buddy_new(const gchar *name, PurpleAccount *account);
-
-/**
- * Clear any existing values from the buddy.
- * This is called before updating so that we can notice removals
- */
-void clear_bonjour_buddy_values(BonjourBuddy *buddy);
-
-/**
- * Sets a value in the BonjourBuddy struct, destroying the old value
- */
-void set_bonjour_buddy_value(BonjourBuddy *buddy, const char *record_key, const char *value, guint32 len);
-
-/**
- * Check if all the compulsory buddy data is present.
- */
-gboolean bonjour_buddy_check(BonjourBuddy *buddy);
-
-/**
- * If the buddy doesn't previously exists, it is created.
- */
-void bonjour_buddy_add_to_purple(BonjourBuddy *bonjour_buddy);
-
-/**
- * The buddy has signed off Bonjour.
- * If the buddy is being saved, mark as offline, otherwise delete
- */
-void bonjour_buddy_signed_off(PurpleContact *contact);
-
-/**
- * We got the buddy icon data; deal with it
- */
-void bonjour_buddy_got_buddy_icon(BonjourBuddy *buddy, gconstpointer data, gsize len);
-
-/**
- * Deletes a buddy from memory.
- */
-void bonjour_buddy_delete(BonjourBuddy *buddy);
-
-#endif /* PURPLE_BONJOUR_BUDDY_H */

--- a/libpurple/protocols/bonjour/dns_sd_proxy.c	Tue Apr 09 23:11:12 2024 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
-/*
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
- */
-
-#include <gmodule.h>
-
-#include <purple.h>
-
-#include "dns_sd_proxy.h"
-
-static DNSServiceErrorType (DNSSD_API* _DNSServiceAddRecord)(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags,
-		uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl);
-static DNSServiceErrorType (DNSSD_API* _DNSServiceBrowse)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
-	const char *regtype, const char *domain, DNSServiceBrowseReply callBack, void *context);
-static int (DNSSD_API* _DNSServiceConstructFullName)(char *fullName, const char *service, const char *regtype, const char *domain);
-static DNSServiceErrorType (DNSSD_API* _DNSServiceGetAddrInfo)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
-	DNSServiceProtocol protocol, const char *hostname, DNSServiceGetAddrInfoReply callBack, void *context);
-static DNSServiceErrorType (DNSSD_API* _DNSServiceProcessResult)(DNSServiceRef sdRef);
-static DNSServiceErrorType (DNSSD_API* _DNSServiceQueryRecord)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
-	const char *fullname, uint16_t rrtype, uint16_t rrclass, DNSServiceQueryRecordReply callBack, void *context);
-static void (DNSSD_API* _DNSServiceRefDeallocate)(DNSServiceRef sdRef);
-static int (DNSSD_API* _DNSServiceRefSockFD)(DNSServiceRef sdRef);
-static DNSServiceErrorType (DNSSD_API* _DNSServiceRegister)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
-	const char *name, const char *regtype, const char *domain, const char *host, uint16_t port, uint16_t txtLen,
-	const void *txtRecord, DNSServiceRegisterReply callBack, void *context);
-static DNSServiceErrorType (DNSSD_API* _DNSServiceResolve)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, const char *name,
-	const char *regtype, const char *domain, DNSServiceResolveReply callBack, void *context);
-static DNSServiceErrorType (DNSSD_API* _DNSServiceRemoveRecord)(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags);
-static DNSServiceErrorType (DNSSD_API* _DNSServiceUpdateRecord)(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags,
-	uint16_t rdlen, const void *rdata, uint32_t ttl);
-static void (DNSSD_API* _TXTRecordCreate)(TXTRecordRef *txtRecord, uint16_t bufferLen, void *buffer);
-static void (DNSSD_API* _TXTRecordDeallocate)(TXTRecordRef *txtRecord);
-static const void * (DNSSD_API* _TXTRecordGetBytesPtr)(const TXTRecordRef *txtRecord);
-static int16_t (DNSSD_API* _TXTRecordGetLength)(const TXTRecordRef *txtRecord);
-static const void * (DNSSD_API* _TXTRecordGetValuePtr)(uint16_t txtLen, const void *txtRecord, const char *key, uint8_t *valueLen);
-static DNSServiceErrorType (DNSSD_API* _TXTRecordSetValue)(TXTRecordRef *txtRecord, const char *key, uint8_t valueSize, const void *value);
-
-
-gboolean dns_sd_available(void) {
-	static gboolean initialized = FALSE;
-	static gboolean loaded = FALSE;
-
-	if (!initialized) {
-		GModule *dnssd = NULL;
-		initialized = TRUE;
-		if((dnssd = g_module_open("dnssd.dll", 0)) != NULL &&
-		   g_module_symbol(dnssd, "DNSServiceAddRecord", (gpointer *)&_DNSServiceAddRecord) &&
-		   g_module_symbol(dnssd, "DNSServiceBrowse", (gpointer *)&_DNSServiceBrowse) &&
-		   g_module_symbol(dnssd, "DNSServiceConstructFullName", (gpointer *)&_DNSServiceConstructFullName) &&
-		   g_module_symbol(dnssd, "DNSServiceGetAddrInfo", (gpointer *)&_DNSServiceGetAddrInfo) &&
-		   g_module_symbol(dnssd, "DNSServiceProcessResult", (gpointer *)&_DNSServiceProcessResult) &&
-		   g_module_symbol(dnssd, "DNSServiceQueryRecord", (gpointer *)&_DNSServiceQueryRecord) &&
-		   g_module_symbol(dnssd, "DNSServiceRefDeallocate", (gpointer *)&_DNSServiceRefDeallocate) &&
-		   g_module_symbol(dnssd, "DNSServiceRefSockFD", (gpointer *)&_DNSServiceRefSockFD) &&
-		   g_module_symbol(dnssd, "DNSServiceRegister", (gpointer *)&_DNSServiceRegister) &&
-		   g_module_symbol(dnssd, "DNSServiceResolve", (gpointer *)&_DNSServiceResolve) &&
-		   g_module_symbol(dnssd, "DNSServiceRemoveRecord", (gpointer *)&_DNSServiceRemoveRecord) &&
-		   g_module_symbol(dnssd, "DNSServiceUpdateRecord", (gpointer *)&_DNSServiceUpdateRecord) &&
-		   g_module_symbol(dnssd, "TXTRecordCreate", (gpointer *)&_TXTRecordCreate) &&
-		   g_module_symbol(dnssd, "TXTRecordDeallocate", (gpointer *)&_TXTRecordDeallocate) &&
-		   g_module_symbol(dnssd, "TXTRecordGetBytesPtr", (gpointer *)&_TXTRecordGetBytesPtr) &&
-		   g_module_symbol(dnssd, "TXTRecordGetLength", (gpointer *)&_TXTRecordGetLength) &&
-		   g_module_symbol(dnssd, "TXTRecordGetValuePtr", (gpointer *)&_TXTRecordGetValuePtr) &&
-		   g_module_symbol(dnssd, "TXTRecordSetValue", (gpointer *)&_TXTRecordSetValue))
-		{
-			/* TODO: The dnssd module leaks, but there's not a good
-			 * place to put the cleanup yet, as there's quite a bit
-			 * of abstraction between mDNS API here to the actual
-			 * plugin unload. */
-			loaded = TRUE;
-		} else {
-			g_clear_pointer(&dnssd, g_module_close);
-		}
-	}
-	return loaded;
-}
-
-
-DNSServiceErrorType _wpurple_DNSServiceAddRecord(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags,
-		uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl) {
-	g_return_val_if_fail(_DNSServiceAddRecord != NULL, kDNSServiceErr_Unknown);
-	return (_DNSServiceAddRecord)(sdRef, RecordRef, flags, rrtype, rdlen, rdata, ttl);
-}
-
-DNSServiceErrorType _wpurple_DNSServiceBrowse(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
-		const char *regtype, const char *domain, DNSServiceBrowseReply callBack, void *context) {
-	g_return_val_if_fail(_DNSServiceBrowse != NULL, kDNSServiceErr_Unknown);
-	return (_DNSServiceBrowse)(sdRef, flags, interfaceIndex, regtype, domain, callBack, context);
-}
-
-int _wpurple_DNSServiceConstructFullName(char *fullName, const char *service, const char *regtype, const char *domain) {
-	g_return_val_if_fail(_DNSServiceConstructFullName != NULL, 0);
-	return (_DNSServiceConstructFullName)(fullName, service, regtype, domain);
-}
-
-DNSServiceErrorType _wpurple_DNSServiceGetAddrInfo(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
-		DNSServiceProtocol protocol, const char *hostname, DNSServiceGetAddrInfoReply callBack, void *context) {
-	g_return_val_if_fail(_DNSServiceGetAddrInfo != NULL, 0);
-	return (_DNSServiceGetAddrInfo)(sdRef, flags, interfaceIndex, protocol, hostname, callBack, context);
-}
-
-DNSServiceErrorType _wpurple_DNSServiceProcessResult(DNSServiceRef sdRef) {
-	g_return_val_if_fail(_DNSServiceProcessResult != NULL, kDNSServiceErr_Unknown);
-	return (_DNSServiceProcessResult)(sdRef);
-}
-
-
-DNSServiceErrorType _wpurple_DNSServiceQueryRecord(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
-		const char *fullname, uint16_t rrtype, uint16_t rrclass, DNSServiceQueryRecordReply callBack, void *context) {
-	g_return_val_if_fail(_DNSServiceQueryRecord != NULL, kDNSServiceErr_Unknown);
-	return (_DNSServiceQueryRecord)(sdRef, flags, interfaceIndex, fullname, rrtype, rrclass, callBack, context);
-}
-
-void _wpurple_DNSServiceRefDeallocate(DNSServiceRef sdRef) {
-	g_return_if_fail(_DNSServiceRefDeallocate != NULL);
-	(_DNSServiceRefDeallocate)(sdRef);
-}
-
-int _wpurple_DNSServiceRefSockFD(DNSServiceRef sdRef) {
-	g_return_val_if_fail(_DNSServiceRefSockFD != NULL, -1);
-	return (_DNSServiceRefSockFD)(sdRef);
-}
-
-DNSServiceErrorType _wpurple_DNSServiceRegister(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
-		const char *name, const char *regtype, const char *domain, const char *host, uint16_t port, uint16_t txtLen,
-		const void *txtRecord, DNSServiceRegisterReply callBack, void *context) {
-	g_return_val_if_fail(_DNSServiceRegister != NULL, kDNSServiceErr_Unknown);
-	return (_DNSServiceRegister)(sdRef, flags, interfaceIndex, name, regtype, domain, host, port, txtLen, txtRecord, callBack, context);
-}
-
-DNSServiceErrorType _wpurple_DNSServiceResolve(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, const char *name,
-		const char *regtype, const char *domain, DNSServiceResolveReply callBack, void *context) {
-	g_return_val_if_fail(_DNSServiceResolve != NULL, kDNSServiceErr_Unknown);
-	return (_DNSServiceResolve)(sdRef, flags, interfaceIndex, name, regtype, domain, callBack, context);
-}
-
-DNSServiceErrorType _wpurple_DNSServiceRemoveRecord(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags) {
-	g_return_val_if_fail(_DNSServiceRemoveRecord != NULL, kDNSServiceErr_Unknown);
-	return (_DNSServiceRemoveRecord)(sdRef, RecordRef, flags);
-}
-
-DNSServiceErrorType _wpurple_DNSServiceUpdateRecord(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags,
-		uint16_t rdlen, const void *rdata, uint32_t ttl) {
-	g_return_val_if_fail(_DNSServiceUpdateRecord != NULL, kDNSServiceErr_Unknown);
-	return (_DNSServiceUpdateRecord)(sdRef, RecordRef, flags, rdlen, rdata, ttl);
-}
-
-void _wpurple_TXTRecordCreate(TXTRecordRef *txtRecord, uint16_t bufferLen, void *buffer) {
-	g_return_if_fail(_TXTRecordCreate != NULL);
-	(_TXTRecordCreate)(txtRecord, bufferLen, buffer);
-}
-
-void _wpurple_TXTRecordDeallocate(TXTRecordRef *txtRecord) {
-	g_return_if_fail(_TXTRecordDeallocate != NULL);
-	(_TXTRecordDeallocate)(txtRecord);
-}
-
-const void * _wpurple_TXTRecordGetBytesPtr(const TXTRecordRef *txtRecord) {
-	g_return_val_if_fail(_TXTRecordGetBytesPtr != NULL, NULL);
-	return (_TXTRecordGetBytesPtr)(txtRecord);
-}
-
-uint16_t _wpurple_TXTRecordGetLength(const TXTRecordRef *txtRecord) {
-	g_return_val_if_fail(_TXTRecordGetLength != NULL, 0);
-	return (_TXTRecordGetLength)(txtRecord);
-}
-
-const void * _wpurple_TXTRecordGetValuePtr(uint16_t txtLen, const void *txtRecord, const char *key, uint8_t *valueLen) {
-	g_return_val_if_fail(_TXTRecordGetValuePtr != NULL, NULL);
-	return (_TXTRecordGetValuePtr)(txtLen, txtRecord, key, valueLen);
-}
-
-DNSServiceErrorType _wpurple_TXTRecordSetValue(TXTRecordRef *txtRecord, const char *key, uint8_t valueSize, const void *value) {
-	g_return_val_if_fail(_TXTRecordSetValue != NULL, kDNSServiceErr_Unknown);
-	return (_TXTRecordSetValue)(txtRecord, key, valueSize, value);
-}
-

--- a/libpurple/protocols/bonjour/dns_sd_proxy.h	Tue Apr 09 23:11:12 2024 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +0,0 @@
-/*
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
- */
-#ifndef PURPLE_BONJOUR_DNS_SD_PROXY_H
-#define PURPLE_BONJOUR_DNS_SD_PROXY_H
-
-#include <stdint.h>
-
-/* The following is a subset of Apple's dns_sd.h file
- * http://www.opensource.apple.com/source/mDNSResponder/mDNSResponder-333.10/mDNSShared/dns_sd.h
- *
- * Copyright (c) 2003-2004, Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1.  Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of its
- *     contributors may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#  if defined(_WIN32) && !defined(EFI32) && !defined(EFI64)
-#    define DNSSD_API __stdcall
-#  else
-#    define DNSSD_API
-#  endif
-
-#  define kDNSServiceInterfaceIndexAny 0
-#  define kDNSServiceMaxDomainName 1009
-
-typedef gint32 DNSServiceErrorType;
-typedef guint32 DNSServiceFlags;
-typedef struct _DNSServiceRef_t *DNSServiceRef;
-typedef struct _DNSRecordRef_t *DNSRecordRef;
-typedef guint32 DNSServiceProtocol;
-
-typedef union _TXTRecordRef_t {
-	gchar PrivateData[16];
-	gchar *ForceNaturalAlignment;
-} TXTRecordRef;
-
-typedef void (DNSSD_API *DNSServiceBrowseReply)();
-typedef void (DNSSD_API *DNSServiceGetAddrInfoReply)();
-typedef void (DNSSD_API *DNSServiceQueryRecordReply)(
-	DNSServiceRef sdRef, DNSServiceFlags flags, guint32 interfaceIndex,
-	DNSServiceErrorType errorCode, const gchar *fullname,
-	guint16 rrtype, guint16 rrclass, guint16 rdlen, const void *rdata,
-	guint32 ttl, void *context);
-typedef void (DNSSD_API *DNSServiceRegisterReply)();
-typedef void (DNSSD_API *DNSServiceResolveReply)(
-	DNSServiceRef sdRef, DNSServiceFlags flags, guint32 interfaceIndex,
-	DNSServiceErrorType errorCode, const gchar *fullname,
-	const gchar *hosttarget, guint16 port, guint16 txtLen,
-	const guchar *txtRecord, void *context);
-
-enum {
-	kDNSServiceErr_NoError = 0,
-	kDNSServiceErr_Unknown = -65537,
-};
-
-enum {
-	kDNSServiceFlagsAdd = 0x2,
-	kDNSServiceFlagsLongLivedQuery = 0x100,
-};
-
-enum {
-	kDNSServiceType_NULL = 10,
-	kDNSServiceType_TXT = 16,
-};
-
-enum {
-	kDNSServiceClass_IN = 1,
-};
-
-enum {
-	kDNSServiceProtocol_IPv4 = 0x01,
-};
-
-
-gboolean dns_sd_available(void);
-
-DNSServiceErrorType _wpurple_DNSServiceAddRecord(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags,
-	uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl);
-#define DNSServiceAddRecord(sdRef, RecordRef, flags, rrtype, rdlen, rdata, ttl) \
-	_wpurple_DNSServiceAddRecord(sdRef, RecordRef, flags, rrtype, rdlen, rdata, ttl)
-
-DNSServiceErrorType _wpurple_DNSServiceBrowse(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
-	const char *regtype, const char *domain, DNSServiceBrowseReply callBack, void *context);
-#define DNSServiceBrowse(sdRef, flags, interfaceIndex, regtype, domain, callBack, context) \
-	_wpurple_DNSServiceBrowse(sdRef, flags, interfaceIndex, regtype, domain, callBack, context)
-
-int _wpurple_DNSServiceConstructFullName(char *fullName, const char *service, const char *regtype, const char *domain);
-#define DNSServiceConstructFullName(fullName, service, regtype, domain) \
-	_wpurple_DNSServiceConstructFullName(fullName, service, regtype, domain)
-
-DNSServiceErrorType _wpurple_DNSServiceGetAddrInfo(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
-	DNSServiceProtocol protocol, const char *hostname, DNSServiceGetAddrInfoReply callBack, void *context);
-#define DNSServiceGetAddrInfo(sdRef, flags, interfaceIndex, protocol, hostname, callBack, context) \
-	_wpurple_DNSServiceGetAddrInfo(sdRef, flags, interfaceIndex, protocol, hostname, callBack, context)
-
-DNSServiceErrorType _wpurple_DNSServiceProcessResult(DNSServiceRef sdRef);
-#define DNSServiceProcessResult(sdRef) \
-	_wpurple_DNSServiceProcessResult(sdRef);
-
-DNSServiceErrorType _wpurple_DNSServiceQueryRecord(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
-	const char *fullname, uint16_t rrtype, uint16_t rrclass, DNSServiceQueryRecordReply callBack, void *context);
-#define DNSServiceQueryRecord(sdRef, flags, interfaceIndex, fullname, rrtype, rrclass, callBack, context) \
-	_wpurple_DNSServiceQueryRecord(sdRef, flags, interfaceIndex, fullname, rrtype, rrclass, callBack, context)
-
-void _wpurple_DNSServiceRefDeallocate(DNSServiceRef sdRef);
-#define DNSServiceRefDeallocate(sdRef) \
-	_wpurple_DNSServiceRefDeallocate(sdRef)
-
-int _wpurple_DNSServiceRefSockFD(DNSServiceRef sdRef);
-#define DNSServiceRefSockFD(sdRef) \
-	_wpurple_DNSServiceRefSockFD(sdRef)
-
-DNSServiceErrorType _wpurple_DNSServiceRegister(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
-	const char *name, const char *regtype, const char *domain, const char *host, uint16_t port, uint16_t txtLen,
-	const void *txtRecord, DNSServiceRegisterReply callBack, void *context);
-#define DNSServiceRegister(sdRef, flags, interfaceIndex, name, regtype, domain, host, port, txtLen, txtRecord, callBack, context) \
-	_wpurple_DNSServiceRegister(sdRef, flags, interfaceIndex, name, regtype, domain, host, port, txtLen, txtRecord, callBack, context)
-
-DNSServiceErrorType _wpurple_DNSServiceResolve(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, const char *name,
-	const char *regtype, const char *domain, DNSServiceResolveReply callBack, void *context);
-#define DNSServiceResolve(sdRef, flags, interfaceIndex, name, regtype, domain, callBack, context) \
-	_wpurple_DNSServiceResolve(sdRef, flags, interfaceIndex, name, regtype, domain, callBack, context)
-
-DNSServiceErrorType _wpurple_DNSServiceRemoveRecord(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags);
-#define DNSServiceRemoveRecord(sdRef, RecordRef, flags) \
-	_wpurple_DNSServiceRemoveRecord(sdRef, RecordRef, flags)
-
-DNSServiceErrorType _wpurple_DNSServiceUpdateRecord(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags,
-	uint16_t rdlen, const void *rdata, uint32_t ttl);
-#define DNSServiceUpdateRecord(sdRef, RecordRef, flags, rdlen, rdata, ttl) \
-	_wpurple_DNSServiceUpdateRecord(sdRef, RecordRef, flags, rdlen, rdata, ttl)
-
-void _wpurple_TXTRecordCreate(TXTRecordRef *txtRecord, uint16_t bufferLen, void *buffer);
-#define TXTRecordCreate(txtRecord, bufferLen, buffer) \
-	_wpurple_TXTRecordCreate(txtRecord, bufferLen, buffer)
-
-void _wpurple_TXTRecordDeallocate(TXTRecordRef *txtRecord);
-#define TXTRecordDeallocate(txtRecord) \
-	_wpurple_TXTRecordDeallocate(txtRecord)
-
-const void * _wpurple_TXTRecordGetBytesPtr(const TXTRecordRef *txtRecord);
-#define TXTRecordGetBytesPtr(txtRecord) \
-	_wpurple_TXTRecordGetBytesPtr(txtRecord)
-
-uint16_t _wpurple_TXTRecordGetLength(const TXTRecordRef *txtRecord);
-#define TXTRecordGetLength(txtRecord) \
-	_wpurple_TXTRecordGetLength(txtRecord)
-
-const void * _wpurple_TXTRecordGetValuePtr(uint16_t txtLen, const void *txtRecord, const char *key, uint8_t *valueLen);
-#define TXTRecordGetValuePtr(txtLen, txtRecord, key, valueLen) \
-	_wpurple_TXTRecordGetValuePtr(txtLen, txtRecord, key, valueLen)
-
-DNSServiceErrorType _wpurple_TXTRecordSetValue(TXTRecordRef *txtRecord, const char *key, uint8_t valueSize, const void *value);
-#define TXTRecordSetValue(txtRecord, key, valueSize, value) \
-	_wpurple_TXTRecordSetValue(txtRecord, key, valueSize, value)
-
-#endif /* PURPLE_BONJOUR_DNS_SD_PROXY_H */

--- a/libpurple/protocols/bonjour/mdns_avahi.c	Tue Apr 09 23:11:12 2024 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,697 +0,0 @@
-/*
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
- */
-
-#include <purple.h>
-
-#include "buddy.h"
-#include "bonjour.h"
-
-#include <avahi-client/client.h>
-#include <avahi-client/lookup.h>
-#include <avahi-client/publish.h>
-
-#include <avahi-common/address.h>
-#include <avahi-common/malloc.h>
-#include <avahi-common/error.h>
-#include <avahi-common/strlst.h>
-
-#include <avahi-glib/glib-malloc.h>
-#include <avahi-glib/glib-watch.h>
-
-/* Avahi only defines the types that it actually uses (which at this time doesn't include NULL) */
-#ifndef AVAHI_DNS_TYPE_NULL
-#define AVAHI_DNS_TYPE_NULL 0x0A
-#endif
-
-/* data used by avahi bonjour implementation */
-typedef struct {
-	AvahiClient *client;
-	AvahiGLibPoll *glib_poll;
-	AvahiServiceBrowser *sb;
-	AvahiEntryGroup *group;
-	AvahiEntryGroup *buddy_icon_group;
-} AvahiSessionImplData;
-
-typedef struct {
-	AvahiServiceResolver *resolver;
-	AvahiIfIndex interface;
-	AvahiProtocol protocol;
-	gchar *name;
-	gchar *type;
-	gchar *domain;
-	/* This is a reference to the entry in BonjourBuddy->ips */
-	const char *ip;
-} AvahiSvcResolverData;
-
-typedef struct {
-	GSList *resolvers;
-	AvahiRecordBrowser *buddy_icon_rec_browser;
-} AvahiBuddyImplData;
-
-static gint
-_find_resolver_data(gconstpointer a, gconstpointer b) {
-	const AvahiSvcResolverData *rd_a = a;
-	const AvahiSvcResolverData *rd_b = b;
-	gint ret = 1;
-
-	if(rd_a->interface == rd_b->interface
-			&& rd_a->protocol == rd_b->protocol
-			&& purple_strequal(rd_a->name, rd_b->name)
-			&& purple_strequal(rd_a->type, rd_b->type)
-			&& purple_strequal(rd_a->domain, rd_b->domain)) {
-		ret = 0;
-	}
-
-	return ret;
-}
-
-static gint
-_find_resolver_data_by_resolver(gconstpointer a, gconstpointer b) {
-	const AvahiSvcResolverData *rd_a = a;
-	const AvahiServiceResolver *resolver = b;
-	gint ret = 1;
-
-	if(rd_a->resolver == resolver)
-		ret = 0;
-
-	return ret;
-}
-
-static void
-_cleanup_resolver_data(AvahiSvcResolverData *rd) {
-	if (rd->resolver)
-		avahi_service_resolver_free(rd->resolver);
-	g_free(rd->name);
-	g_free(rd->type);
-	g_free(rd->domain);
-	g_free(rd);
-}
-
-
-static void
-_resolver_callback(AvahiServiceResolver *r, AvahiIfIndex interface,
-                   AvahiProtocol protocol, AvahiResolverEvent event,
-                   const char *name, const char *type, const char *domain,
-                   G_GNUC_UNUSED const char *host_name, const AvahiAddress *a,
-                   uint16_t port, AvahiStringList *txt,
-                   G_GNUC_UNUSED AvahiLookupResultFlags flags, void *userdata)
-{
-	BonjourBuddy *bb = NULL;
-	PurpleAccount *account = userdata;
-	PurpleContactManager *manager = NULL;
-	PurpleContact *contact = NULL;
-	AvahiStringList *l;
-	size_t size;
-	char *key, *value;
-	char ip[AVAHI_ADDRESS_STR_MAX];
-	AvahiBuddyImplData *b_impl;
-	AvahiSvcResolverData *rd;
-	GSList *res;
-
-	g_return_if_fail(r != NULL);
-
-	manager = purple_contact_manager_get_default();
-	contact = purple_contact_manager_find_with_username(manager, account,
-	                                                    name);
-	if(PURPLE_IS_CONTACT(contact)) {
-		bb = g_object_get_data(G_OBJECT(contact), "bonjour-buddy");
-	}
-
-	switch (event) {
-		case AVAHI_RESOLVER_FAILURE:
-			purple_debug_error("bonjour", "_resolve_callback - Failure: %s\n",
-				avahi_strerror(avahi_client_errno(avahi_service_resolver_get_client(r))));
-
-			avahi_service_resolver_free(r);
-			if (bb != NULL) {
-				b_impl = bb->mdns_impl_data;
-				res = g_slist_find_custom(b_impl->resolvers, r, _find_resolver_data_by_resolver);
-				if (res != NULL) {
-					rd = res->data;
-					b_impl->resolvers = g_slist_delete_link(b_impl->resolvers, res);
-
-					/* We've already freed the resolver */
-					rd->resolver = NULL;
-					_cleanup_resolver_data(rd);
-
-					/* If this was the last resolver, remove the buddy */
-					if (b_impl->resolvers == NULL) {
-						bonjour_buddy_signed_off(contact);
-					}
-				}
-			}
-			break;
-		case AVAHI_RESOLVER_FOUND:
-
-			purple_debug_info("bonjour", "_resolve_callback - name:%s account:%p bb:%p\n",
-				name, account, bb);
-
-			/* create a buddy record */
-			if (bb == NULL)
-				bb = bonjour_buddy_new(name, account);
-			b_impl = bb->mdns_impl_data;
-
-			/* If we're reusing an existing buddy, it may be a new resolver or an existing one. */
-			res = g_slist_find_custom(b_impl->resolvers, r, _find_resolver_data_by_resolver);
-			if (res != NULL)
-				rd = res->data;
-			else {
-				rd = g_new0(AvahiSvcResolverData, 1);
-				rd->resolver = r;
-				rd->interface = interface;
-				rd->protocol = protocol;
-				rd->name = g_strdup(name);
-				rd->type = g_strdup(type);
-				rd->domain = g_strdup(domain);
-
-				b_impl->resolvers = g_slist_prepend(b_impl->resolvers, rd);
-			}
-
-
-			/* Get the ip as a string */
-			ip[0] = '\0';
-			avahi_address_snprint(ip, AVAHI_ADDRESS_STR_MAX, a);
-
-			if (protocol == AVAHI_PROTO_INET6)
-				append_iface_if_linklocal(ip, interface);
-
-			purple_debug_info("bonjour", "_resolve_callback - name:%s ip:%s prev_ip:%s\n",
-				name, ip, rd->ip);
-
-			if (rd->ip == NULL || !purple_strequal(rd->ip, ip)) {
-				/* We store duplicates in bb->ips, so we always remove the one */
-				if (rd->ip != NULL) {
-					bb->ips = g_slist_remove(bb->ips, rd->ip);
-					g_free((gchar *) rd->ip);
-				}
-				rd->ip = g_strdup(ip);
-				/* IPv6 goes at the front of the list and IPv4 at the end so that we "prefer" IPv6, if present */
-				if (protocol == AVAHI_PROTO_INET6) {
-					bb->ips = g_slist_prepend(bb->ips, (gchar *) rd->ip);
-				} else {
-					bb->ips = g_slist_append(bb->ips, (gchar *) rd->ip);
-				}
-			}
-
-			bb->port_p2pj = port;
-
-			/* Obtain the parameters from the text_record */
-			clear_bonjour_buddy_values(bb);
-			for(l = txt; l != NULL; l = l->next) {
-				if (avahi_string_list_get_pair(l, &key, &value, &size) < 0)
-					continue;
-				set_bonjour_buddy_value(bb, key, value, size);
-				/* TODO: Since we're using the glib allocator, I think we
-				 * can use the values instead of re-copying them */
-				avahi_free(key);
-				avahi_free(value);
-			}
-
-			if (!bonjour_buddy_check(bb)) {
-				b_impl->resolvers = g_slist_remove(b_impl->resolvers, rd);
-				_cleanup_resolver_data(rd);
-				/* If this was the last resolver, remove the buddy */
-				if (b_impl->resolvers == NULL) {
-					if (PURPLE_IS_CONTACT(contact)) {
-						bonjour_buddy_signed_off(contact);
-					} else {
-						bonjour_buddy_delete(bb);
-					}
-				}
-			} else {
-				/* Add or update the buddy in our buddy list */
-				bonjour_buddy_add_to_purple(bb);
-			}
-
-			break;
-		default:
-			purple_debug_info("bonjour", "Unrecognized Service Resolver event: %d.\n", event);
-	}
-
-	g_clear_object(&contact);
-}
-
-static void
-_browser_callback(AvahiServiceBrowser *b, AvahiIfIndex interface,
-                  AvahiProtocol protocol, AvahiBrowserEvent event,
-                  const char *name, const char *type, const char *domain,
-                  G_GNUC_UNUSED AvahiLookupResultFlags flags, void *userdata)
-{
-	PurpleAccount *account = userdata;
-
-	switch (event) {
-		case AVAHI_BROWSER_FAILURE:
-			purple_debug_error("bonjour", "_browser_callback - Failure: %s\n",
-				avahi_strerror(avahi_client_errno(avahi_service_browser_get_client(b))));
-			/* TODO: This is an error that should be handled. */
-			break;
-		case AVAHI_BROWSER_NEW:
-			/* A new peer has joined the network and uses iChat bonjour */
-			purple_debug_info("bonjour", "_browser_callback - new service\n");
-			/* Make sure it isn't us */
-			if (purple_utf8_strcasecmp(name, bonjour_get_jid(account)) != 0) {
-				if (!avahi_service_resolver_new(avahi_service_browser_get_client(b),
-						interface, protocol, name, type, domain, protocol,
-						0, _resolver_callback, account)) {
-					purple_debug_warning("bonjour", "_browser_callback -- Error initiating resolver: %s\n",
-						avahi_strerror(avahi_client_errno(avahi_service_browser_get_client(b))));
-				}
-			}
-			break;
-		case AVAHI_BROWSER_REMOVE: {
-			PurpleContact *contact = NULL;
-			PurpleContactManager *manager = NULL;
-
-			purple_debug_info("bonjour", "_browser_callback - Remove service\n");
-
-			manager = purple_contact_manager_get_default();
-			contact = purple_contact_manager_find_with_username(manager,
-			                                                    account, name);
-			if (PURPLE_IS_CONTACT(contact)) {
-				BonjourBuddy *bb = NULL;
-				AvahiBuddyImplData *b_impl;
-				GSList *l;
-				AvahiSvcResolverData *rd_search;
-
-				bb = g_object_get_data(G_OBJECT(contact), "bonjour-buddy");
-				g_return_if_fail(bb != NULL);
-
-				b_impl = bb->mdns_impl_data;
-
-				/* There may be multiple presences, we should only get rid of this one */
-
-				rd_search = g_new0(AvahiSvcResolverData, 1);
-				rd_search->interface = interface;
-				rd_search->protocol = protocol;
-				rd_search->name = (gchar *) name;
-				rd_search->type = (gchar *) type;
-				rd_search->domain = (gchar *) domain;
-
-				l = g_slist_find_custom(b_impl->resolvers, rd_search, _find_resolver_data);
-
-				g_free(rd_search);
-
-				if (l != NULL) {
-					AvahiSvcResolverData *rd = l->data;
-					b_impl->resolvers =
-					        g_slist_delete_link(b_impl->resolvers, l);
-					/* This IP is no longer available */
-					if (rd->ip != NULL) {
-						bb->ips = g_slist_remove(bb->ips, rd->ip);
-						g_free((gchar *) rd->ip);
-					}
-					_cleanup_resolver_data(rd);
-
-					/* If this was the last resolver, remove the buddy */
-					if (b_impl->resolvers == NULL) {
-						bonjour_buddy_signed_off(contact);
-					}
-				}
-			}
-
-			g_clear_object(&contact);
-
-			break;
-		}
-		case AVAHI_BROWSER_ALL_FOR_NOW:
-		case AVAHI_BROWSER_CACHE_EXHAUSTED:
-			break;
-		default:
-			purple_debug_info("bonjour", "Unrecognized Service browser event: %d.\n", event);
-	}
-}
-
-static void
-_buddy_icon_group_cb(AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata) {
-	BonjourDnsSd *data = userdata;
-	AvahiSessionImplData *idata = data->mdns_impl_data;
-
-	g_return_if_fail(g == idata->buddy_icon_group || idata->buddy_icon_group == NULL);
-
-	switch(state) {
-		case AVAHI_ENTRY_GROUP_ESTABLISHED:
-			purple_debug_info("bonjour", "Successfully registered buddy icon data.\n");
-			break;
-		case AVAHI_ENTRY_GROUP_COLLISION:
-			purple_debug_error("bonjour", "Collision registering buddy icon data.\n");
-			break;
-		case AVAHI_ENTRY_GROUP_FAILURE:
-			purple_debug_error("bonjour", "Error registering buddy icon data: %s.\n",
-				avahi_strerror(avahi_client_errno(avahi_entry_group_get_client(g))));
-			break;
-		case AVAHI_ENTRY_GROUP_UNCOMMITED:
-		case AVAHI_ENTRY_GROUP_REGISTERING:
-			break;
-	}
-
-}
-
-static void
-_entry_group_cb(AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata) {
-	AvahiSessionImplData *idata = userdata;
-
-	g_return_if_fail(g == idata->group || idata->group == NULL);
-
-	switch(state) {
-		case AVAHI_ENTRY_GROUP_ESTABLISHED:
-			purple_debug_info("bonjour", "Successfully registered service.\n");
-			break;
-		case AVAHI_ENTRY_GROUP_COLLISION:
-			purple_debug_error("bonjour", "Collision registering entry group.\n");
-			/* TODO: Handle error - this should log out the account. (Possibly with "wants to die")*/
-			break;
-		case AVAHI_ENTRY_GROUP_FAILURE:
-			purple_debug_error("bonjour", "Error registering entry group: %s\n.",
-				avahi_strerror(avahi_client_errno(avahi_entry_group_get_client(g))));
-			/* TODO: Handle error - this should log out the account.*/
-			break;
-		case AVAHI_ENTRY_GROUP_UNCOMMITED:
-		case AVAHI_ENTRY_GROUP_REGISTERING:
-			break;
-	}
-
-}
-
-static void
-_buddy_icon_record_cb(AvahiRecordBrowser *b,
-                      G_GNUC_UNUSED AvahiIfIndex interface,
-                      G_GNUC_UNUSED AvahiProtocol protocol,
-                      AvahiBrowserEvent event, G_GNUC_UNUSED const char *name,
-                      G_GNUC_UNUSED uint16_t clazz,
-                      G_GNUC_UNUSED uint16_t type,
-                      const void *rdata, size_t size,
-                      G_GNUC_UNUSED AvahiLookupResultFlags flags,
-                      void *userdata)
-{
-	BonjourBuddy *buddy = userdata;
-	AvahiBuddyImplData *idata = buddy->mdns_impl_data;
-
-	switch (event) {
-		case AVAHI_BROWSER_CACHE_EXHAUSTED:
-		case AVAHI_BROWSER_ALL_FOR_NOW:
-			/* Ignore these "meta" informational events */
-			return;
-		case AVAHI_BROWSER_NEW:
-			bonjour_buddy_got_buddy_icon(buddy, rdata, size);
-			break;
-		case AVAHI_BROWSER_REMOVE:
-		case AVAHI_BROWSER_FAILURE:
-			purple_debug_error("bonjour", "Error retrieving buddy icon record: %s\n",
-				avahi_strerror(avahi_client_errno(avahi_record_browser_get_client(b))));
-			break;
-	}
-
-	/* Stop listening */
-	avahi_record_browser_free(b);
-	if (idata->buddy_icon_rec_browser == b) {
-		idata->buddy_icon_rec_browser = NULL;
-	}
-}
-
-/****************************
- * mdns_interface functions *
- ****************************/
-
-static gboolean
-avahi_mdns_init_session(BonjourDnsSd *data)
-{
-	AvahiSessionImplData *idata = g_new0(AvahiSessionImplData, 1);
-	const AvahiPoll *poll_api;
-	int error;
-
-	/* Tell avahi to use g_malloc and g_free */
-	avahi_set_allocator (avahi_glib_allocator ());
-
-	/* This currently depends on the glib mainloop,
-	 * we should make it use the libpurple abstraction */
-
-	idata->glib_poll = avahi_glib_poll_new(NULL, G_PRIORITY_DEFAULT);
-
-	poll_api = avahi_glib_poll_get(idata->glib_poll);
-
-	idata->client = avahi_client_new(poll_api, 0, NULL, data, &error);
-
-	if (idata->client == NULL) {
-		purple_debug_error("bonjour", "Error initializing Avahi: %s\n", avahi_strerror(error));
-		avahi_glib_poll_free(idata->glib_poll);
-		g_free(idata);
-		return FALSE;
-	}
-
-	data->mdns_impl_data = idata;
-
-	bonjour_dns_sd_set_jid(data->account, avahi_client_get_host_name(idata->client));
-
-	return TRUE;
-}
-
-static gboolean
-avahi_mdns_publish(BonjourDnsSd *data, PublishType type, GSList *records)
-{
-	int publish_result = 0;
-	AvahiSessionImplData *idata = data->mdns_impl_data;
-	AvahiStringList *lst = NULL;
-
-	g_return_val_if_fail(idata != NULL, FALSE);
-
-	if (!idata->group) {
-		idata->group = avahi_entry_group_new(idata->client,
-						     _entry_group_cb, idata);
-		if (!idata->group) {
-			purple_debug_error("bonjour",
-				"Unable to initialize the data for the mDNS (%s).\n",
-				avahi_strerror(avahi_client_errno(idata->client)));
-			return FALSE;
-		}
-	}
-
-	while (records) {
-		PurpleKeyValuePair *kvp = records->data;
-		lst = avahi_string_list_add_pair(lst, kvp->key, kvp->value);
-		records = records->next;
-	}
-
-	/* Publish the service */
-	switch (type) {
-		case PUBLISH_START:
-			publish_result = avahi_entry_group_add_service_strlst(
-				idata->group, AVAHI_IF_UNSPEC,
-				AVAHI_PROTO_UNSPEC, 0,
-				bonjour_get_jid(data->account),
-				LINK_LOCAL_RECORD_NAME, NULL, NULL, data->port_p2pj, lst);
-			break;
-		case PUBLISH_UPDATE:
-			publish_result = avahi_entry_group_update_service_txt_strlst(
-				idata->group, AVAHI_IF_UNSPEC,
-				AVAHI_PROTO_UNSPEC, 0,
-				bonjour_get_jid(data->account),
-				LINK_LOCAL_RECORD_NAME, NULL, lst);
-			break;
-	}
-
-	/* Free the memory used by temp data */
-	avahi_string_list_free(lst);
-
-	if (publish_result < 0) {
-		purple_debug_error("bonjour",
-			"Failed to add the " LINK_LOCAL_RECORD_NAME " service. Error: %s\n",
-			avahi_strerror(publish_result));
-		return FALSE;
-	}
-
-	if (type == PUBLISH_START
-			&& (publish_result = avahi_entry_group_commit(idata->group)) < 0) {
-		purple_debug_error("bonjour",
-			"Failed to commit " LINK_LOCAL_RECORD_NAME " service. Error: %s\n",
-			avahi_strerror(publish_result));
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static gboolean
-avahi_mdns_browse(BonjourDnsSd *data)
-{
-	AvahiSessionImplData *idata = data->mdns_impl_data;
-
-	g_return_val_if_fail(idata != NULL, FALSE);
-
-	idata->sb = avahi_service_browser_new(idata->client, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, LINK_LOCAL_RECORD_NAME, NULL, 0, _browser_callback, data->account);
-	if (!idata->sb) {
-
-		purple_debug_error("bonjour",
-			"Unable to initialize service browser.  Error: %s.\n",
-			avahi_strerror(avahi_client_errno(idata->client)));
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static gboolean
-avahi_mdns_set_buddy_icon_data(BonjourDnsSd *data, gconstpointer avatar_data, gsize avatar_len)
-{
-	AvahiSessionImplData *idata = data->mdns_impl_data;
-
-	if (idata == NULL || idata->client == NULL)
-		return FALSE;
-
-	if (avatar_data != NULL) {
-		gboolean new_group = FALSE;
-		gchar *svc_name;
-		int ret;
-		AvahiPublishFlags flags = 0;
-
-		if (idata->buddy_icon_group == NULL) {
-			purple_debug_info("bonjour", "Setting new buddy icon.\n");
-			new_group = TRUE;
-
-			idata->buddy_icon_group = avahi_entry_group_new(idata->client,
-				_buddy_icon_group_cb, data);
-		} else {
-			purple_debug_info("bonjour", "Updating existing buddy icon.\n");
-			flags |= AVAHI_PUBLISH_UPDATE;
-		}
-
-		if (idata->buddy_icon_group == NULL) {
-			purple_debug_error("bonjour",
-				"Unable to initialize the buddy icon group (%s).\n",
-				avahi_strerror(avahi_client_errno(idata->client)));
-			return FALSE;
-		}
-
-		svc_name = g_strdup_printf("%s." LINK_LOCAL_RECORD_NAME "local",
-				bonjour_get_jid(data->account));
-
-		ret = avahi_entry_group_add_record(idata->buddy_icon_group, AVAHI_IF_UNSPEC,
-			AVAHI_PROTO_UNSPEC, flags, svc_name,
-			AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_NULL, 120, avatar_data, avatar_len);
-
-		g_free(svc_name);
-
-		if (ret < 0) {
-			purple_debug_error("bonjour",
-				"Failed to register buddy icon. Error: %s\n", avahi_strerror(ret));
-			if (new_group) {
-				avahi_entry_group_free(idata->buddy_icon_group);
-				idata->buddy_icon_group = NULL;
-			}
-			return FALSE;
-		}
-
-		if (new_group && (ret = avahi_entry_group_commit(idata->buddy_icon_group)) < 0) {
-			purple_debug_error("bonjour",
-				"Failed to commit buddy icon group. Error: %s\n", avahi_strerror(ret));
-			avahi_entry_group_free(idata->buddy_icon_group);
-			idata->buddy_icon_group = NULL;
-			return FALSE;
-		}
-	} else if (idata->buddy_icon_group != NULL) {
-		purple_debug_info("bonjour", "Removing existing buddy icon.\n");
-		avahi_entry_group_free(idata->buddy_icon_group);
-		idata->buddy_icon_group = NULL;
-	}
-
-	return TRUE;
-}
-
-static void
-avahi_mdns_stop(BonjourDnsSd *data)
-{
-	AvahiSessionImplData *idata = data->mdns_impl_data;
-
-	if (idata == NULL || idata->client == NULL)
-		return;
-
-	if (idata->sb != NULL)
-		avahi_service_browser_free(idata->sb);
-
-	avahi_client_free(idata->client);
-	avahi_glib_poll_free(idata->glib_poll);
-
-	g_free(idata);
-
-	data->mdns_impl_data = NULL;
-}
-
-static void
-avahi_mdns_init_buddy(BonjourBuddy *buddy)
-{
-	buddy->mdns_impl_data = g_new0(AvahiBuddyImplData, 1);
-}
-
-static void
-avahi_mdns_delete_buddy(BonjourBuddy *buddy)
-{
-	AvahiBuddyImplData *idata = buddy->mdns_impl_data;
-
-	g_return_if_fail(idata != NULL);
-
-	if (idata->buddy_icon_rec_browser != NULL)
-		avahi_record_browser_free(idata->buddy_icon_rec_browser);
-
-	g_slist_free_full(idata->resolvers, (GDestroyNotify)_cleanup_resolver_data);
-
-	g_free(idata);
-
-	buddy->mdns_impl_data = NULL;
-}
-
-static void
-avahi_mdns_retrieve_buddy_icon(BonjourBuddy* buddy)
-{
-	PurpleConnection *conn = purple_account_get_connection(buddy->account);
-	BonjourData *bd = purple_connection_get_protocol_data(conn);
-	AvahiSessionImplData *session_idata = bd->dns_sd_data->mdns_impl_data;
-	AvahiBuddyImplData *idata = buddy->mdns_impl_data;
-	gchar *name;
-
-	g_return_if_fail(idata != NULL);
-
-	if (idata->buddy_icon_rec_browser != NULL)
-		avahi_record_browser_free(idata->buddy_icon_rec_browser);
-
-	purple_debug_info("bonjour", "Retrieving buddy icon for '%s'.\n", buddy->name);
-
-	name = g_strdup_printf("%s." LINK_LOCAL_RECORD_NAME "local", buddy->name);
-	idata->buddy_icon_rec_browser = avahi_record_browser_new(session_idata->client, AVAHI_IF_UNSPEC,
-		AVAHI_PROTO_UNSPEC, name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_NULL, 0,
-		_buddy_icon_record_cb, buddy);
-	g_free(name);
-
-	if (!idata->buddy_icon_rec_browser) {
-		purple_debug_error("bonjour",
-			"Unable to initialize buddy icon record browser.  Error: %s.\n",
-			avahi_strerror(avahi_client_errno(session_idata->client)));
-	}
-
-}
-
-gboolean
-mdns_available(void)
-{
-	_mdns_init_session = avahi_mdns_init_session;
-	_mdns_publish = avahi_mdns_publish;
-	_mdns_browse = avahi_mdns_browse;
-	_mdns_stop = avahi_mdns_stop;
-	_mdns_set_buddy_icon_data = avahi_mdns_set_buddy_icon_data;
-	_mdns_init_buddy = avahi_mdns_init_buddy;
-	_mdns_delete_buddy = avahi_mdns_delete_buddy;
-	_mdns_retrieve_buddy_icon = avahi_mdns_retrieve_buddy_icon;
-
-	return TRUE;
-}

--- a/libpurple/protocols/bonjour/mdns_common.c	Tue Apr 09 23:11:12 2024 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,282 +0,0 @@
-/*
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
- */
-
-#include <string.h>
-
-#include <purple.h>
-
-#include "mdns_common.h"
-#include "bonjour.h"
-#include "buddy.h"
-
-
-/****************************
- * mdns_interface functions *
- ****************************/
-
-mdns_init_session_func *_mdns_init_session = NULL;
-mdns_publish_func *_mdns_publish = NULL;
-mdns_browse_func *_mdns_browse = NULL;
-mdns_stop_func *_mdns_stop = NULL;
-mdns_set_buddy_icon_data_func *_mdns_set_buddy_icon_data = NULL;
-mdns_init_buddy_func *_mdns_init_buddy = NULL;
-mdns_delete_buddy_func *_mdns_delete_buddy = NULL;
-mdns_retrieve_buddy_icon_func *_mdns_retrieve_buddy_icon = NULL;
-
-/**
- * Allocate space for the dns-sd data.
- */
-BonjourDnsSd *
-bonjour_dns_sd_new(void) {
-	BonjourDnsSd *data = g_new0(BonjourDnsSd, 1);
-	return data;
-}
-
-/**
- * Deallocate the space of the dns-sd data.
- */
-void bonjour_dns_sd_free(BonjourDnsSd *data) {
-	g_free(data->first);
-	g_free(data->last);
-	g_free(data->phsh);
-	g_free(data->status);
-	g_free(data->vc);
-	g_free(data->msg);
-	g_free(data);
-}
-
-#define MAX_TXT_CONSTITUENT_LEN 255
-
-/* Make sure that the value isn't longer than it is supposed to be */
-static const char*
-get_max_txt_record_value(const char *key, const char *value)
-{
-	/* "each constituent string of a DNS TXT record is limited to 255 bytes"
-	 * This includes the key and the '='
-	 */
-	static char buffer[MAX_TXT_CONSTITUENT_LEN + 1];
-	gchar *end_valid = NULL;
-	int len = MIN(strlen(value), MAX_TXT_CONSTITUENT_LEN - (strlen(key) + 2));
-
-	strncpy(buffer, value, len);
-
-	buffer[len] = '\0';
-
-	/* If we've cut part of a utf-8 character, kill it */
-	if (!g_utf8_validate(buffer, -1, (const gchar **)&end_valid))
-		*end_valid = '\0';
-
-	return buffer;
-}
-
-static inline GSList *
-_add_txt_record(GSList *list, const gchar *key, const gchar *value)
-{
-	const char *max_value = get_max_txt_record_value(key, value);
-	PurpleKeyValuePair *kvp = purple_key_value_pair_new_full(key, g_strdup(max_value), g_free);
-	return g_slist_prepend(list, kvp);
-}
-
-static GSList *generate_presence_txt_records(BonjourDnsSd *data) {
-	GSList *ret = NULL;
-	char portstring[6];
-	const char *jid, *aim, *email;
-
-	/* Convert the port to a string */
-	g_snprintf(portstring, sizeof(portstring), "%d", data->port_p2pj);
-
-	jid = purple_account_get_string(data->account, "jid", NULL);
-	aim = purple_account_get_string(data->account, "AIM", NULL);
-	email = purple_account_get_string(data->account, "email", NULL);
-
-	/* We should try to follow XEP-0174, but some clients have "issues", so we humor them.
-	 * See http://telepathy.freedesktop.org/wiki/SalutInteroperability
-	 */
-
-	/* Large TXT records are problematic.
-	 * While it is technically possible for this to exceed a standard 512-byte
-	 * DNS message, it shouldn't happen unless we get wacky data entered for
-	 * some of the freeform fields.  It is even less likely to exceed the
-	 * recommended maximum of 1300 bytes.
-	 */
-
-	/* Needed by iChat */
-	ret = _add_txt_record(ret, "txtvers", "1");
-	/* Needed by Gaim/Pidgin <= 2.0.1 (remove at some point) */
-	ret = _add_txt_record(ret, "1st", data->first);
-	/* Needed by Gaim/Pidgin <= 2.0.1 (remove at some point) */
-	ret = _add_txt_record(ret, "last", data->last);
-	/* Needed by Adium */
-	ret = _add_txt_record(ret, "port.p2pj", portstring);
-	/* Needed by iChat, Gaim/Pidgin <= 2.0.1 */
-	ret = _add_txt_record(ret, "status", data->status);
-	ret = _add_txt_record(ret, "node", "libpurple");
-	ret = _add_txt_record(ret, "ver", VERSION);
-	/* Currently always set to "!" since we don't support AV and won't ever be in a conference */
-	ret = _add_txt_record(ret, "vc", data->vc);
-	if (email != NULL && *email != '\0') {
-		ret = _add_txt_record(ret, "email", email);
-	}
-	if (jid != NULL && *jid != '\0') {
-		ret = _add_txt_record(ret, "jid", jid);
-	}
-	/* Nonstandard, but used by iChat */
-	if (aim != NULL && *aim != '\0') {
-		ret = _add_txt_record(ret, "AIM", aim);
-	}
-	if (data->msg != NULL && *data->msg != '\0') {
-		ret = _add_txt_record(ret, "msg", data->msg);
-	}
-	if (data->phsh != NULL && *data->phsh != '\0') {
-		ret = _add_txt_record(ret, "phsh", data->phsh);
-	}
-
-	/* TODO: ext, nick */
-	return ret;
-}
-
-static gboolean publish_presence(BonjourDnsSd *data, PublishType type) {
-	GSList *txt_records;
-	gboolean ret;
-
-	txt_records = generate_presence_txt_records(data);
-	ret = _mdns_publish(data, type, txt_records);
-	g_slist_free_full(txt_records, (GDestroyNotify)purple_key_value_pair_free);
-
-	return ret;
-}
-
-/**
- * Send a new dns-sd packet updating our status.
- */
-void bonjour_dns_sd_send_status(BonjourDnsSd *data, const char *status, const char *status_message) {
-	g_free(data->status);
-	g_free(data->msg);
-
-	data->status = g_strdup(status);
-	data->msg = g_strdup(status_message);
-
-	/* Update our text record with the new status */
-	publish_presence(data, PUBLISH_UPDATE);
-}
-
-/**
- * Retrieve the buddy icon blob
- */
-void bonjour_dns_sd_retrieve_buddy_icon(BonjourBuddy* buddy) {
-	_mdns_retrieve_buddy_icon(buddy);
-}
-
-void bonjour_dns_sd_update_buddy_icon(BonjourDnsSd *data) {
-	PurpleImage *img;
-
-	if ((img = purple_buddy_icons_find_account_icon(data->account))) {
-		gconstpointer avatar_data;
-		gsize avatar_len;
-
-		avatar_data = purple_image_get_data(img);
-		avatar_len = purple_image_get_data_size(img);
-
-		if (_mdns_set_buddy_icon_data(data, avatar_data, avatar_len)) {
-			g_free(data->phsh);
-			data->phsh = NULL;
-
-			data->phsh = g_compute_checksum_for_data(
-				G_CHECKSUM_SHA1, avatar_data, avatar_len);
-
-			/* Update our TXT record */
-			publish_presence(data, PUBLISH_UPDATE);
-		}
-
-		g_object_unref(img);
-	} else {
-		/* We need to do this regardless of whether data->phsh is set so that we
-		 * cancel any icons that are currently in the process of being set */
-		_mdns_set_buddy_icon_data(data, NULL, 0);
-		if (data->phsh != NULL) {
-			/* Clear the buddy icon */
-			g_free(data->phsh);
-			data->phsh = NULL;
-			/* Update our TXT record */
-			publish_presence(data, PUBLISH_UPDATE);
-		}
-	}
-}
-
-/**
- * Advertise our presence within the dns-sd daemon and start browsing
- * for other bonjour peers.
- */
-gboolean bonjour_dns_sd_start(BonjourDnsSd *data) {
-
-	/* Initialize the dns-sd data and session */
-	if (!_mdns_init_session(data))
-		return FALSE;
-
-	/* Publish our bonjour IM client at the mDNS daemon */
-	if (!publish_presence(data, PUBLISH_START))
-		return FALSE;
-
-	/* Advise the daemon that we are waiting for connections */
-	if (!_mdns_browse(data)) {
-		purple_debug_error("bonjour", "Unable to get service.\n");
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/**
- * Unregister the "_presence._tcp" service at the mDNS daemon.
- */
-
-void bonjour_dns_sd_stop(BonjourDnsSd *data) {
-	_mdns_stop(data);
-}
-
-void
-bonjour_dns_sd_set_jid(PurpleAccount *account, const char *hostname)
-{
-	PurpleConnection *conn = purple_account_get_connection(account);
-	PurpleContactInfo *info = PURPLE_CONTACT_INFO(account);
-	BonjourData *bd = purple_connection_get_protocol_data(conn);
-	const char *tmp, *account_name = purple_contact_info_get_username(info);
-
-	/* Previously we allowed the hostname part of the jid to be set
-	 * explicitly when it should always be the current hostname.
-	 * That is what this is intended to deal with.
-	 */
-	if ((tmp = strchr(account_name, '@'))
-	    && strstr(tmp, hostname) == (tmp + 1)
-	    && *((tmp + 1) + strlen(hostname)) == '\0')
-		bd->jid = g_strdup(account_name);
-	else {
-		const char *tmp2;
-		GString *str = g_string_new("");
-		/* Escape an '@' in the account name */
-		tmp = account_name;
-		while ((tmp2 = strchr(tmp, '@')) != NULL) {
-			g_string_append_len(str, tmp, tmp2 - tmp);
-			g_string_append(str, "\\40");
-			tmp = tmp2 + 1;
-		}
-		g_string_append(str, tmp);
-		g_string_append_c(str, '@');
-		g_string_append(str, hostname);
-
-		bd->jid = g_string_free(str, FALSE);
-	}
-}