#include "subscribe.h"
#include "util.h"
-static void elapse(flxTimeEvent *e, void *userdata) {
- flxSubscription *s = userdata;
+static void elapse(AvahiTimeEvent *e, void *userdata) {
+ AvahiSubscription *s = userdata;
GTimeVal tv;
gchar *t;
g_assert(s);
- flx_server_post_query(s->server, s->interface, s->protocol, s->key);
+ avahi_server_post_query(s->server, s->interface, s->protocol, s->key);
if (s->n_query++ <= 8)
s->sec_delay *= 2;
- g_message("%i. Continuous querying for %s", s->n_query, t = flx_key_to_string(s->key));
+ g_message("%i. Continuous querying for %s", s->n_query, t = avahi_key_to_string(s->key));
g_free(t);
- flx_elapse_time(&tv, s->sec_delay*1000, 0);
- flx_time_event_queue_update(s->server->time_event_queue, s->time_event, &tv);
+ avahi_elapse_time(&tv, s->sec_delay*1000, 0);
+ avahi_time_event_queue_update(s->server->time_event_queue, s->time_event, &tv);
}
-static void scan_cache_callback(flxInterfaceMonitor *m, flxInterface *i, gpointer userdata) {
- flxSubscription *s = userdata;
- flxCacheEntry *e;
+struct cbdata {
+ AvahiSubscription *subscription;
+ AvahiInterface *interface;
+};
+
+static gpointer scan_cache_callback(AvahiCache *c, AvahiKey *pattern, AvahiCacheEntry *e, gpointer userdata) {
+ struct cbdata *cbdata = userdata;
+
+ g_assert(c);
+ g_assert(pattern);
+ g_assert(e);
+ g_assert(cbdata);
+
+ cbdata->subscription->callback(
+ cbdata->subscription,
+ e->record,
+ cbdata->interface->hardware->index,
+ cbdata->interface->protocol,
+ AVAHI_SUBSCRIPTION_NEW,
+ cbdata->subscription->userdata);
+
+ return NULL;
+}
+
+static void scan_interface_callback(AvahiInterfaceMonitor *m, AvahiInterface *i, gpointer userdata) {
+ AvahiSubscription *s = userdata;
+ struct cbdata cbdata = { s, i };
g_assert(m);
g_assert(i);
g_assert(s);
- for (e = flx_cache_lookup_key(i->cache, s->key); e; e = e->by_name_next)
- s->callback(s, e->record, i->hardware->index, i->protocol, FLX_SUBSCRIPTION_NEW, s->userdata);
+ avahi_cache_walk(i->cache, s->key, scan_cache_callback, &cbdata);
}
-flxSubscription *flx_subscription_new(flxServer *server, flxKey *key, gint interface, guchar protocol, flxSubscriptionCallback callback, gpointer userdata) {
- flxSubscription *s, *t;
+AvahiSubscription *avahi_subscription_new(AvahiServer *server, AvahiKey *key, gint interface, guchar protocol, AvahiSubscriptionCallback callback, gpointer userdata) {
+ AvahiSubscription *s, *t;
GTimeVal tv;
g_assert(server);
g_assert(key);
g_assert(callback);
- s = g_new(flxSubscription, 1);
+ g_assert(!avahi_key_is_pattern(key));
+
+ s = g_new(AvahiSubscription, 1);
s->server = server;
- s->key = flx_key_ref(key);
+ s->key = avahi_key_ref(key);
s->interface = interface;
s->protocol = protocol;
s->callback = callback;
s->n_query = 1;
s->sec_delay = 1;
- flx_server_post_query(s->server, s->interface, s->protocol, s->key);
+ avahi_server_post_query(s->server, s->interface, s->protocol, s->key);
- flx_elapse_time(&tv, s->sec_delay*1000, 0);
- s->time_event = flx_time_event_queue_add(server->time_event_queue, &tv, elapse, s);
+ avahi_elapse_time(&tv, s->sec_delay*1000, 0);
+ s->time_event = avahi_time_event_queue_add(server->time_event_queue, &tv, elapse, s);
- FLX_LLIST_PREPEND(flxSubscription, subscriptions, server->subscriptions, s);
+ AVAHI_LLIST_PREPEND(AvahiSubscription, subscriptions, server->subscriptions, s);
/* Add the new entry to the subscription hash table */
t = g_hash_table_lookup(server->subscription_hashtable, key);
- FLX_LLIST_PREPEND(flxSubscription, by_key, t, s);
+ AVAHI_LLIST_PREPEND(AvahiSubscription, by_key, t, s);
g_hash_table_replace(server->subscription_hashtable, key, t);
/* Scan the caches */
- flx_interface_monitor_walk(s->server->monitor, s->interface, s->protocol, scan_cache_callback, s);
+ avahi_interface_monitor_walk(s->server->monitor, s->interface, s->protocol, scan_interface_callback, s);
return s;
}
-void flx_subscription_free(flxSubscription *s) {
- flxSubscription *t;
+void avahi_subscription_free(AvahiSubscription *s) {
+ AvahiSubscription *t;
g_assert(s);
- FLX_LLIST_REMOVE(flxSubscription, subscriptions, s->server->subscriptions, s);
+ AVAHI_LLIST_REMOVE(AvahiSubscription, subscriptions, s->server->subscriptions, s);
t = g_hash_table_lookup(s->server->subscription_hashtable, s->key);
- FLX_LLIST_REMOVE(flxSubscription, by_key, t, s);
+ AVAHI_LLIST_REMOVE(AvahiSubscription, by_key, t, s);
if (t)
g_hash_table_replace(s->server->subscription_hashtable, t->key, t);
else
g_hash_table_remove(s->server->subscription_hashtable, s->key);
- flx_time_event_queue_remove(s->server->time_event_queue, s->time_event);
- flx_key_unref(s->key);
+ avahi_time_event_queue_remove(s->server->time_event_queue, s->time_event);
+ avahi_key_unref(s->key);
g_free(s);
}
-void flx_subscription_notify(flxServer *server, flxInterface *i, flxRecord *record, flxSubscriptionEvent event) {
- flxSubscription *s;
+void avahi_subscription_notify(AvahiServer *server, AvahiInterface *i, AvahiRecord *record, AvahiSubscriptionEvent event) {
+ AvahiSubscription *s;
+ AvahiKey *pattern;
g_assert(server);
g_assert(record);
for (s = g_hash_table_lookup(server->subscription_hashtable, record->key); s; s = s->by_key_next)
- if (flx_interface_match(i, s->interface, s->protocol))
+ if (avahi_interface_match(i, s->interface, s->protocol))
s->callback(s, record, i->hardware->index, i->protocol, event, s->userdata);
-
+}
+
+gboolean avahi_is_subscribed(AvahiServer *server, AvahiKey *k) {
+ g_assert(server);
+ g_assert(k);
+
+ return !!g_hash_table_lookup(server->subscription_hashtable, k);
}
projects / catta / blobdiff