Rename flx_* to avahi_*

[catta] / address.h

diff --git a/address.h b/address.h
index 33dcc279826e3dfb4f92e3b609a8642279cd0d1c..2eea75d49d61153a495c72761ea825cfee65ccc2 100644 (file)
--- a/address.h
+++ b/address.h
@@ -3,33 +3,38 @@
 
 #include <glib.h>
 
+#include <sys/socket.h>
+
 typedef struct {
     guint32 address;
-} flxIPv4Address;
+} AvahiIPv4Address;
 
 typedef struct {
     guint8 address[16];
-} flxIPv6Address;
+} AvahiIPv6Address;
 
 typedef struct {
-    guint family;
+    guchar family;
 
     union {
-        flxIPv6Address ipv6;
-        flxIPv4Address ipv4;
+        AvahiIPv6Address ipv6;
+        AvahiIPv4Address ipv4;
         guint8 data[0];
-    };
-} flxAddress;
+    } data;
+} AvahiAddress;
+
+guint avahi_address_get_size(const AvahiAddress *a);
+gint avahi_address_cmp(const AvahiAddress *a, const AvahiAddress *b);
 
-guint flx_address_get_size(const flxAddress *a);
-gint flx_address_cmp(const flxAddress *a, const flxAddress *b);
+gchar *avahi_address_snprint(char *ret_s, guint length, const AvahiAddress *a);
 
-gchar *flx_address_snprint(char *ret_s, guint length, const flxAddress *a);
+AvahiAddress *avahi_address_parse(const char *s, guchar family, AvahiAddress *ret_addr);
 
-flxAddress *flx_address_parse(const char *s, int family, flxAddress *ret_addr);
+AvahiAddress *avahi_address_from_sockaddr(const struct sockaddr* sa, AvahiAddress *ret_addr);
+guint16 avahi_port_from_sockaddr(const struct sockaddr* sa);
 
-gchar* flx_reverse_lookup_name_ipv4(const flxIPv4Address *a);
-gchar* flx_reverse_lookup_name_ipv6_arpa(const flxIPv6Address *a);
-gchar* flx_reverse_lookup_name_ipv6_int(const flxIPv6Address *a);
+gchar* avahi_reverse_lookup_name_ipv4(const AvahiIPv4Address *a);
+gchar* avahi_reverse_lookup_name_ipv6_arpa(const AvahiIPv6Address *a);
+gchar* avahi_reverse_lookup_name_ipv6_int(const AvahiIPv6Address *a);
 
 #endif