summaryrefslogtreecommitdiffstats
path: root/avahi-core/resolve-host-name.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2005-06-24 19:02:51 +0000
committerLennart Poettering <lennart@poettering.net>2005-06-24 19:02:51 +0000
commit9962a048634c590db23a00db1d01daada779844c (patch)
tree521108bad5026135c129396d3c317738ec151818 /avahi-core/resolve-host-name.c
parent9f9f4f6ea2405edc642d322c19f6f13e31920046 (diff)
* implement new source address check mechanisms
* introduce new types AvahiIfIndex and AvahiProtocol to abstract underlying OS structures a bit * document string list, address and other stuff * implement qclass = ANY queries * don't make use of UTF8 collation as RFC mandates git-svn-id: file:///home/lennart/svn/public/avahi/trunk@144 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-core/resolve-host-name.c')
-rw-r--r--avahi-core/resolve-host-name.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c
index c10119a..fadfc85 100644
--- a/avahi-core/resolve-host-name.c
+++ b/avahi-core/resolve-host-name.c
@@ -64,12 +64,12 @@ static void finish(AvahiHostNameResolver *r, gint interface, guchar protocol, Av
if (record) {
switch (record->key->type) {
case AVAHI_DNS_TYPE_A:
- a.family = AF_INET;
+ a.family = AVAHI_PROTO_INET;
a.data.ipv4 = record->data.a.address;
break;
case AVAHI_DNS_TYPE_AAAA:
- a.family = AF_INET6;
+ a.family = AVAHI_PROTO_INET6;
a.data.ipv6 = record->data.aaaa.address;
break;
@@ -101,7 +101,7 @@ static void time_event_callback(AvahiTimeEvent *e, void *userdata) {
g_assert(e);
g_assert(r);
- finish(r, -1, AF_UNSPEC, AVAHI_RESOLVER_TIMEOUT, NULL);
+ finish(r, -1, AVAHI_PROTO_UNSPEC, AVAHI_RESOLVER_TIMEOUT, NULL);
}
AvahiHostNameResolver *avahi_host_name_resolver_new(AvahiServer *server, gint interface, guchar protocol, const gchar *host_name, guchar aprotocol, AvahiHostNameResolverCallback callback, gpointer userdata) {
@@ -113,7 +113,7 @@ AvahiHostNameResolver *avahi_host_name_resolver_new(AvahiServer *server, gint in
g_assert(host_name);
g_assert(callback);
- g_assert(aprotocol == AF_UNSPEC || aprotocol == AF_INET || aprotocol == AF_INET6);
+ g_assert(aprotocol == AVAHI_PROTO_UNSPEC || aprotocol == AVAHI_PROTO_INET || aprotocol == AVAHI_PROTO_INET6);
r = g_new(AvahiHostNameResolver, 1);
r->server = server;
@@ -128,13 +128,13 @@ AvahiHostNameResolver *avahi_host_name_resolver_new(AvahiServer *server, gint in
AVAHI_LLIST_PREPEND(AvahiHostNameResolver, resolver, server->host_name_resolvers, r);
- if (aprotocol == AF_INET || aprotocol == AF_UNSPEC) {
+ if (aprotocol == AVAHI_PROTO_INET || aprotocol == AVAHI_PROTO_UNSPEC) {
k = avahi_key_new(host_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_A);
r->record_browser_a = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
avahi_key_unref(k);
}
- if (aprotocol == AF_INET6 || aprotocol == AF_UNSPEC) {
+ if (aprotocol == AVAHI_PROTO_INET6 || aprotocol == AVAHI_PROTO_UNSPEC) {
k = avahi_key_new(host_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_AAAA);
r->record_browser_aaaa = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
avahi_key_unref(k);