2005-01-15 Havoc Pennington <hp@redhat.com>

	* Land the new message args API and type system.

	This patch is huge, but the public API change is not
	really large. The set of D-BUS types has changed somewhat,
	and the arg "getters" are more geared toward language bindings;
	they don't make a copy, etc.

	There are also some known issues. See these emails for details
	on this huge patch:
	http://lists.freedesktop.org/archives/dbus/2004-December/001836.html
        http://lists.freedesktop.org/archives/dbus/2005-January/001922.html

	* dbus/dbus-marshal-*: all the new stuff

	* dbus/dbus-message.c: basically rewritten

	* dbus/dbus-memory.c (check_guards): with "guards" enabled, init
	freed blocks to be all non-nul bytes so using freed memory is less
	likely to work right

	* dbus/dbus-internals.c (_dbus_test_oom_handling): add
	DBUS_FAIL_MALLOC=N environment variable, so you can do
	DBUS_FAIL_MALLOC=0 to skip the out-of-memory checking, or
	DBUS_FAIL_MALLOC=10 to make it really, really, really slow and
	thorough.

	* qt/message.cpp: port to the new message args API
	(operator<<): use str.utf8() rather than str.unicode()
	(pretty sure this is right from the Qt docs?)

	* glib/dbus-gvalue.c: port to the new message args API

	* bus/dispatch.c, bus/driver.c: port to the new message args API

	* dbus/dbus-string.c (_dbus_string_init_const_len): initialize the
	"locked" flag to TRUE and align_offset to 0; I guess we never
	looked at these anyhow, but seems cleaner.

	* dbus/dbus-string.h (_DBUS_STRING_ALLOCATION_PADDING):
	move allocation padding macro to this header; use it to implement
	(_DBUS_STRING_STATIC): ability to declare a static string.

	* dbus/dbus-message.c (_dbus_message_has_type_interface_member):
	change to return TRUE if the interface is not set.

	* dbus/dbus-string.[hc]: move the D-BUS specific validation stuff
	to dbus-marshal-validate.[hc]

	* dbus/dbus-marshal-basic.c (_dbus_type_to_string): move here from
	dbus-internals.c

	* dbus/Makefile.am: cut over from dbus-marshal.[hc]
	to dbus-marshal-*.[hc]

	* dbus/dbus-object-tree.c (_dbus_decompose_path): move this
	function here from dbus-marshal.c

1 files changed, 128 insertions, 0 deletions

diff --git a/dbus/dbus-marshal-header.h b/dbus/dbus-marshal-header.h
new file mode 100644
index 00000000..32bf51eb
--- /dev/null
+++ b/dbus/dbus-marshal-header.h
@@ -0,0 +1,128 @@
+/* -*- mode: C; c-file-style: "gnu" -*- */
+/* dbus-marshal-header.h  Managing marshaling/demarshaling of message headers
+ *
+ * Copyright (C) 2005  Red Hat, Inc.
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef DBUS_MARSHAL_HEADER_H
+#define DBUS_MARSHAL_HEADER_H
+
+#include <config.h>
+#include <dbus/dbus-marshal-basic.h>
+#include <dbus/dbus-marshal-validate.h>
+
+#ifndef PACKAGE
+#error "config.h not included here"
+#endif
+
+typedef struct DBusHeader      DBusHeader;
+typedef struct DBusHeaderField DBusHeaderField;
+
+#define _DBUS_HEADER_FIELD_VALUE_UNKNOWN -1
+#define _DBUS_HEADER_FIELD_VALUE_NONEXISTENT -2
+
+/**
+ * Cached information about a header field in the message
+ */
+struct DBusHeaderField
+{
+  int            value_pos; /**< Position of field value, or -1/-2 */
+};
+
+struct DBusHeader
+{
+  DBusString data; /**< Header network data, stored
+                    * separately from body so we can
+                    * independently realloc it.
+                    */
+
+  DBusHeaderField fields[DBUS_HEADER_FIELD_LAST + 1]; /**< Track the location
+                                                       * of each field in header
+                                                       */
+
+  dbus_uint32_t padding : 3;        /**< bytes of alignment in header */
+  dbus_uint32_t byte_order : 8;     /**< byte order of header */
+};
+
+dbus_bool_t   _dbus_header_init                   (DBusHeader        *header,
+                                                   int                byte_order);
+void          _dbus_header_free                   (DBusHeader        *header);
+void          _dbus_header_reinit                 (DBusHeader        *header,
+                                                   int                byte_order);
+dbus_bool_t   _dbus_header_create                 (DBusHeader        *header,
+                                                   int                type,
+                                                   const char        *destination,
+                                                   const char        *path,
+                                                   const char        *interface,
+                                                   const char        *member,
+                                                   const char        *error_name);
+dbus_bool_t   _dbus_header_copy                   (const DBusHeader  *header,
+                                                   DBusHeader        *dest);
+int           _dbus_header_get_message_type       (DBusHeader        *header);
+void          _dbus_header_set_serial             (DBusHeader        *header,
+                                                   dbus_uint32_t      serial);
+dbus_uint32_t _dbus_header_get_serial             (DBusHeader        *header);
+void          _dbus_header_update_lengths         (DBusHeader        *header,
+                                                   int                body_len);
+dbus_bool_t   _dbus_header_set_field_basic        (DBusHeader        *header,
+                                                   int                field,
+                                                   int                type,
+                                                   const void        *value);
+dbus_bool_t   _dbus_header_get_field_basic        (DBusHeader        *header,
+                                                   int                field,
+                                                   int                type,
+                                                   void              *value);
+dbus_bool_t   _dbus_header_get_field_raw          (DBusHeader        *header,
+                                                   int                field,
+                                                   const DBusString **str,
+                                                   int               *pos);
+dbus_bool_t   _dbus_header_delete_field           (DBusHeader        *header,
+                                                   int                field);
+void          _dbus_header_toggle_flag            (DBusHeader        *header,
+                                                   dbus_uint32_t      flag,
+                                                   dbus_bool_t        value);
+dbus_bool_t   _dbus_header_get_flag               (DBusHeader        *header,
+                                                   dbus_uint32_t      flag);
+dbus_bool_t   _dbus_header_ensure_signature       (DBusHeader        *header,
+                                                   DBusString       **type_str,
+                                                   int               *type_pos);
+dbus_bool_t   _dbus_header_have_message_untrusted (int                max_message_length,
+                                                   DBusValidity      *validity,
+                                                   int               *byte_order,
+                                                   int               *fields_array_len,
+                                                   int               *header_len,
+                                                   int               *body_len,
+                                                   const DBusString  *str,
+                                                   int                start,
+                                                   int                len);
+dbus_bool_t   _dbus_header_load_untrusted         (DBusHeader        *header,
+                                                   DBusValidity      *validity,
+                                                   int                byte_order,
+                                                   int                fields_array_len,
+                                                   int                header_len,
+                                                   int                body_len,
+                                                   const DBusString  *str,
+                                                   int                start,
+                                                   int                len);
+
+
+
+
+#endif /* DBUS_MARSHAL_HEADER_H */