forgot to pull the publish_no_reverse change to the example.

[catta] / avahi-common / address.c

diff --git a/avahi-common/address.c b/avahi-common/address.c
index d02d9977f37791fbf3f72f42e38f26ab28dbc45b..e8f61489f702570915a8e4ab9a438444651264f2 100644 (file)
--- a/avahi-common/address.c
+++ b/avahi-common/address.c
@@ -1,18 +1,16 @@
-/* $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
@@ -23,8 +21,8 @@
 #include <config.h>
 #endif
 
-#include <netinet/in.h>
 #include <sys/types.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <string.h>
@@ -34,7 +32,7 @@
 #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->proto == AVAHI_PROTO_INET)
@@ -48,25 +46,25 @@ size_t avahi_address_get_size(const AvahiAddress *a) {
 int avahi_address_cmp(const AvahiAddress *a, const AvahiAddress *b) {
     assert(a);
     assert(b);
-    
+
     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);
-    
+
     if (!(inet_ntop(avahi_proto_to_af(a->proto), a->data.data, s, length)))
         return NULL;
-    
+
     return s;
 }
 
-char* avahi_reverse_lookup_name(char *ret_s, size_t length, const AvahiAddress *a) {
+char* avahi_reverse_lookup_name(const AvahiAddress *a, char *ret_s, size_t length) {
     assert(ret_s);
     assert(length > 0);
     assert(a);
@@ -119,56 +117,13 @@ AvahiAddress *avahi_address_parse(const char *s, AvahiProtocol proto, AvahiAddre
     } else {
         if (inet_pton(avahi_proto_to_af(proto), s, ret_addr->data.data) <= 0)
             return NULL;
-        
+
         ret_addr->proto = proto;
     }
-    
-    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->proto = avahi_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));
-    else
-        memcpy(&ret_addr->data.ipv6, &((const struct sockaddr_in6*) sa)->sin6_addr, sizeof(ret_addr->data.ipv6));
 
     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);
-
-    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);
-}
-
-int avahi_address_is_ipv4_in_ipv6(const AvahiAddress *a) {
-
-    static const uint8_t ipv4_in_ipv6[] = {
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0xFF, 0xFF, 0xFF, 0xFF
-    };
-    
-    assert(a);
-
-    if (a->proto != AVAHI_PROTO_INET6)
-        return 0;
-
-    return memcmp(a->data.ipv6.address, ipv4_in_ipv6, sizeof(ipv4_in_ipv6)) == 0;
-}
-
 int avahi_proto_to_af(AvahiProtocol proto) {
     if (proto == AVAHI_PROTO_INET)
         return AF_INET;