With AF_BUS, use the peer address as unique name

2 files changed, 9 insertions, 12 deletions

diff --git a/bus/driver-afbus.c b/bus/driver-afbus.c
index 507a19a6..62c2938b 100644
--- a/bus/driver-afbus.c
+++ b/bus/driver-afbus.c
@@ -224,9 +224,6 @@ bus_driver_afbus_append_unique_name (DBusConnection *connection,
   if (!_dbus_string_append_uint (str, address.sbus_addr.s_addr))
     return FALSE;
 
-  if (!_dbus_string_append (str, "."))
-    return FALSE;
-
   return TRUE;
 }
 
@@ -290,7 +287,7 @@ bus_driver_afbus_assign_address (DBusConnection *connection)
   struct sockaddr_bus address;
   long len = sizeof (address);
   int fd;
-  static unsigned long long next_address = 0x1111000000000001;
+  static dbus_uint64_t next_address = 0x1111000000000001ULL;
 
   memset (&address, 0, sizeof (address));
   if (!dbus_connection_get_peer_address (connection, &address, &len) ||
diff --git a/bus/driver.c b/bus/driver.c
index d776e2cc..11767c8c 100644
--- a/bus/driver.c
+++ b/bus/driver.c
@@ -223,16 +223,16 @@ create_unique_client_name (DBusConnection *connection,
         return FALSE;
 
       if (!bus_driver_afbus_append_unique_name (connection, str))
-        return FALSE;
-
-      if (!_dbus_string_append_int (str, next_major_number))
-        return FALSE;
+        {
+          if (!_dbus_string_append_int (str, next_major_number))
+            return FALSE;
 
-      if (!_dbus_string_append (str, "."))
-        return FALSE;
+          if (!_dbus_string_append (str, "."))
+            return FALSE;
 
-      if (!_dbus_string_append_int (str, next_minor_number))
-        return FALSE;
+          if (!_dbus_string_append_int (str, next_minor_number))
+            return FALSE;
+        }
 
       next_minor_number += 1;