2003-08-30 Havoc Pennington <hp@pobox.com>

	* test/data/valid-config-files/system.d/test.conf: change to
	root for the user so warnings don't get printed

	* dbus/dbus-message.c: add dbus_message_get_path,
	dbus_message_set_path

	* dbus/dbus-object-tree.c (do_test_dispatch): add test of
	dispatching to a path

	* dbus/dbus-string.c (_dbus_string_validate_path): add

	* dbus/dbus-marshal.c (_dbus_demarshal_object_path): implement
	(_dbus_marshal_object_path): implement

	* dbus/dbus-protocol.h (DBUS_HEADER_FIELD_PATH): new header field
	to contain the path to the target object
	(DBUS_HEADER_FIELD_SENDER_SERVICE): rename
	DBUS_HEADER_FIELD_SENDER to explicitly say it's the sender service

16 files changed, 27 insertions, 63 deletions

diff --git a/test/data/valid-config-files/system.d/test.conf b/test/data/valid-config-files/system.d/test.conf
index 3d1b2f54..10a79847 100644
--- a/test/data/valid-config-files/system.d/test.conf
+++ b/test/data/valid-config-files/system.d/test.conf
@@ -5,9 +5,9 @@
        policy so that a particular user can own a service, and other 
        connections can get messages from it -->
 
-  <!-- Only fooserviceuser can own the FooService service, and 
+  <!-- Only root can own the FooService service, and 
        this user can only send the one kind of message -->
-  <policy user="fooserviceuser">
+  <policy user="root">
     <allow own="org.foo.FooService"/>
     <allow send_interface="org.foo.FooBroadcastInterface"/>
   </policy>
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 4fea3d25..692eca06 100644
--- a/test/data/valid-messages/array-of-array-of-uint32.message
+++ b/test/data/valid-messages/array-of-array-of-uint32.message
@@ -1,12 +1,7 @@
 # Message with an array of array of uint32
 
 VALID_HEADER method_call
-FIELD_NAME ifce
-TYPE STRING
-STRING 'org.freedesktop.Foo'
-FIELD_NAME mebr
-TYPE STRING
-STRING 'Bar'
+REQUIRED_FIELDS
 END_LENGTH Header
 ALIGN 8
 START_LENGTH Body
diff --git a/test/data/valid-messages/dict-simple.message b/test/data/valid-messages/dict-simple.message
index 9450ef14..6986d439 100644
--- a/test/data/valid-messages/dict-simple.message
+++ b/test/data/valid-messages/dict-simple.message
@@ -1,12 +1,7 @@
 # A simple dict
 
 VALID_HEADER method_call
-FIELD_NAME ifce
-TYPE STRING
-STRING 'org.freedesktop.Foo'
-FIELD_NAME mebr
-TYPE STRING
-STRING 'Bar'
+REQUIRED_FIELDS
 END_LENGTH Header
 ALIGN 8
 START_LENGTH Body
diff --git a/test/data/valid-messages/dict.message b/test/data/valid-messages/dict.message
index 6b15c627..0f997b1f 100644
--- a/test/data/valid-messages/dict.message
+++ b/test/data/valid-messages/dict.message
@@ -1,12 +1,7 @@
 # Dict with different values
 
 VALID_HEADER method_call
-FIELD_NAME ifce
-TYPE STRING
-STRING 'org.freedesktop.Foo'
-FIELD_NAME mebr
-TYPE STRING
-STRING 'Bar'
+REQUIRED_FIELDS
 ALIGN 8
 END_LENGTH Header
 START_LENGTH Body
diff --git a/test/data/valid-messages/emptiness.message b/test/data/valid-messages/emptiness.message
index edc7a6cb..dbf531ca 100644
--- a/test/data/valid-messages/emptiness.message
+++ b/test/data/valid-messages/emptiness.message
@@ -1,12 +1,7 @@
 # Empty arrays and strings
 
 VALID_HEADER method_call
-FIELD_NAME ifce
-TYPE STRING
-STRING 'org.freedesktop.Foo'
-FIELD_NAME mebr
-TYPE STRING
-STRING 'Bar'
+REQUIRED_FIELDS
 END_LENGTH Header
 ALIGN 8
 START_LENGTH Body
diff --git a/test/data/valid-messages/lots-of-arguments.message b/test/data/valid-messages/lots-of-arguments.message
index 36cad4cd..993755ab 100644
--- a/test/data/valid-messages/lots-of-arguments.message
+++ b/test/data/valid-messages/lots-of-arguments.message
@@ -1,12 +1,7 @@
 # Message with lots of different argument types
 
 VALID_HEADER method_call
-FIELD_NAME ifce
-TYPE STRING
-STRING 'org.freedesktop.Foo'
-FIELD_NAME mebr
-TYPE STRING
-STRING 'Bar'
+REQUIRED_FIELDS
 END_LENGTH Header
 ALIGN 8
 START_LENGTH Body
diff --git a/test/data/valid-messages/no-padding.message b/test/data/valid-messages/no-padding.message
index 0241c364..e6d27d9d 100644
--- a/test/data/valid-messages/no-padding.message
+++ b/test/data/valid-messages/no-padding.message
@@ -3,12 +3,7 @@
 ## VALID_HEADER includes a LENGTH Header and LENGTH Body
 VALID_HEADER method_call
 
-FIELD_NAME ifce
-TYPE STRING
-STRING 'org.freedesktop.Foo'
-FIELD_NAME mebr
-TYPE STRING
-STRING 'Bar'
+REQUIRED_FIELDS
 
 ## this byte array is filled with zeros to the natural length 
 ## of the header
diff --git a/test/data/valid-messages/opposite-endian.message b/test/data/valid-messages/opposite-endian.message
index b225f013..c638b7b0 100644
--- a/test/data/valid-messages/opposite-endian.message
+++ b/test/data/valid-messages/opposite-endian.message
@@ -5,12 +5,7 @@ OPPOSITE_ENDIAN
 ## VALID_HEADER includes a LENGTH Header and LENGTH Body
 VALID_HEADER method_call
 
-FIELD_NAME ifce
-TYPE STRING
-STRING 'org.freedesktop.Foo'
-FIELD_NAME mebr
-TYPE STRING
-STRING 'Bar'
+REQUIRED_FIELDS
 
 FIELD_NAME unkn
 TYPE INT32
diff --git a/test/data/valid-messages/recursive-types.message b/test/data/valid-messages/recursive-types.message
index a8ef0441..192fd9b7 100644
--- a/test/data/valid-messages/recursive-types.message
+++ b/test/data/valid-messages/recursive-types.message
@@ -3,12 +3,7 @@
 ## VALID_HEADER includes a LENGTH Header and LENGTH Body
 VALID_HEADER method_call
 
-FIELD_NAME ifce
-TYPE STRING
-STRING 'org.freedesktop.Foo'
-FIELD_NAME mebr
-TYPE STRING
-STRING 'Bar'
+REQUIRED_FIELDS
 
 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 533c1179..9779234b 100644
--- a/test/data/valid-messages/simplest-manual.message
+++ b/test/data/valid-messages/simplest-manual.message
@@ -11,6 +11,9 @@ LENGTH Body
 ## client serial
 INT32 7
 
+FIELD_NAME path
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
 FIELD_NAME ifce
 TYPE STRING
 STRING 'org.freedesktop.Foo'
diff --git a/test/data/valid-messages/simplest.message b/test/data/valid-messages/simplest.message
index 868d270e..b9ddaf6b 100644
--- a/test/data/valid-messages/simplest.message
+++ b/test/data/valid-messages/simplest.message
@@ -2,13 +2,7 @@
 
 ## VALID_HEADER includes a LENGTH Header and LENGTH Body
 VALID_HEADER method_call
-
-FIELD_NAME ifce
-TYPE STRING
-STRING 'org.freedesktop.Foo'
-FIELD_NAME mebr
-TYPE STRING
-STRING 'Bar'
+REQUIRED_FIELDS
 
 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 081473f0..f313061f 100644
--- a/test/data/valid-messages/standard-acquire-service.message
+++ b/test/data/valid-messages/standard-acquire-service.message
@@ -1,6 +1,9 @@
 # Standard org.freedesktop.DBus.AcquireService message
 
 VALID_HEADER method_call
+FIELD_NAME path
+TYPE OBJECT_PATH
+OBJECT_PATH '/org/freedesktop/DBus'
 FIELD_NAME ifce
 TYPE STRING
 STRING 'org.freedesktop.DBus'
diff --git a/test/data/valid-messages/standard-hello.message b/test/data/valid-messages/standard-hello.message
index ed9ff9e7..795ede74 100644
--- a/test/data/valid-messages/standard-hello.message
+++ b/test/data/valid-messages/standard-hello.message
@@ -1,6 +1,9 @@
 # Standard org.freedesktop.DBus.Hello message
 
 VALID_HEADER method_call
+FIELD_NAME path
+TYPE OBJECT_PATH
+OBJECT_PATH '/org/freedesktop/DBus'
 FIELD_NAME ifce
 TYPE STRING
 STRING 'org.freedesktop.DBus'
diff --git a/test/data/valid-messages/standard-list-services.message b/test/data/valid-messages/standard-list-services.message
index 9a6f1d87..4c9c7c66 100644
--- a/test/data/valid-messages/standard-list-services.message
+++ b/test/data/valid-messages/standard-list-services.message
@@ -1,6 +1,9 @@
 # Standard org.freedesktop.DBus.ListServices message
 
 VALID_HEADER method_call
+FIELD_NAME path
+TYPE OBJECT_PATH
+OBJECT_PATH '/org/freedesktop/DBus'
 FIELD_NAME ifce
 TYPE STRING
 STRING 'org.freedesktop.DBus'
diff --git a/test/data/valid-messages/standard-service-exists.message b/test/data/valid-messages/standard-service-exists.message
index c53319b6..ce14811a 100644
--- a/test/data/valid-messages/standard-service-exists.message
+++ b/test/data/valid-messages/standard-service-exists.message
@@ -1,6 +1,9 @@
 # Standard org.freedesktop.DBus.ServiceExists message
 
 VALID_HEADER method_call
+FIELD_NAME path
+TYPE OBJECT_PATH
+OBJECT_PATH '/org/freedesktop/DBus'
 FIELD_NAME ifce
 TYPE STRING
 STRING 'org.freedesktop.DBus'
diff --git a/test/data/valid-messages/unknown-header-field.message b/test/data/valid-messages/unknown-header-field.message
index 17ae116a..5d95f812 100644
--- a/test/data/valid-messages/unknown-header-field.message
+++ b/test/data/valid-messages/unknown-header-field.message
@@ -2,12 +2,7 @@
 
 ## VALID_HEADER includes a LENGTH Header and LENGTH Body
 VALID_HEADER method_call
-FIELD_NAME ifce
-TYPE STRING
-STRING 'org.freedesktop.Foo'
-FIELD_NAME mebr
-TYPE STRING
-STRING 'Bar'
+REQUIRED_FIELDS
 FIELD_NAME unkn
 TYPE INT32
 INT32 0xfeeb