* add new macros AVAHI_IF_VALID, AVAHI_PROTO_VALID

[catta] / avahi-core / resolve-host-name.c

diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c
index ae7ef783a0db2eefbbd94a9fc9cceb79549082ff..7bb5727bb4d6dc7e324ffbbbf37f8315921b1466 100644 (file)
--- a/avahi-core/resolve-host-name.c
+++ b/avahi-core/resolve-host-name.c
@@ -72,12 +72,12 @@ static void finish(AvahiSHostNameResolver *r, AvahiResolverEvent event) {
     
         switch (r->address_record->key->type) {
             case AVAHI_DNS_TYPE_A:
-                a.family = AVAHI_PROTO_INET;
+                a.proto = AVAHI_PROTO_INET;
                 a.data.ipv4 = r->address_record->data.a.address;
                 break;
                 
             case AVAHI_DNS_TYPE_AAAA:
-                a.family = AVAHI_PROTO_INET6;
+                a.proto = AVAHI_PROTO_INET6;
                 a.data.ipv6 = r->address_record->data.aaaa.address;
                 break;
                 
@@ -141,7 +141,7 @@ static void record_browser_callback(AvahiSRecordBrowser*rr, AvahiIfIndex interfa
 
         assert(event == AVAHI_BROWSER_REMOVE);
 
-        if (avahi_record_equal_no_ttl(record, r->address_record)) {
+        if (r->address_record && avahi_record_equal_no_ttl(record, r->address_record)) {
             avahi_record_unref(r->address_record);
             r->address_record = NULL;