summaryrefslogtreecommitdiffstats
path: root/avahi-common/address.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-common/address.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-common/address.c')
-rw-r--r--avahi-common/address.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/avahi-common/address.c b/avahi-common/address.c
index 3e6fc97..b982a2c 100644
--- a/avahi-common/address.c
+++ b/avahi-common/address.c
@@ -33,9 +33,9 @@
guint avahi_address_get_size(const AvahiAddress *a) {
g_assert(a);
- if (a->family == AF_INET)
+ if (a->family == AVAHI_PROTO_INET)
return 4;
- else if (a->family == AF_INET6)
+ else if (a->family == AVAHI_PROTO_INET6)
return 16;
return 0;
@@ -111,18 +111,18 @@ gchar *avahi_reverse_lookup_name_ipv6_int(const AvahiIPv6Address *a) {
return reverse_lookup_name_ipv6(a, "ip6.int");
}
-AvahiAddress *avahi_address_parse(const char *s, guchar family, AvahiAddress *ret_addr) {
+AvahiAddress *avahi_address_parse(const gchar *s, AvahiProtocol family, AvahiAddress *ret_addr) {
g_assert(ret_addr);
g_assert(s);
- if (family == AF_UNSPEC) {
+ if (family == AVAHI_PROTO_UNSPEC) {
if (inet_pton(AF_INET, s, ret_addr->data.data) <= 0) {
if (inet_pton(AF_INET6, s, ret_addr->data.data) <= 0)
return NULL;
else
- ret_addr->family = AF_INET6;
+ ret_addr->family = AVAHI_PROTO_INET6;
} else
- ret_addr->family = AF_INET;
+ ret_addr->family = AVAHI_PROTO_INET;
} else {
if (inet_pton(family, s, ret_addr->data.data) <= 0)
return NULL;
@@ -168,7 +168,7 @@ gboolean avahi_address_is_ipv4_in_ipv6(const AvahiAddress *a) {
g_assert(a);
- if (a->family != AF_INET6)
+ if (a->family != AVAHI_PROTO_INET6)
return FALSE;
return memcmp(a->data.ipv6.address, ipv4_in_ipv6, sizeof(ipv4_in_ipv6)) == 0;