X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fbrowse-domain.c;h=c6331b4c20681a2a4064301f430a2d51796bbcf5;hb=cc0a4994f07b61952a77549fffa1711014f936be;hp=61807a540892aa50a5993636301ae5d5d3654dc7;hpb=de7d6694f611157f0d74118a2755bbe7357f7479;p=catta diff --git a/avahi-core/browse-domain.c b/avahi-core/browse-domain.c index 61807a5..c6331b4 100644 --- a/avahi-core/browse-domain.c +++ b/avahi-core/browse-domain.c @@ -38,7 +38,7 @@ struct AvahiDomainBrowser { AVAHI_LLIST_FIELDS(AvahiDomainBrowser, browser); }; -static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, guchar protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) { +static void record_browser_callback(AvahiRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) { AvahiDomainBrowser *b = userdata; gchar *n; @@ -53,7 +53,7 @@ static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, gucha g_free(n); } -AvahiDomainBrowser *avahi_domain_browser_new(AvahiServer *server, gint interface, guchar protocol, const gchar *domain, AvahiDomainBrowserType type, AvahiDomainBrowserCallback callback, gpointer 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; @@ -63,22 +63,29 @@ AvahiDomainBrowser *avahi_domain_browser_new(AvahiServer *server, gint interface b = g_new(AvahiDomainBrowser, 1); 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; switch (type) { case AVAHI_DOMAIN_BROWSER_BROWSE: - n = g_strdup_printf("_browse._dns-sd._udp.%s", b->domain_name); + n = g_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 = g_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 = g_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 = 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; }