From 9962a048634c590db23a00db1d01daada779844c Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 24 Jun 2005 19:02:51 +0000
Subject: * 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
---
 avahi-core/resolve-service.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'avahi-core/resolve-service.c')

diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c
index deb4cdb..8fe9fd2 100644
--- a/avahi-core/resolve-service.c
+++ b/avahi-core/resolve-service.c
@@ -94,12 +94,12 @@ static void finish(AvahiServiceResolver *r, AvahiResolverEvent event) {
         
         switch (r->address_record->key->type) {
             case AVAHI_DNS_TYPE_A:
-                a.family = AF_INET;
+                a.family = AVAHI_PROTO_INET;
                 a.data.ipv4 = r->address_record->data.a.address;
                 break;
                 
             case AVAHI_DNS_TYPE_AAAA:
-                a.family = AF_INET6;
+                a.family = AVAHI_PROTO_INET6;
                 a.data.ipv6 = r->address_record->data.aaaa.address;
                 break;
                 
@@ -134,13 +134,13 @@ static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, gucha
     if (r->interface > 0 && interface != r->interface)
         return;
 
-    if (r->protocol != AF_UNSPEC && protocol != r->protocol)
+    if (r->protocol != AVAHI_PROTO_UNSPEC && protocol != r->protocol)
         return;
     
     if (r->interface <= 0)
         r->interface = interface;
 
-    if (r->protocol == AF_UNSPEC)
+    if (r->protocol == AVAHI_PROTO_UNSPEC)
         r->protocol = protocol;
     
     switch (record->key->type) {
@@ -150,13 +150,13 @@ static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, gucha
 
                 g_assert(!r->record_browser_a && !r->record_browser_aaaa);
                 
-                if (r->address_protocol == AF_INET || r->address_protocol == AF_UNSPEC) {
+                if (r->address_protocol == AVAHI_PROTO_INET || r->address_protocol == AVAHI_PROTO_UNSPEC) {
                     AvahiKey *k = avahi_key_new(r->srv_record->data.srv.name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_A);
                     r->record_browser_a = avahi_record_browser_new(r->server, r->interface, r->protocol, k, record_browser_callback, r);
                     avahi_key_unref(k);
                 } 
                 
-                if (r->address_protocol == AF_INET6 || r->address_protocol == AF_UNSPEC) {
+                if (r->address_protocol == AVAHI_PROTO_INET6 || r->address_protocol == AVAHI_PROTO_UNSPEC) {
                     AvahiKey *k = avahi_key_new(r->srv_record->data.srv.name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_AAAA);
                     r->record_browser_aaaa = avahi_record_browser_new(r->server, r->interface, r->protocol, k, record_browser_callback, r);
                     avahi_key_unref(k);
@@ -204,7 +204,7 @@ AvahiServiceResolver *avahi_service_resolver_new(AvahiServer *server, gint inter
     g_assert(type);
     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(AvahiServiceResolver, 1);
     r->server = server;
-- 
cgit