* rename avahi_is_valid_service_type() to avahi_is_valid_service_type_generic()

* add avahi_is_valid_service_type_strict() which doesn't allow subtypes and other strange things to pass
* fix protocol validity checks in server.c
* add new API function avahi_get_type_from_subtype()


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

1 files changed, 21 insertions, 3 deletions

diff --git a/avahi-common/domain-test.c b/avahi-common/domain-test.c
index 444f553..f1313cb 100644
--- 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."));