if(id == 0)
size += strlen(name) + 1;
- cmd = malloc(size);
+ cmd = alloca(size);
if (!cmd)
{
_dbus_verbose("Error allocating memory for: %s,%s\n", _dbus_strerror (errno), _dbus_error_from_errno (errno));
if(errno == EINTR)
goto again;
pInfo->uniqueId = 0;
+ return -errno;
}
else
{
if(errno == EINTR)
goto again2;
_dbus_verbose("kdbus error freeing pool: %d (%m)\n", errno);
- return -1;
+ return -errno;
}
}
- free(cmd);
return ret;
}
*/
char* make_kdbus_bus(DBusBusType type, const char* address, DBusError *error)
{
- struct {
- struct kdbus_cmd_bus_make head;
- uint64_t n_size;
- uint64_t n_type;
- char name[64];
- } __attribute__ ((__aligned__(8))) bus_make;
-
- int fdc, ret;
- char *bus;
- char *addr_value;
-
- _dbus_verbose("Opening /dev/kdbus/control\n");
- fdc = open("/dev/kdbus/control", O_RDWR|O_CLOEXEC);
- if (fdc < 0)
+ // TODO Function alloca() used. In upstream there was a patch proposing to
+ // replace alloca() with malloc() to assure memory alignment. If there will be
+ // suggestion to use malloc instead of alloca this function has to be modified
+ struct kdbus_cmd_bus_make *bus_make;
+ struct kdbus_item *item;
+ __u64 name_size, item_size, bus_make_size;
+ int fdc, ret;
+ char *addr_value = NULL;
+ char *bus = NULL;
+ char *name = NULL;
+
+ if(type == DBUS_BUS_SYSTEM)
+ name_size = snprintf(name, 0, "%u-kdbus-%s", getuid(), "system") + 1;
+ else if(type == DBUS_BUS_SESSION)
+ name_size = snprintf(name, 0, "%u-kdbus", getuid()) + 1;
+ else
+ name_size = snprintf(name, 0, "%u-kdbus-%u", getuid(), getpid()) + 1;
+
+ name = alloca(name_size);
+ if (!name)
+ {
+ return NULL;
+ }
+
+ item_size = KDBUS_PART_HEADER_SIZE + name_size;
+ bus_make_size = sizeof(struct kdbus_cmd_bus_make) + item_size;
+
+ bus_make = alloca(bus_make_size);
+ if (!bus_make)
{
- _dbus_verbose("--- error %d (%m)\n", fdc);
- dbus_set_error(error, DBUS_ERROR_FAILED, "Opening /dev/kdbus/control failed: %d (%m)", fdc);
- return NULL;
+ return NULL;
}
- addr_value = strchr(address, ':') + 1;
+ item = bus_make->items;
+ item->size = item_size;
+ item->type = KDBUS_ITEM_MAKE_NAME;
+
+ if(type == DBUS_BUS_SYSTEM)
+ sprintf(name, "%u-kdbus-%s", getuid(), "system");
+ else if(type == DBUS_BUS_SESSION)
+ sprintf(name, "%u-kdbus", getuid());
+ else
+ sprintf(name, "%u-kdbus-%u", getuid(), getpid());
+
+ memcpy((bus_make->items)->str, name, name_size);
+
+ bus_make->bloom_size = 64;
+ bus_make->size = bus_make_size;
- memset(&bus_make, 0, sizeof(bus_make));
- bus_make.head.bloom_size = 64;
#ifdef POLICY_TO_KDBUS
- bus_make.head.flags = KDBUS_MAKE_ACCESS_WORLD;
+ bus_make->flags = KDBUS_MAKE_ACCESS_WORLD;
#else
- bus_make.head.flags = KDBUS_MAKE_POLICY_OPEN;
+ bus_make->flags = KDBUS_MAKE_POLICY_OPEN;
#endif
- if(*addr_value)
- {
- if(!strcmp(addr_value, "sbb"))
- bus_make.head.flags |= KDBUS_MAKE_SBB_OFFSET;
- else
- {
- dbus_set_error_const(error, DBUS_ERROR_BAD_ADDRESS, "Invalid address parameter.");
- return NULL;
- }
- }
- if(type == DBUS_BUS_SYSTEM)
- snprintf(bus_make.name, sizeof(bus_make.name), "%u-kdbus-%s", getuid(), "system");
- else if(type == DBUS_BUS_SESSION)
- snprintf(bus_make.name, sizeof(bus_make.name), "%u-kdbus", getuid());
- else
- snprintf(bus_make.name, sizeof(bus_make.name), "%u-kdbus-%u", getuid(), getpid());
+ addr_value = strchr(address, ':') + 1;
+ if(*addr_value)
+ {
+ if(!strcmp(addr_value, "sbb"))
+ bus_make->flags |= KDBUS_MAKE_SBB_OFFSET;
+ else
+ {
+ dbus_set_error_const(error, DBUS_ERROR_BAD_ADDRESS, "Invalid address parameter.");
+ return NULL;
+ }
+ }
- bus_make.n_type = KDBUS_MAKE_NAME;
- bus_make.n_size = KDBUS_PART_HEADER_SIZE + strlen(bus_make.name) + 1;
- bus_make.head.size = sizeof(struct kdbus_cmd_bus_make) + bus_make.n_size;
+ _dbus_verbose("Opening /dev/kdbus/control\n");
+ fdc = open("/dev/kdbus/control", O_RDWR|O_CLOEXEC);
+ if (fdc < 0)
+ {
+ _dbus_verbose("--- error %d (%m)\n", fdc);
+ dbus_set_error(error, DBUS_ERROR_FAILED, "Opening /dev/kdbus/control failed: %d (%m)", fdc);
+ return NULL;
+ }
- _dbus_verbose("Creating bus '%s'\n", bus_make.name);
- ret = ioctl(fdc, KDBUS_CMD_BUS_MAKE, &bus_make);
- if (ret)
+ _dbus_verbose("Creating bus '%s'\n", (bus_make->items[0]).str);
+ ret = ioctl(fdc, KDBUS_CMD_BUS_MAKE, bus_make);
+ if (ret)
{
- _dbus_verbose("--- error %d (%m)\n", ret);
- dbus_set_error(error, DBUS_ERROR_FAILED, "Creating bus '%s' failed: %d (%m)", bus_make.name, fdc);
- return NULL;
+ _dbus_verbose("--- error %d (%m)\n", errno);
+ dbus_set_error(error, DBUS_ERROR_FAILED, "Creating bus '%s' failed: %d (%m)",
+ (bus_make->items[0]).str, errno);
+ return NULL;
}
- if (asprintf(&bus, "kdbus:path=/dev/kdbus/%s/bus", bus_make.name) < 0)
+ if (asprintf(&bus, "kdbus:path=/dev/kdbus/%s/bus", (bus_make->items[0]).str) < 0)
{
- BUS_SET_OOM (error);
- return NULL;
+ BUS_SET_OOM (error);
+ return NULL;
}
- _dbus_verbose("Return value '%s'\n", bus);
- return bus;
+ _dbus_verbose("Return value '%s'\n", bus);
+ return bus;
}
/*
struct kdbus_cmd_name_list __attribute__ ((__aligned__(8))) cmd;
struct kdbus_name_list *name_list;
struct kdbus_cmd_name *name;
- DBusTransport *transport;
+ DBusTransport *transport = dbus_connection_get_transport(connection);
dbus_bool_t ret_val = FALSE;
char** list;
int list_len = 0;
int i = 0;
int j;
- transport = dbus_connection_get_transport(connection);
-
if(!_dbus_transport_get_socket_fd(transport, &fd))
return FALSE;
- cmd.flags = KDBUS_NAME_LIST_NAMES; //TODO add handling | KDBUS_NAME_LIST_UNIQUE;
+ cmd.flags = KDBUS_NAME_LIST_NAMES | KDBUS_NAME_LIST_UNIQUE;
again:
- if(ioctl(fd, KDBUS_CMD_NAME_LIST, cmd))
+ if(ioctl(fd, KDBUS_CMD_NAME_LIST, &cmd))
{
if(errno == EINTR)
goto again;
else
{
_dbus_verbose("kdbus error asking for name list: err %d (%m)\n",errno);
- goto out;
+ return FALSE;
}
}
for (name = name_list->names; (uint8_t *)(name) < (uint8_t *)(name_list) + name_list->size; name = KDBUS_PART_NEXT(name))
list_len++;
+ _dbus_verbose ("List len: %d\n", list_len);
+
list = malloc(sizeof(char*) * (list_len + 1));
if(list == NULL)
goto out;
for (name = name_list->names; (uint8_t *)(name) < (uint8_t *)(name_list) + name_list->size; name = KDBUS_PART_NEXT(name))
{
- list[i] = strdup(name->name);
- if(list[i] == NULL)
- {
- for(j=0; j<i; j++)
- free(list[j]);
- free(list);
- goto out;
- }
+ if(*name->name)
+ {
+ list[i] = strdup(name->name);
+ if(list[i] == NULL)
+ goto out;
+ }
+ else
+ {
+ list[i] = malloc(snprintf(list[i], 0, ":1.%llu0", (unsigned long long)name->id));
+ if(list[i] == NULL)
+ goto out;
+ sprintf(list[i], ":1.%llu", (unsigned long long int)name->id);
+ }
_dbus_verbose ("Name %d: %s\n", i, list[i]);
++i;
}
- again2:
- if (ioctl(fd, KDBUS_CMD_FREE, &cmd.offset) < 0)
- {
- if(errno == EINTR)
- goto again2;
- _dbus_verbose("kdbus error freeing pool: %d (%m)\n", errno);
- return -1;
- }
-
list[i] = NULL;
*array_len = list_len;
*listp = list;
ret_val = TRUE;
out:
+ if (ioctl(fd, KDBUS_CMD_FREE, &cmd.offset) < 0)
+ {
+ if(errno == EINTR)
+ goto out;
+ _dbus_verbose("kdbus error freeing pool: %d (%m)\n", errno);
+ ret_val = FALSE;
+ }
+ if(ret_val == FALSE)
+ {
+ for(j=0; j<i; j++)
+ free(list[j]);
+ free(list);
+ *array_len = 0;
+ *listp = NULL;
+ }
+
return ret_val;
}
*/
dbus_bool_t kdbus_list_queued (DBusConnection *connection, DBusList **return_list,
const char *name, DBusError *error)
-{ //todo implement using new CMD_NAME_LIST
-/* int fd;
+{
+ int fd;
dbus_bool_t ret_val = FALSE;
int name_length;
- struct kdbus_cmd_names* pCmd;
+ struct kdbus_cmd_conn_info *pCmd;
__u64 cmd_size;
-
+ DBusTransport *transport = dbus_connection_get_transport(connection);
+ struct kdbus_name_list *name_list;
+ struct kdbus_cmd_name *owner;
_dbus_assert (*return_list == NULL);
name_length = strlen(name) + 1;
-
- cmd_size = sizeof(struct kdbus_cmd_names) + sizeof(struct kdbus_cmd_name) + name_length;
- pCmd = malloc(cmd_size);
+ cmd_size = sizeof(struct kdbus_cmd_conn_info) + name_length;
+ pCmd = alloca(cmd_size);
if(pCmd == NULL)
goto out;
pCmd->size = cmd_size;
- pCmd->names[0].id = 0;
- pCmd->names[0].size = sizeof(struct kdbus_cmd_name) + name_length;
- memcpy(pCmd->names[0].name, name, name_length);
+ pCmd->id = 0;
+ memcpy(pCmd->name, name, name_length);
- _dbus_verbose ("Asking for queued owners of %s\n", pCmd->names[0].name);
+ _dbus_verbose ("Asking for queued owners of %s\n", pCmd->name);
- _dbus_transport_get_socket_fd(dbus_connection_get_transport(connection), &fd);
+ _dbus_transport_get_socket_fd(transport, &fd);
again:
- cmd_size = 0;
- if(ioctl(fd, KDBUS_CMD_NAME_LIST, pCmd))
+ if(ioctl(fd, KDBUS_CMD_NAME_LIST_QUEUED, pCmd))
{
if(errno == EINTR)
goto again;
- if(errno == ENOBUFS) //buffer to small to put all names into it
- cmd_size = pCmd->size; //here kernel tells how much memory it needs
- else if(errno == ENOENT)
+ else if(errno == ESRCH)
{
dbus_set_error (error, DBUS_ERROR_NAME_HAS_NO_OWNER,
"Could not get owners of name '%s': no such name", name);
- free(pCmd);
return FALSE;
}
else
goto out;
}
}
- if(cmd_size) //kernel needs more memory
- {
- pCmd = realloc(pCmd, cmd_size); //prepare memory
- if(pCmd == NULL)
- return FALSE;
- goto again; //and try again
- }
- else
- {
- struct kdbus_cmd_name* pCmd_name;
- for (pCmd_name = pCmd->names; (uint8_t *)(pCmd_name) < (uint8_t *)(pCmd) + pCmd->size; pCmd_name = KDBUS_PART_NEXT(pCmd_name))
- {
- char *uname = NULL;
+ name_list = (struct kdbus_name_list *)((char*)dbus_transport_get_pool_pointer(transport) + pCmd->offset);
- _dbus_verbose ("Got queued owner id: %llu\n", (unsigned long long)pCmd_name->id);
- uname = malloc(snprintf(uname, 0, ":1.%llu0", (unsigned long long)pCmd_name->id));
- if(uname == NULL)
- goto out;
- sprintf(uname, ":1.%llu", (unsigned long long int)pCmd_name->id);
- if (!_dbus_list_append (return_list, uname))
- goto out;
- }
+ for (owner = name_list->names; (uint8_t *)(owner) < (uint8_t *)(name_list) + name_list->size; owner = KDBUS_PART_NEXT(owner))
+ {
+ char *uname = NULL;
+
+ _dbus_verbose ("Got queued owner id: %llu\n", (unsigned long long)owner->id);
+ uname = malloc(snprintf(uname, 0, ":1.%llu0", (unsigned long long)owner->id));
+ if(uname == NULL)
+ goto out;
+ sprintf(uname, ":1.%llu", (unsigned long long int)owner->id);
+ if (!_dbus_list_append (return_list, uname))
+ goto out;
}
ret_val = TRUE;
out:
- if(pCmd)
- free(pCmd);
+ if (ioctl(fd, KDBUS_CMD_FREE, &pCmd->offset) < 0)
+ {
+ if(errno == EINTR)
+ goto out;
+ _dbus_verbose("kdbus error freeing pool: %d (%m)\n", errno);
+ ret_val = FALSE;
+ }
if(ret_val == FALSE)
{
DBusList *link;
}
}
- return ret_val;*/
- dbus_set_error (error, _dbus_error_from_errno (errno),
- "Failed to list queued owners of \"%s\": %s",
- name, "Function not implemented yet");
- return FALSE;
+ return ret_val;
}
/*
_dbus_verbose("Unique name discovered:%s\n", owner);
}
else if((ret != -ENOENT) && (ret != -ENXIO))
- _dbus_verbose("kdbus error sending name query: err %d (%m)\n", errno);
+ _dbus_verbose("kdbus error sending name query: err %d (%m)\n", ret);
return ret;
}
goto out;
#endif
- if (request_kdbus_name(fd, services[i], (DBUS_NAME_FLAG_ALLOW_REPLACEMENT | KDBUS_NAME_STARTER) , 0) < 0)
+ if (request_kdbus_name(fd, services[i], (DBUS_NAME_FLAG_ALLOW_REPLACEMENT | KDBUS_NAME_STARTER_NAME) , 0) < 0)
goto out;
if(!_dbus_string_append(&name, services[i]))
goto out;
if(!bus_registry_ensure (bus_connection_get_registry (connection), &name, connection,
- (DBUS_NAME_FLAG_ALLOW_REPLACEMENT | KDBUS_NAME_STARTER), transaction, NULL))
+ (DBUS_NAME_FLAG_ALLOW_REPLACEMENT | KDBUS_NAME_STARTER_NAME), transaction, NULL))
goto out;
if(!_dbus_string_set_length(&name, 0))
goto out;
projects / platform / upstream / dbus.git / blobdiff