X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Futil.c;h=b1925f0e207f5a41686fe7f5d81d5ac1e285d9bf;hb=ee6736004d8662875e1a4a4a4f48faae7ea889b4;hp=fa97eecedbcc3eb6cb33482c09a0eb6becb98955;hpb=c58379bde376cb2298fca14f83a86626f1b76f2f;p=catta

diff --git a/avahi-core/util.c b/avahi-core/util.c
index fa97eec..b1925f0 100644
--- a/avahi-core/util.c
+++ b/avahi-core/util.c
@@ -24,194 +24,22 @@
 #endif
 
 #include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <limits.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <ctype.h>
 
+#include <avahi-common/malloc.h>
 #include "util.h"
 
-gchar *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);
-}
-
-gchar *avahi_normalize_name(const gchar *s) {
-    size_t l;
-    g_assert(s);
+void avahi_hexdump(const void* p, size_t size) {
+    const uint8_t *c = p;
+    assert(p);
 
-    l = strlen(s);
-
-    if (!l)
-        return g_strdup(".");
-
-    if (s[l-1] == '.')
-        return g_strdup(s);
-    
-    return g_strdup_printf("%s.", s);
-}
-
-gint avahi_timeval_compare(const GTimeVal *a, const GTimeVal *b) {
-    g_assert(a);
-    g_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;
-}
-
-glong avahi_timeval_diff(const GTimeVal *a, const GTimeVal *b) {
-    g_assert(a);
-    g_assert(b);
-
-    if (avahi_timeval_compare(a, b) < 0)
-        return avahi_timeval_diff(b, a);
-
-    return ((glong) a->tv_sec - b->tv_sec)*1000000 + a->tv_usec - b->tv_usec;
-}
-
-
-gint avahi_set_cloexec(gint fd) {
-    gint n;
-
-    g_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);
-}
-
-gint avahi_set_nonblock(gint fd) {
-    gint n;
-
-    g_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);
-}
-
-gint avahi_wait_for_write(gint fd) {
-    fd_set fds;
-    gint r;
-    
-    FD_ZERO(&fds);
-    FD_SET(fd, &fds);
-    
-    if ((r = select(fd+1, NULL, &fds, NULL, NULL)) < 0) {
-        g_message("select() failed: %s", strerror(errno));
-
-        return -1;
-    }
-    
-    g_assert(r > 0);
-
-    return 0;
-}
-
-GTimeVal *avahi_elapse_time(GTimeVal *tv, guint msec, guint jitter) {
-    g_assert(tv);
-
-    g_get_current_time(tv);
-
-    if (msec)
-        g_time_val_add(tv, msec*1000);
-
-    if (jitter)
-        g_time_val_add(tv, g_random_int_range(0, jitter) * 1000);
-        
-    return tv;
-}
-
-gint avahi_age(const GTimeVal *a) {
-    GTimeVal now;
-    
-    g_assert(a);
-
-    g_get_current_time(&now);
-
-    return avahi_timeval_diff(&now, a);
-}
-
-gboolean avahi_domain_cmp(const gchar *a, const gchar *b) {
-    int escaped_a = 0, escaped_b = 0;
-    g_assert(a);
-    g_assert(b);
-
-    for (;;) {
-        /* Check for escape characters "\" */
-        if ((escaped_a = *a == '\\'))
-            a ++;
-
-        if ((escaped_b = *b == '\\'))
-            b++;
-
-        /* Check for string end */
-        if (*a == 0 && *b == 0)
-            return 0;
-        
-        if (*a == 0 && !escaped_b && *b == '.' && *(b+1) == 0)
-            return 0;
-
-        if (!escaped_a && *a == '.' && *(a+1) == 0 && *b == 0)
-            return 0;
-
-        /* Compare characters */
-        if (escaped_a == escaped_b && *a != *b)
-            return *a < *b ? -1 : 1;
-
-        /* Next characters */
-        a++;
-        b++;
-        
-    }
-}
-
-gboolean avahi_domain_equal(const gchar *a, const gchar *b) {
-    return avahi_domain_cmp(a, b) == 0;
-}
-
-guint avahi_domain_hash(const gchar *p) {
-    char t[256];
-    strncpy(t, p, sizeof(t)-1);
-    t[sizeof(t)-1] = 0;
-
-    return g_int_hash(t);
-}
-
-void avahi_hexdump(gconstpointer p, guint size) {
-    const guint8 *c = p;
-    g_assert(p);
-
-    printf("Dumping %u bytes from %p:\n", size, p);
+    printf("Dumping %lu bytes from %p:\n", (unsigned long) size, p);
     
     while (size > 0) {
-        guint i;
+        unsigned i;
 
         for (i = 0; i < 16; i++) { 
             if (i < size)
@@ -237,3 +65,58 @@ void avahi_hexdump(gconstpointer p, guint size) {
         size -= 16;
     }
 }
+
+char *avahi_format_mac_address(char *r, size_t l, const uint8_t* mac, size_t size) {
+    char *t = r;
+    unsigned i;
+    static const char hex[] = "0123456789abcdef";
+
+    assert(r);
+    assert(l > 0);
+    assert(mac);
+    
+    if (size <= 0) {
+        *r = 0;
+        return r;
+    }
+    
+    for (i = 0; i < size; i++) {
+        if (l < 3)
+            break;
+        
+        *(t++) = hex[*mac >> 4];
+        *(t++) = hex[*mac & 0xF];
+        *(t++) = ':';
+
+        l -= 3;
+        
+        mac++;
+    }
+
+    if (t > r)
+        *(t-1) = 0;
+    else
+        *r = 0;
+    
+    return r;
+}
+
+char *avahi_strup(char *s) {
+    char *c;
+    assert(s);
+
+    for (c = s; *c; c++)
+        *c = (char) toupper(*c);
+
+    return s;
+}
+
+char *avahi_strdown(char *s) {
+    char *c;
+    assert(s);
+
+    for (c = s; *c; c++)
+        *c = (char) tolower(*c);
+
+    return s;
+}