* updated the invalid test cases to include the

  missing PATH header field which is required
* updated the spec documentation to indicate that
  INTERFACE, MEMBER, and PATH are all required fields

diff --git a/ChangeLog b/ChangeLog
index c15388a36c08d72780d149c47668d7b0ad123554..07095fe3ebfc70f53b0a14d6d3a204c66ba266a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-05-11  John (J5) Palmieri  <johnp@redhat.com>:
+
+       * doc/dbus-specification.xml: Added a "Required" column to the 
+       header fields table and changed the "zero or more" verbage in
+       the above paragraph to read "The header must contain the required 
+       named header fields and zero or more of the optional named header 
+       fields".
+       * test/data/invalid-messages/*.message: Added the required PATH 
+       named header field to the tests so that they don't fail on 
+       'Missing path field'
+
 2004-05-07  John (J5) Palmieri  <johnp@redhat.com>
 
        * python/dbus-bindings.pyx.in: Stopped the bindings from trashing

diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml
index 412d8ea093d394e3641ec519711acab240f43005..7a09a5cfb07c62f471702c4739a76d8118174ece 100644 (file)
--- a/doc/dbus-specification.xml
+++ b/doc/dbus-specification.xml
@@ -266,7 +266,8 @@
       <para>
         In addition to the required header information mentioned 
         in <xref linkend="message-protocol-header-encoding"/>, 
-          the header may contain zero or more named 
+          the header must contain the required named header
+          fields and zero or more of the optional named 
           header fields. Future versions of this protocol
           specification may add new fields. Implementations must
           ignore fields they do not understand. Implementations
@@ -287,12 +288,13 @@
       <para>
         Here are the currently-defined named header fields:
         <informaltable>
-          <tgroup cols="3">
+          <tgroup cols="5">
             <thead>
               <row>
                 <entry>Conventional Name</entry>
                <entry>Decimal Value</entry>
                 <entry>Type</entry>
+                <entry>Required</entry>
                 <entry>Description</entry>
               </row>
             </thead>
@@ -301,12 +303,14 @@
                 <entry>INVALID</entry>
                <entry>0</entry>
                 <entry>INVALID</entry>
+                <entry>no</entry>
                 <entry>Not a valid field name (error if it appears in a message)</entry>
               </row>
               <row>
                 <entry>PATH</entry>
                <entry>1</entry>
                 <entry>OBJECT_PATH</entry>
+                <entry>yes</entry>
                 <entry>The object to send the message to; objects are identified by 
                 a path, "/foo/bar"</entry>
               </row>
@@ -314,6 +318,7 @@
                 <entry>INTERFACE</entry>
                <entry>2</entry>
                 <entry>STRING</entry>
+                <entry>yes</entry>
                 <entry>The interface to invoke a method call on, or 
                 that a signal is emitted from. e.g. "org.freedesktop.Introspectable"</entry>
               </row>
@@ -321,6 +326,7 @@
                 <entry>MEMBER</entry>
                <entry>3</entry>
                 <entry>STRING</entry>
+                <entry>yes</entry>
                 <entry>The member, either the method name or signal name. 
                 e.g. "Frobate"</entry>
               </row>
@@ -328,12 +334,14 @@
                 <entry>ERROR_NAME</entry>
                <entry>4</entry>
                 <entry>STRING</entry>
+                <entry>no</entry>
                 <entry>The name of the error that occurred, for errors</entry>
               </row>
               <row>
                 <entry>REPLY_SERIAL</entry>
                <entry>5</entry>
                 <entry>UINT32</entry>
+                <entry>no</entry>
                 <entry>The serial number of the message this message is a reply
                 to. (The serial number is one of the mandatory header fields,
                 see <xref linkend="message-protocol-header-encoding"/>.)</entry>
@@ -342,6 +350,7 @@
                 <entry>DESTINATION</entry>
                <entry>6</entry>
                 <entry>STRING</entry>
+                <entry>no</entry>
                 <entry>The name of the service this message should be routed to. 
                 Only used in combination with the message bus, see 
                 <xref linkend="message-bus"/>.</entry>
@@ -350,6 +359,7 @@
                 <entry>SENDER</entry>
                <entry>7</entry>
                 <entry>STRING</entry>
+                <entry>no</entry>
                 <entry>Sender service. The name of the base service that sent
                 this message.  The message bus fills in this field; the field is
                 only meaningful in combination with the message bus.</entry>

diff --git a/test/data/invalid-messages/array-of-nil.message b/test/data/invalid-messages/array-of-nil.message
index 7f0ac71874966ab7d85f3e5dfcf56af58a0760c7..1197a13625f41ff743791d02526d9733c6ced5e3 100644 (file)
--- a/test/data/invalid-messages/array-of-nil.message
+++ b/test/data/invalid-messages/array-of-nil.message
@@ -8,6 +8,9 @@ STRING 'org.freedesktop.Foo'
 HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH 
+OBJECT_PATH '/foo'
 
 ALIGN 8
 END_LENGTH Header

diff --git a/test/data/invalid-messages/array-with-mixed-types.message b/test/data/invalid-messages/array-with-mixed-types.message
index 4455c898a784af6539934680de0706bae18cb36e..dea2d1e568b359687957601b7452f6414e623ce7 100644 (file)
--- a/test/data/invalid-messages/array-with-mixed-types.message
+++ b/test/data/invalid-messages/array-with-mixed-types.message
@@ -9,6 +9,9 @@ STRING 'org.freedesktop.Foo'
 HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
 
 ALIGN 8
 END_LENGTH Header

diff --git a/test/data/invalid-messages/bad-boolean-array.message b/test/data/invalid-messages/bad-boolean-array.message
index 91ad5ef1c14701b6da3d0dd28eb88b6d82b6660a..48000afd7bc3f37a9a3ccc0cf1e8136b837bca15 100644 (file)
--- a/test/data/invalid-messages/bad-boolean-array.message
+++ b/test/data/invalid-messages/bad-boolean-array.message
@@ -9,6 +9,9 @@ STRING 'org.freedesktop.Foo'
 HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
 
 ALIGN 8
 END_LENGTH Header

diff --git a/test/data/invalid-messages/bad-boolean.message b/test/data/invalid-messages/bad-boolean.message
index cd588ad8a89f11c26a6cab4abba66bfa73b57dfd..09026db8348b4482725fc56669920ea1796f82dd 100644 (file)
--- a/test/data/invalid-messages/bad-boolean.message
+++ b/test/data/invalid-messages/bad-boolean.message
@@ -9,6 +9,9 @@ STRING 'org.freedesktop.Foo'
 HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
 
 ALIGN 8
 END_LENGTH Header

diff --git a/test/data/invalid-messages/bad-endian.message b/test/data/invalid-messages/bad-endian.message
index 8d6092445143a6596e11fcd2f22cc34bc0c84bc3..e979baae6f6ccbc87442fb37e49cd39c3931350e 100644 (file)
--- a/test/data/invalid-messages/bad-endian.message
+++ b/test/data/invalid-messages/bad-endian.message
@@ -14,6 +14,9 @@ STRING 'org.freedesktop.Foo'
 HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
 
 ALIGN 8
 END_LENGTH Header

diff --git a/test/data/invalid-messages/bad-header-field-alignment.message b/test/data/invalid-messages/bad-header-field-alignment.message
index 75776a37058845f6ddb637af12a37428f1289fcf..22c0d7eec7cca56bca463fd7bc60a6bba0c8d902 100644 (file)
--- a/test/data/invalid-messages/bad-header-field-alignment.message
+++ b/test/data/invalid-messages/bad-header-field-alignment.message
@@ -11,6 +11,10 @@ HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Bar'
 
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
+
 HEADER_FIELD UNKNOWN
 TYPE STRING
 STRING 'a'

diff --git a/test/data/invalid-messages/local-namespace.message b/test/data/invalid-messages/local-namespace.message
index dad98a775e1121fcb5eeefceb3f0bcfced4d9aad..f42b5c6ac3771d2abe09037553a2b566fa1d19c1 100644 (file)
--- a/test/data/invalid-messages/local-namespace.message
+++ b/test/data/invalid-messages/local-namespace.message
@@ -10,6 +10,9 @@ STRING 'org.freedesktop.Local'
 HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Disconnected'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
 
 ALIGN 8
 END_LENGTH Header

diff --git a/test/data/invalid-messages/no-dot-in-name.message b/test/data/invalid-messages/no-dot-in-name.message
index 131be05d86b1a614606b162be85436641acd27d4..6d6317a5a55d1ccbf3f5e852abadf2868261a3bc 100644 (file)
--- a/test/data/invalid-messages/no-dot-in-name.message
+++ b/test/data/invalid-messages/no-dot-in-name.message
@@ -9,6 +9,9 @@ STRING 'NoDotInHere'
 HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
 
 ALIGN 8
 END_LENGTH Header

diff --git a/test/data/invalid-messages/not-nul-header-padding.message b/test/data/invalid-messages/not-nul-header-padding.message
index a12c0fa790a3eef1be6351f43add032f6b5619f9..be846da0ddbbc3b4a08b1941be146e6a57645bdf 100644 (file)
--- a/test/data/invalid-messages/not-nul-header-padding.message
+++ b/test/data/invalid-messages/not-nul-header-padding.message
@@ -9,6 +9,9 @@ STRING 'org.freedesktop.Foo'
 HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
 
 HEADER_FIELD UNKNOWN
 TYPE STRING

diff --git a/test/data/invalid-messages/overlong-name.message b/test/data/invalid-messages/overlong-name.message
index 4fd7025e22019877e3a34f99383820f26d723d23..c1f9079068fcdc43c1b0b3b627603d6d9c00e50f 100644 (file)
--- a/test/data/invalid-messages/overlong-name.message
+++ b/test/data/invalid-messages/overlong-name.message
@@ -10,6 +10,10 @@ HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Bar'
 
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
+
 ALIGN 8
 END_LENGTH Header
 START_LENGTH Body

diff --git a/test/data/invalid-messages/too-little-header-padding.message b/test/data/invalid-messages/too-little-header-padding.message
index 894e4c3eee9ea0b845a1880cd6f4d96fdd7faa02..358815a56f203c22023c0c6dfb1bebcd607c5144 100644 (file)
--- a/test/data/invalid-messages/too-little-header-padding.message
+++ b/test/data/invalid-messages/too-little-header-padding.message
@@ -9,6 +9,9 @@ STRING 'org.freedesktop.Foo'
 HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
 
 HEADER_FIELD UNKNOWN
 TYPE STRING

diff --git a/test/data/invalid-messages/too-much-header-padding-by-far.message b/test/data/invalid-messages/too-much-header-padding-by-far.message
index b74f559b4c524adc77bb3e551b22509fe462a668..2d2be3a595e0f51683ffc98eaff1cbbffe0fae96 100644 (file)
--- a/test/data/invalid-messages/too-much-header-padding-by-far.message
+++ b/test/data/invalid-messages/too-much-header-padding-by-far.message
@@ -9,6 +9,9 @@ STRING 'org.freedesktop.Foo'
 HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
 
 HEADER_FIELD UNKNOWN
 TYPE STRING

diff --git a/test/data/invalid-messages/too-much-header-padding.message b/test/data/invalid-messages/too-much-header-padding.message
index 01111b63a4236f01ba84afdf88d569ddccbe362a..0b1c294c4dfa8dfe285541f77a6153ec3e592cd9 100644 (file)
--- a/test/data/invalid-messages/too-much-header-padding.message
+++ b/test/data/invalid-messages/too-much-header-padding.message
@@ -9,6 +9,9 @@ STRING 'org.freedesktop.Foo'
 HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
 
 HEADER_FIELD UNKNOWN
 TYPE STRING

diff --git a/test/data/invalid-messages/too-short-dict.message b/test/data/invalid-messages/too-short-dict.message
index fde88850881198fdfb3595797e2bd143fd4cce6d..ffc3cc529fae70bb3988bce26698de9fba9cd761 100644 (file)
--- a/test/data/invalid-messages/too-short-dict.message
+++ b/test/data/invalid-messages/too-short-dict.message
@@ -8,6 +8,9 @@ STRING 'org.freedesktop.Foo'
 HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
 
 ALIGN 8