/*parsing rule and calculating size of command*/
size = sizeof(struct kdbus_cmd_match);
if(parse_match_key(rule, "interface='", &pInterface)) /*actual size is not important for interface because bloom size is defined by bus*/
- size += KDBUS_PART_HEADER_SIZE + bloom_size;
+ size += KDBUS_ITEM_HEADER_SIZE + bloom_size;
name_size = parse_match_key(rule, "sender='", &pName);
if(name_size)
{
pName = NULL;
}
else
- size += KDBUS_PART_SIZE(name_size + 1); //well known name
+ size += KDBUS_ITEM_SIZE(name_size + 1); //well known name
}
pCmd_match = alloca(size);
if(pName)
{
pItem->type = KDBUS_MATCH_SRC_NAME;
- pItem->size = KDBUS_PART_HEADER_SIZE + name_size + 1;
+ pItem->size = KDBUS_ITEM_HEADER_SIZE + name_size + 1;
memcpy(pItem->str, pName, strlen(pName) + 1);
pItem = KDBUS_PART_NEXT(pItem);
}
if(pInterface)
{
pItem->type = KDBUS_MATCH_BLOOM;
- pItem->size = KDBUS_PART_HEADER_SIZE + bloom_size;
+ pItem->size = KDBUS_ITEM_HEADER_SIZE + bloom_size;
strncpy(pItem->data, pInterface, bloom_size);
}
uint64_t size;
__u64 id = 0;
- pInfo->sec_label_len = 0;
- pInfo->sec_label = NULL;
+ memset(pInfo, 0, sizeof(struct nameInfo));
if(!_dbus_transport_get_socket_fd(transport, &fd))
return -EPERM;
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));
return -errno;
}
+ memset(cmd, 0, sizeof(struct kdbus_cmd_conn_info));
cmd->size = size;
cmd->id = id;
if(id == 0)
if(errno == EINTR)
goto again;
pInfo->uniqueId = 0;
+ return -errno;
}
else
{
if(item->type == KDBUS_ITEM_CREDS)
{
pInfo->userId = item->creds.uid;
- pInfo->processId = item->creds.uid;
+ pInfo->processId = item->creds.pid;
}
if(item->type == KDBUS_ITEM_SECLABEL)
{
- pInfo->sec_label_len = item->size - KDBUS_PART_HEADER_SIZE - 1;
+ pInfo->sec_label_len = item->size - KDBUS_ITEM_HEADER_SIZE - 1;
if(pInfo->sec_label_len != 0)
{
pInfo->sec_label = malloc(pInfo->sec_label_len);
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_make *bus_make;
+ struct kdbus_item *item;
+ __u64 name_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)
{
- _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;
+ bus_make_size = sizeof(struct kdbus_cmd_make) + KDBUS_ITEM_SIZE(name_size) + KDBUS_ITEM_SIZE(sizeof(__u64));
+ bus_make = alloca(bus_make_size);
+ if (!bus_make)
+ {
+ return NULL;
+ }
- memset(&bus_make, 0, sizeof(bus_make));
- bus_make.head.bloom_size = 64;
+ bus_make->size = bus_make_size;
#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_ACCESS_WORLD | 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;
- }
- }
+ item = bus_make->items;
+
+ item->type = KDBUS_ITEM_MAKE_NAME;
+ item->size = KDBUS_ITEM_HEADER_SIZE + name_size;
+ 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);
- 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());
+ item = KDBUS_PART_NEXT(item);
+ item->type = KDBUS_ITEM_BLOOM_SIZE;
+ item->size = KDBUS_ITEM_HEADER_SIZE + sizeof(__u64);
+ item->data64[0] = 64;
- bus_make.n_type = KDBUS_ITEM_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;
+ 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;
+ }
+ }
- _dbus_verbose("Creating bus '%s'\n", bus_make.name);
- ret = ioctl(fdc, KDBUS_CMD_BUS_MAKE, &bus_make);
- if (ret)
+ _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", 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", fdc);
+ dbus_set_error(error, DBUS_ERROR_FAILED, "Opening /dev/kdbus/control failed: %d (%m)", fdc);
+ return NULL;
}
- if (asprintf(&bus, "kdbus:path=/dev/kdbus/%s/bus", bus_make.name) < 0)
+ _dbus_verbose("Creating bus '%s'\n", (bus_make->items[0]).str);
+ ret = ioctl(fdc, KDBUS_CMD_BUS_MAKE, bus_make);
+ if (ret)
{
- BUS_SET_OOM (error);
- 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;
}
- _dbus_verbose("Return value '%s'\n", bus);
- return bus;
+ if (asprintf(&bus, "kdbus:path=/dev/kdbus/%s/bus", (bus_make->items[0]).str) < 0)
+ {
+ BUS_SET_OOM (error);
+ return NULL;
+ }
+
+ _dbus_verbose("Return value '%s'\n", bus);
+ return bus;
}
/*
uint64_t size;
int fd;
DBusTransport *transport;
- const char* unique_name;
transport = dbus_connection_get_transport(connection);
}
size = sizeof(struct kdbus_cmd_match);
- size += KDBUS_PART_SIZE(1)*3 + KDBUS_PART_SIZE(sizeof(__u64))*2; /*3 name related items plus 2 id related items*/
+ size += KDBUS_ITEM_SIZE(1)*3 + KDBUS_ITEM_SIZE(sizeof(__u64))*2; /*3 name related items plus 2 id related items*/
pCmd_match = alloca(size);
if(pCmd_match == NULL)
return FALSE;
}
- unique_name = dbus_bus_get_unique_name(connection);
-
- pCmd_match->id = strtoull(&unique_name[3], NULL, 10);
+ pCmd_match->id = 0;
pCmd_match->cookie = 1;
pCmd_match->size = size;
+ pCmd_match->src_id = 0;
pItem = pCmd_match->items;
- pCmd_match->src_id = 0;
pItem->type = KDBUS_MATCH_NAME_CHANGE;
- pItem->size = KDBUS_PART_HEADER_SIZE + 1;
+ pItem->size = KDBUS_ITEM_HEADER_SIZE + 1;
pItem = KDBUS_PART_NEXT(pItem);
pItem->type = KDBUS_MATCH_NAME_ADD;
- pItem->size = KDBUS_PART_HEADER_SIZE + 1;
+ pItem->size = KDBUS_ITEM_HEADER_SIZE + 1;
pItem = KDBUS_PART_NEXT(pItem);
pItem->type = KDBUS_MATCH_NAME_REMOVE;
- pItem->size = KDBUS_PART_HEADER_SIZE + 1;
+ pItem->size = KDBUS_ITEM_HEADER_SIZE + 1;
pItem = KDBUS_PART_NEXT(pItem);
pItem->type = KDBUS_MATCH_ID_ADD;
- pItem->size = KDBUS_PART_HEADER_SIZE + sizeof(__u64);
+ pItem->size = KDBUS_ITEM_HEADER_SIZE + sizeof(__u64);
+ pItem->id = KDBUS_MATCH_SRC_ID_ANY;
pItem = KDBUS_PART_NEXT(pItem);
pItem->type = KDBUS_MATCH_ID_REMOVE;
- pItem->size = KDBUS_PART_HEADER_SIZE + sizeof(__u64);
+ pItem->size = KDBUS_ITEM_HEADER_SIZE + sizeof(__u64);
+ pItem->id = KDBUS_MATCH_SRC_ID_ANY;
if(ioctl(fd, KDBUS_CMD_MATCH_ADD, pCmd_match))
{
retval = TRUE;
out:
- bus_transaction_cancel_and_free(transaction);
- return retval;
+ if(retval)
+ bus_transaction_execute_and_free(transaction);
+ else
+ bus_transaction_cancel_and_free(transaction);
+
+ return retval;
}
dbus_uint32_t kdbus_request_name(DBusConnection* connection, const DBusString *service_name, dbus_uint32_t flags, __u64 sender_id)
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))
for (name = name_list->names; (uint8_t *)(name) < (uint8_t *)(name_list) + name_list->size; name = KDBUS_PART_NEXT(name))
list_len++;
- _dbus_verbose ("Name list size: %llu\n", name_list->size);
_dbus_verbose ("List len: %d\n", list_len);
list = malloc(sizeof(char*) * (list_len + 1));
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)
- goto out;
+ if(name->size > sizeof(struct kdbus_cmd_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;
}
_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;
}
}
dbus_free_string_array (services);
_dbus_string_free(&name);
+ if(retval)
+ bus_transaction_execute_and_free(transaction);
+ else
bus_transaction_cancel_and_free(transaction);
- return retval;
+
+ return retval;
}
/*
retval = TRUE;
out:
- bus_transaction_cancel_and_free(transaction);
- return retval;
+ if(retval)
+ bus_transaction_execute_and_free(transaction);
+ else
+ bus_transaction_cancel_and_free(transaction);
+
+ return retval;
}
/*