X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Faddr-util.c;h=003f18223cb64cedc5ddbfed663808664b649a6c;hb=08ac450b42b7533e97c02c02bbbef8946b9582fb;hp=979b1b774d901af22abad6a0fa8b0ae8efc3ab89;hpb=37d19f15523b6fe4d1fef2329abe421221b3d4b3;p=catta

diff --git a/src/addr-util.c b/src/addr-util.c
index 979b1b7..003f182 100644
--- a/src/addr-util.c
+++ b/src/addr-util.c
@@ -1,18 +1,18 @@
 /***
-  This file is part of avahi.
+  This file is part of catta.
 
-  avahi is free software; you can redistribute it and/or modify it
+  catta 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
+  catta 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
+  License along with catta; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,13 +30,13 @@
 
 #include "addr-util.h"
 
-AvahiAddress *avahi_address_from_sockaddr(const struct sockaddr* sa, AvahiAddress *ret_addr) {
+CattaAddress *catta_address_from_sockaddr(const struct sockaddr* sa, CattaAddress *ret_addr) {
     assert(sa);
     assert(ret_addr);
 
     assert(sa->sa_family == AF_INET || sa->sa_family == AF_INET6);
 
-    ret_addr->proto = avahi_af_to_proto(sa->sa_family);
+    ret_addr->proto = catta_af_to_proto(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));
@@ -46,7 +46,7 @@ AvahiAddress *avahi_address_from_sockaddr(const struct sockaddr* sa, AvahiAddres
     return ret_addr;
 }
 
-uint16_t avahi_port_from_sockaddr(const struct sockaddr* sa) {
+uint16_t catta_port_from_sockaddr(const struct sockaddr* sa) {
     assert(sa);
 
     assert(sa->sa_family == AF_INET || sa->sa_family == AF_INET6);
@@ -57,7 +57,7 @@ uint16_t avahi_port_from_sockaddr(const struct sockaddr* sa) {
         return ntohs(((const struct sockaddr_in6*) sa)->sin6_port);
 }
 
-int avahi_address_is_ipv4_in_ipv6(const AvahiAddress *a) {
+int catta_address_is_ipv4_in_ipv6(const CattaAddress *a) {
 
     static const uint8_t ipv4_in_ipv6[] = {
         0x00, 0x00, 0x00, 0x00,
@@ -67,7 +67,7 @@ int avahi_address_is_ipv4_in_ipv6(const AvahiAddress *a) {
 
     assert(a);
 
-    if (a->proto != AVAHI_PROTO_INET6)
+    if (a->proto != CATTA_PROTO_INET6)
         return 0;
 
     return memcmp(a->data.ipv6.address, ipv4_in_ipv6, sizeof(ipv4_in_ipv6)) == 0;
@@ -78,14 +78,14 @@ int avahi_address_is_ipv4_in_ipv6(const AvahiAddress *a) {
 #define IPV6LL_NETWORK 0xFE80
 #define IPV6LL_NETMASK 0xFFC0
 
-int avahi_address_is_link_local(const AvahiAddress *a) {
+int catta_address_is_link_local(const CattaAddress *a) {
     assert(a);
 
-    if (a->proto == AVAHI_PROTO_INET) {
+    if (a->proto == CATTA_PROTO_INET) {
         uint32_t n = ntohl(a->data.ipv4.address);
         return (n & IPV4LL_NETMASK) == IPV4LL_NETWORK;
     }
-    else if (a->proto == AVAHI_PROTO_INET6) {
+    else if (a->proto == CATTA_PROTO_INET6) {
         unsigned n = (a->data.ipv6.address[0] << 8) | (a->data.ipv6.address[1] << 0);
         return (n & IPV6LL_NETMASK) == IPV6LL_NETWORK;
     }