-/* $Id$ */
-
/***
This file is part of avahi.
-
+
avahi 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
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
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
#endif
#include <sys/types.h>
+#include <netinet/in.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <string.h>
#include <assert.h>
+#include <stdio.h>
#include "address.h"
#include "malloc.h"
-size_t avahi_address_get_size(const AvahiAddress *a) {
+static size_t address_get_size(const AvahiAddress *a) {
assert(a);
- if (a->family == AVAHI_PROTO_INET)
+ if (a->proto == AVAHI_PROTO_INET)
return 4;
- else if (a->family == AVAHI_PROTO_INET6)
+ else if (a->proto == AVAHI_PROTO_INET6)
return 16;
return 0;
int avahi_address_cmp(const AvahiAddress *a, const AvahiAddress *b) {
assert(a);
assert(b);
-
- if (a->family != b->family)
+
+ if (a->proto != b->proto)
return -1;
- return memcmp(a->data.data, b->data.data, avahi_address_get_size(a));
+ return memcmp(a->data.data, b->data.data, address_get_size(a));
}
char *avahi_address_snprint(char *s, size_t length, const AvahiAddress *a) {
assert(s);
assert(length);
assert(a);
-
- return (char*) inet_ntop(a->family, a->data.data, s, length);
-}
-char* avahi_reverse_lookup_name_ipv4(const AvahiIPv4Address *a) {
- uint32_t n = ntohl(a->address);
- assert(a);
+ if (!(inet_ntop(avahi_proto_to_af(a->proto), a->data.data, s, length)))
+ return NULL;
- return avahi_strdup_printf("%u.%u.%u.%u.in-addr.arpa", n & 0xFF, (n >> 8) & 0xFF, (n >> 16) & 0xFF, n >> 24);
+ return s;
}
-static char *reverse_lookup_name_ipv6(const AvahiIPv6Address *a, const char *suffix) {
-
- return avahi_strdup_printf("%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%s",
- a->address[15] & 0xF,
- a->address[15] >> 4,
- a->address[14] & 0xF,
- a->address[14] >> 4,
- a->address[13] & 0xF,
- a->address[13] >> 4,
- a->address[12] & 0xF,
- a->address[12] >> 4,
- a->address[11] & 0xF,
- a->address[11] >> 4,
- a->address[10] & 0xF,
- a->address[10] >> 4,
- a->address[9] & 0xF,
- a->address[9] >> 4,
- a->address[8] & 0xF,
- a->address[8] >> 4,
- a->address[7] & 0xF,
- a->address[7] >> 4,
- a->address[6] & 0xF,
- a->address[6] >> 4,
- a->address[5] & 0xF,
- a->address[5] >> 4,
- a->address[4] & 0xF,
- a->address[4] >> 4,
- a->address[3] & 0xF,
- a->address[3] >> 4,
- a->address[2] & 0xF,
- a->address[2] >> 4,
- a->address[1] & 0xF,
- a->address[1] >> 4,
- a->address[0] & 0xF,
- a->address[0] >> 4,
- suffix);
-}
+char* avahi_reverse_lookup_name(const AvahiAddress *a, char *ret_s, size_t length) {
+ assert(ret_s);
+ assert(length > 0);
+ assert(a);
-char *avahi_reverse_lookup_name_ipv6_arpa(const AvahiIPv6Address *a) {
- return reverse_lookup_name_ipv6(a, "ip6.arpa");
-}
+ if (a->proto == AVAHI_PROTO_INET) {
+ uint32_t n = ntohl(a->data.ipv4.address);
+ snprintf(
+ ret_s, length,
+ "%u.%u.%u.%u.in-addr.arpa",
+ n & 0xFF, (n >> 8) & 0xFF, (n >> 16) & 0xFF, n >> 24);
+ } else {
+ assert(a->proto == AVAHI_PROTO_INET6);
+
+ snprintf(
+ ret_s, length,
+ "%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.ip6.arpa",
+ a->data.ipv6.address[15] & 0xF, a->data.ipv6.address[15] >> 4,
+ a->data.ipv6.address[14] & 0xF, a->data.ipv6.address[14] >> 4,
+ a->data.ipv6.address[13] & 0xF, a->data.ipv6.address[13] >> 4,
+ a->data.ipv6.address[12] & 0xF, a->data.ipv6.address[12] >> 4,
+ a->data.ipv6.address[11] & 0xF, a->data.ipv6.address[11] >> 4,
+ a->data.ipv6.address[10] & 0xF, a->data.ipv6.address[10] >> 4,
+ a->data.ipv6.address[ 9] & 0xF, a->data.ipv6.address[ 9] >> 4,
+ a->data.ipv6.address[ 8] & 0xF, a->data.ipv6.address[ 8] >> 4,
+ a->data.ipv6.address[ 7] & 0xF, a->data.ipv6.address[ 7] >> 4,
+ a->data.ipv6.address[ 6] & 0xF, a->data.ipv6.address[ 6] >> 4,
+ a->data.ipv6.address[ 5] & 0xF, a->data.ipv6.address[ 5] >> 4,
+ a->data.ipv6.address[ 4] & 0xF, a->data.ipv6.address[ 4] >> 4,
+ a->data.ipv6.address[ 3] & 0xF, a->data.ipv6.address[ 3] >> 4,
+ a->data.ipv6.address[ 2] & 0xF, a->data.ipv6.address[ 2] >> 4,
+ a->data.ipv6.address[ 1] & 0xF, a->data.ipv6.address[ 1] >> 4,
+ a->data.ipv6.address[ 0] & 0xF, a->data.ipv6.address[ 0] >> 4);
+ }
-char *avahi_reverse_lookup_name_ipv6_int(const AvahiIPv6Address *a) {
- return reverse_lookup_name_ipv6(a, "ip6.int");
+ return ret_s;
}
-AvahiAddress *avahi_address_parse(const char *s, AvahiProtocol family, AvahiAddress *ret_addr) {
+AvahiAddress *avahi_address_parse(const char *s, AvahiProtocol proto, AvahiAddress *ret_addr) {
assert(ret_addr);
assert(s);
- if (family == AVAHI_PROTO_UNSPEC) {
+ if (proto == 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 = AVAHI_PROTO_INET6;
+ ret_addr->proto = AVAHI_PROTO_INET6;
} else
- ret_addr->family = AVAHI_PROTO_INET;
+ ret_addr->proto = AVAHI_PROTO_INET;
} else {
- if (inet_pton(family, s, ret_addr->data.data) <= 0)
+ if (inet_pton(avahi_proto_to_af(proto), s, ret_addr->data.data) <= 0)
return NULL;
-
- ret_addr->family = family;
- }
-
- return ret_addr;
-}
-
-AvahiAddress *avahi_address_from_sockaddr(const struct sockaddr* sa, AvahiAddress *ret_addr) {
- assert(sa);
- assert(ret_addr);
-
- assert(sa->sa_family == AF_INET || sa->sa_family == AF_INET6);
- ret_addr->family = sa->sa_family;
-
- if (sa->sa_family == AF_INET)
- memcpy(&ret_addr->data.ipv4, &((const struct sockaddr_in*) sa)->sin_addr, sizeof(ret_addr->data.ipv4));
- else
- memcpy(&ret_addr->data.ipv6, &((const struct sockaddr_in6*) sa)->sin6_addr, sizeof(ret_addr->data.ipv6));
+ ret_addr->proto = proto;
+ }
return ret_addr;
}
-uint16_t avahi_port_from_sockaddr(const struct sockaddr* sa) {
- assert(sa);
-
- assert(sa->sa_family == AF_INET || sa->sa_family == AF_INET6);
+int avahi_proto_to_af(AvahiProtocol proto) {
+ if (proto == AVAHI_PROTO_INET)
+ return AF_INET;
+ if (proto == AVAHI_PROTO_INET6)
+ return AF_INET6;
- if (sa->sa_family == AF_INET)
- return ntohs(((const struct sockaddr_in*) sa)->sin_port);
- else
- return ntohs(((const struct sockaddr_in6*) sa)->sin6_port);
+ assert(proto == AVAHI_PROTO_UNSPEC);
+ return AF_UNSPEC;
}
-int avahi_address_is_ipv4_in_ipv6(const AvahiAddress *a) {
+AvahiProtocol avahi_af_to_proto(int af) {
+ if (af == AF_INET)
+ return AVAHI_PROTO_INET;
+ if (af == AF_INET6)
+ return AVAHI_PROTO_INET6;
- static const uint8_t ipv4_in_ipv6[] = {
- 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00,
- 0xFF, 0xFF, 0xFF, 0xFF
- };
-
- assert(a);
+ assert(af == AF_UNSPEC);
+ return AVAHI_PROTO_UNSPEC;
+}
- if (a->family != AVAHI_PROTO_INET6)
- return 0;
+const char* avahi_proto_to_string(AvahiProtocol proto) {
+ if (proto == AVAHI_PROTO_INET)
+ return "IPv4";
+ if (proto == AVAHI_PROTO_INET6)
+ return "IPv6";
- return memcmp(a->data.ipv6.address, ipv4_in_ipv6, sizeof(ipv4_in_ipv6)) == 0;
+ assert(proto == AVAHI_PROTO_UNSPEC);
+ return "UNSPEC";
}
-
projects / catta / blobdiff