/***
- This file is part of avahi.
+ This file is part of catta.
- avahi is free software; you can redistribute it and/or modify it
+ catta is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- avahi is distributed in the hope that it will be useful, but WITHOUT
+ catta is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with avahi; if not, write to the Free Software
+ License along with catta; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
***/
#include <stdlib.h>
-#include <avahi/timeval.h>
-#include <avahi/malloc.h>
+#include <catta/timeval.h>
+#include <catta/malloc.h>
#include "query-sched.h"
-#include <avahi/log.h>
+#include <catta/log.h>
-#define AVAHI_QUERY_HISTORY_MSEC 100
-#define AVAHI_QUERY_DEFER_MSEC 100
+#define CATTA_QUERY_HISTORY_MSEC 100
+#define CATTA_QUERY_DEFER_MSEC 100
-typedef struct AvahiQueryJob AvahiQueryJob;
-typedef struct AvahiKnownAnswer AvahiKnownAnswer;
+typedef struct CattaQueryJob CattaQueryJob;
+typedef struct CattaKnownAnswer CattaKnownAnswer;
-struct AvahiQueryJob {
+struct CattaQueryJob {
unsigned id;
int n_posted;
- AvahiQueryScheduler *scheduler;
- AvahiTimeEvent *time_event;
+ CattaQueryScheduler *scheduler;
+ CattaTimeEvent *time_event;
int done;
struct timeval delivery;
- AvahiKey *key;
+ CattaKey *key;
/* Jobs are stored in a simple linked list. It might turn out in
* the future that this list grows too long and we must switch to
* assumption, especially on setups where traffic reflection is
* involved. */
- AVAHI_LLIST_FIELDS(AvahiQueryJob, jobs);
+ CATTA_LLIST_FIELDS(CattaQueryJob, jobs);
};
-struct AvahiKnownAnswer {
- AvahiQueryScheduler *scheduler;
- AvahiRecord *record;
+struct CattaKnownAnswer {
+ CattaQueryScheduler *scheduler;
+ CattaRecord *record;
- AVAHI_LLIST_FIELDS(AvahiKnownAnswer, known_answer);
+ CATTA_LLIST_FIELDS(CattaKnownAnswer, known_answer);
};
-struct AvahiQueryScheduler {
- AvahiInterface *interface;
- AvahiTimeEventQueue *time_event_queue;
+struct CattaQueryScheduler {
+ CattaInterface *interface;
+ CattaTimeEventQueue *time_event_queue;
unsigned next_id;
- AVAHI_LLIST_HEAD(AvahiQueryJob, jobs);
- AVAHI_LLIST_HEAD(AvahiQueryJob, history);
- AVAHI_LLIST_HEAD(AvahiKnownAnswer, known_answers);
+ CATTA_LLIST_HEAD(CattaQueryJob, jobs);
+ CATTA_LLIST_HEAD(CattaQueryJob, history);
+ CATTA_LLIST_HEAD(CattaKnownAnswer, known_answers);
};
-static AvahiQueryJob* job_new(AvahiQueryScheduler *s, AvahiKey *key, int done) {
- AvahiQueryJob *qj;
+static CattaQueryJob* job_new(CattaQueryScheduler *s, CattaKey *key, int done) {
+ CattaQueryJob *qj;
assert(s);
assert(key);
- if (!(qj = avahi_new(AvahiQueryJob, 1))) {
- avahi_log_error(__FILE__": Out of memory");
+ if (!(qj = catta_new(CattaQueryJob, 1))) {
+ catta_log_error(__FILE__": Out of memory");
return NULL;
}
qj->scheduler = s;
- qj->key = avahi_key_ref(key);
+ qj->key = catta_key_ref(key);
qj->time_event = NULL;
qj->n_posted = 1;
qj->id = s->next_id++;
if ((qj->done = done))
- AVAHI_LLIST_PREPEND(AvahiQueryJob, jobs, s->history, qj);
+ CATTA_LLIST_PREPEND(CattaQueryJob, jobs, s->history, qj);
else
- AVAHI_LLIST_PREPEND(AvahiQueryJob, jobs, s->jobs, qj);
+ CATTA_LLIST_PREPEND(CattaQueryJob, jobs, s->jobs, qj);
return qj;
}
-static void job_free(AvahiQueryScheduler *s, AvahiQueryJob *qj) {
+static void job_free(CattaQueryScheduler *s, CattaQueryJob *qj) {
assert(s);
assert(qj);
if (qj->time_event)
- avahi_time_event_free(qj->time_event);
+ catta_time_event_free(qj->time_event);
if (qj->done)
- AVAHI_LLIST_REMOVE(AvahiQueryJob, jobs, s->history, qj);
+ CATTA_LLIST_REMOVE(CattaQueryJob, jobs, s->history, qj);
else
- AVAHI_LLIST_REMOVE(AvahiQueryJob, jobs, s->jobs, qj);
+ CATTA_LLIST_REMOVE(CattaQueryJob, jobs, s->jobs, qj);
- avahi_key_unref(qj->key);
- avahi_free(qj);
+ catta_key_unref(qj->key);
+ catta_free(qj);
}
-static void elapse_callback(AvahiTimeEvent *e, void* data);
+static void elapse_callback(CattaTimeEvent *e, void* data);
-static void job_set_elapse_time(AvahiQueryScheduler *s, AvahiQueryJob *qj, unsigned msec, unsigned jitter) {
+static void job_set_elapse_time(CattaQueryScheduler *s, CattaQueryJob *qj, unsigned msec, unsigned jitter) {
struct timeval tv;
assert(s);
assert(qj);
- avahi_elapse_time(&tv, msec, jitter);
+ catta_elapse_time(&tv, msec, jitter);
if (qj->time_event)
- avahi_time_event_update(qj->time_event, &tv);
+ catta_time_event_update(qj->time_event, &tv);
else
- qj->time_event = avahi_time_event_new(s->time_event_queue, &tv, elapse_callback, qj);
+ qj->time_event = catta_time_event_new(s->time_event_queue, &tv, elapse_callback, qj);
}
-static void job_mark_done(AvahiQueryScheduler *s, AvahiQueryJob *qj) {
+static void job_mark_done(CattaQueryScheduler *s, CattaQueryJob *qj) {
assert(s);
assert(qj);
assert(!qj->done);
- AVAHI_LLIST_REMOVE(AvahiQueryJob, jobs, s->jobs, qj);
- AVAHI_LLIST_PREPEND(AvahiQueryJob, jobs, s->history, qj);
+ CATTA_LLIST_REMOVE(CattaQueryJob, jobs, s->jobs, qj);
+ CATTA_LLIST_PREPEND(CattaQueryJob, jobs, s->history, qj);
qj->done = 1;
- job_set_elapse_time(s, qj, AVAHI_QUERY_HISTORY_MSEC, 0);
+ job_set_elapse_time(s, qj, CATTA_QUERY_HISTORY_MSEC, 0);
gettimeofday(&qj->delivery, NULL);
}
-AvahiQueryScheduler *avahi_query_scheduler_new(AvahiInterface *i) {
- AvahiQueryScheduler *s;
+CattaQueryScheduler *catta_query_scheduler_new(CattaInterface *i) {
+ CattaQueryScheduler *s;
assert(i);
- if (!(s = avahi_new(AvahiQueryScheduler, 1))) {
- avahi_log_error(__FILE__": Out of memory");
+ if (!(s = catta_new(CattaQueryScheduler, 1))) {
+ catta_log_error(__FILE__": Out of memory");
return NULL; /* OOM */
}
s->time_event_queue = i->monitor->server->time_event_queue;
s->next_id = 0;
- AVAHI_LLIST_HEAD_INIT(AvahiQueryJob, s->jobs);
- AVAHI_LLIST_HEAD_INIT(AvahiQueryJob, s->history);
- AVAHI_LLIST_HEAD_INIT(AvahiKnownAnswer, s->known_answers);
+ CATTA_LLIST_HEAD_INIT(CattaQueryJob, s->jobs);
+ CATTA_LLIST_HEAD_INIT(CattaQueryJob, s->history);
+ CATTA_LLIST_HEAD_INIT(CattaKnownAnswer, s->known_answers);
return s;
}
-void avahi_query_scheduler_free(AvahiQueryScheduler *s) {
+void catta_query_scheduler_free(CattaQueryScheduler *s) {
assert(s);
assert(!s->known_answers);
- avahi_query_scheduler_clear(s);
- avahi_free(s);
+ catta_query_scheduler_clear(s);
+ catta_free(s);
}
-void avahi_query_scheduler_clear(AvahiQueryScheduler *s) {
+void catta_query_scheduler_clear(CattaQueryScheduler *s) {
assert(s);
while (s->jobs)
job_free(s, s->history);
}
-static void* known_answer_walk_callback(AvahiCache *c, AvahiKey *pattern, AvahiCacheEntry *e, void* userdata) {
- AvahiQueryScheduler *s = userdata;
- AvahiKnownAnswer *ka;
+static void* known_answer_walk_callback(CattaCache *c, CattaKey *pattern, CattaCacheEntry *e, void* userdata) {
+ CattaQueryScheduler *s = userdata;
+ CattaKnownAnswer *ka;
assert(c);
assert(pattern);
assert(e);
assert(s);
- if (avahi_cache_entry_half_ttl(c, e))
+ if (catta_cache_entry_half_ttl(c, e))
return NULL;
- if (!(ka = avahi_new0(AvahiKnownAnswer, 1))) {
- avahi_log_error(__FILE__": Out of memory");
+ if (!(ka = catta_new0(CattaKnownAnswer, 1))) {
+ catta_log_error(__FILE__": Out of memory");
return NULL;
}
ka->scheduler = s;
- ka->record = avahi_record_ref(e->record);
+ ka->record = catta_record_ref(e->record);
- AVAHI_LLIST_PREPEND(AvahiKnownAnswer, known_answer, s->known_answers, ka);
+ CATTA_LLIST_PREPEND(CattaKnownAnswer, known_answer, s->known_answers, ka);
return NULL;
}
-static int packet_add_query_job(AvahiQueryScheduler *s, AvahiDnsPacket *p, AvahiQueryJob *qj) {
+static int packet_add_query_job(CattaQueryScheduler *s, CattaDnsPacket *p, CattaQueryJob *qj) {
assert(s);
assert(p);
assert(qj);
- if (!avahi_dns_packet_append_key(p, qj->key, 0))
+ if (!catta_dns_packet_append_key(p, qj->key, 0))
return 0;
/* Add all matching known answers to the list */
- avahi_cache_walk(s->interface->cache, qj->key, known_answer_walk_callback, s);
+ catta_cache_walk(s->interface->cache, qj->key, known_answer_walk_callback, s);
job_mark_done(s, qj);
return 1;
}
-static void append_known_answers_and_send(AvahiQueryScheduler *s, AvahiDnsPacket *p) {
- AvahiKnownAnswer *ka;
+static void append_known_answers_and_send(CattaQueryScheduler *s, CattaDnsPacket *p) {
+ CattaKnownAnswer *ka;
unsigned n;
assert(s);
assert(p);
while ((ka = s->known_answers)) {
int too_large = 0;
- while (!avahi_dns_packet_append_record(p, ka->record, 0, 0)) {
+ while (!catta_dns_packet_append_record(p, ka->record, 0, 0)) {
- if (avahi_dns_packet_is_empty(p)) {
+ if (catta_dns_packet_is_empty(p)) {
/* The record is too large to fit into one packet, so
there's no point in sending it. Better is letting
the owner of the record send it as a response. This
break;
}
- avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_FLAGS, avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_FLAGS) | AVAHI_DNS_FLAG_TC);
- avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_ANCOUNT, n);
- avahi_interface_send_packet(s->interface, p);
- avahi_dns_packet_free(p);
+ catta_dns_packet_set_field(p, CATTA_DNS_FIELD_FLAGS, catta_dns_packet_get_field(p, CATTA_DNS_FIELD_FLAGS) | CATTA_DNS_FLAG_TC);
+ catta_dns_packet_set_field(p, CATTA_DNS_FIELD_ANCOUNT, n);
+ catta_interface_send_packet(s->interface, p);
+ catta_dns_packet_free(p);
- p = avahi_dns_packet_new_query(s->interface->hardware->mtu);
+ p = catta_dns_packet_new_query(s->interface->hardware->mtu);
n = 0;
}
- AVAHI_LLIST_REMOVE(AvahiKnownAnswer, known_answer, s->known_answers, ka);
- avahi_record_unref(ka->record);
- avahi_free(ka);
+ CATTA_LLIST_REMOVE(CattaKnownAnswer, known_answer, s->known_answers, ka);
+ catta_record_unref(ka->record);
+ catta_free(ka);
if (!too_large)
n++;
}
- avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_ANCOUNT, n);
- avahi_interface_send_packet(s->interface, p);
- avahi_dns_packet_free(p);
+ catta_dns_packet_set_field(p, CATTA_DNS_FIELD_ANCOUNT, n);
+ catta_interface_send_packet(s->interface, p);
+ catta_dns_packet_free(p);
}
-static void elapse_callback(AVAHI_GCC_UNUSED AvahiTimeEvent *e, void* data) {
- AvahiQueryJob *qj = data;
- AvahiQueryScheduler *s;
- AvahiDnsPacket *p;
+static void elapse_callback(CATTA_GCC_UNUSED CattaTimeEvent *e, void* data) {
+ CattaQueryJob *qj = data;
+ CattaQueryScheduler *s;
+ CattaDnsPacket *p;
unsigned n;
int b;
assert(!s->known_answers);
- if (!(p = avahi_dns_packet_new_query(s->interface->hardware->mtu)))
+ if (!(p = catta_dns_packet_new_query(s->interface->hardware->mtu)))
return; /* OOM */
b = packet_add_query_job(s, p, qj);
n++;
}
- avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_QDCOUNT, n);
+ catta_dns_packet_set_field(p, CATTA_DNS_FIELD_QDCOUNT, n);
/* Now add known answers */
append_known_answers_and_send(s, p);
}
-static AvahiQueryJob* find_scheduled_job(AvahiQueryScheduler *s, AvahiKey *key) {
- AvahiQueryJob *qj;
+static CattaQueryJob* find_scheduled_job(CattaQueryScheduler *s, CattaKey *key) {
+ CattaQueryJob *qj;
assert(s);
assert(key);
for (qj = s->jobs; qj; qj = qj->jobs_next) {
assert(!qj->done);
- if (avahi_key_equal(qj->key, key))
+ if (catta_key_equal(qj->key, key))
return qj;
}
return NULL;
}
-static AvahiQueryJob* find_history_job(AvahiQueryScheduler *s, AvahiKey *key) {
- AvahiQueryJob *qj;
+static CattaQueryJob* find_history_job(CattaQueryScheduler *s, CattaKey *key) {
+ CattaQueryJob *qj;
assert(s);
assert(key);
for (qj = s->history; qj; qj = qj->jobs_next) {
assert(qj->done);
- if (avahi_key_equal(qj->key, key)) {
+ if (catta_key_equal(qj->key, key)) {
/* Check whether this entry is outdated */
- if (avahi_age(&qj->delivery) > AVAHI_QUERY_HISTORY_MSEC*1000) {
+ if (catta_age(&qj->delivery) > CATTA_QUERY_HISTORY_MSEC*1000) {
/* it is outdated, so let's remove it */
job_free(s, qj);
return NULL;
return NULL;
}
-int avahi_query_scheduler_post(AvahiQueryScheduler *s, AvahiKey *key, int immediately, unsigned *ret_id) {
+int catta_query_scheduler_post(CattaQueryScheduler *s, CattaKey *key, int immediately, unsigned *ret_id) {
struct timeval tv;
- AvahiQueryJob *qj;
+ CattaQueryJob *qj;
assert(s);
assert(key);
if ((qj = find_history_job(s, key)))
return 0;
- avahi_elapse_time(&tv, immediately ? 0 : AVAHI_QUERY_DEFER_MSEC, 0);
+ catta_elapse_time(&tv, immediately ? 0 : CATTA_QUERY_DEFER_MSEC, 0);
if ((qj = find_scheduled_job(s, key))) {
/* Duplicate questions suppression */
- if (avahi_timeval_compare(&tv, &qj->delivery) < 0) {
+ if (catta_timeval_compare(&tv, &qj->delivery) < 0) {
/* If the new entry should be scheduled earlier,
* update the old entry */
qj->delivery = tv;
- avahi_time_event_update(qj->time_event, &qj->delivery);
+ catta_time_event_update(qj->time_event, &qj->delivery);
}
qj->n_posted++;
return 0; /* OOM */
qj->delivery = tv;
- qj->time_event = avahi_time_event_new(s->time_event_queue, &qj->delivery, elapse_callback, qj);
+ qj->time_event = catta_time_event_new(s->time_event_queue, &qj->delivery, elapse_callback, qj);
}
if (ret_id)
return 1;
}
-void avahi_query_scheduler_incoming(AvahiQueryScheduler *s, AvahiKey *key) {
- AvahiQueryJob *qj;
+void catta_query_scheduler_incoming(CattaQueryScheduler *s, CattaKey *key) {
+ CattaQueryJob *qj;
assert(s);
assert(key);
return; /* OOM */
gettimeofday(&qj->delivery, NULL);
- job_set_elapse_time(s, qj, AVAHI_QUERY_HISTORY_MSEC, 0);
+ job_set_elapse_time(s, qj, CATTA_QUERY_HISTORY_MSEC, 0);
}
-int avahi_query_scheduler_withdraw_by_id(AvahiQueryScheduler *s, unsigned id) {
- AvahiQueryJob *qj;
+int catta_query_scheduler_withdraw_by_id(CattaQueryScheduler *s, unsigned id) {
+ CattaQueryJob *qj;
assert(s);
/* Very short lived queries can withdraw an already scheduled item
* from the queue using this function, simply by passing the id
- * returned by avahi_query_scheduler_post(). */
+ * returned by catta_query_scheduler_post(). */
for (qj = s->jobs; qj; qj = qj->jobs_next) {
assert(!qj->done);
projects / catta / blobdiff