2003-09-21 Mark McLoughlin <mark@skynet.ie>

        * doc/dbus-specification.sgml: Change the header field name
        to be an enum and update the rest of the spec to reference
        the fields using the conventinal name.

        * dbus/dbus-protocol.h: update to reflect the spec.

        * doc/TODO: add item to remove the 4 byte alignment requirement.

        * dbus/dbus-message.c: Remove the code to generalise the
        header/body length and serial number header fields as named
        header fields so we can reference field names using the
        protocol values.
        (append_int_field), (append_uint_field), (append_string_field):
        Append the field name as a byte rather than four chars.
        (delete_int_or_uint_field), (delete_string_field): reflect the
        fact that the field name and typecode now occupy 4 bytes instead
        of 8.
        (decode_string_field), (decode_header_data): update to reflect
        protocol changes and move the field specific encoding from
        decode_string_field() back into decode_header_data().

        * dbus/dbus-internals.[ch]: (_dbus_header_field_to_string):
        Add utility to aid debugging.

        * dbus/dbus-message-builder.c:
        (append_string_field), (_dbus_message_data_load): Update to
        reflect protocol changes; Change the FIELD_NAME directive
        to HEADER_FIELD and allow it to take the field's conventional
        name rather than the actual value.

        * test/data/*/*.message: Update to use HEADER_FIELD instead
        of FIELD_NAME; Always align the header on an 8 byte boundary
        *before* updating the header length.

13 files changed, 27 insertions, 26 deletions

diff --git a/test/data/valid-messages/array-of-array-of-uint32.message b/test/data/valid-messages/array-of-array-of-uint32.message
index 692eca06..e12186b1 100644
--- a/test/data/valid-messages/array-of-array-of-uint32.message
+++ b/test/data/valid-messages/array-of-array-of-uint32.message
@@ -2,8 +2,8 @@
 
 VALID_HEADER method_call
 REQUIRED_FIELDS
-END_LENGTH Header
 ALIGN 8
+END_LENGTH Header
 START_LENGTH Body
 
 TYPE ARRAY
diff --git a/test/data/valid-messages/dict-simple.message b/test/data/valid-messages/dict-simple.message
index 6986d439..fa6927df 100644
--- a/test/data/valid-messages/dict-simple.message
+++ b/test/data/valid-messages/dict-simple.message
@@ -2,8 +2,8 @@
 
 VALID_HEADER method_call
 REQUIRED_FIELDS
-END_LENGTH Header
 ALIGN 8
+END_LENGTH Header
 START_LENGTH Body
 TYPE DICT
 LENGTH Dict
diff --git a/test/data/valid-messages/emptiness.message b/test/data/valid-messages/emptiness.message
index dbf531ca..32042c01 100644
--- a/test/data/valid-messages/emptiness.message
+++ b/test/data/valid-messages/emptiness.message
@@ -2,8 +2,8 @@
 
 VALID_HEADER method_call
 REQUIRED_FIELDS
-END_LENGTH Header
 ALIGN 8
+END_LENGTH Header
 START_LENGTH Body
 TYPE STRING
 INT32 0
diff --git a/test/data/valid-messages/lots-of-arguments.message b/test/data/valid-messages/lots-of-arguments.message
index 993755ab..d3f6a4ee 100644
--- a/test/data/valid-messages/lots-of-arguments.message
+++ b/test/data/valid-messages/lots-of-arguments.message
@@ -2,8 +2,8 @@
 
 VALID_HEADER method_call
 REQUIRED_FIELDS
-END_LENGTH Header
 ALIGN 8
+END_LENGTH Header
 START_LENGTH Body
 TYPE NIL
 TYPE BYTE
diff --git a/test/data/valid-messages/no-padding.message b/test/data/valid-messages/no-padding.message
index e6d27d9d..94df4d45 100644
--- a/test/data/valid-messages/no-padding.message
+++ b/test/data/valid-messages/no-padding.message
@@ -7,7 +7,7 @@ REQUIRED_FIELDS
 
 ## this byte array is filled with zeros to the natural length 
 ## of the header
-FIELD_NAME unkn
+HEADER_FIELD UNKNOWN
 TYPE ARRAY
 TYPE BYTE
 ALIGN 4
diff --git a/test/data/valid-messages/opposite-endian.message b/test/data/valid-messages/opposite-endian.message
index c638b7b0..90949dd2 100644
--- a/test/data/valid-messages/opposite-endian.message
+++ b/test/data/valid-messages/opposite-endian.message
@@ -7,7 +7,7 @@ VALID_HEADER method_call
 
 REQUIRED_FIELDS
 
-FIELD_NAME unkn
+HEADER_FIELD UNKNOWN
 TYPE INT32
 INT32 0xfeeb
 
diff --git a/test/data/valid-messages/recursive-types.message b/test/data/valid-messages/recursive-types.message
index 192fd9b7..e306fd1f 100644
--- a/test/data/valid-messages/recursive-types.message
+++ b/test/data/valid-messages/recursive-types.message
@@ -5,6 +5,7 @@ VALID_HEADER method_call
 
 REQUIRED_FIELDS
 
+ALIGN 8
 END_LENGTH Header
 START_LENGTH Body
 
diff --git a/test/data/valid-messages/simplest-manual.message b/test/data/valid-messages/simplest-manual.message
index 9779234b..5a5b4105 100644
--- a/test/data/valid-messages/simplest-manual.message
+++ b/test/data/valid-messages/simplest-manual.message
@@ -11,13 +11,13 @@ LENGTH Body
 ## client serial
 INT32 7
 
-FIELD_NAME path
+HEADER_FIELD PATH
 TYPE OBJECT_PATH
 OBJECT_PATH '/foo'
-FIELD_NAME ifce
+HEADER_FIELD INTERFACE
 TYPE STRING
 STRING 'org.freedesktop.Foo'
-FIELD_NAME mebr
+HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Bar'
 
diff --git a/test/data/valid-messages/standard-acquire-service.message b/test/data/valid-messages/standard-acquire-service.message
index f313061f..a42a639c 100644
--- a/test/data/valid-messages/standard-acquire-service.message
+++ b/test/data/valid-messages/standard-acquire-service.message
@@ -1,16 +1,16 @@
 # Standard org.freedesktop.DBus.AcquireService message
 
 VALID_HEADER method_call
-FIELD_NAME path
+HEADER_FIELD PATH
 TYPE OBJECT_PATH
 OBJECT_PATH '/org/freedesktop/DBus'
-FIELD_NAME ifce
+HEADER_FIELD INTERFACE
 TYPE STRING
 STRING 'org.freedesktop.DBus'
-FIELD_NAME mebr
+HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'AcquireService'
-FIELD_NAME srvc
+HEADER_FIELD SERVICE
 TYPE STRING
 STRING 'org.freedesktop.DBus'
 ALIGN 8
diff --git a/test/data/valid-messages/standard-hello.message b/test/data/valid-messages/standard-hello.message
index 795ede74..50d4e0ff 100644
--- a/test/data/valid-messages/standard-hello.message
+++ b/test/data/valid-messages/standard-hello.message
@@ -1,16 +1,16 @@
 # Standard org.freedesktop.DBus.Hello message
 
 VALID_HEADER method_call
-FIELD_NAME path
+HEADER_FIELD PATH
 TYPE OBJECT_PATH
 OBJECT_PATH '/org/freedesktop/DBus'
-FIELD_NAME ifce
+HEADER_FIELD INTERFACE
 TYPE STRING
 STRING 'org.freedesktop.DBus'
-FIELD_NAME mebr
+HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Hello'
-FIELD_NAME srvc
+HEADER_FIELD SERVICE
 TYPE STRING
 STRING 'org.freedesktop.DBus'
 ALIGN 8
diff --git a/test/data/valid-messages/standard-list-services.message b/test/data/valid-messages/standard-list-services.message
index 4c9c7c66..10c9a2f7 100644
--- a/test/data/valid-messages/standard-list-services.message
+++ b/test/data/valid-messages/standard-list-services.message
@@ -1,16 +1,16 @@
 # Standard org.freedesktop.DBus.ListServices message
 
 VALID_HEADER method_call
-FIELD_NAME path
+HEADER_FIELD PATH
 TYPE OBJECT_PATH
 OBJECT_PATH '/org/freedesktop/DBus'
-FIELD_NAME ifce
+HEADER_FIELD INTERFACE
 TYPE STRING
 STRING 'org.freedesktop.DBus'
-FIELD_NAME mebr
+HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'ListServices'
-FIELD_NAME srvc
+HEADER_FIELD SERVICES
 TYPE STRING
 STRING 'org.freedesktop.DBus'
 ALIGN 8
diff --git a/test/data/valid-messages/standard-service-exists.message b/test/data/valid-messages/standard-service-exists.message
index ce14811a..c3b715bc 100644
--- a/test/data/valid-messages/standard-service-exists.message
+++ b/test/data/valid-messages/standard-service-exists.message
@@ -1,16 +1,16 @@
 # Standard org.freedesktop.DBus.ServiceExists message
 
 VALID_HEADER method_call
-FIELD_NAME path
+HEADER_FIELD PATH
 TYPE OBJECT_PATH
 OBJECT_PATH '/org/freedesktop/DBus'
-FIELD_NAME ifce
+HEADER_FIELD INTERFACE
 TYPE STRING
 STRING 'org.freedesktop.DBus'
-FIELD_NAME mebr
+HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'ServiceExists'
-FIELD_NAME srvc
+HEADER_FIELD SERVICE
 TYPE STRING
 STRING 'org.freedesktop.DBus'
 ALIGN 8
diff --git a/test/data/valid-messages/unknown-header-field.message b/test/data/valid-messages/unknown-header-field.message
index 5d95f812..973def68 100644
--- a/test/data/valid-messages/unknown-header-field.message
+++ b/test/data/valid-messages/unknown-header-field.message
@@ -3,7 +3,7 @@
 ## VALID_HEADER includes a LENGTH Header and LENGTH Body
 VALID_HEADER method_call
 REQUIRED_FIELDS
-FIELD_NAME unkn
+HEADER_FIELD UNKNOWN
 TYPE INT32
 INT32 0xfeeb
 ALIGN 8