Mercurial > pidgin
changeset 21808:fe305715f4c7
merge of 'e2c8b56610435df5a63688fe4fc302f51f48cf10'
and 'eab7fe1c9392eb68ab4aca3736d65b8bf4d99d14'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Mon, 10 Dec 2007 03:54:21 +0000 |
| parents | 1ba8e97ca24c (current diff) f890c02eee13 (diff) |
| children | aa80135b8cfb |
| files | libpurple/protocols/bonjour/mdns_howl.c |
| diffstat | 11 files changed, 471 insertions(+), 490 deletions(-) [+] |
line wrap: on
line diff
--- a/.mtn-ignore Mon Dec 10 03:53:08 2007 +0000 +++ b/.mtn-ignore Mon Dec 10 03:54:21 2007 +0000 @@ -33,6 +33,7 @@ pidgin.spec$ pidgin-.*.tar.gz pidgin-.*.tar.bz2 +pidgin-*.*.*-win32bin$ pidgin/pidgin$ pidgin/pixmaps/emotes/default/24/theme pidgin/pixmaps/emotes/none/theme
--- a/ChangeLog Mon Dec 10 03:53:08 2007 +0000 +++ b/ChangeLog Mon Dec 10 03:54:21 2007 +0000 @@ -4,6 +4,9 @@ libpurple: * Fixed various problems with loss of status messages when going or returning from idle on MySpaceIM. + * Eliminated unmaintained Howl backend implementation for the + Bonjour protocol. Avahi (or Apple's Bonjour runtime on win32) is + now required to use Bonjour. Finch: * Color is used in the buddylist to indicate status, and the conversation
--- a/configure.ac Mon Dec 10 03:53:08 2007 +0000 +++ b/configure.ac Mon Dec 10 03:54:21 2007 +0000 @@ -722,59 +722,6 @@ AC_SUBST(AVAHI_CFLAGS) AC_SUBST(AVAHI_LIBS) -AM_CONDITIONAL(MDNS_AVAHI, test "x$avahiincludes" = "xyes" -a "x$avahilibs" = "xyes") - -dnl ####################################################################### -dnl # Check for Howl headers (for Bonjour) -dnl ####################################################################### -AC_ARG_WITH(howl-includes, [AC_HELP_STRING([--with-howl-includes=DIR], [compile the Bonjour plugin against the Howl includes in DIR])], [ac_howl_includes="$withval"], [ac_howl_includes="no"]) -AC_ARG_WITH(howl-libs, [AC_HELP_STRING([--with-howl-libs=DIR], [compile the Bonjour plugin against the Howl libs in DIR])], [ac_howl_libs="$withval"], [ac_howl_libs="no"]) -HOWL_CFLAGS="" -HOWL_LIBS="" - -dnl Attempt to autodetect avahi-compat-howl -dnl TODO: (This should be removed when the native avahi stuff is stable) -PKG_CHECK_MODULES(HOWL, avahi-compat-howl, [ - howlincludes="yes" - howllibs="yes" -], [ - AC_MSG_RESULT(no) - howlincludes="no" - howllibs="no" -]) - -dnl Attempt to autodetect Howl -if test "x$howlincludes" = "xno"; then - PKG_CHECK_MODULES(HOWL, howl, [ - howlincludes="yes" - howllibs="yes" - ], [ - AC_MSG_RESULT(no) - howlincludes="no" - howllibs="no" - ]) -fi - -dnl Override HOWL_CFLAGS if the user specified an include dir -if test "$ac_howl_includes" != "no"; then - HOWL_CFLAGS="-I$ac_howl_includes" -fi -CPPFLAGS_save="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $HOWL_CFLAGS" -AC_CHECK_HEADER(howl.h, [howlincludes=yes], [howlincludes=no]) -CPPFLAGS="$CPPFLAGS_save" - -dnl Override HOWL_LIBS if the user specified a libs dir -if test "$ac_howl_libs" != "no"; then - HOWL_LIBS="-L$ac_howl_libs -lhowl" -fi -AC_CHECK_LIB(howl, sw_discovery_init, [howllibs=yes], [howllibs=no], $HOWL_LIBS) - -AC_SUBST(HOWL_CFLAGS) -AC_SUBST(HOWL_LIBS) - -AM_CONDITIONAL(MDNS_HOWL, test "x$howlincludes" = "xyes" -a "x$howllibs" = "xyes") - dnl ####################################################################### dnl # Check for SILC client includes and libraries @@ -960,9 +907,7 @@ STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'` fi if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then - if test "x$howlincludes" != "xyes" -o "x$howllibs" != "xyes"; then - STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'` - fi + STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'` fi if test "x$enable_msnp14" != "xyes" ; then STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/msn/msnp9/'` @@ -1049,9 +994,7 @@ DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'` fi if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then - if test "x$howlincludes" != "xyes" -o "x$howllibs" != "xyes"; then - DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'` - fi + DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'` fi if test "x$enable_msnp14" != "xyes" ; then DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/msn/msnp9/'` @@ -1087,7 +1030,7 @@ *) echo "Invalid dynamic protocol $i!!" ; exit ;; esac done -AM_CONDITIONAL(DYNAMIC_BONJOUR, test "x$dynamic_bonjour" = "xyes" -a [ [ "x$avahiincludes" = "xyes" -a "x$avahilibs " = "xyes" ] -o [ "x$howlincludes" = "xyes" -a "x$howllibs" = "xyes" ] ] ) +AM_CONDITIONAL(DYNAMIC_BONJOUR, test "x$dynamic_bonjour" = "xyes" -a [ "x$avahiincludes" = "xyes" -a "x$avahilibs " = "xyes" ] ) AM_CONDITIONAL(DYNAMIC_GG, test "x$dynamic_gg" = "xyes") AM_CONDITIONAL(DYNAMIC_IRC, test "x$dynamic_irc" = "xyes") AM_CONDITIONAL(DYNAMIC_JABBER, test "x$dynamic_jabber" = "xyes")
--- a/libpurple/protocols/bonjour/Makefile.am Mon Dec 10 03:53:08 2007 +0000 +++ b/libpurple/protocols/bonjour/Makefile.am Mon Dec 10 03:54:21 2007 +0000 @@ -13,6 +13,7 @@ buddy.h \ jabber.c \ jabber.h \ + mdns_avahi.c \ mdns_common.c \ mdns_common.h \ mdns_interface.h \ @@ -22,14 +23,6 @@ bonjour_ft.c \ bonjour_ft.h -if MDNS_AVAHI - BONJOURSOURCES += mdns_avahi.c -else -if MDNS_HOWL - BONJOURSOURCES += mdns_howl.c -endif -endif - AM_CFLAGS = $(st) libbonjour_la_LDFLAGS = -module -avoid-version @@ -40,29 +33,14 @@ noinst_LIBRARIES = libbonjour.a libbonjour_a_SOURCES = $(BONJOURSOURCES) libbonjour_a_CFLAGS = $(AM_CFLAGS) -libbonjour_a_LIBADD = - -if MDNS_AVAHI - libbonjour_a_LIBADD += $(AVAHI_LIBS) -else -if MDNS_HOWL - libbonjour_a_LIBADD += $(HOWL_LIBS) -endif -endif +libbonjour_a_LIBADD = $(AVAHI_LIBS) else st = pkg_LTLIBRARIES = libbonjour.la libbonjour_la_SOURCES = $(BONJOURSOURCES) -libbonjour_la_LIBADD = $(GLIB_LIBS) $(LIBXML_LIBS) -if MDNS_AVAHI - libbonjour_la_LIBADD += $(AVAHI_LIBS) -else -if MDNS_HOWL - libbonjour_la_LIBADD += $(HOWL_LIBS) -endif -endif +libbonjour_la_LIBADD = $(GLIB_LIBS) $(LIBXML_LIBS) $(AVAHI_LIBS) endif @@ -72,13 +50,6 @@ -I$(top_builddir)/libpurple \ $(GLIB_CFLAGS) \ $(DEBUG_CFLAGS) \ - $(LIBXML_CFLAGS) + $(LIBXML_CFLAGS) \ + $(AVAHI_CFLAGS) -if MDNS_AVAHI - AM_CPPFLAGS += $(AVAHI_CFLAGS) -else -if MDNS_HOWL - AM_CPPFLAGS += $(HOWL_CFLAGS) -endif -endif -
--- a/libpurple/protocols/bonjour/bonjour_ft.c Mon Dec 10 03:53:08 2007 +0000 +++ b/libpurple/protocols/bonjour/bonjour_ft.c Mon Dec 10 03:54:21 2007 +0000 @@ -387,7 +387,7 @@ bonjour_xfer_init(PurpleXfer *xfer) { PurpleBuddy *buddy = NULL; - BonjourBuddy *bd = NULL; + BonjourBuddy *bb = NULL; XepXfer *xf = NULL; xf = (XepXfer*)xfer->data; @@ -401,8 +401,10 @@ if (buddy == NULL) return; - bd = (BonjourBuddy *)buddy->proto_data; - xf->buddy_ip = g_strdup(bd->ip); + bb = (BonjourBuddy *)buddy->proto_data; + /* 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_type(xfer) == PURPLE_XFER_SEND) { /* initiate file transfer, send SI offer. */ purple_debug_info("bonjour", "Bonjour xfer type is PURPLE_XFER_SEND.\n");
--- a/libpurple/protocols/bonjour/buddy.c Mon Dec 10 03:53:08 2007 +0000 +++ b/libpurple/protocols/bonjour/buddy.c Mon Dec 10 03:54:21 2007 +0000 @@ -237,7 +237,10 @@ bonjour_buddy_delete(BonjourBuddy *buddy) { g_free(buddy->name); - g_free(buddy->ip); + while (buddy->ips != NULL) { + g_free(buddy->ips->data); + buddy->ips = g_slist_delete_link(buddy->ips, buddy->ips); + } g_free(buddy->first); g_free(buddy->phsh); g_free(buddy->status);
--- a/libpurple/protocols/bonjour/buddy.h Mon Dec 10 03:53:08 2007 +0000 +++ b/libpurple/protocols/bonjour/buddy.h Mon Dec 10 03:54:21 2007 +0000 @@ -27,8 +27,7 @@ PurpleAccount *account; gchar *name; - /* TODO: Remove and just use the hostname */ - gchar *ip; + GSList *ips; gint port_p2pj; gchar *first;
--- a/libpurple/protocols/bonjour/jabber.c Mon Dec 10 03:53:08 2007 +0000 +++ b/libpurple/protocols/bonjour/jabber.c Mon Dec 10 03:54:21 2007 +0000 @@ -239,13 +239,24 @@ /* * If the current PurpleBuddy's data is not null and the PurpleBuddy's account * is the same as the account requesting the check then continue to determine - * whether the buddies IP matches the target IP. + * whether one of the buddies IPs matches the target IP. */ if (cbba->bj->account == pb->account) { bb = pb->proto_data; - if ((bb != NULL) && (g_ascii_strcasecmp(bb->ip, cbba->address) == 0)) - *(cbba->pb) = pb; + if (bb != NULL) { + const char *ip; + GSList *tmp = bb->ips; + + while(tmp) { + ip = tmp->data; + if (ip != NULL && g_ascii_strcasecmp(ip, cbba->address) == 0) { + *(cbba->pb) = pb; + break; + } + tmp = tmp->next; + } + } } } @@ -449,9 +460,14 @@ else if (ret <= 0) { const char *err = g_strerror(errno); PurpleConversation *conv; + const char *ip = NULL; + + /* For better or worse, use the first IP*/ + if (bb->ips) + ip = bb->ips->data; purple_debug_error("bonjour", "Error starting stream with buddy %s at %s:%d error: %s\n", - purple_buddy_get_name(pb), bb->ip ? bb->ip : "(null)", bb->port_p2pj, err ? err : "(null)"); + purple_buddy_get_name(pb), ip ? ip : "(null)", bb->port_p2pj, err ? err : "(null)"); conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, bb->name, pb->account); if (conv != NULL) @@ -504,9 +520,14 @@ ret = 0; else if (ret <= 0) { const char *err = g_strerror(errno); + const char *ip = NULL; + + /* For better or worse, use the first IP*/ + if (bb->ips) + ip = bb->ips->data; purple_debug_error("bonjour", "Error starting stream with buddy %s at %s:%d error: %s\n", - purple_buddy_get_name(pb), bb->ip ? bb->ip : "(null)", bb->port_p2pj, err ? err : "(null)"); + purple_buddy_get_name(pb), ip ? ip : "(null)", bb->port_p2pj, err ? err : "(null)"); close(client_socket); g_free(stream_start); @@ -544,9 +565,14 @@ if (bconv->sent_stream_start == NOT_SENT && !bonjour_jabber_send_stream_init(pb, bconv->socket)) { const char *err = g_strerror(errno); PurpleConversation *conv; + const char *ip = NULL; + + /* For better or worse, use the first IP*/ + if (bb->ips) + ip = bb->ips->data; purple_debug_error("bonjour", "Error starting stream with buddy %s at %s:%d error: %s\n", - purple_buddy_get_name(pb), bb->ip ? bb->ip : "(null)", bb->port_p2pj, err ? err : "(null)"); + purple_buddy_get_name(pb), ip ? ip : "(null)", bb->port_p2pj, err ? err : "(null)"); conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, bb->name, pb->account); if (conv != NULL) @@ -721,9 +747,14 @@ if (source < 0) { PurpleConversation *conv; + const char *ip = NULL; + + /* For better or worse, use the first IP*/ + if (bb->ips) + ip = bb->ips->data; purple_debug_error("bonjour", "Error connecting to buddy %s at %s:%d error: %s\n", - purple_buddy_get_name(pb), bb->ip ? bb->ip : "(null)", bb->port_p2pj, error ? error : "(null)"); + purple_buddy_get_name(pb), ip ? ip : "(null)", bb->port_p2pj, error ? error : "(null)"); conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, bb->name, pb->account); if (conv != NULL) @@ -739,9 +770,14 @@ if (!bonjour_jabber_send_stream_init(pb, source)) { const char *err = g_strerror(errno); PurpleConversation *conv; + const char *ip = NULL; + + /* For better or worse, use the first IP*/ + if (bb->ips) + ip = bb->ips->data; purple_debug_error("bonjour", "Error starting stream with buddy %s at %s:%d error: %s\n", - purple_buddy_get_name(pb), bb->ip ? bb->ip : "(null)", bb->port_p2pj, err ? err : "(null)"); + purple_buddy_get_name(pb), ip ? ip : "(null)", bb->port_p2pj, err ? err : "(null)"); conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, bb->name, pb->account); if (conv != NULL) @@ -782,6 +818,11 @@ { PurpleProxyConnectData *connect_data; PurpleProxyInfo *proxy_info; + const char *ip = NULL; + + /* For better or worse, use the first IP*/ + if (bb->ips) + ip = bb->ips->data; purple_debug_info("bonjour", "Starting conversation with %s\n", to); @@ -795,7 +836,7 @@ purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_NONE); connect_data = purple_proxy_connect(NULL, data->account, - bb->ip, bb->port_p2pj, _connected_to_buddy, pb); + ip, bb->port_p2pj, _connected_to_buddy, pb); if (connect_data == NULL) { purple_debug_error("bonjour", "Unable to connect to buddy (%s).\n", to);
--- a/libpurple/protocols/bonjour/mdns_avahi.c Mon Dec 10 03:53:08 2007 +0000 +++ b/libpurple/protocols/bonjour/mdns_avahi.c Mon Dec 10 03:54:21 2007 +0000 @@ -47,11 +47,62 @@ AvahiEntryGroup *buddy_icon_group; } AvahiSessionImplData; +typedef struct _avahi_buddy_service_resolver_data { + 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 _avahi_buddy_impl_data { - AvahiServiceResolver *resolver; + 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 + && !strcmp(rd_a->name, rd_b->name) + && !strcmp(rd_a->type, rd_b->type) + && !strcmp(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, @@ -65,6 +116,10 @@ size_t size; char *key, *value; int ret; + char ip[AVAHI_ADDRESS_STR_MAX]; + AvahiBuddyImplData *b_impl; + AvahiSvcResolverData *rd; + GSList *res; g_return_if_fail(r != NULL); @@ -78,30 +133,59 @@ avahi_service_resolver_free(r); if (bb != NULL) { - /* We've already freed the resolver */ - if (r == ((AvahiBuddyImplData *)bb->mdns_impl_data)->resolver) - ((AvahiBuddyImplData *)bb->mdns_impl_data)->resolver = NULL; - purple_account_remove_buddy(account, pb, NULL); - purple_blist_remove_buddy(pb); + 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_remove_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) { + purple_account_remove_buddy(account, pb, NULL); + purple_blist_remove_buddy(pb); + } + } } break; case AVAHI_RESOLVER_FOUND: /* 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, make sure if it is a different resolver to clean up the old one. - * I don't think this should ever happen, but I'm afraid we might get events out of sequence. */ - if (((AvahiBuddyImplData *)bb->mdns_impl_data)->resolver != NULL - && ((AvahiBuddyImplData *)bb->mdns_impl_data)->resolver != r) { - avahi_service_resolver_free(((AvahiBuddyImplData *)bb->mdns_impl_data)->resolver); + /* 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); } - ((AvahiBuddyImplData *)bb->mdns_impl_data)->resolver = r; + + + /* Get the ip as a string */ + avahi_address_snprint(ip, AVAHI_ADDRESS_STR_MAX, a); - g_free(bb->ip); - /* Get the ip as a string */ - bb->ip = g_malloc(AVAHI_ADDRESS_STR_MAX); - avahi_address_snprint(bb->ip, AVAHI_ADDRESS_STR_MAX, a); + if (rd->ip == NULL || strcmp(rd->ip, ip) != 0) { + /* 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); + } + bb->ips = g_slist_prepend(bb->ips, g_strdup(ip)); + rd->ip = bb->ips->data; + } bb->port_p2pj = port; @@ -118,11 +202,16 @@ } if (!bonjour_buddy_check(bb)) { - if (pb != NULL) { - purple_account_remove_buddy(account, pb, NULL); - purple_blist_remove_buddy(pb); - } else - bonjour_buddy_delete(bb); + _cleanup_resolver_data(rd); + b_impl->resolvers = g_slist_remove(b_impl->resolvers, rd); + /* If this was the last resolver, remove the buddy */ + if (b_impl->resolvers == NULL) { + if (pb != NULL) { + purple_account_remove_buddy(account, pb, NULL); + purple_blist_remove_buddy(pb); + } else + bonjour_buddy_delete(bb); + } } else /* Add or update the buddy in our buddy list */ bonjour_buddy_add_to_purple(bb, pb); @@ -166,8 +255,44 @@ purple_debug_info("bonjour", "_browser_callback - Remove service\n"); pb = purple_find_buddy(account, name); if (pb != NULL) { - purple_account_remove_buddy(account, pb, NULL); - purple_blist_remove_buddy(pb); + BonjourBuddy *bb = pb->proto_data; + AvahiBuddyImplData *b_impl; + GSList *l; + AvahiSvcResolverData *rd_search; + + 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_remove(b_impl->resolvers, rd); + /* 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) { + purple_account_remove_buddy(account, pb, NULL); + purple_blist_remove_buddy(pb); + } + } } break; case AVAHI_BROWSER_ALL_FOR_NOW: @@ -188,6 +313,7 @@ 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; @@ -249,8 +375,10 @@ } /* Stop listening */ - avahi_record_browser_free(idata->buddy_icon_rec_browser); - idata->buddy_icon_rec_browser = NULL; + avahi_record_browser_free(b); + if (idata->buddy_icon_rec_browser == b) { + idata->buddy_icon_rec_browser = NULL; + } } /**************************** @@ -462,8 +590,11 @@ if (idata->buddy_icon_rec_browser != NULL) avahi_record_browser_free(idata->buddy_icon_rec_browser); - if (idata->resolver != NULL) - avahi_service_resolver_free(idata->resolver); + while(idata->resolvers != NULL) { + AvahiSvcResolverData *rd = idata->resolvers->data; + _cleanup_resolver_data(rd); + idata->resolvers = g_slist_delete_link(idata->resolvers, idata->resolvers); + } g_free(idata);
--- a/libpurple/protocols/bonjour/mdns_howl.c Mon Dec 10 03:53:08 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,288 +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 "internal.h" - -#include "mdns_interface.h" -#include "debug.h" -#include "buddy.h" - -#include <howl.h> - -/* data used by howl bonjour implementation */ -typedef struct _howl_impl_data { - sw_discovery session; - sw_discovery_oid session_id; - guint session_handler; -} HowlSessionImplData; - -static sw_result HOWL_API -_publish_reply(sw_discovery discovery, sw_discovery_oid oid, - sw_discovery_publish_status status, sw_opaque extra) -{ - purple_debug_warning("bonjour", "_publish_reply --> Start\n"); - - /* Check the answer from the mDNS daemon */ - switch (status) - { - case SW_DISCOVERY_PUBLISH_STARTED : - purple_debug_info("bonjour", "_publish_reply --> Service started\n"); - break; - case SW_DISCOVERY_PUBLISH_STOPPED : - purple_debug_info("bonjour", "_publish_reply --> Service stopped\n"); - break; - case SW_DISCOVERY_PUBLISH_NAME_COLLISION : - purple_debug_info("bonjour", "_publish_reply --> Name collision\n"); - break; - case SW_DISCOVERY_PUBLISH_INVALID : - purple_debug_info("bonjour", "_publish_reply --> Service invalid\n"); - break; - } - - return SW_OKAY; -} - -static sw_result HOWL_API -_resolve_reply(sw_discovery discovery, sw_discovery_oid oid, - sw_uint32 interface_index, sw_const_string name, - sw_const_string type, sw_const_string domain, - sw_ipv4_address address, sw_port port, - sw_octets text_record, sw_ulong text_record_len, - sw_opaque extra) -{ - BonjourBuddy *buddy; - PurpleAccount *account = (PurpleAccount*)extra; - gint address_length = 16; - sw_text_record_iterator iterator; - char key[SW_TEXT_RECORD_MAX_LEN]; - char value[SW_TEXT_RECORD_MAX_LEN]; - sw_uint32 value_length; - - /* TODO: We want to keep listening for updates*/ - sw_discovery_cancel(discovery, oid); - - /* create a buddy record */ - buddy = bonjour_buddy_new(name, account); - - /* Get the ip as a string */ - buddy->ip = g_malloc(address_length); - sw_ipv4_address_name(address, buddy->ip, address_length); - - buddy->port_p2pj = port; - - /* Obtain the parameters from the text_record */ - if ((text_record_len > 0) && (text_record) && (*text_record != '\0')) - { - clear_bonjour_buddy_values(buddy); - sw_text_record_iterator_init(&iterator, text_record, text_record_len); - while (sw_text_record_iterator_next(iterator, key, (sw_octet *)value, &value_length) == SW_OKAY) - set_bonjour_buddy_value(buddy, key, value, value_length); - - sw_text_record_iterator_fina(iterator); - } - - if (!bonjour_buddy_check(buddy)) - { - bonjour_buddy_delete(buddy); - return SW_DISCOVERY_E_UNKNOWN; - } - - /* Add or update the buddy in our buddy list */ - bonjour_buddy_add_to_purple(buddy, NULL); - - return SW_OKAY; -} - -static sw_result HOWL_API -_browser_reply(sw_discovery discovery, sw_discovery_oid oid, - sw_discovery_browse_status status, - sw_uint32 interface_index, sw_const_string name, - sw_const_string type, sw_const_string domain, - sw_opaque_t extra) -{ - sw_discovery_resolve_id rid; - PurpleAccount *account = (PurpleAccount*)extra; - PurpleBuddy *pb = NULL; - - switch (status) - { - case SW_DISCOVERY_BROWSE_INVALID: - purple_debug_warning("bonjour", "_browser_reply --> Invalid\n"); - break; - case SW_DISCOVERY_BROWSE_RELEASE: - purple_debug_warning("bonjour", "_browser_reply --> Release\n"); - break; - case SW_DISCOVERY_BROWSE_ADD_DOMAIN: - purple_debug_warning("bonjour", "_browser_reply --> Add domain\n"); - break; - case SW_DISCOVERY_BROWSE_ADD_DEFAULT_DOMAIN: - purple_debug_warning("bonjour", "_browser_reply --> Add default domain\n"); - break; - case SW_DISCOVERY_BROWSE_REMOVE_DOMAIN: - purple_debug_warning("bonjour", "_browser_reply --> Remove domain\n"); - break; - case SW_DISCOVERY_BROWSE_ADD_SERVICE: - /* A new peer has joined the network and uses iChat bonjour */ - purple_debug_info("bonjour", "_browser_reply --> Add service\n"); - if (g_ascii_strcasecmp(name, account->username) != 0) - { - if (sw_discovery_resolve(discovery, interface_index, name, type, - domain, _resolve_reply, extra, &rid) != SW_OKAY) - { - purple_debug_warning("bonjour", "_browser_reply --> Cannot send resolve\n"); - } - } - break; - case SW_DISCOVERY_BROWSE_REMOVE_SERVICE: - purple_debug_info("bonjour", "_browser_reply --> Remove service\n"); - pb = purple_find_buddy(account, name); - if (pb != NULL) { - purple_account_remove_buddy(account, pb, NULL); - purple_blist_remove_buddy(pb); - } - break; - case SW_DISCOVERY_BROWSE_RESOLVED: - purple_debug_info("bonjour", "_browse_reply --> Resolved\n"); - break; - default: - break; - } - - return SW_OKAY; -} - -static void -_mdns_handle_event(gpointer data, gint source, PurpleInputCondition condition) -{ - sw_discovery_read_socket((sw_discovery)data); -} - -/**************************** - * mdns_interface functions * - ****************************/ - -gboolean _mdns_init_session(BonjourDnsSd *data) { - HowlSessionImplData *idata = g_new0(HowlSessionImplData, 1); - - if (sw_discovery_init(&idata->session) != SW_OKAY) { - purple_debug_error("bonjour", "Unable to initialize an mDNS session.\n"); - - /* In Avahi, sw_discovery_init frees data->session but doesn't clear it */ - idata->session = NULL; - - g_free(idata); - - return FALSE; - } - - data->mdns_impl_data = idata; - - return TRUE; -} - - -gboolean _mdns_publish(BonjourDnsSd *data, PublishType type, GSList *records) { - sw_text_record dns_data; - sw_result publish_result = SW_OKAY; - HowlSessionImplData *idata = data->mdns_impl_data; - - g_return_val_if_fail(idata != NULL, FALSE); - - /* Fill the data for the service */ - if (sw_text_record_init(&dns_data) != SW_OKAY) { - purple_debug_error("bonjour", "Unable to initialize the data for the mDNS.\n"); - return FALSE; - } - - while (records) { - PurpleKeyValuePair *kvp = records->data; - sw_text_record_add_key_and_string_value(dns_data, kvp->key, kvp->value); - records = records->next; - } - - /* Publish the service */ - switch (type) { - case PUBLISH_START: - publish_result = sw_discovery_publish(idata->session, 0, purple_account_get_username(data->account), ICHAT_SERVICE, NULL, - NULL, data->port_p2pj, sw_text_record_bytes(dns_data), sw_text_record_len(dns_data), - _publish_reply, NULL, &idata->session_id); - break; - case PUBLISH_UPDATE: - publish_result = sw_discovery_publish_update(idata->session, idata->session_id, - sw_text_record_bytes(dns_data), sw_text_record_len(dns_data)); - break; - } - - /* Free the memory used by temp data */ - sw_text_record_fina(dns_data); - - if (publish_result != SW_OKAY) { - purple_debug_error("bonjour", "Unable to publish or change the status of the " ICHAT_SERVICE " service.\n"); - return FALSE; - } - - return TRUE; -} - -gboolean _mdns_browse(BonjourDnsSd *data) { - HowlSessionImplData *idata = data->mdns_impl_data; - /* TODO: don't we need to hang onto this to cancel later? */ - sw_discovery_oid session_id; - - g_return_val_if_fail(idata != NULL, FALSE); - - if (sw_discovery_browse(idata->session, 0, ICHAT_SERVICE, NULL, _browser_reply, - data->account, &session_id) == SW_OKAY) { - idata->session_handler = purple_input_add(sw_discovery_socket(idata->session), - PURPLE_INPUT_READ, _mdns_handle_event, idata->session); - return TRUE; - } - - return FALSE; -} - -gboolean _mdns_set_buddy_icon_data(BonjourDnsSd *data, gconstpointer avatar_data, gsize avatar_len) { - return FALSE; -} - -void _mdns_stop(BonjourDnsSd *data) { - HowlSessionImplData *idata = data->mdns_impl_data; - - if (idata == NULL || idata->session == NULL) - return; - - sw_discovery_cancel(idata->session, idata->session_id); - - purple_input_remove(idata->session_handler); - - /* TODO: should this really be g_free()'d ??? */ - g_free(idata->session); - - g_free(idata); - - data->mdns_impl_data = NULL; -} - -void _mdns_init_buddy(BonjourBuddy *buddy) { -} - -void _mdns_delete_buddy(BonjourBuddy *buddy) { -} - -void _mdns_retrieve_buddy_icon(BonjourBuddy* buddy) { -} - -
--- a/libpurple/protocols/bonjour/mdns_win32.c Mon Dec 10 03:53:08 2007 +0000 +++ b/libpurple/protocols/bonjour/mdns_win32.c Mon Dec 10 03:54:21 2007 +0000 @@ -28,17 +28,7 @@ #include "dnsquery.h" #include "mdns_common.h" - -/* data structure for the resolve callback */ -typedef struct _ResolveCallbackArgs { - DNSServiceRef resolver; - guint resolver_handler; - gchar *full_service_name; - - PurpleDnsQueryData *query; - - BonjourBuddy* buddy; -} ResolveCallbackArgs; +static GSList *pending_buddies = NULL; /* data used by win32 bonjour implementation */ typedef struct _win32_session_impl_data { @@ -50,20 +40,69 @@ guint browser_handler; } Win32SessionImplData; -typedef struct _win32_buddy_impl_data { +typedef struct _win32_buddy_service_resolver_data { DNSServiceRef txt_query; guint txt_query_handler; + uint32_t if_idx; + gchar *name; + gchar *type; + gchar *domain; + /* This is a reference to the entry in BonjourBuddy->ips */ + const char *ip; +} Win32SvcResolverData; + +typedef struct _win32_buddy_impl_data { + GSList *resolvers; DNSServiceRef null_query; guint null_query_handler; } Win32BuddyImplData; +/* data structure for the resolve callback */ +typedef struct _ResolveCallbackArgs { + DNSServiceRef resolver; + guint resolver_handler; + PurpleAccount *account; + BonjourBuddy *bb; + Win32SvcResolverData *res_data; + gchar *full_service_name; + PurpleDnsQueryData *query; +} ResolveCallbackArgs; + +static gint +_find_resolver_data(gconstpointer a, gconstpointer b) { + const Win32SvcResolverData *rd_a = a; + const Win32SvcResolverData *rd_b = b; + gint ret = 1; + + if(rd_a->if_idx == rd_b->if_idx + && !strcmp(rd_a->name, rd_b->name) + && !strcmp(rd_a->type, rd_b->type) + && !strcmp(rd_a->domain, rd_b->domain)) { + ret = 0; + } + + return ret; +} + +static void +_cleanup_resolver_data(Win32SvcResolverData *rd) { + if (rd->txt_query != NULL) { + purple_input_remove(rd->txt_query_handler); + DNSServiceRefDeallocate(rd->txt_query); + } + g_free(rd->name); + g_free(rd->type); + g_free(rd->domain); + g_free(rd); +} + static void _mdns_handle_event(gpointer data, gint source, PurpleInputCondition condition) { DNSServiceProcessResult((DNSServiceRef) data); } static void -_mdns_parse_text_record(BonjourBuddy* buddy, const char* record, uint16_t record_len) +_mdns_parse_text_record(BonjourBuddy *buddy, const char *record, uint16_t record_len) { const char *txt_entry; uint8_t txt_len; @@ -114,35 +153,44 @@ static void _mdns_resolve_host_callback(GSList *hosts, gpointer data, const char *error_message) { - ResolveCallbackArgs* args = (ResolveCallbackArgs*)data; - BonjourBuddy* bb = args->buddy; + ResolveCallbackArgs* args = (ResolveCallbackArgs*) data; + Win32BuddyImplData *idata = args->bb->mdns_impl_data; + gboolean delete_buddy = FALSE; + PurpleBuddy *pb; + + if ((pb = purple_find_buddy(args->account, args->bb->name))) + if (pb->proto_data != args->bb) + purple_debug_error("bonjour", "Found purple buddy for %s not matching bonjour buddy record. " + "This is going to be ugly!.\n", args->bb->name); if (!hosts || !hosts->data) { purple_debug_error("bonjour", "host resolution - callback error.\n"); - bonjour_buddy_delete(bb); + delete_buddy = TRUE; } else { - struct sockaddr_in *addr = (struct sockaddr_in*)g_slist_nth_data(hosts, 1); - Win32BuddyImplData *idata = bb->mdns_impl_data; - - g_return_if_fail(idata != NULL); - - g_free(bb->ip); - bb->ip = g_strdup(inet_ntoa(addr->sin_addr)); + struct sockaddr_in *addr = g_slist_nth_data(hosts, 1); /* finally, set up the continuous txt record watcher, and add the buddy to purple */ - if (kDNSServiceErr_NoError == DNSServiceQueryRecord(&idata->txt_query, kDNSServiceFlagsLongLivedQuery, + if (kDNSServiceErr_NoError == DNSServiceQueryRecord(&args->res_data->txt_query, kDNSServiceFlagsLongLivedQuery, kDNSServiceInterfaceIndexAny, args->full_service_name, kDNSServiceType_TXT, - kDNSServiceClass_IN, _mdns_record_query_callback, bb)) { + kDNSServiceClass_IN, _mdns_record_query_callback, args->bb)) { - purple_debug_info("bonjour", "Found buddy %s at %s:%d\n", bb->name, bb->ip, bb->port_p2pj); + const char *ip = inet_ntoa(addr->sin_addr); + + purple_debug_info("bonjour", "Found buddy %s at %s:%d\n", args->bb->name, ip, args->bb->port_p2pj); + - idata->txt_query_handler = purple_input_add(DNSServiceRefSockFD(idata->txt_query), - PURPLE_INPUT_READ, _mdns_handle_event, idata->txt_query); + args->bb->ips = g_slist_prepend(args->bb->ips, g_strdup(ip)); + args->res_data->ip = args->bb->ips->data; + + args->res_data->txt_query_handler = purple_input_add(DNSServiceRefSockFD(args->res_data->txt_query), + PURPLE_INPUT_READ, _mdns_handle_event, args->res_data->txt_query); - bonjour_buddy_add_to_purple(bb, NULL); - } else - bonjour_buddy_delete(bb); + bonjour_buddy_add_to_purple(args->bb, NULL); + } else { + purple_debug_error("bonjour", "Unable to set up record watcher for buddy %s\n", args->bb->name); + delete_buddy = TRUE; + } } @@ -153,6 +201,26 @@ hosts = g_slist_remove(hosts, hosts->data); } + if (delete_buddy) { + idata->resolvers = g_slist_remove(idata->resolvers, args->res_data); + _cleanup_resolver_data(args->res_data); + + /* If this was the last resolver, remove the buddy */ + if (idata->resolvers == NULL) { + if (pb) { + purple_account_remove_buddy(args->account, pb, NULL); + purple_blist_remove_buddy(pb); + } else + bonjour_buddy_delete(args->bb); + + /* Remove from the pending list */ + pending_buddies = g_slist_remove(pending_buddies, args->bb); + } + } else { + /* Remove from the pending list */ + pending_buddies = g_slist_remove(pending_buddies, args->bb); + } + /* free the remaining args memory */ g_free(args->full_service_name); g_free(args); @@ -163,37 +231,54 @@ const char *fullname, const char *hosttarget, uint16_t port, uint16_t txtLen, const char *txtRecord, void *context) { ResolveCallbackArgs *args = (ResolveCallbackArgs*)context; + Win32BuddyImplData *idata = args->bb->mdns_impl_data; /* remove the input fd and destroy the service ref */ purple_input_remove(args->resolver_handler); + args->resolver_handler = 0; DNSServiceRefDeallocate(args->resolver); + args->resolver = NULL; if (kDNSServiceErr_NoError != errorCode) - { purple_debug_error("bonjour", "service resolver - callback error.\n"); - bonjour_buddy_delete(args->buddy); - g_free(args); - } - else - { - args->buddy->port_p2pj = ntohs(port); + else { + /* set more arguments, and start the host resolver */ + + if ((args->query = + purple_dnsquery_a(hosttarget, port, _mdns_resolve_host_callback, args)) != NULL) { + + args->full_service_name = g_strdup(fullname); + + /* TODO: Should this be per resolver? */ + args->bb->port_p2pj = ntohs(port); - /* parse the text record */ - _mdns_parse_text_record(args->buddy, txtRecord, txtLen); + /* We don't want to hit the cleanup code */ + return; + } else + purple_debug_error("bonjour", "service resolver - host resolution failed.\n"); + } - /* set more arguments, and start the host resolver */ - args->full_service_name = g_strdup(fullname); + /* If we get this far, clean up */ + + idata->resolvers = g_slist_remove(idata->resolvers, args->res_data); + _cleanup_resolver_data(args->res_data); - if (!(args->query = - purple_dnsquery_a(hosttarget, port, _mdns_resolve_host_callback, args))) - { - purple_debug_error("bonjour", "service resolver - host resolution failed.\n"); - bonjour_buddy_delete(args->buddy); - g_free(args->full_service_name); - g_free(args); + /* If this was the last resolver, remove the buddy */ + if (idata->resolvers == NULL) { + PurpleBuddy *pb; + /* See if this is now attached to a PurpleBuddy */ + if ((pb = purple_find_buddy(args->account, args->bb->name))) { + purple_account_remove_buddy(args->account, pb, NULL); + purple_blist_remove_buddy(pb); + } else { + /* Remove from the pending list */ + pending_buddies = g_slist_remove(pending_buddies, args->bb); + bonjour_buddy_delete(args->bb); } } + g_free(args); + } static void DNSSD_API @@ -212,7 +297,6 @@ DNSServiceErrorType errorCode, const char *serviceName, const char *regtype, const char *replyDomain, void *context) { PurpleAccount *account = (PurpleAccount*)context; - PurpleBuddy *pb = NULL; if (kDNSServiceErr_NoError != errorCode) purple_debug_error("bonjour", "service browser - callback error\n"); @@ -221,28 +305,118 @@ if (purple_utf8_strcasecmp(serviceName, account->username) != 0) { /* OK, lets go ahead and resolve it to add to the buddy list */ ResolveCallbackArgs *args = g_new0(ResolveCallbackArgs, 1); - args->buddy = bonjour_buddy_new(serviceName, account); + + purple_debug_info("bonjour", "Received new record for '%s' on iface %u (%s, %s)\n", + serviceName, interfaceIndex, regtype ? regtype : "", + replyDomain ? replyDomain : ""); + + if (kDNSServiceErr_NoError == DNSServiceResolve(&args->resolver, 0, 0, serviceName, regtype, + replyDomain, _mdns_service_resolve_callback, args)) { + GSList *tmp = pending_buddies; + PurpleBuddy *pb; + BonjourBuddy* bb = NULL; + Win32SvcResolverData *rd; + Win32BuddyImplData *idata; + gint fd; + + /* Is there an existing buddy? */ + if ((pb = purple_find_buddy(account, serviceName))) + bb = pb->proto_data; + /* Is there a pending buddy? */ + else { + while (tmp) { + BonjourBuddy *bb_tmp = tmp->data; + if (!strcmp(bb_tmp->name, serviceName)) { + bb = bb_tmp; + break; + } + tmp = tmp->next; + } + } - if (kDNSServiceErr_NoError != DNSServiceResolve(&args->resolver, 0, 0, serviceName, regtype, - replyDomain, _mdns_service_resolve_callback, args)) { - bonjour_buddy_delete(args->buddy); + if (bb == NULL) { + bb = bonjour_buddy_new(serviceName, account); + + /* This is only necessary for the wacky case where someone previously manually added a buddy. */ + if (pb == NULL) + pending_buddies = g_slist_prepend(pending_buddies, bb); + else + pb->proto_data = bb; + } + + + rd = g_new0(Win32SvcResolverData, 1); + rd->if_idx = interfaceIndex; + rd->name = g_strdup(serviceName); + rd->type = g_strdup(regtype); + rd->domain = g_strdup(replyDomain); + + idata = bb->mdns_impl_data; + idata->resolvers = g_slist_prepend(idata->resolvers, rd); + + args->bb = bb; + args->res_data = rd; + args->account = account; + + /* get a file descriptor for this service ref, and add it to the input list */ + fd = DNSServiceRefSockFD(args->resolver); + args->resolver_handler = purple_input_add(fd, PURPLE_INPUT_READ, _mdns_handle_event, args->resolver); + } else { + purple_debug_error("bonjour", "service browser - failed to resolve service.\n"); g_free(args); - purple_debug_error("bonjour", "service browser - failed to resolve service.\n"); - } else { - /* get a file descriptor for this service ref, and add it to the input list */ - gint fd = DNSServiceRefSockFD(args->resolver); - args->resolver_handler = purple_input_add(fd, PURPLE_INPUT_READ, _mdns_handle_event, args->resolver); } } } else { + PurpleBuddy *pb = NULL; + /* A peer has sent a goodbye packet, remove them from the buddy list */ - purple_debug_info("bonjour", "service browser - remove notification\n"); + purple_debug_info("bonjour", "Received remove notification for '%s' on iface %u (%s, %s)\n", + serviceName, interfaceIndex, regtype ? regtype : "", + replyDomain ? replyDomain : ""); + pb = purple_find_buddy(account, serviceName); if (pb != NULL) { - purple_account_remove_buddy(account, pb, NULL); - purple_blist_remove_buddy(pb); - } else + GSList *l; + /* There may be multiple presences, we should only get rid of this one */ + Win32SvcResolverData *rd_search; + BonjourBuddy *bb = pb->proto_data; + Win32BuddyImplData *idata; + + g_return_if_fail(bb != NULL); + + idata = bb->mdns_impl_data; + + rd_search = g_new0(Win32SvcResolverData, 1); + rd_search->if_idx = interfaceIndex; + rd_search->name = (gchar *) serviceName; + rd_search->type = (gchar *) regtype; + rd_search->domain = (gchar *) replyDomain; + + l = g_slist_find_custom(idata->resolvers, rd_search, _find_resolver_data); + + g_free(rd_search); + + if (l != NULL) { + Win32SvcResolverData *rd = l->data; + idata->resolvers = g_slist_delete_link(idata->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 (idata->resolvers == NULL) { + purple_debug_info("bonjour", "Removed last presence for buddy '%s'; removing buddy.\n", serviceName); + purple_account_remove_buddy(account, pb, NULL); + purple_blist_remove_buddy(pb); + } + } + } else { purple_debug_warning("bonjour", "Unable to find buddy (%s) to remove\n", serviceName ? serviceName : "(null)"); + /* TODO: Should we look in the pending buddies list? */ + } } } @@ -385,9 +559,10 @@ g_return_if_fail(idata != NULL); - if (idata->txt_query != NULL) { - purple_input_remove(idata->txt_query_handler); - DNSServiceRefDeallocate(idata->txt_query); + while (idata->resolvers) { + Win32SvcResolverData *rd = idata->resolvers->data; + _cleanup_resolver_data(rd); + idata->resolvers = g_slist_delete_link(idata->resolvers, idata->resolvers); } if (idata->null_query != NULL) {