diff options
Diffstat (limited to 'avahi-daemon/dbus-sync-service-resolver.c')
| -rw-r--r-- | avahi-daemon/dbus-sync-service-resolver.c | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/avahi-daemon/dbus-sync-service-resolver.c b/avahi-daemon/dbus-sync-service-resolver.c index 21ae481..ed7276a 100644 --- a/avahi-daemon/dbus-sync-service-resolver.c +++ b/avahi-daemon/dbus-sync-service-resolver.c @@ -1,18 +1,16 @@ -/* $Id$ */ - /*** This file is part of avahi. - + avahi is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + avahi 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 Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with avahi; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 @@ -42,8 +40,8 @@ void avahi_dbus_sync_service_resolver_free(SyncServiceResolverInfo *i) { dbus_message_unref(i->message); AVAHI_LLIST_REMOVE(SyncServiceResolverInfo, sync_service_resolvers, i->client->sync_service_resolvers, i); + assert(i->client->n_objects >= 1); i->client->n_objects--; - assert(i->client->n_objects >= 0); avahi_free(i); } @@ -60,11 +58,11 @@ void avahi_dbus_sync_service_resolver_callback( const AvahiAddress *a, uint16_t port, AvahiStringList *txt, - AvahiLookupResultFlags flags, + AvahiLookupResultFlags flags, void* userdata) { - + SyncServiceResolverInfo *i = userdata; - + assert(r); assert(i); @@ -73,13 +71,13 @@ void avahi_dbus_sync_service_resolver_callback( int32_t i_interface, i_protocol, i_aprotocol; uint32_t u_flags; DBusMessage *reply; - + assert(host_name); if (!name) name = ""; - if (a) + if (a) avahi_address_snprint(t, sizeof(t), a); else t[0] = 0; @@ -88,16 +86,22 @@ void avahi_dbus_sync_service_resolver_callback( if (avahi_dbus_is_our_own_service(i->client, interface, protocol, name, type, domain) > 0) flags |= AVAHI_LOOKUP_RESULT_OUR_OWN; - + i_interface = (int32_t) interface; i_protocol = (int32_t) protocol; - if (a) - i_aprotocol = (int32_t) a->proto; - else - i_aprotocol = AVAHI_PROTO_UNSPEC; + if (a) + i_aprotocol = (int32_t) a->proto; + else + i_aprotocol = AVAHI_PROTO_UNSPEC; u_flags = (uint32_t) flags; reply = dbus_message_new_method_return(i->message); + + if (!reply) { + avahi_log_error("Failed allocate message"); + goto finish; + } + dbus_message_append_args( reply, DBUS_TYPE_INT32, &i_interface, @@ -112,7 +116,7 @@ void avahi_dbus_sync_service_resolver_callback( DBUS_TYPE_INVALID); avahi_dbus_append_string_list(reply, txt); - + dbus_message_append_args( reply, DBUS_TYPE_UINT32, &u_flags, @@ -122,9 +126,10 @@ void avahi_dbus_sync_service_resolver_callback( dbus_message_unref(reply); } else { assert(event == AVAHI_RESOLVER_FAILURE); - + avahi_dbus_respond_error(server->bus, i->message, avahi_server_errno(avahi_server), NULL); } +finish: avahi_dbus_sync_service_resolver_free(i); } |