Merge branch 'release/0.0.1'

[catta] / avahi-daemon / dbus-sync-service-resolver.c

diff --git a/avahi-daemon/dbus-sync-service-resolver.c b/avahi-daemon/dbus-sync-service-resolver.c
deleted file mode 100644 (file)
index ed7276a..0000000
--- a/avahi-daemon/dbus-sync-service-resolver.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/***
-  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
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-
-#include <avahi-common/malloc.h>
-#include <avahi-common/dbus.h>
-#include <avahi-common/error.h>
-#include <avahi-core/log.h>
-
-#include "dbus-util.h"
-#include "dbus-internal.h"
-#include "main.h"
-
-void avahi_dbus_sync_service_resolver_free(SyncServiceResolverInfo *i) {
-    assert(i);
-
-    if (i->service_resolver)
-        avahi_s_service_resolver_free(i->service_resolver);
-    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--;
-
-    avahi_free(i);
-}
-
-void avahi_dbus_sync_service_resolver_callback(
-    AvahiSServiceResolver *r,
-    AvahiIfIndex interface,
-    AvahiProtocol protocol,
-    AvahiResolverEvent event,
-    const char *name,
-    const char *type,
-    const char *domain,
-    const char *host_name,
-    const AvahiAddress *a,
-    uint16_t port,
-    AvahiStringList *txt,
-    AvahiLookupResultFlags flags,
-    void* userdata) {
-
-    SyncServiceResolverInfo *i = userdata;
-
-    assert(r);
-    assert(i);
-
-    if (event == AVAHI_RESOLVER_FOUND) {
-        char t[AVAHI_ADDRESS_STR_MAX], *pt = t;
-        int32_t i_interface, i_protocol, i_aprotocol;
-        uint32_t u_flags;
-        DBusMessage *reply;
-
-        assert(host_name);
-
-        if (!name)
-            name = "";
-
-        if (a)
-            avahi_address_snprint(t, sizeof(t), a);
-        else
-            t[0] = 0;
-
-        /* Patch in AVAHI_LOOKUP_RESULT_OUR_OWN */
-
-        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;
-        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,
-            DBUS_TYPE_INT32, &i_protocol,
-            DBUS_TYPE_STRING, &name,
-            DBUS_TYPE_STRING, &type,
-            DBUS_TYPE_STRING, &domain,
-            DBUS_TYPE_STRING, &host_name,
-            DBUS_TYPE_INT32, &i_aprotocol,
-            DBUS_TYPE_STRING, &pt,
-            DBUS_TYPE_UINT16, &port,
-            DBUS_TYPE_INVALID);
-
-        avahi_dbus_append_string_list(reply, txt);
-
-        dbus_message_append_args(
-            reply,
-            DBUS_TYPE_UINT32, &u_flags,
-            DBUS_TYPE_INVALID);
-
-        dbus_connection_send(server->bus, reply, NULL);
-        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);
-}