#endif
#include <avahi-common/domain.h>
+#include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
+
#include "browse.h"
-struct AvahiDomainBrowser {
+struct AvahiSDomainBrowser {
AvahiServer *server;
- gchar *domain_name;
- AvahiRecordBrowser *record_browser;
-
- AvahiDomainBrowserCallback callback;
- gpointer userdata;
+ AvahiSRecordBrowser *record_browser;
+
+ AvahiSDomainBrowserCallback callback;
+ void* userdata;
- AVAHI_LLIST_FIELDS(AvahiDomainBrowser, browser);
+ AVAHI_LLIST_FIELDS(AvahiSDomainBrowser, browser);
};
-static void record_browser_callback(AvahiRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
- AvahiDomainBrowser *b = userdata;
- gchar *n;
-
- g_assert(rr);
- g_assert(record);
- g_assert(b);
+static void record_browser_callback(
+ AvahiSRecordBrowser*rr,
+ AvahiIfIndex interface,
+ AvahiProtocol protocol,
+ AvahiBrowserEvent event,
+ AvahiRecord *record,
+ AvahiLookupResultFlags flags,
+ void* userdata) {
+
+ AvahiSDomainBrowser *b = userdata;
+ char *n = NULL;
- g_assert(record->key->type == AVAHI_DNS_TYPE_PTR);
+ assert(rr);
+ assert(b);
- n = avahi_normalize_name(record->data.ptr.name);
- b->callback(b, interface, protocol, event, n, b->userdata);
- g_free(n);
+ /* Filter flags */
+ flags &= AVAHI_LOOKUP_RESULT_CACHED | AVAHI_LOOKUP_RESULT_MULTICAST | AVAHI_LOOKUP_RESULT_WIDE_AREA;
+
+ if (record) {
+ assert(record->key->type == AVAHI_DNS_TYPE_PTR);
+ n = record->data.ptr.name;
+ }
+
+ b->callback(b, interface, protocol, event, n, flags, b->userdata);
}
-AvahiDomainBrowser *avahi_domain_browser_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const gchar *domain, AvahiDomainBrowserType type, AvahiDomainBrowserCallback callback, gpointer userdata) {
- AvahiDomainBrowser *b;
- AvahiKey *k;
- gchar *n = NULL;
+AvahiSDomainBrowser *avahi_s_domain_browser_new(
+ AvahiServer *server,
+ AvahiIfIndex interface,
+ AvahiProtocol protocol,
+ const char *domain,
+ AvahiDomainBrowserType type,
+ AvahiLookupFlags flags,
+ AvahiSDomainBrowserCallback callback,
+ void* userdata) {
+
+ static const char * const type_table[AVAHI_DOMAIN_BROWSER_MAX] = {
+ "r",
+ "dr",
+ "b",
+ "db",
+ "lb"
+ };
- g_assert(server);
- g_assert(callback);
- g_assert(type >= AVAHI_DOMAIN_BROWSER_BROWSE && type <= AVAHI_DOMAIN_BROWSER_BROWSE_LEGACY);
+ AvahiSDomainBrowser *b;
+ AvahiKey *k = NULL;
+ char n[AVAHI_DOMAIN_NAME_MAX];
+ int r;
+
+ assert(server);
+ assert(callback);
+
+ AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_IF_VALID(interface), AVAHI_ERR_INVALID_INTERFACE);
+ AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_PROTO_VALID(protocol), AVAHI_ERR_INVALID_PROTOCOL);
+ AVAHI_CHECK_VALIDITY_RETURN_NULL(server, type < AVAHI_DOMAIN_BROWSER_MAX, AVAHI_ERR_INVALID_FLAGS);
+ AVAHI_CHECK_VALIDITY_RETURN_NULL(server, !domain || avahi_is_valid_domain_name(domain), AVAHI_ERR_INVALID_DOMAIN_NAME);
+ AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST), AVAHI_ERR_INVALID_FLAGS);
- if (domain && !avahi_valid_domain_name(domain)) {
- avahi_server_set_errno(server, AVAHI_ERR_INVALID_DOMAIN_NAME);
+ if (!domain)
+ domain = server->domain_name;
+
+ if ((r = avahi_service_name_join(n, sizeof(n), type_table[type], "_dns-sd._udp", domain)) < 0) {
+ avahi_server_set_errno(server, r);
return NULL;
}
-
- b = g_new(AvahiDomainBrowser, 1);
+
+ if (!(b = avahi_new(AvahiSDomainBrowser, 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->callback = callback;
b->userdata = userdata;
+ b->record_browser = NULL;
- AVAHI_LLIST_PREPEND(AvahiDomainBrowser, browser, server->domain_browsers, b);
-
- switch (type) {
- case AVAHI_DOMAIN_BROWSER_BROWSE:
- n = g_strdup_printf("b._dns-sd._udp.%s", b->domain_name);
- break;
- case AVAHI_DOMAIN_BROWSER_BROWSE_DEFAULT:
- n = g_strdup_printf("db._dns-sd._udp.%s", b->domain_name);
- break;
- case AVAHI_DOMAIN_BROWSER_REGISTER:
- n = g_strdup_printf("r._dns-sd._udp.%s", b->domain_name);
- break;
- case AVAHI_DOMAIN_BROWSER_REGISTER_DEFAULT:
- n = g_strdup_printf("dr._dns-sd._udp.%s", b->domain_name);
- break;
- case AVAHI_DOMAIN_BROWSER_BROWSE_LEGACY:
- n = g_strdup_printf("lb._dns-sd._udp.%s", b->domain_name);
- break;
-
- case AVAHI_DOMAIN_BROWSER_MAX:
- g_assert(FALSE);
- break;
- }
-
- g_assert(n);
+ AVAHI_LLIST_PREPEND(AvahiSDomainBrowser, browser, server->domain_browsers, b);
- k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR);
- g_free(n);
-
- b->record_browser = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, b);
- avahi_key_unref(k);
-
- if (!b->record_browser) {
- avahi_domain_browser_free(b);
- return NULL;
+ if (!(k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR))) {
+ avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
+ goto fail;
}
+ if (!(b->record_browser = avahi_s_record_browser_new(server, interface, protocol, k, flags, record_browser_callback, b)))
+ goto fail;
+
+ avahi_key_unref(k);
return b;
+
+fail:
+
+ if (k)
+ avahi_key_unref(k);
+
+ avahi_s_domain_browser_free(b);
+
+ return NULL;
}
-void avahi_domain_browser_free(AvahiDomainBrowser *b) {
- g_assert(b);
+void avahi_s_domain_browser_free(AvahiSDomainBrowser *b) {
+ assert(b);
- AVAHI_LLIST_REMOVE(AvahiDomainBrowser, browser, b->server->domain_browsers, b);
+ AVAHI_LLIST_REMOVE(AvahiSDomainBrowser, browser, b->server->domain_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);
}
projects / catta / blobdiff