diff options
author | Lennart Poettering <lennart@poettering.net> | 2005-10-17 22:23:16 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2005-10-17 22:23:16 +0000 |
commit | 263515cd1d7b52ce2ad3dc55a93b9d6f730133f1 (patch) | |
tree | 89ac4314dea5cb976fdbffcd8eefce1d7e0222ea /avahi-core/browse.c | |
parent | 55f7dcb690bcbdf6bca6568e0d9aacb2456811a5 (diff) |
* move unicast DNS server registration/browsing routines to their own header dns-srv-rr.h
* remove some unused functions
* unexport some functions
* other cleanups
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@803 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-core/browse.c')
-rw-r--r-- | avahi-core/browse.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/avahi-core/browse.c b/avahi-core/browse.c index 639a7cb..09bc0fa 100644 --- a/avahi-core/browse.c +++ b/avahi-core/browse.c @@ -79,7 +79,6 @@ static void transport_flags_from_domain(AvahiServer *s, AvahiLookupFlags *flags, *flags |= AVAHI_LOOKUP_USE_WIDE_AREA; } - static AvahiSRBLookup* lookup_new( AvahiSRecordBrowser *b, AvahiIfIndex interface, @@ -180,6 +179,21 @@ static AvahiSRBLookup *lookup_find( return NULL; } +static void browser_cancel(AvahiSRecordBrowser *b) { + assert(b); + + if (b->root_lookup) { + lookup_unref(b->root_lookup); + b->root_lookup = NULL; + } + + if (b->defer_time_event) { + avahi_time_event_free(b->defer_time_event); + b->defer_time_event = NULL; + } +} + + static void lookup_wide_area_callback( AvahiWideAreaLookupEngine *e, AvahiBrowserEvent event, @@ -469,7 +483,7 @@ static void defer_callback(AvahiTimeEvent *e, void *userdata) { b->flags & AVAHI_LOOKUP_USE_WIDE_AREA ? AVAHI_LOOKUP_RESULT_WIDE_AREA : AVAHI_LOOKUP_RESULT_MULTICAST, b->userdata); - avahi_s_record_browser_cancel(b); + browser_cancel(b); return; } @@ -493,7 +507,7 @@ void avahi_s_record_browser_restart(AvahiSRecordBrowser *b) { assert(b); assert(!b->dead); - avahi_s_record_browser_cancel(b); + browser_cancel(b); /* Request a new iteration of the cache scanning */ if (!b->defer_time_event) { @@ -550,20 +564,6 @@ AvahiSRecordBrowser *avahi_s_record_browser_new( return b; } -void avahi_s_record_browser_cancel(AvahiSRecordBrowser *b) { - assert(b); - - if (b->root_lookup) { - lookup_unref(b->root_lookup); - b->root_lookup = NULL; - } - - if (b->defer_time_event) { - avahi_time_event_free(b->defer_time_event); - b->defer_time_event = NULL; - } -} - void avahi_s_record_browser_free(AvahiSRecordBrowser *b) { assert(b); assert(!b->dead); @@ -571,13 +571,13 @@ void avahi_s_record_browser_free(AvahiSRecordBrowser *b) { b->dead = 1; b->server->need_browser_cleanup = 1; - avahi_s_record_browser_cancel(b); + browser_cancel(b); } void avahi_s_record_browser_destroy(AvahiSRecordBrowser *b) { assert(b); - avahi_s_record_browser_cancel(b); + browser_cancel(b); AVAHI_LLIST_REMOVE(AvahiSRecordBrowser, browser, b->server->record_browsers, b); |