* Add support for specifying the protocol in service definition files

 * Add support for proper URL encoding of IPv6 addresses to avahi-bookmarks
 * Cast some calls in dbus-watch-glue to get rid of warnings

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

diff --git a/avahi-common/dbus-watch-glue.c b/avahi-common/dbus-watch-glue.c
index 11192f8fdbfd6cedc72db174e8a5ed596da1fdf3..7ca1c9df2f2e3486b93f1ce2f52650962fcc4e97 100644 (file)
--- a/avahi-common/dbus-watch-glue.c
+++ b/avahi-common/dbus-watch-glue.c
@@ -286,13 +286,13 @@ int avahi_dbus_connection_glue(DBusConnection *c, const AvahiPoll *poll_api) {
     if (!(d->dispatch_timeout = poll_api->timeout_new(poll_api, NULL, dispatch_timeout_callback, d)))
         goto fail;
     
-    if (!(dbus_connection_set_watch_functions(c, add_watch, remove_watch, watch_toggled, connection_data_ref(d), connection_data_unref)))
+    if (!(dbus_connection_set_watch_functions(c, add_watch, remove_watch, watch_toggled, connection_data_ref(d), (DBusFreeFunction)connection_data_unref)))
         goto fail;
 
-    if (!(dbus_connection_set_timeout_functions(c, add_timeout, remove_timeout, timeout_toggled, connection_data_ref(d), connection_data_unref)))
+    if (!(dbus_connection_set_timeout_functions(c, add_timeout, remove_timeout, timeout_toggled, connection_data_ref(d), (DBusFreeFunction)connection_data_unref)))
         goto fail;
 
-    dbus_connection_set_dispatch_status_function(c, dispatch_status, connection_data_ref(d), connection_data_unref);
+    dbus_connection_set_dispatch_status_function(c, dispatch_status, connection_data_ref(d), (DBusFreeFunction)connection_data_unref);
 
     if (dbus_connection_get_dispatch_status(c) == DBUS_DISPATCH_DATA_REMAINS)
         request_dispatch(d);

diff --git a/avahi-daemon/avahi-service.dtd b/avahi-daemon/avahi-service.dtd
index 3c627644e57e3fa5a2aee5781c352e5aa7735f45..c8477f19405bf4716cc7726009721b1d818418bc 100644 (file)
--- a/avahi-daemon/avahi-service.dtd
+++ b/avahi-daemon/avahi-service.dtd
@@ -14,5 +14,7 @@
 <!ATTLIST host-name>
 <!ELEMENT port (#PCDATA)>
 <!ATTLIST port>
+<!ELEMENT protocol (#PCDATA)>
+<!ATTLIST protocol>
 <!ELEMENT txt-record (#PCDATA)>
 <!ATTLIST txt-record>

diff --git a/avahi-daemon/example.service b/avahi-daemon/example.service
index 9b2e89187b0f09acdd103b1b882bf5a1bbf20a36..72ab8ea3b4eec198cf0108dc8d8f53dd92ba74b3 100644 (file)
--- a/avahi-daemon/example.service
+++ b/avahi-daemon/example.service
@@ -21,6 +21,7 @@
     <domain-name>local</domain-name>
     <host-name>quux.local</host-name>
     <port>4711</port>
+    <protocol>any</protocol>
     <txt-record>this=is</txt-record>
     <txt-record>a=really</txt-record>
     <txt-record>bad=example</txt-record>

diff --git a/avahi-daemon/static-services.c b/avahi-daemon/static-services.c
index 0c0c56333b75bd898d274ec10b4e0c2a3df50fc8..f659371a8d31b6ba8bbf2f926e359b9aedd569a4 100644 (file)
--- a/avahi-daemon/static-services.c
+++ b/avahi-daemon/static-services.c
@@ -50,6 +50,7 @@ struct StaticService {
     char *domain_name;
     char *host_name;
     uint16_t port;
+    int protocol;
 
     AvahiStringList *txt_records;
     
@@ -110,6 +111,7 @@ static StaticService *static_service_new(StaticServiceGroup *group) {
 
     s->type = s->host_name = s->domain_name = NULL;
     s->port = 0;
+    s->protocol = AF_UNSPEC;
 
     s->txt_records = NULL;
 
@@ -215,7 +217,7 @@ static void add_static_service_group_to_server(StaticServiceGroup *g) {
         if (avahi_server_add_service_strlst(
                 avahi_server,
                 g->entry_group,
-                -1, AF_UNSPEC,
+                -1, s->protocol,
                 g->chosen_name, s->type, 
                 s->domain_name, s->host_name, s->port,
                 s->txt_records) < 0) {
@@ -246,6 +248,7 @@ typedef enum {
     XML_TAG_DOMAIN_NAME,
     XML_TAG_HOST_NAME,
     XML_TAG_PORT,
+    XML_TAG_PROTOCOL,
     XML_TAG_TXT_RECORD
 } xml_tag_name;
 
@@ -312,6 +315,11 @@ static void XMLCALL xml_start(void *data, const char *el, const char *attr[]) {
             goto invalid_attr;
         
         u->current_tag = XML_TAG_PORT;
+    } else if (u->current_tag == XML_TAG_SERVICE && strcmp(el, "protocol") == 0) {
+        if (attr[0])
+            goto invalid_attr;
+
+        u->current_tag = XML_TAG_PROTOCOL;
     } else if (u->current_tag == XML_TAG_SERVICE && strcmp(el, "txt-record") == 0) {
         if (attr[0])
             goto invalid_attr;
@@ -383,6 +391,26 @@ static void XMLCALL xml_end(void *data, const char *el) {
             break;
         }
 
+        case XML_TAG_PROTOCOL: {
+            int protocol;
+            assert(u->service);
+
+            if (strcasecmp (u->buf, "ipv4") == 0) {
+                protocol = AF_INET;
+            } else if (strcasecmp (u->buf, "ipv6") == 0) {
+                protocol = AF_INET6;
+            } else if (strcasecmp (u->buf, "any") == 0) {
+                protocol = AF_UNSPEC;
+            } else {
+                avahi_log_error("%s: parse failure: invalid protocol specification \"%s\".", u->group->filename, u->buf);
+                u->failed = 1;
+                return;
+            }
+
+            u->service->protocol = protocol;
+            break;
+        }
+
         case XML_TAG_TXT_RECORD: {
             assert(u->service);
             
@@ -452,7 +480,9 @@ static void XMLCALL xml_cdata(void *data, const XML_Char *s, int len) {
             break;
 
         case XML_TAG_PORT:
+        case XML_TAG_PROTOCOL:
         case XML_TAG_TXT_RECORD:
+            assert(u->service);
             u->buf = append_cdata(u->buf, s, len);
             break;
 

diff --git a/avahi-utils/avahi-bookmarks.in b/avahi-utils/avahi-bookmarks.in
index 2dd01beedcf7e90a82046dc4633283a4f58175f9..ce8eba13b073e7939fe5640a11f8a4455047b8df 100755 (executable)
--- a/avahi-utils/avahi-bookmarks.in
+++ b/avahi-utils/avahi-bookmarks.in
@@ -96,7 +96,12 @@ class AvahiBookmarks(resource.Resource):
 
                 path = self.find_path(v[4])
 
-                t += '<li><a href="%s://%s%s%s">%s</a></li>' % (urlproto[k[3]], v[2], port, path, k[2])
+                if v[1] == avahi.PROTO_INET6:
+                    ip = "[" + v[2] + "]"
+                else:
+                    ip = v[2]
+
+                t += '<li><a href="%s://%s%s%s">%s</a></li>' % (urlproto[k[3]], ip, port, path, k[2])
                 
             t += '</ul>'
         

diff --git a/man/avahi.service.5.xml.in b/man/avahi.service.5.xml.in
index 89d9c03e5f1c6265397d3a05162c31b47283b579..5260ef29017bd34999725907b4e26437df29b8bf 100644 (file)
--- a/man/avahi.service.5.xml.in
+++ b/man/avahi.service.5.xml.in
@@ -87,6 +87,10 @@
         <p><opt>&lt;port&gt;</opt> The IP port number the service listens on.</p>
       </option>
 
+      <option>
+        <p><opt>&lt;protocol&gt;</opt> The protocol to advertise the service on, can be any of <opt>ipv4</opt>, <opt>ipv6</opt> or <opt>any</opt>.</p>
+      </option>
+
       <option>
         <p><opt>&lt;txt-record&gt;</opt> DNS-SD TXT record data.</p>
       </option>