X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2Faddress.h;h=a14104fad658a6d72603d6210a13a48e4f3c0fc2;hb=9c0f9c65093cfa53d45f9b68782321eb8063a032;hp=7f10a55d4e8c5a89fa328c1c7f952250d03b6d98;hpb=394b91f04a9a8901ec6896907cbe5ad998d4338e;p=catta diff --git a/avahi-common/address.h b/avahi-common/address.h index 7f10a55..a14104f 100644 --- a/avahi-common/address.h +++ b/avahi-common/address.h @@ -1,21 +1,19 @@ #ifndef fooaddresshfoo #define fooaddresshfoo -/* $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 @@ -53,7 +51,7 @@ enum { #define AVAHI_ADDRESS_STR_MAX 40 /* IPv6 Max = 4*8 + 7 + 1 for NUL */ /** Return TRUE if the specified interface index is valid */ -#define AVAHI_IF_VALID(ifindex) (((ifindex) > 0) || ((ifindex) == AVAHI_PROTO_UNSPEC)) +#define AVAHI_IF_VALID(ifindex) (((ifindex) >= 0) || ((ifindex) == AVAHI_IF_UNSPEC)) /** Return TRUE if the specified protocol is valid */ #define AVAHI_PROTO_VALID(protocol) (((protocol) == AVAHI_PROTO_INET) || ((protocol) == AVAHI_PROTO_INET6) || ((protocol) == AVAHI_PROTO_UNSPEC)) @@ -75,23 +73,35 @@ typedef struct AvahiAddress { union { AvahiIPv6Address ipv6; /**< Address when IPv6 */ AvahiIPv4Address ipv4; /**< Address when IPv4 */ - uint8_t data[1]; /**< Type independant data field */ + uint8_t data[1]; /**< Type-independent data field */ } data; } AvahiAddress; +/** @{ \name Comparison */ + /** Compare two addresses. Returns 0 when equal, a negative value when a < b, a positive value when a > b. */ int avahi_address_cmp(const AvahiAddress *a, const AvahiAddress *b); +/** @} */ + +/** @{ \name String conversion */ + /** Convert the specified address *a to a human readable character string, use AVAHI_ADDRESS_STR_MAX to allocate an array of the right size */ char *avahi_address_snprint(char *ret_s, size_t length, const AvahiAddress *a); -/** Convert the specifeid human readable character string to an +/** Convert the specified human readable character string to an * address structure. Set af to AVAHI_UNSPEC for automatic address * family detection. */ AvahiAddress *avahi_address_parse(const char *s, AvahiProtocol af, AvahiAddress *ret_addr); +/** @} */ + +/** \cond fulldocs */ /** Generate the DNS reverse lookup name for an IPv4 or IPv6 address. */ char* avahi_reverse_lookup_name(const AvahiAddress *a, char *ret_s, size_t length); +/** \endcond */ + +/** @{ \name Protocol/address family handling */ /** Map AVAHI_PROTO_xxx constants to Unix AF_xxx constants */ int avahi_proto_to_af(AvahiProtocol proto); @@ -102,6 +112,8 @@ AvahiProtocol avahi_af_to_proto(int af); /** Return a textual representation of the specified protocol number. i.e. "IPv4", "IPv6" or "UNSPEC" */ const char* avahi_proto_to_string(AvahiProtocol proto); +/** @} */ + AVAHI_C_DECL_END #endif