From 8b34c2c538f182fe29af58f5153b9dd7cdbaf7fa Mon Sep 17 00:00:00 2001 From: Waldo Bastian Date: Mon, 12 Sep 2005 08:19:33 +0000 Subject: * dbus/dbus-marshal-validate.c, doc/dbus-specification.xml, test/Makefile.am, test/test-names.c: allow hyphens in bus names. --- doc/dbus-specification.xml | 51 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 11 deletions(-) (limited to 'doc') diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml index 0ea43a87..0194ff42 100644 --- a/doc/dbus-specification.xml +++ b/doc/dbus-specification.xml @@ -974,7 +974,7 @@ additional restrictions that apply to interface names specifically: - They are composed of 1 or more elements separated by + Interface names are composed of 1 or more elements separated by a period ('.') character. All elements must contain at least one character. @@ -984,25 +984,54 @@ - They must contain at least one '.' (period) + Interface names must contain at least one '.' (period) character (and thus at least two elements). - They must not begin with a '.' (period) character. - They must not exceed the maximum name length. + Interface names must not begin with a '.' (period) character. + Interface names must not exceed the maximum name length. Bus names - Bus names have the same restrictions as interface names, with a - special exception for unique connection names. A unique name's first - element must start with a colon (':') character. After the colon, any - characters in "[A-Z][a-z][0-9]_" may appear. Elements after - the first must follow the usual rules, except that they may start with - a digit. Bus names not starting with a colon have none of these - exceptions and follow the same rules as interface names. + Connections have one or more bus names associated with them. + A connection has exactly one bus name that is a unique connection + name. The unique connection name remains with the connection for + its entire lifetime. + A bus name is of type STRING, + meaning that it must be valid UTF-8. However, there are also + some additional restrictions that apply to bus names + specifically: + + Bus names that start with a colon (':') + character are unique connection names. + + + Bus names are composed of 1 or more elements separated by + a period ('.') character. All elements must contain at least + one character. + + + Each element must only contain the ASCII characters + "[A-Z][a-z][0-9]_-". Only elements that are part of a unique + connection name may begin with a digit, elements in + other bus names must not begin with a digit. + + + + Bus names must contain at least one '.' (period) + character (and thus at least two elements). + + + Bus names must not begin with a '.' (period) character. + Bus names must not exceed the maximum name length. + + + + Note that the hyphen ('-') character is allowed in bus names but + not in interface names. -- cgit