summaryrefslogtreecommitdiffstats
path: root/avahi-daemon
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2005-07-29 01:06:21 +0000
committerLennart Poettering <lennart@poettering.net>2005-07-29 01:06:21 +0000
commit1e4fbfdf6b633cc3e3af9ba01b7baaa6994ffd38 (patch)
tree7fb6ae4a9ba753e85c5def81836d7c21b213392c /avahi-daemon
parentfb4c7136077bdce1fb168e39561d2dfadbd3df61 (diff)
DBUS: implement ServiceBrowser
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@188 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-daemon')
-rw-r--r--avahi-daemon/DBUS-API10
-rw-r--r--avahi-daemon/dbus-protocol.c118
-rwxr-xr-xavahi-daemon/dbus-test.py7
3 files changed, 127 insertions, 8 deletions
diff --git a/avahi-daemon/DBUS-API b/avahi-daemon/DBUS-API
index 651af66..4a8f561 100644
--- a/avahi-daemon/DBUS-API
+++ b/avahi-daemon/DBUS-API
@@ -11,7 +11,7 @@ TODO: [int32 interface, int32 protocol, string name, string type, string domai
path EntryGroupNew() -- Creates a new org.freedesktop.Avahi.EntryGroup object
path DomainBrowserNew(int32 interface, int32 protocol, string domain, int32 btype)
path ServiceTypeBrowserNew(int32 interface, int32 protocol, string domain)
-TODO: path ServiceBrowserNew(int32 interface, int32 protocol, string type, string domain)
+ path ServiceBrowserNew(int32 interface, int32 protocol, string type, string domain)
SIGNAL StateChanged(int32 state)
org.freedesktop.Avahi.EntryGroup
@@ -32,7 +32,7 @@ org.freedesktop.Avahi.ServiceTypeBrowser
SIGNAL ItemNew(int32 interface, int32 protocol, string type, string domain)
SIGNAL ItemRemove(int32 interface, int32 protocol, string type, string domain)
-TODO: org.freedesktop.Avahi.ServiceBrowser
-TODO: void Free()
-TODO: SIGNAL ItemNew(int32 interface, int32 protocol, string name, string type, string domain)
-TODO: SIGNAL ItemRemove(int32 interface, int32 protocol, string name, string type, string domain)
+org.freedesktop.Avahi.ServiceBrowser
+ void Free()
+ SIGNAL ItemNew(int32 interface, int32 protocol, string name, string type, string domain)
+ SIGNAL ItemRemove(int32 interface, int32 protocol, string name, string type, string domain)
diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
index cde791d..ab30a91 100644
--- a/avahi-daemon/dbus-protocol.c
+++ b/avahi-daemon/dbus-protocol.c
@@ -46,9 +46,7 @@
#define AVAHI_DBUS_INTERFACE_SERVICE_BROWSER AVAHI_DBUS_NAME".ServiceBrowser"
/* Needs wrapping:
- - AvahiServiceResolver
- - AvahiServiceTypeBrowser
- - AvahiServiceBrowser */
+ - AvahiServiceResolver */
typedef struct Server Server;
typedef struct Client Client;
@@ -737,6 +735,74 @@ static void service_type_browser_callback(AvahiServiceTypeBrowser *b, AvahiIfInd
dbus_message_unref(m);
}
+static DBusHandlerResult msg_service_browser_impl(DBusConnection *c, DBusMessage *m, void *userdata) {
+ DBusError error;
+ ServiceBrowserInfo *i = userdata;
+
+ g_assert(c);
+ g_assert(m);
+ g_assert(i);
+
+ dbus_error_init(&error);
+
+ avahi_log_debug("dbus: interface=%s, path=%s, member=%s",
+ dbus_message_get_interface(m),
+ dbus_message_get_path(m),
+ dbus_message_get_member(m));
+
+ /* Access control */
+ if (strcmp(dbus_message_get_sender(m), i->client->name))
+ return respond_error(c, m, DBUS_ERROR_ACCESS_DENIED, NULL);
+
+ if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVICE_BROWSER, "Free")) {
+
+ if (!dbus_message_get_args(m, &error, DBUS_TYPE_INVALID)) {
+ avahi_log_warn("Error parsing ServiceBrowser::Free message");
+ goto fail;
+ }
+
+ service_browser_free(i);
+ return respond_ok(c, m);
+
+ }
+
+ avahi_log_warn("Missed message %s::%s()", dbus_message_get_interface(m), dbus_message_get_member(m));
+
+fail:
+ if (dbus_error_is_set(&error))
+ dbus_error_free(&error);
+
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+static void service_browser_callback(AvahiServiceBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, const gchar *name, const gchar *type, const gchar *domain, gpointer userdata) {
+ ServiceBrowserInfo *i = userdata;
+ DBusMessage *m;
+ gint32 i_interface, i_protocol;
+
+ g_assert(b);
+ g_assert(name);
+ g_assert(type);
+ g_assert(domain);
+ g_assert(i);
+
+ i_interface = (gint32) interface;
+ i_protocol = (gint32) protocol;
+
+ m = dbus_message_new_signal(i->path, AVAHI_DBUS_INTERFACE_SERVICE_BROWSER, event == AVAHI_BROWSER_NEW ? "ItemNew" : "ItemRemove");
+ dbus_message_append_args(
+ m,
+ DBUS_TYPE_INT32, &i_interface,
+ DBUS_TYPE_INT32, &i_protocol,
+ DBUS_TYPE_STRING, &name,
+ DBUS_TYPE_STRING, &type,
+ DBUS_TYPE_STRING, &domain,
+ DBUS_TYPE_INVALID);
+ dbus_message_set_destination(m, i->client->name);
+ dbus_connection_send(server->bus, m, NULL);
+ dbus_message_unref(m);
+}
+
static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, void *userdata) {
DBusError error;
@@ -978,6 +1044,52 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, void
dbus_connection_register_object_path(c, i->path, &vtable, i);
return respond_path(c, m, i->path);
+
+ } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "ServiceBrowserNew")) {
+ Client *client;
+ ServiceBrowserInfo *i;
+ static const DBusObjectPathVTable vtable = {
+ NULL,
+ msg_service_browser_impl,
+ NULL,
+ NULL,
+ NULL,
+ NULL
+ };
+ gint32 interface, protocol;
+ gchar *domain, *type;
+
+ if (!dbus_message_get_args(
+ m, &error,
+ DBUS_TYPE_INT32, &interface,
+ DBUS_TYPE_INT32, &protocol,
+ DBUS_TYPE_STRING, &type,
+ DBUS_TYPE_STRING, &domain,
+ DBUS_TYPE_INVALID) || !type || !*type) {
+ avahi_log_warn("Error parsing Server::ServiceBrowserNew message");
+ goto fail;
+ }
+
+ client = client_get(dbus_message_get_sender(m), TRUE);
+
+ if (!*domain)
+ domain = NULL;
+
+ i = g_new(ServiceBrowserInfo, 1);
+ i->id = ++client->current_id;
+ i->client = client;
+ i->path = g_strdup_printf("/org/freedesktop/Avahi/Client%u/ServiceBrowser%u", client->id, i->id);
+
+ AVAHI_LLIST_PREPEND(ServiceBrowserInfo, service_browsers, client->service_browsers, i);
+
+ if (!(i->service_browser = avahi_service_browser_new(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, type, domain, service_browser_callback, i))) {
+ avahi_log_warn("Failed to create service browser");
+ service_browser_free(i);
+ goto fail;
+ }
+
+ dbus_connection_register_object_path(c, i->path, &vtable, i);
+ return respond_path(c, m, i->path);
}
avahi_log_warn("Missed message %s::%s()", dbus_message_get_interface(m), dbus_message_get_member(m));
diff --git a/avahi-daemon/dbus-test.py b/avahi-daemon/dbus-test.py
index 753c7d0..30bd261 100755
--- a/avahi-daemon/dbus-test.py
+++ b/avahi-daemon/dbus-test.py
@@ -49,6 +49,13 @@ stb = dbus.Interface(bus.get_object("org.freedesktop.Avahi", server.ServiceTypeB
stb.connect_to_signal('ItemNew', lambda interface, protocol, type, domain: service_type_browser_callback("NEW", interface, protocol, type, domain))
stb.connect_to_signal('ItemRemove', lambda interface, protocol, type, domain: service_type_browser_callback("REMOVE", interface, protocol, type, domain))
+def service_browser_callback(a, interface, protocol, name, type, domain):
+ print "SERVICE_BROWSER: %s %i %i %s %s %s" % (a, interface, protocol, name, type, domain)
+
+sb = dbus.Interface(bus.get_object("org.freedesktop.Avahi", server.ServiceBrowserNew(0, 0, "_http._tcp", "")), 'org.freedesktop.Avahi.ServiceBrowser')
+sb.connect_to_signal('ItemNew', lambda interface, protocol, name, type, domain: service_browser_callback("NEW", interface, protocol, name, type, domain))
+sb.connect_to_signal('ItemRemove', lambda interface, protocol, name, type, domain: service_browser_callback("REMOVE", interface, protocol, name, type, domain))
+
try:
gobject.MainLoop().run()
except KeyboardInterrupt, k: