* rename avahi_is_valid_service_type() to avahi_is_valid_service_type_generic()

[catta] / avahi-common / domain-test.c

diff --git a/avahi-common/domain-test.c b/avahi-common/domain-test.c
index 444f553fbfc1ea65eb5e8365d95b2fdb7f451c3c..f1313cbae88dc397b19b7ee8d1fb3cca27c218b6 100644 (file)
--- a/avahi-common/domain-test.c
+++ b/avahi-common/domain-test.c
@@ -84,9 +84,27 @@ int main(int argc, char *argv[]) {
 
     assert(avahi_domain_ends_with("foo.bar.\\065\\\\\\.aaaa", "\\065\\\\\\.aaaa"));
 
-    assert(avahi_is_valid_service_type("_foo._bar._waldo"));
-    assert(!avahi_is_valid_service_type("_foo._bar.waldo"));
-    assert(!avahi_is_valid_service_type(""));
+    assert(avahi_is_valid_service_type_generic("_foo._bar._waldo"));
+    assert(!avahi_is_valid_service_type_strict("_foo._bar._waldo"));
+    assert(!avahi_is_valid_service_subtype("_foo._bar._waldo"));
+
+    assert(avahi_is_valid_service_type_generic("_foo._tcp"));
+    assert(avahi_is_valid_service_type_strict("_foo._tcp"));
+    assert(!avahi_is_valid_service_subtype("_foo._tcp"));
+
+    assert(!avahi_is_valid_service_type_generic("_foo._bar.waldo"));
+    assert(!avahi_is_valid_service_type_strict("_foo._bar.waldo"));
+    assert(!avahi_is_valid_service_subtype("_foo._bar.waldo"));
+    
+    assert(!avahi_is_valid_service_type_generic(""));
+    assert(!avahi_is_valid_service_type_strict(""));
+    assert(!avahi_is_valid_service_subtype(""));
+
+    assert(avahi_is_valid_service_type_generic("_foo._sub._bar._tcp"));
+    assert(!avahi_is_valid_service_type_strict("_foo._sub._bar._tcp"));
+    assert(avahi_is_valid_service_subtype("_foo._sub._bar._tcp"));
+
+    printf("%s\n", avahi_get_type_from_subtype("_foo._sub._bar._tcp"));
 
     assert(!avahi_is_valid_host_name("sf.ooo."));
     assert(avahi_is_valid_host_name("sfooo."));