#include <config.h>
#endif
+#include <avahi-common/domain.h>
+#include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
+
#include "browse.h"
-#include "util.h"
-struct AvahiDomainBrowser {
+struct AvahiSDomainBrowser {
AvahiServer *server;
- gchar *domain_name;
+ char *domain_name;
- AvahiRecordBrowser *record_browser;
+ AvahiSRecordBrowser *record_browser;
- AvahiDomainBrowserCallback callback;
- gpointer userdata;
+ AvahiSDomainBrowserCallback callback;
+ void* userdata;
- AVAHI_LLIST_FIELDS(AvahiDomainBrowser, browser);
+ AVAHI_LLIST_FIELDS(AvahiSDomainBrowser, browser);
};
-static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, guchar protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
- AvahiDomainBrowser *b = userdata;
- gchar *n;
+static void record_browser_callback(AvahiSRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, void* userdata) {
+ AvahiSDomainBrowser *b = userdata;
+ char *n;
- g_assert(rr);
- g_assert(record);
- g_assert(b);
+ assert(rr);
+ assert(record);
+ assert(b);
- g_assert(record->key->type == AVAHI_DNS_TYPE_PTR);
+ assert(record->key->type == AVAHI_DNS_TYPE_PTR);
n = avahi_normalize_name(record->data.ptr.name);
b->callback(b, interface, protocol, event, n, b->userdata);
- g_free(n);
+ avahi_free(n);
}
-AvahiDomainBrowser *avahi_domain_browser_new(AvahiServer *server, gint interface, guchar protocol, const gchar *domain, AvahiDomainBrowserType type, AvahiDomainBrowserCallback callback, gpointer userdata) {
- AvahiDomainBrowser *b;
+AvahiSDomainBrowser *avahi_s_domain_browser_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const char *domain, AvahiDomainBrowserType type, AvahiSDomainBrowserCallback callback, void* userdata) {
+ AvahiSDomainBrowser *b;
AvahiKey *k;
- gchar *n = NULL;
+ char *n = NULL;
- g_assert(server);
- g_assert(callback);
+ assert(server);
+ assert(callback);
+ assert(type >= AVAHI_DOMAIN_BROWSER_BROWSE && type <= AVAHI_DOMAIN_BROWSER_BROWSE_LEGACY);
+
+ if (domain && !avahi_is_valid_domain_name(domain)) {
+ avahi_server_set_errno(server, AVAHI_ERR_INVALID_DOMAIN_NAME);
+ 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->domain_name = avahi_normalize_name(domain ? domain : "local");
b->callback = callback;
b->userdata = userdata;
+ AVAHI_LLIST_PREPEND(AvahiSDomainBrowser, browser, server->domain_browsers, b);
+
switch (type) {
case AVAHI_DOMAIN_BROWSER_BROWSE:
- n = g_strdup_printf("_browse._dns-sd._udp.%s", b->domain_name);
+ n = avahi_strdup_printf("b._dns-sd._udp.%s", b->domain_name);
break;
case AVAHI_DOMAIN_BROWSER_BROWSE_DEFAULT:
- n = g_strdup_printf("_default._browse._dns-sd._udp.%s", b->domain_name);
+ n = avahi_strdup_printf("db._dns-sd._udp.%s", b->domain_name);
break;
case AVAHI_DOMAIN_BROWSER_REGISTER:
- n = g_strdup_printf("_register._dns-sd._udp.%s", b->domain_name);
+ n = avahi_strdup_printf("r._dns-sd._udp.%s", b->domain_name);
break;
case AVAHI_DOMAIN_BROWSER_REGISTER_DEFAULT:
- n = g_strdup_printf("_default._register._dns-sd._udp.%s", b->domain_name);
+ n = avahi_strdup_printf("dr._dns-sd._udp.%s", b->domain_name);
+ break;
+ case AVAHI_DOMAIN_BROWSER_BROWSE_LEGACY:
+ n = avahi_strdup_printf("lb._dns-sd._udp.%s", b->domain_name);
+ break;
+
+ case AVAHI_DOMAIN_BROWSER_MAX:
+ assert(0);
break;
}
- g_assert(n);
+ assert(n);
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, record_browser_callback, b);
avahi_key_unref(k);
- AVAHI_LLIST_PREPEND(AvahiDomainBrowser, browser, server->domain_browsers, b);
+ if (!b->record_browser) {
+ avahi_s_domain_browser_free(b);
+ return NULL;
+ }
return b;
}
-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);
- avahi_record_browser_free(b->record_browser);
- g_free(b->domain_name);
- g_free(b);
+ if (b->record_browser)
+ avahi_s_record_browser_free(b->record_browser);
+
+ avahi_free(b->domain_name);
+ avahi_free(b);
}