2004-06-07 Havoc Pennington <hp@redhat.com>

	* dbus/dbus-message-builder.c (_dbus_message_data_load): append
	random signature when using REQUIRED_FIELDS (this hack won't work
	in the long term)

	* dbus/dbus-message.c: change the signature to be a header field,
	instead of message->signature special-case string. Incremental
	step forward. Then we can fix up code to send the signature in the
	message, then fix up code to validate said signature, then fix up
	code to not put the typecodes inline, etc.
	(load_one_message): don't make up the signature after the fact
	(decode_header_data): require signature field for the known
	message types

	* dbus/dbus-marshal.c (_dbus_marshal_string_len): new

	* dbus/dbus-protocol.h: add DBUS_HEADER_FIELD_SIGNATURE

6 files changed, 16 insertions, 1 deletions

diff --git a/test/data/valid-messages/simplest-manual.message b/test/data/valid-messages/simplest-manual.message
index 5a5b4105..d6a960d6 100644
--- a/test/data/valid-messages/simplest-manual.message
+++ b/test/data/valid-messages/simplest-manual.message
@@ -20,6 +20,9 @@ STRING 'org.freedesktop.Foo'
 HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Bar'
+HEADER_FIELD SIGNATURE
+TYPE STRING
+STRING ''
 
 ALIGN 8
 END_LENGTH Header
diff --git a/test/data/valid-messages/standard-acquire-service.message b/test/data/valid-messages/standard-acquire-service.message
index 34036091..459f3bb4 100644
--- a/test/data/valid-messages/standard-acquire-service.message
+++ b/test/data/valid-messages/standard-acquire-service.message
@@ -13,6 +13,9 @@ STRING 'AcquireService'
 HEADER_FIELD DESTINATION
 TYPE STRING
 STRING 'org.freedesktop.DBus'
+HEADER_FIELD SIGNATURE
+TYPE STRING
+STRING 'su'
 ALIGN 8
 END_LENGTH Header
 START_LENGTH Body
diff --git a/test/data/valid-messages/standard-hello.message b/test/data/valid-messages/standard-hello.message
index 0ea9dba6..a08835e0 100644
--- a/test/data/valid-messages/standard-hello.message
+++ b/test/data/valid-messages/standard-hello.message
@@ -13,6 +13,9 @@ STRING 'Hello'
 HEADER_FIELD DESTINATION
 TYPE STRING
 STRING 'org.freedesktop.DBus'
+HEADER_FIELD SIGNATURE
+TYPE STRING
+STRING ''
 ALIGN 8
 END_LENGTH Header
 START_LENGTH Body
diff --git a/test/data/valid-messages/standard-list-services.message b/test/data/valid-messages/standard-list-services.message
index a3f1ff5c..3e10aebe 100644
--- a/test/data/valid-messages/standard-list-services.message
+++ b/test/data/valid-messages/standard-list-services.message
@@ -13,6 +13,9 @@ STRING 'ListServices'
 HEADER_FIELD DESTINATION
 TYPE STRING
 STRING 'org.freedesktop.DBus'
+HEADER_FIELD SIGNATURE
+TYPE STRING
+STRING ''
 ALIGN 8
 END_LENGTH Header
 START_LENGTH Body
diff --git a/test/data/valid-messages/standard-service-exists.message b/test/data/valid-messages/standard-service-exists.message
index 293ff787..6b57eb50 100644
--- a/test/data/valid-messages/standard-service-exists.message
+++ b/test/data/valid-messages/standard-service-exists.message
@@ -13,6 +13,9 @@ STRING 'ServiceExists'
 HEADER_FIELD DESTINATION
 TYPE STRING
 STRING 'org.freedesktop.DBus'
+HEADER_FIELD SIGNATURE
+TYPE STRING
+STRING 's'
 ALIGN 8
 END_LENGTH Header
 START_LENGTH Body
diff --git a/test/test-service.c b/test/test-service.c
index f8f8b92a..cb4ff582 100644
--- a/test/test-service.c
+++ b/test/test-service.c
@@ -17,7 +17,7 @@ quit (void)
 static void
 die (const char *message)
 {
-  fprintf (stderr, "*** %s", message);
+  fprintf (stderr, "*** test-service: %s", message);
   exit (1);
 }