#include <string.h>
#include <avahi-common/domain.h>
+#include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
+
#include "browse.h"
#include "log.h"
-struct AvahiServiceTypeBrowser {
+struct AvahiSServiceTypeBrowser {
AvahiServer *server;
- gchar *domain_name;
+ char *domain_name;
- AvahiRecordBrowser *record_browser;
+ AvahiSRecordBrowser *record_browser;
- AvahiServiceTypeBrowserCallback callback;
- gpointer userdata;
+ AvahiSServiceTypeBrowserCallback callback;
+ void* userdata;
- AVAHI_LLIST_FIELDS(AvahiServiceTypeBrowser, browser);
+ AVAHI_LLIST_FIELDS(AvahiSServiceTypeBrowser, browser);
};
-static void record_browser_callback(AvahiRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
- AvahiServiceTypeBrowser *b = userdata;
- gchar *n, *e, *c;
-
- g_assert(rr);
- g_assert(record);
- g_assert(b);
-
- g_assert(record->key->type == AVAHI_DNS_TYPE_PTR);
-
- n = avahi_normalize_name(record->data.ptr.name);
-
- if (*n != '_')
- goto fail;
+static void record_browser_callback(
+ AvahiSRecordBrowser*rr,
+ AvahiIfIndex interface,
+ AvahiProtocol protocol,
+ AvahiBrowserEvent event,
+ AvahiRecord *record,
+ AvahiLookupResultFlags flags,
+ void* userdata) {
- for (c = e = n; *c == '_';) {
- c += strcspn(c, ".");
-
- if (*c == 0)
+ AvahiSServiceTypeBrowser *b = userdata;
+ char *n = NULL, *c = NULL;
+
+ assert(rr);
+ assert(b);
+
+ if (record) {
+ char *e;
+
+ assert(record->key->type == AVAHI_DNS_TYPE_PTR);
+
+ n = avahi_normalize_name(record->data.ptr.name);
+
+ if (*n != '_')
+ goto fail;
+
+ for (c = e = n; *c == '_';) {
+ c += strcspn(c, ".");
+
+ if (*c == 0)
+ goto fail;
+
+ assert(*c == '.');
+ e = c;
+ c++;
+ }
+
+ *e = 0;
+
+ if (!avahi_domain_equal(c, b->domain_name))
goto fail;
-
- g_assert(*c == '.');
- e = c;
- c++;
}
-
- *e = 0;
-
- if (!avahi_domain_equal(c, b->domain_name))
- goto fail;
- b->callback(b, interface, protocol, event, n, c, b->userdata);
- g_free(n);
-
+ b->callback(b, interface, protocol, event, n, c, flags, b->userdata);
+ avahi_free(n);
+
return;
fail:
avahi_log_warn("Invalid service type '%s'", n);
- g_free(n);
+ avahi_free(n);
}
-AvahiServiceTypeBrowser *avahi_service_type_browser_new(AvahiServer *server, gint interface, AvahiProtocol protocol, const gchar *domain, AvahiServiceTypeBrowserCallback callback, gpointer userdata) {
- AvahiServiceTypeBrowser *b;
+AvahiSServiceTypeBrowser *avahi_s_service_type_browser_new(
+ AvahiServer *server,
+ AvahiIfIndex interface,
+ AvahiProtocol protocol,
+ const char *domain,
+ AvahiLookupFlags flags,
+ AvahiSServiceTypeBrowserCallback callback,
+ void* userdata) {
+
+ AvahiSServiceTypeBrowser *b;
AvahiKey *k;
- gchar *n = NULL;
+ char *n = NULL;
- g_assert(server);
- g_assert(callback);
+ assert(server);
+ assert(callback);
if (domain && !avahi_is_valid_domain_name(domain)) {
avahi_server_set_errno(server, AVAHI_ERR_INVALID_DOMAIN_NAME);
return NULL;
}
- b = g_new(AvahiServiceTypeBrowser, 1);
+ if (!domain)
+ domain = server->domain_name;
+
+ if (!AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST)) {
+ avahi_server_set_errno(server, AVAHI_ERR_INVALID_FLAGS);
+ return NULL;
+ }
+
+ if (!(b = avahi_new(AvahiSServiceTypeBrowser, 1))) {
+ avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
+ return NULL;
+ }
+
b->server = server;
- b->domain_name = avahi_normalize_name(domain ? domain : "local");
+ b->domain_name = avahi_normalize_name(domain);
b->callback = callback;
b->userdata = userdata;
- AVAHI_LLIST_PREPEND(AvahiServiceTypeBrowser, browser, server->service_type_browsers, b);
+ AVAHI_LLIST_PREPEND(AvahiSServiceTypeBrowser, browser, server->service_type_browsers, b);
- n = g_strdup_printf("_services._dns-sd._udp.%s", b->domain_name);
+ n = avahi_strdup_printf("_services._dns-sd._udp.%s", b->domain_name);
k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR);
- g_free(n);
+ avahi_free(n);
- b->record_browser = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, b);
+ b->record_browser = avahi_s_record_browser_new(server, interface, protocol, k, flags, record_browser_callback, b);
avahi_key_unref(k);
if (!b->record_browser)
return b;
}
-void avahi_service_type_browser_free(AvahiServiceTypeBrowser *b) {
- g_assert(b);
+void avahi_s_service_type_browser_free(AvahiSServiceTypeBrowser *b) {
+ assert(b);
- AVAHI_LLIST_REMOVE(AvahiServiceTypeBrowser, browser, b->server->service_type_browsers, b);
+ AVAHI_LLIST_REMOVE(AvahiSServiceTypeBrowser, browser, b->server->service_type_browsers, b);
if (b->record_browser)
- avahi_record_browser_free(b->record_browser);
+ avahi_s_record_browser_free(b->record_browser);
- g_free(b->domain_name);
- g_free(b);
+ avahi_free(b->domain_name);
+ avahi_free(b);
}