From 7ce7502e1ae23766ba40105327de787c2d1cef9d Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 25 Feb 2005 22:03:30 +0000 Subject: 2005-02-25 Havoc Pennington * doc/dbus-specification.xml: document the GUID thing * dbus/dbus-server.c (_dbus_server_init_base): initialize a globally unique ID for the server, and put a "guid=hexencoded" field in the address * dbus/dbus-bus.c: fix missing #include of dbus-threads-internal.h * dbus/dbus-message.c: ditto * dbus/dbus-dataslot.c: ditto * dbus/dbus-list.c: ditto * dbus/dbus-internals.h: wait, just include dbus-threads-internal.h here * dbus/dbus-string.c (_dbus_string_copy_to_buffer): move back for use in main library * dbus/dbus-sysdeps.c (_dbus_generate_random_bytes_buffer): new function --- dbus/dbus-server-protected.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'dbus/dbus-server-protected.h') diff --git a/dbus/dbus-server-protected.h b/dbus/dbus-server-protected.h index 284d02c5..dbbc3c62 100644 --- a/dbus/dbus-server-protected.h +++ b/dbus/dbus-server-protected.h @@ -35,6 +35,16 @@ DBUS_BEGIN_DECLS typedef struct DBusServerVTable DBusServerVTable; +typedef union DBusGUID DBusGUID; + +/** + * A server's globally unique ID + */ +union DBusGUID +{ + dbus_uint32_t as_uint32s[4]; + unsigned char as_bytes[16]; +}; /** * Virtual table to be implemented by all server "subclasses" @@ -56,6 +66,9 @@ struct DBusServer DBusAtomic refcount; /**< Reference count. */ const DBusServerVTable *vtable; /**< Virtual methods for this instance. */ DBusMutex *mutex; /**< Lock on the server object */ + + DBusGUID guid; /**< Globally unique ID of server */ + DBusWatchList *watches; /**< Our watches */ DBusTimeoutList *timeouts; /**< Our timeouts */ -- cgit