add support for service subtypes: avahi_server_add_service_subtype()

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

4 files changed, 40 insertions, 36 deletions

diff --git a/avahi-common/dbus.c b/avahi-common/dbus.c
index 14d1b2b..d658868 100644
--- a/avahi-common/dbus.c
+++ b/avahi-common/dbus.c
@@ -63,7 +63,8 @@ static const char * const table[- AVAHI_ERR_MAX] = {
     AVAHI_DBUS_ERR_INVALID_FLAGS,
     AVAHI_DBUS_ERR_NOT_FOUND,
     AVAHI_DBUS_ERR_INVALID_CONFIG,
-    AVAHI_DBUS_ERR_VERSION_MISMATCH
+    AVAHI_DBUS_ERR_VERSION_MISMATCH,
+    AVAHI_DBUS_ERR_INVALID_SERVICE_SUBTYPE
 };
 
 int avahi_error_dbus_to_number(const char *s) {
diff --git a/avahi-common/dbus.h b/avahi-common/dbus.h
index 5f2acff..cb7ba19 100644
--- a/avahi-common/dbus.h
+++ b/avahi-common/dbus.h
@@ -74,6 +74,7 @@ AVAHI_C_DECL_BEGIN
 #define AVAHI_DBUS_ERR_NOT_FOUND "org.freedesktop.Avahi.NotFoundError"
 #define AVAHI_DBUS_ERR_INVALID_CONFIG "org.freedesktop.Avahi.InvalidConfigurationError"
 #define AVAHI_DBUS_ERR_VERSION_MISMATCH "org.freedesktop.Avahi.VersionMismatchError"
+#define AVAHI_DBUS_ERR_INVALID_SERVICE_SUBTYPE "org.freedesktop.Avahi.InvalidServiceSubtypeError"
 
 /** Convert a DBus error string into an Avahi error number */
 int avahi_error_dbus_to_number(const char *s);
diff --git a/avahi-common/error.c b/avahi-common/error.c
index 4242361..76a05fd 100644
--- a/avahi-common/error.c
+++ b/avahi-common/error.c
@@ -60,7 +60,8 @@ const char *avahi_strerror(int error) {
         "Invalid flags",
         "Not found",
         "Invalid configuration",
-        "Version mismatch"
+        "Version mismatch",
+        "Invalid service subtype"
     };
 
     if (-error < 0 || -error >= -AVAHI_ERR_MAX)
diff --git a/avahi-common/error.h b/avahi-common/error.h
index 851c600..623620a 100644
--- a/avahi-common/error.h
+++ b/avahi-common/error.h
@@ -32,39 +32,40 @@ AVAHI_C_DECL_BEGIN
 
 /** Error codes used by avahi */
 enum { 
-    AVAHI_OK = 0,                          /**< OK */
-    AVAHI_ERR_FAILURE = -1,                /**< Generic error code */
-    AVAHI_ERR_BAD_STATE = -2,              /**< Object was in a bad state */
-    AVAHI_ERR_INVALID_HOST_NAME = -3,      /**< Invalid host name */
-    AVAHI_ERR_INVALID_DOMAIN_NAME = -4,    /**< Invalid domain name */
-    AVAHI_ERR_NO_NETWORK = -5,             /**< No suitable network protocol available */
-    AVAHI_ERR_INVALID_TTL = -6,            /**< Invalid DNS TTL */
-    AVAHI_ERR_IS_PATTERN = -7,             /**< RR key is pattern */
-    AVAHI_ERR_LOCAL_COLLISION = -8,        /**< Local name collision */
-    AVAHI_ERR_INVALID_RECORD = -9,         /**< Invalid RR */
-    AVAHI_ERR_INVALID_SERVICE_NAME = -10,  /**< Invalid service name */
-    AVAHI_ERR_INVALID_SERVICE_TYPE = -11,  /**< Invalid service type */
-    AVAHI_ERR_INVALID_PORT = -12,          /**< Invalid port number */
-    AVAHI_ERR_INVALID_KEY = -13,           /**< Invalid key */
-    AVAHI_ERR_INVALID_ADDRESS = -14,       /**< Invalid address */
-    AVAHI_ERR_TIMEOUT = -15,               /**< Timeout reached */
-    AVAHI_ERR_TOO_MANY_CLIENTS = -16,      /**< Too many clients */
-    AVAHI_ERR_TOO_MANY_OBJECTS = -17,      /**< Too many objects */
-    AVAHI_ERR_TOO_MANY_ENTRIES = -18,      /**< Too many entries */
-    AVAHI_ERR_OS = -19,                    /**< OS error */
-    AVAHI_ERR_ACCESS_DENIED = -20,         /**< Access denied */
-    AVAHI_ERR_INVALID_OPERATION = -21,     /**< Invalid operation */
-    AVAHI_ERR_DBUS_ERROR = -22,            /**< An unexpected DBUS error occured */
-    AVAHI_ERR_NOT_CONNECTED = -23,         /**< Could not get a connection to the daemon */
-    AVAHI_ERR_NO_MEMORY = -24,             /**< Memory exhausted */
-    AVAHI_ERR_INVALID_OBJECT = -25,        /**< The object passed to this function was invalid */
-    AVAHI_ERR_NO_DAEMON = -26,             /**< Daemon not running */
-    AVAHI_ERR_INVALID_INTERFACE = -27,     /**< Invalid interface */
-    AVAHI_ERR_INVALID_PROTOCOL = -28,      /**< Invalid protocol */
-    AVAHI_ERR_INVALID_FLAGS = -29,         /**< Invalid flags */
-    AVAHI_ERR_NOT_FOUND = -30,             /**< Not found */
-    AVAHI_ERR_INVALID_CONFIG = -31,        /**< Configuration error */
-    AVAHI_ERR_VERSION_MISMATCH = -32,      /**< Verson mismatch */
+    AVAHI_OK = 0,                            /**< OK */
+    AVAHI_ERR_FAILURE = -1,                  /**< Generic error code */
+    AVAHI_ERR_BAD_STATE = -2,                /**< Object was in a bad state */
+    AVAHI_ERR_INVALID_HOST_NAME = -3,        /**< Invalid host name */
+    AVAHI_ERR_INVALID_DOMAIN_NAME = -4,      /**< Invalid domain name */
+    AVAHI_ERR_NO_NETWORK = -5,               /**< No suitable network protocol available */
+    AVAHI_ERR_INVALID_TTL = -6,              /**< Invalid DNS TTL */
+    AVAHI_ERR_IS_PATTERN = -7,               /**< RR key is pattern */
+    AVAHI_ERR_LOCAL_COLLISION = -8,          /**< Local name collision */
+    AVAHI_ERR_INVALID_RECORD = -9,           /**< Invalid RR */
+    AVAHI_ERR_INVALID_SERVICE_NAME = -10,    /**< Invalid service name */
+    AVAHI_ERR_INVALID_SERVICE_TYPE = -11,    /**< Invalid service type */
+    AVAHI_ERR_INVALID_PORT = -12,            /**< Invalid port number */
+    AVAHI_ERR_INVALID_KEY = -13,             /**< Invalid key */
+    AVAHI_ERR_INVALID_ADDRESS = -14,         /**< Invalid address */
+    AVAHI_ERR_TIMEOUT = -15,                 /**< Timeout reached */
+    AVAHI_ERR_TOO_MANY_CLIENTS = -16,        /**< Too many clients */
+    AVAHI_ERR_TOO_MANY_OBJECTS = -17,        /**< Too many objects */
+    AVAHI_ERR_TOO_MANY_ENTRIES = -18,        /**< Too many entries */
+    AVAHI_ERR_OS = -19,                      /**< OS error */
+    AVAHI_ERR_ACCESS_DENIED = -20,           /**< Access denied */
+    AVAHI_ERR_INVALID_OPERATION = -21,       /**< Invalid operation */
+    AVAHI_ERR_DBUS_ERROR = -22,              /**< An unexpected DBUS error occured */
+    AVAHI_ERR_NOT_CONNECTED = -23,           /**< Could not get a connection to the daemon */
+    AVAHI_ERR_NO_MEMORY = -24,               /**< Memory exhausted */
+    AVAHI_ERR_INVALID_OBJECT = -25,          /**< The object passed to this function was invalid */
+    AVAHI_ERR_NO_DAEMON = -26,               /**< Daemon not running */
+    AVAHI_ERR_INVALID_INTERFACE = -27,       /**< Invalid interface */
+    AVAHI_ERR_INVALID_PROTOCOL = -28,        /**< Invalid protocol */
+    AVAHI_ERR_INVALID_FLAGS = -29,           /**< Invalid flags */
+    AVAHI_ERR_NOT_FOUND = -30,               /**< Not found */
+    AVAHI_ERR_INVALID_CONFIG = -31,          /**< Configuration error */
+    AVAHI_ERR_VERSION_MISMATCH = -32,        /**< Verson mismatch */
+    AVAHI_ERR_INVALID_SERVICE_SUBTYPE = -33, /**< Invalid service subtype */
 
     /****
      ****    IF YOU ADD A NEW ERROR CODE HERE, PLEASE DON'T FORGET TO ADD
@@ -74,7 +75,7 @@ enum {
      ****    Also remember to update the MAX value below.
      ****/
     
-    AVAHI_ERR_MAX = -33
+    AVAHI_ERR_MAX = -34
 };
 
 /** Return a human readable error string for the specified error code */