summaryrefslogtreecommitdiff
path: root/test/data/valid-messages/standard-hello.message
diff options
context:
space:
mode:
authorMark McLoughlin <mark@skynet.ie>2003-09-21 18:43:20 +0000
committerMark McLoughlin <mark@skynet.ie>2003-09-21 18:43:20 +0000
commitdaf8d6579e1ae0ea748810b63180bd5eea2ab9c4 (patch)
tree940fca6401e72cfbf8ed47fd9b185f21377483b2 /test/data/valid-messages/standard-hello.message
parentfafc38bb45db8031fc6f252e86df86dc585fefc9 (diff)
downloaddbus-daf8d6579e1ae0ea748810b63180bd5eea2ab9c4.tar.gz
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.
Diffstat (limited to 'test/data/valid-messages/standard-hello.message')
-rw-r--r--test/data/valid-messages/standard-hello.message8
1 files changed, 4 insertions, 4 deletions
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