X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2Fstrlst.c;h=b861cf82eaad58bb823c5fdbea0f1db44ed70cba;hb=f3d2bd3ed27d895da403abe7c7f1c4cead4b3693;hp=46ed852720766b5df780c2d75f6f0fa5b7129caf;hpb=aa458a0a13d18882354f33c07b0a4e8e82e7a424;p=catta

diff --git a/avahi-common/strlst.c b/avahi-common/strlst.c
index 46ed852..b861cf8 100644
--- a/avahi-common/strlst.c
+++ b/avahi-common/strlst.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
@@ -25,58 +23,86 @@
 
 #include <string.h>
 #include <stdarg.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "strlst.h"
+#include "malloc.h"
+#include "defs.h"
 
-AvahiStringList*avahi_string_list_add_anonymous(AvahiStringList *l, guint size) {
+AvahiStringList*avahi_string_list_add_anonymous(AvahiStringList *l, size_t size) {
     AvahiStringList *n;
 
-    n = g_malloc(sizeof(AvahiStringList) + size);
+    if (!(n = avahi_malloc(sizeof(AvahiStringList) + size)))
+        return NULL;
+
     n->next = l;
     n->size = size;
-    
+
+    /* NUL terminate strings, just to make sure */
+    n->text[size] = 0;
+
     return n;
 }
 
-AvahiStringList *avahi_string_list_add_arbitrary(AvahiStringList *l, const guint8*text, guint size) {
+AvahiStringList *avahi_string_list_add_arbitrary(AvahiStringList *l, const uint8_t*text, size_t size) {
     AvahiStringList *n;
 
-    g_assert(text);
+    assert(size == 0 || text);
 
-    n = avahi_string_list_add_anonymous(l, size);
+    if (!(n = avahi_string_list_add_anonymous(l, size)))
+        return NULL;
 
     if (size > 0)
         memcpy(n->text, text, size);
-    
+
     return n;
 }
 
-AvahiStringList *avahi_string_list_add(AvahiStringList *l, const gchar *text) {
-    g_assert(text);
+AvahiStringList *avahi_string_list_add(AvahiStringList *l, const char *text) {
+    assert(text);
 
-    return avahi_string_list_add_arbitrary(l, (const guint8*) text, strlen(text));
+    return avahi_string_list_add_arbitrary(l, (const uint8_t*) text, strlen(text));
 }
 
-AvahiStringList *avahi_string_list_parse(gconstpointer data, guint size) {
+int avahi_string_list_parse(const void* data, size_t size, AvahiStringList **ret) {
+    const uint8_t *c;
     AvahiStringList *r = NULL;
-    const guint8 *c;
-    g_assert(data);
+
+    assert(data);
+    assert(ret);
 
     c = data;
-    for (;;) {
-        guint k;
-        
-        if (size < 1)
-            break;
+    while (size > 0) {
+        size_t k;
 
         k = *(c++);
-        r = avahi_string_list_add_arbitrary(r, c, k);
-        c += k;
+        size--;
 
-        size -= 1 + k;
+        if (k > size)
+            goto fail; /* Overflow */
+
+        if (k > 0) { /* Ignore empty strings */
+            AvahiStringList *n;
+
+            if (!(n = avahi_string_list_add_arbitrary(r, c, k)))
+                goto fail; /* OOM */
+
+            r = n;
+        }
+
+        c += k;
+        size -= k;
     }
 
-    return r;
+    *ret = r;
+
+    return 0;
+
+fail:
+    avahi_string_list_free(r);
+    return -1;
 }
 
 void avahi_string_list_free(AvahiStringList *l) {
@@ -84,7 +110,7 @@ void avahi_string_list_free(AvahiStringList *l) {
 
     while (l) {
         n = l->next;
-        g_free(l);
+        avahi_free(l);
         l = n;
     }
 }
@@ -102,13 +128,11 @@ AvahiStringList* avahi_string_list_reverse(AvahiStringList *l) {
     return r;
 }
 
-gchar* avahi_string_list_to_string(AvahiStringList *l) {
+char* avahi_string_list_to_string(AvahiStringList *l) {
     AvahiStringList *n;
-    guint s = 0;
-    gchar *t, *e;
+    size_t s = 0;
+    char *t, *e;
 
-    l = avahi_string_list_reverse(l);
-    
     for (n = l; n; n = n->next) {
         if (n != l)
             s ++;
@@ -116,91 +140,112 @@ gchar* avahi_string_list_to_string(AvahiStringList *l) {
         s += n->size+2;
     }
 
-    t = e = g_new(gchar, s+1);
+    if (!(t = e = avahi_new(char, s+1)))
+        return NULL;
+
+    l = avahi_string_list_reverse(l);
 
     for (n = l; n; n = n->next) {
         if (n != l)
             *(e++) = ' ';
 
         *(e++) = '"';
-        strncpy(e, (gchar*) n->text, n->size);
+        strncpy(e, (char*) n->text, n->size);
         e[n->size] = 0;
         e = strchr(e, 0);
         *(e++) = '"';
 
-        g_assert(e);
+        assert(e);
     }
 
     l = avahi_string_list_reverse(l);
-    
+
     *e = 0;
 
     return t;
 }
 
-guint avahi_string_list_serialize(AvahiStringList *l, gpointer data, guint size) {
-    guint used = 0;
+size_t avahi_string_list_serialize(AvahiStringList *l, void *data, size_t size) {
+    size_t used = 0;
 
     if (data) {
-        guint8 *c;
         AvahiStringList *n;
-    
-        g_assert(data);
-        
+        uint8_t *c;
+
         l = avahi_string_list_reverse(l);
         c = data;
-        
-        for (n = l; n; n = n->next) {
-            guint k;
-            if (size < 1)
-                break;
-            
-            k = n->size;
+
+        for (n = l; size > 1 && n; n = n->next) {
+            size_t k;
+
+            if ((k = n->size) == 0)
+                /* Skip empty strings */
+                continue;
+
             if (k > 255)
+                /* Truncate strings at 255 characters */
                 k = 255;
-            
+
             if (k > size-1)
+                /* Make sure this string fits in */
                 k = size-1;
-            
-            *(c++) = k;
+
+            *(c++) = (uint8_t) k;
             memcpy(c, n->text, k);
             c += k;
-            
-            used += 1+ k;
+
+            used += 1 + k;
+            size -= 1 + k;
         }
-        
+
         l = avahi_string_list_reverse(l);
+
+        if (used == 0 && size > 0) {
+
+            /* Empty lists are treated specially. To comply with
+             * section 6.1 of the DNS-SD spec, we return a single
+             * empty string (i.e. a NUL byte)*/
+
+            *(uint8_t*) data = 0;
+            used = 1;
+        }
+
     } else {
         AvahiStringList *n;
 
         for (n = l; n; n = n->next) {
-            guint k;
-        
-            k = n->size;
+            size_t k;
+
+            if ((k = n->size) == 0)
+                continue;
+
             if (k > 255)
                 k = 255;
-            
+
             used += 1+k;
         }
+
+        if (used == 0)
+            used = 1;
     }
 
     return used;
 }
 
-gboolean avahi_string_list_equal(const AvahiStringList *a, const AvahiStringList *b) {
+int avahi_string_list_equal(const AvahiStringList *a, const AvahiStringList *b) {
 
     for (;;) {
         if (!a && !b)
-            return TRUE;
+            return 1;
 
         if (!a || !b)
-            return FALSE;
+            return 0;
 
         if (a->size != b->size)
-            return FALSE;
+            return 0;
 
         if (a->size != 0 && memcmp(a->text, b->text, a->size) != 0)
-            return FALSE;
+            return 0;
 
         a = a->next;
         b = b->next;
@@ -213,21 +258,20 @@ AvahiStringList *avahi_string_list_add_many(AvahiStringList *r, ...) {
     va_start(va, r);
     r = avahi_string_list_add_many_va(r, va);
     va_end(va);
-    
+
     return r;
 }
 
 AvahiStringList *avahi_string_list_add_many_va(AvahiStringList *r, va_list va) {
-    const gchar *txt;
+    const char *txt;
 
-    while ((txt = va_arg(va, const gchar*)))
+    while ((txt = va_arg(va, const char*)))
         r = avahi_string_list_add(r, txt);
 
     return r;
 }
 
-
-AvahiStringList *avahi_string_list_new(const gchar *txt, ...) {
+AvahiStringList *avahi_string_list_new(const char *txt, ...) {
     va_list va;
     AvahiStringList *r = NULL;
 
@@ -250,16 +294,19 @@ AvahiStringList *avahi_string_list_copy(const AvahiStringList *l) {
     AvahiStringList *r = NULL;
 
     for (; l; l = l->next)
-        r = avahi_string_list_add_arbitrary(r, l->text, l->size);
+        if (!(r = avahi_string_list_add_arbitrary(r, l->text, l->size))) {
+            avahi_string_list_free(r);
+            return NULL;
+        }
 
     return avahi_string_list_reverse(r);
 }
 
-AvahiStringList *avahi_string_list_new_from_array(const gchar *array[], gint length) {
+AvahiStringList *avahi_string_list_new_from_array(const char *array[], int length) {
     AvahiStringList *r = NULL;
-    gint i;
+    int i;
 
-    g_assert(array);
+    assert(array);
 
     for (i = 0; length >= 0 ? i < length : !!array[i]; i++)
         r = avahi_string_list_add(r, array[i]);
@@ -267,11 +314,192 @@ AvahiStringList *avahi_string_list_new_from_array(const gchar *array[], gint len
     return r;
 }
 
-guint avahi_string_list_length(const AvahiStringList *l) {
-    guint n = 0;
+unsigned avahi_string_list_length(const AvahiStringList *l) {
+    unsigned n = 0;
 
     for (; l; l = l->next)
         n++;
 
     return n;
 }
+
+AvahiStringList *avahi_string_list_add_vprintf(AvahiStringList *l, const char *format, va_list va) {
+    size_t len = 80;
+    AvahiStringList *r;
+
+    assert(format);
+
+    if (!(r = avahi_malloc(sizeof(AvahiStringList) + len)))
+        return NULL;
+
+    for (;;) {
+        int n;
+        AvahiStringList *nr;
+        va_list va2;
+
+        va_copy(va2, va);
+        n = vsnprintf((char*) r->text, len, format, va2);
+        va_end(va2);
+
+        if (n >= 0 && n < (int) len)
+            break;
+
+        if (n >= 0)
+            len = n+1;
+        else
+            len *= 2;
+
+        if (!(nr = avahi_realloc(r, sizeof(AvahiStringList) + len))) {
+            avahi_free(r);
+            return NULL;
+        }
+
+        r = nr;
+    }
+
+    r->next = l;
+    r->size = strlen((char*) r->text);
+
+    return r;
+}
+
+AvahiStringList *avahi_string_list_add_printf(AvahiStringList *l, const char *format, ...) {
+    va_list va;
+
+    assert(format);
+
+    va_start(va, format);
+    l  = avahi_string_list_add_vprintf(l, format, va);
+    va_end(va);
+
+    return l;
+}
+
+AvahiStringList *avahi_string_list_find(AvahiStringList *l, const char *key) {
+    size_t n;
+
+    assert(key);
+    n = strlen(key);
+
+    for (; l; l = l->next) {
+        if (strcasecmp((char*) l->text, key) == 0)
+            return l;
+
+        if (strncasecmp((char*) l->text, key, n) == 0 && l->text[n] == '=')
+            return l;
+    }
+
+    return NULL;
+}
+
+AvahiStringList *avahi_string_list_add_pair(AvahiStringList *l, const char *key, const char *value) {
+    assert(key);
+
+    if (value)
+        return avahi_string_list_add_printf(l, "%s=%s", key, value);
+    else
+        return avahi_string_list_add(l, key);
+}
+
+AvahiStringList *avahi_string_list_add_pair_arbitrary(AvahiStringList *l, const char *key, const uint8_t *value, size_t size) {
+    size_t n;
+    assert(key);
+
+    if (!value)
+        return avahi_string_list_add(l, key);
+
+    n = strlen(key);
+
+    if (!(l = avahi_string_list_add_anonymous(l, n + 1 + size)))
+        return NULL;
+
+    memcpy(l->text, key, n);
+    l->text[n] = '=';
+    memcpy(l->text + n + 1, value, size);
+
+    return l;
+}
+
+int avahi_string_list_get_pair(AvahiStringList *l, char **key, char **value, size_t *size) {
+    char *e;
+
+    assert(l);
+
+    if (!(e = memchr(l->text, '=', l->size))) {
+
+        if (key)
+            if (!(*key = avahi_strdup((char*) l->text)))
+                return -1;
+
+        if (value)
+            *value = NULL;
+
+        if (size)
+            *size = 0;
+
+    } else {
+        size_t n;
+
+        if (key)
+            if (!(*key = avahi_strndup((char*) l->text, e - (char *) l->text)))
+                return -1;
+
+        e++; /* Advance after '=' */
+
+        n = l->size - (e - (char*) l->text);
+
+        if (value) {
+
+            if (!(*value = avahi_memdup(e, n+1))) {
+                if (key)
+                    avahi_free(*key);
+                return -1;
+            }
+
+            (*value)[n] = 0;
+        }
+
+        if (size)
+            *size = n;
+    }
+
+    return 0;
+}
+
+AvahiStringList *avahi_string_list_get_next(AvahiStringList *l) {
+    assert(l);
+    return l->next;
+}
+
+uint8_t *avahi_string_list_get_text(AvahiStringList *l) {
+    assert(l);
+    return l->text;
+}
+
+size_t avahi_string_list_get_size(AvahiStringList *l) {
+    assert(l);
+    return l->size;
+}
+
+uint32_t avahi_string_list_get_service_cookie(AvahiStringList *l) {
+    AvahiStringList *f;
+    char *value = NULL, *end = NULL;
+    uint32_t ret;
+
+    if (!(f = avahi_string_list_find(l, AVAHI_SERVICE_COOKIE)))
+        return AVAHI_SERVICE_COOKIE_INVALID;
+
+    if (avahi_string_list_get_pair(f, NULL, &value, NULL) < 0 || !value)
+        return AVAHI_SERVICE_COOKIE_INVALID;
+
+    ret = (uint32_t) strtoll(value, &end, 0);
+
+    if (*value && end && *end != 0) {
+        avahi_free(value);
+        return AVAHI_SERVICE_COOKIE_INVALID;
+    }
+
+    avahi_free(value);
+
+    return ret;
+}