diff options
Diffstat (limited to 'dbus/dbus-server.c')
| -rw-r--r-- | dbus/dbus-server.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c index 883b361b..3b9ee341 100644 --- a/dbus/dbus-server.c +++ b/dbus/dbus-server.c @@ -53,24 +53,6 @@ * @{ */ -static void -init_guid (DBusGUID *guid) -{ - long now; - char *p; - int ts_size; - - _dbus_get_current_time (&now, NULL); - - guid->as_uint32s[0] = now; - - ts_size = sizeof (guid->as_uint32s[0]); - p = ((char*)guid->as_bytes) + ts_size; - - _dbus_generate_random_bytes_buffer (p, - sizeof (guid->as_bytes) - ts_size); -} - /* this is a little fragile since it assumes the address doesn't * already have a guid, but it shouldn't */ @@ -116,8 +98,6 @@ _dbus_server_init_base (DBusServer *server, const DBusServerVTable *vtable, const DBusString *address) { - DBusString guid_raw; - server->vtable = vtable; server->refcount.value = 1; @@ -128,13 +108,9 @@ _dbus_server_init_base (DBusServer *server, if (!_dbus_string_init (&server->guid_hex)) return FALSE; - init_guid (&server->guid); + _dbus_generate_uuid (&server->guid); - _dbus_string_init_const_len (&guid_raw, (signed char*) server->guid.as_bytes, - sizeof (server->guid.as_bytes)); - if (!_dbus_string_hex_encode (&guid_raw, 0, - &server->guid_hex, - _dbus_string_get_length (&server->guid_hex))) + if (!_dbus_uuid_encode (&server->guid, &server->guid_hex)) goto failed; server->address = copy_address_with_guid_appended (address, |