Split avahi-common/util.h into

	avahi-common/domain.h
	avahi-core/fdutil.h
	avahi-core/timeval.h


git-svn-id: file:///home/lennart/svn/public/avahi/trunk@299 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

1 files changed, 0 insertions, 540 deletions

diff --git a/avahi-common/util.c b/avahi-common/util.c
deleted file mode 100644
index cc80fe5..0000000
--- a/avahi-common/util.c
+++ /dev/null
@@ -1,540 +0,0 @@
-/* $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
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#include "util.h"
-#include "malloc.h"
-
-char *avahi_get_host_name(void) {
-#ifdef HOST_NAME_MAX
-    char t[HOST_NAME_MAX];
-#else
-    char t[256];
-#endif
-    gethostname(t, sizeof(t));
-    t[sizeof(t)-1] = 0;
-    return avahi_normalize_name(t);
-}
-
-static char *unescape_uneeded(const char *src, char *ret_dest, size_t size) {
-    int escaped = 0;
-    
-    assert(src);
-    assert(ret_dest);
-    assert(size > 0);
-    
-    for (; *src; src++) {
-
-        if (!escaped && *src == '\\')
-            escaped = 1;
-        else if (escaped && (*src == '.' || *src == '\\')) {
-
-            if ((size -= 2) <= 1) break;
-            
-            *(ret_dest++) = '\\';
-            *(ret_dest++) = *src;
-            escaped = 0;
-        } else {
-            if (--size <= 1) break;
-
-            *(ret_dest++) = *src;
-            escaped = 0;
-        }
-
-    }
-
-    *ret_dest = 0;
-    
-    return ret_dest;
-}
-
-char *avahi_normalize_name(const char *s) {
-    char tmp[256];
-    size_t l;
-    
-    assert(s);
-
-    unescape_uneeded(s, tmp, sizeof(tmp));
-
-    l = strlen(tmp);
-
-    while (l > 0 && tmp[l-1] == '.')
-        tmp[--l] = 0;
-
-    return avahi_strdup(tmp);
-}
-
-int avahi_timeval_compare(const struct timeval *a, const struct timeval *b) {
-    assert(a);
-    assert(b);
-
-    if (a->tv_sec < b->tv_sec)
-        return -1;
-
-    if (a->tv_sec > b->tv_sec)
-        return 1;
-
-    if (a->tv_usec < b->tv_usec)
-        return -1;
-
-    if (a->tv_usec > b->tv_usec)
-        return 1;
-
-    return 0;
-}
-
-AvahiUsec avahi_timeval_diff(const struct timeval *a, const struct timeval *b) {
-    assert(a);
-    assert(b);
-
-    if (avahi_timeval_compare(a, b) < 0)
-        return - avahi_timeval_diff(b, a);
-
-    return ((AvahiUsec) a->tv_sec - b->tv_sec)*1000000 + a->tv_usec - b->tv_usec;
-}
-
-struct timeval* avahi_timeval_add(struct timeval *a, AvahiUsec usec) {
-    AvahiUsec u;
-    assert(a);
-
-    u = usec + a->tv_usec;
-
-    if (u < 0) {
-        a->tv_usec = (long) (1000000 + (u % 1000000));
-        a->tv_sec += (long) (-1 + (u / 1000000));
-    } else {
-        a->tv_usec = (long) (u % 1000000);
-        a->tv_sec += (long) (u / 1000000);
-    }
-
-    return a;
-}
-
-AvahiUsec avahi_age(const struct timeval *a) {
-    struct timeval now;
-    
-    assert(a);
-
-    gettimeofday(&now, NULL);
-
-    return avahi_timeval_diff(&now, a);
-}
-
-
-struct timeval *avahi_elapse_time(struct timeval *tv, unsigned msec, unsigned jitter) {
-    assert(tv);
-
-    gettimeofday(tv, NULL);
-
-    if (msec)
-        avahi_timeval_add(tv, (AvahiUsec) msec*1000);
-
-    if (jitter)
-        avahi_timeval_add(tv, (AvahiUsec) (jitter*1000.0*rand()/(RAND_MAX+1.0)));
-        
-    return tv;
-}
-
-int avahi_set_cloexec(int fd) {
-    int n;
-
-    assert(fd >= 0);
-    
-    if ((n = fcntl(fd, F_GETFD)) < 0)
-        return -1;
-
-    if (n & FD_CLOEXEC)
-        return 0;
-
-    return fcntl(fd, F_SETFD, n|FD_CLOEXEC);
-}
-
-int avahi_set_nonblock(int fd) {
-    int n;
-    
-    assert(fd >= 0);
-
-    if ((n = fcntl(fd, F_GETFL)) < 0)
-        return -1;
-
-    if (n & O_NONBLOCK)
-        return 0;
-
-    return fcntl(fd, F_SETFL, n|O_NONBLOCK);
-}
-
-int avahi_wait_for_write(int fd) {
-    fd_set fds;
-    int r;
-    
-    FD_ZERO(&fds);
-    FD_SET(fd, &fds);
-    
-    if ((r = select(fd+1, NULL, &fds, NULL, NULL)) < 0)
-        return -1;
-    
-    assert(r > 0);
-
-    return 0;
-}
-
-/* Read the first label from string *name, unescape "\" and write it to dest */
-char *avahi_unescape_label(const char **name, char *dest, size_t size) {
-    unsigned i = 0;
-    char *d;
-    
-    assert(dest);
-    assert(size > 0);
-    assert(name);
-
-    if (!**name)
-        return NULL;
-
-    d = dest;
-    
-    for (;;) {
-        if (i >= size)
-            return NULL;
-
-        if (**name == '.') {
-            (*name)++;
-            break;
-        }
-        
-        if (**name == 0)
-            break;
-        
-        if (**name == '\\') {
-            (*name) ++;
-            
-            if (**name == 0)
-                break;
-        }
-        
-        *(d++) = *((*name) ++);
-        i++;
-    }
-
-    assert(i < size);
-
-    *d = 0;
-
-    return dest;
-}
-
-/* Escape "\" and ".", append \0 */
-char *avahi_escape_label(const uint8_t* src, size_t src_length, char **ret_name, size_t *ret_size) {
-    char *r;
-
-    assert(src);
-    assert(ret_name);
-    assert(*ret_name);
-    assert(ret_size);
-    assert(*ret_size > 0);
-
-    r = *ret_name;
-
-    while (src_length > 0) {
-        if (*src == '.' || *src == '\\') {
-            if (*ret_size < 3)
-                return NULL;
-            
-            *((*ret_name) ++) = '\\';
-            (*ret_size) --;
-        }
-
-        if (*ret_size < 2)
-            return NULL;
-        
-        *((*ret_name)++) = *src;
-        (*ret_size) --;
-
-        src_length --;
-        src++;
-    }
-
-    **ret_name = 0;
-
-    return r;
-}
-
-int avahi_domain_equal(const char *a, const char *b) {
-    assert(a);
-    assert(b);
-
-    if (a == b)
-        return 1;
-    
-    for (;;) {
-        char ca[65], cb[65], *pa, *pb;
-
-        pa = avahi_unescape_label(&a, ca, sizeof(ca));
-        pb = avahi_unescape_label(&b, cb, sizeof(cb));
-
-        if (!pa && !pb)
-            return 1;
-        else if ((pa && !pb) || (!pa && pb))
-            return 0;
-
-        if (strcasecmp(pa, pb))
-            return 0;
-    }
-
-    return 1;
-}
-
-int avahi_binary_domain_cmp(const char *a, const char *b) {
-    assert(a);
-    assert(b);
-
-    if (a == b)
-        return 0;
-
-    for (;;) {
-        char ca[65], cb[65], *pa, *pb;
-        int r;
-
-        pa = avahi_unescape_label(&a, ca, sizeof(ca));
-        pb = avahi_unescape_label(&b, cb, sizeof(cb));
-
-        if (!pa && !pb)
-            return 0;
-        else if (pa && !pb)
-            return 1;
-        else if (!pa && pb)
-            return -1;
-        
-        if ((r = strcmp(pa, pb)))
-            return r;
-    }
-}
-
-void avahi_hexdump(const void* p, size_t size) {
-    const uint8_t *c = p;
-    assert(p);
-
-    printf("Dumping %u bytes from %p:\n", size, p);
-    
-    while (size > 0) {
-        unsigned i;
-
-        for (i = 0; i < 16; i++) { 
-            if (i < size)
-                printf("%02x ", c[i]);
-            else
-                printf("   ");
-        }
-
-        for (i = 0; i < 16; i++) {
-            if (i < size)
-                printf("%c", c[i] >= 32 && c[i] < 127 ? c[i] : '.');
-            else
-                printf(" ");
-        }
-        
-        printf("\n");
-
-        c += 16;
-
-        if (size <= 16)
-            break;
-        
-        size -= 16;
-    }
-}
-
-unsigned avahi_strhash(const char *p) {
-    unsigned hash = 0;
-
-    for (; *p; p++)
-        hash = 31 * hash + *p;
-
-    return hash;
-}
-
-unsigned avahi_domain_hash(const char *s) {
-    unsigned hash = 0;
-    
-    for (;;) {
-        char c[65];
-
-        if (!avahi_unescape_label(&s, c, sizeof(c)))
-            return hash;
-
-        if (!c[0])
-            continue;
-        
-        hash += avahi_strhash(avahi_strdown(c));
-    }
-}
-
-char *avahi_format_mac_address(const uint8_t* mac, size_t size) {
-    char *r, *t;
-    unsigned i;
-    static const char hex[] = "0123456789abcdef";
-
-    t = r = avahi_new(char, size > 0 ? size*3 : 1);
-
-    if (size <= 0) {
-        *r = 0;
-        return r;
-    }
-    
-    for (i = 0; i < size; i++) {
-        *(t++) = hex[*mac >> 4];
-        *(t++) = hex[*mac & 0xF];
-        *(t++) = ':';
-
-        mac++;
-    }
-
-    *(--t) = 0;
-    return r;
-}
-
-int avahi_valid_service_type(const char *t) {
-    const char *p;
-    assert(t);
-
-    if (strlen(t) < 5)
-        return 0;
-    
-    if (*t != '_')
-        return 0;
-
-    if (!(p = strchr(t, '.')))
-        return 0;
-
-    if (p - t > 63 || p - t < 2)
-        return 0;
-
-    if (*(++p) != '_')
-        return 0;
-
-    if (strchr(p, '.'))
-        return 0;
-
-    if (strlen(p) > 63 || strlen(p) < 2)
-        return 0;
-    
-    return 1;
-}
-
-int avahi_valid_domain_name(const char *t) {
-    const char *p, *dp;
-    int dot = 0;
-        
-    assert(t);
-
-    if (*t == 0)
-        return 0;
-
-    /* Domains may not start with a dot */
-    if (*t == '.')
-        return 0;
-
-    dp = t; 
-
-    for (p = t; *p; p++) {
-
-        if (*p == '.') {
-            if (dot) /* Two subsequent dots */
-                return 0;
-
-            if (p - dp > 63)
-                return 0;
-
-            dot = 1;
-            dp = p + 1;
-        } else
-            dot = 0;
-
-    }
-
-    if (p - dp > 63)
-        return 0;
-
-    /* A trailing dot IS allowed */
-    
-    return 1;
-}
-
-int avahi_valid_service_name(const char *t) {
-    assert(t);
-
-    if (*t == 0)
-        return 0;
-
-    if (strlen(t) > 63)
-        return 0;
-
-    return 1;
-}
-
-int avahi_valid_host_name(const char *t) {
-    assert(t);
-
-    if (*t == 0)
-        return 0;
-
-    if (strlen(t) > 63)
-        return 0;
-
-    if (strchr(t, '.'))
-        return 0;
-
-    return 1;
-}
-
-char *avahi_strdown(char *s) {
-    char *c;
-    
-    assert(s);
-
-    for (c = s; *c; c++)
-        *c = (char) tolower(*c);
-
-    return s;
-}
-
-char *avahi_strup(char *s) {
-    char *c;
-    assert(s);
-
-    for (c = s; *c; c++)
-        *c = (char) toupper(*c);
-
-    return s;
-}
-