From e63a65b3955b173a3e8d6b78c6377a518a9922d6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 11 Aug 2005 23:45:42 +0000 Subject: * drop glib from avahi-common * add new module with avahi_malloc() and friends git-svn-id: file:///home/lennart/svn/public/avahi/trunk@298 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-common/address.h | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'avahi-common/address.h') diff --git a/avahi-common/address.h b/avahi-common/address.h index 3b34551..8056ac9 100644 --- a/avahi-common/address.h +++ b/avahi-common/address.h @@ -23,7 +23,8 @@ ***/ #include -#include +#include + #include /** \file address.h Defintions and functions to manipulate IP addresses. */ @@ -31,10 +32,10 @@ AVAHI_C_DECL_BEGIN /** Protocol family specification, takes the values AVAHI_INET, AVAHI_INET6, AVAHI_UNSPEC */ -typedef guchar AvahiProtocol; +typedef unsigned char AvahiProtocol; /** Numeric network interface index. Takes OS dependent values and the special constant AVAHI_IF_UNSPEC */ -typedef gint AvahiIfIndex; +typedef int AvahiIfIndex; /** Values for AvahiProtocol */ enum { @@ -50,12 +51,12 @@ enum { /** An IPv4 address */ typedef struct { - guint32 address; /**< Address data in network byte order. */ + uint32_t address; /**< Address data in network byte order. */ } AvahiIPv4Address; /** An IPv6 address */ typedef struct { - guint8 address[16]; /**< Address data */ + uint8_t address[16]; /**< Address data */ } AvahiIPv6Address; /** Protocol (address family) independent address structure */ @@ -65,18 +66,18 @@ typedef struct { union { AvahiIPv6Address ipv6; /** Address when IPv6 */ AvahiIPv4Address ipv4; /** Address when IPv4 */ - guint8 data[1]; /** Type independant data field */ + uint8_t data[1]; /** Type independant data field */ } data; } AvahiAddress; /** Return the address data size of the specified address. (4 for IPv4, 16 for IPv6) */ -guint avahi_address_get_size(const AvahiAddress *a); +size_t avahi_address_get_size(const AvahiAddress *a); /** Compare two addresses. Returns 0 when equal, a negative value when a < b, a positive value when a > b. */ -gint avahi_address_cmp(const AvahiAddress *a, const AvahiAddress *b); +int avahi_address_cmp(const AvahiAddress *a, const AvahiAddress *b); /** Convert the specified address *a to a human readable character string */ -gchar *avahi_address_snprint(char *ret_s, guint length, const AvahiAddress *a); +char *avahi_address_snprint(char *ret_s, size_t length, const AvahiAddress *a); /** Convert the specifeid human readable character string to an * address structure. Set af to AVAHI_UNSPEC for automatic address @@ -87,20 +88,20 @@ AvahiAddress *avahi_address_parse(const char *s, AvahiProtocol af, AvahiAddress AvahiAddress *avahi_address_from_sockaddr(const struct sockaddr* sa, AvahiAddress *ret_addr); /** Return the port number of a sockaddr structure (either IPv4 or IPv6) */ -guint16 avahi_port_from_sockaddr(const struct sockaddr* sa); +uint16_t avahi_port_from_sockaddr(const struct sockaddr* sa); /** Generate the DNS reverse lookup name for an IPv4 address. g_free() the result! */ -gchar* avahi_reverse_lookup_name_ipv4(const AvahiIPv4Address *a); +char* avahi_reverse_lookup_name_ipv4(const AvahiIPv4Address *a); /** Generate the modern DNS reverse lookup name for an IPv6 address, ending in ipv6.arpa. g_free() the result! */ -gchar* avahi_reverse_lookup_name_ipv6_arpa(const AvahiIPv6Address *a); +char* avahi_reverse_lookup_name_ipv6_arpa(const AvahiIPv6Address *a); /** Generate the historic DNS reverse lookup name for an IPv6 address, ending in ipv6.int. g_free() the result! */ -gchar* avahi_reverse_lookup_name_ipv6_int(const AvahiIPv6Address *a); +char* avahi_reverse_lookup_name_ipv6_int(const AvahiIPv6Address *a); /** Check whether the specified IPv6 address is in fact an - * encapsulated IPv4 address */ -gboolean avahi_address_is_ipv4_in_ipv6(const AvahiAddress *a); + * encapsulated IPv4 address, returns 1 if yes, 0 otherwise */ +int avahi_address_is_ipv4_in_ipv6(const AvahiAddress *a); AVAHI_C_DECL_END -- cgit