* Rename various data structures to prevent a namespace conflict with avahi-core

[catta] / avahi-core / resolve-service.c

diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c
index b15af4f25232d826241e22b9d0a91d6d68bdbc0c..bf4f7b94e4f7f06556955124c56a06927d715cec 100644 (file)
--- a/avahi-core/resolve-service.c
+++ b/avahi-core/resolve-service.c
@@ -25,8 +25,9 @@
 
 #include <string.h>
 
+#include <avahi-common/domain.h>
 #include "browse.h"
-#include "util.h"
+#include "timeval.h"
 
 struct AvahiServiceResolver {
     AvahiServer *server;
@@ -195,7 +196,7 @@ static void time_event_callback(AvahiTimeEvent *e, void *userdata) {
 AvahiServiceResolver *avahi_service_resolver_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const gchar *name, const gchar *type, const gchar *domain, AvahiProtocol aprotocol, AvahiServiceResolverCallback callback, gpointer userdata) {
     AvahiServiceResolver *r;
     AvahiKey *k;
-    GTimeVal tv;
+    struct timeval tv;
     gchar t[256], *n;
     size_t l;
     
@@ -206,6 +207,21 @@ AvahiServiceResolver *avahi_service_resolver_new(AvahiServer *server, AvahiIfInd
 
     g_assert(aprotocol == AVAHI_PROTO_UNSPEC || aprotocol == AVAHI_PROTO_INET || aprotocol == AVAHI_PROTO_INET6);
 
+    if (!avahi_valid_service_name(name)) {
+        avahi_server_set_errno(server, AVAHI_ERR_INVALID_SERVICE_NAME);
+        return NULL;
+    }
+
+    if (!avahi_valid_service_type(type)) {
+        avahi_server_set_errno(server, AVAHI_ERR_INVALID_SERVICE_TYPE);
+        return NULL;
+    }
+
+    if (!avahi_valid_domain_name(domain)) {
+        avahi_server_set_errno(server, AVAHI_ERR_INVALID_DOMAIN_NAME);
+        return NULL;
+    }
+    
     r = g_new(AvahiServiceResolver, 1);
     r->server = server;
     r->service_name = g_strdup(name);
@@ -234,10 +250,20 @@ AvahiServiceResolver *avahi_service_resolver_new(AvahiServer *server, AvahiIfInd
     r->record_browser_srv = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
     avahi_key_unref(k);
 
+    if (!r->record_browser_srv) {
+        avahi_service_resolver_free(r);
+        return NULL;
+    }
+    
     k = avahi_key_new(t, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_TXT);
     r->record_browser_txt = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
     avahi_key_unref(k);
-    
+
+    if (!r->record_browser_txt) {
+        avahi_service_resolver_free(r);
+        return NULL;
+    }
+
     return r;
 }