#include <stdlib.h>
#include <unistd.h>
#include <sys/mman.h>
+#include <limits.h>
#define KDBUS_ALIGN8(l) (((l) + 7) & ~7)
#define KDBUS_PART_HEADER_SIZE offsetof(struct kdbus_item, data)
for (part = (head)->first; \
(uint8_t *)(part) < (uint8_t *)(head) + (head)->size; \
part = KDBUS_PART_NEXT(part))
-#define POOL_SIZE (16 * 1024LU * 1024LU) //todo pool size to be decided
+#define RECEIVE_POOL_SIZE (10 * 1024LU * 1024LU)
+#define MEMFD_SIZE_THRESHOLD (2 * 1024 * 1024LU) // over this memfd is used
+
+#define KDBUS_MSG_DECODE_DEBUG 0
+
/**
* Opaque object representing a socket file descriptor transport.
* incoming data.
*/
void* kdbus_mmap_ptr;
+ int memfd; /* File descriptor to memory
+ * pool from Kdbus kernel module */
};
return TRUE;
}
+//static void check_read_watch (DBusTransport *transport);
+
/*
* Adds locally generated message to received messages queue
*
}
_dbus_connection_queue_synthesized_message_link(transport->connection, message_link);
+// check_read_watch(transport);
return TRUE;
}
-static int kdbus_write_msg(DBusTransport *transport, DBusMessage *message, int fd)
+/*static void kdbus_debug_print_bytes(struct DBusString *data, int size)
{
- struct kdbus_msg *msg;
- struct kdbus_item *item;
- uint64_t size;
- const char *name;
- uint64_t dst_id = KDBUS_DST_ID_BROADCAST;
- const DBusString *header;
- const DBusString *body;
- uint64_t ret_size;
- uint64_t body_size;
+ uint64_t i;
+
+ fprintf (stderr, "\ndata:\n");
+ for(i=0; i < size; i++)
+ {
+ fprintf (stderr, "%02x", _dbus_string_get_byte(data,i));
+ }
+ fprintf (stderr, "\nsize: %d, i: %lu\n", size, i);
+
+}*/
+
+static int kdbus_init_memfd(DBusTransportSocket* socket_transport)
+{
+ int memfd;
+ int ret;
+
+ if(socket_transport->memfd == -1)
+ {
+ ret = ioctl(socket_transport->fd, KDBUS_CMD_MEMFD_NEW, &memfd);
+ if (ret < 0) {
+ _dbus_verbose("KDBUS_CMD_MEMFD_NEW failed: \n");
+ return -1;
+ }
+
+ socket_transport->memfd = memfd;
+ _dbus_verbose("kdbus_init_memfd: %d!!\n", socket_transport->memfd);
+
+ }
+ return 0;
+}
+
+static struct kdbus_msg* kdbus_init_msg(const char* name, __u64 dst_id, uint64_t body_size, dbus_bool_t use_memfd, int fds_count)
+{
+ struct kdbus_msg* msg;
+ uint64_t msg_size;
+
+ msg_size = sizeof(struct kdbus_msg);
-// uint64_t i;
+ if(use_memfd == TRUE) // bulk data - memfd - encoded and plain
+ msg_size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_memfd));
+ else {
+ msg_size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec));
+ if(body_size)
+ msg_size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec));
+ }
+
+ if(fds_count)
+ msg_size += KDBUS_ITEM_SIZE(sizeof(int)*fds_count);
+
+ if (name)
+ msg_size += KDBUS_ITEM_SIZE(strlen(name) + 1);
+ else if (dst_id == KDBUS_DST_ID_BROADCAST)
+ msg_size += KDBUS_PART_HEADER_SIZE + KDBUS_BLOOM_SIZE_BYTES;
+
+ msg = malloc(msg_size);
+ if (!msg)
+ {
+ _dbus_verbose("Error allocating memory for: %s,%s\n", _dbus_strerror (errno), _dbus_error_from_errno (errno));
+ return NULL;
+ }
+
+ memset(msg, 0, msg_size);
+ msg->size = msg_size;
+ msg->payload_type = KDBUS_PAYLOAD_DBUS1;
+ msg->dst_id = name ? 0 : dst_id;
+
+ return msg;
+}
+static int kdbus_write_msg(DBusTransportSocket *transport, DBusMessage *message, dbus_bool_t encoded)
+{
+ struct kdbus_msg *msg;
+ struct kdbus_item *item;
+ const char *name;
+ uint64_t dst_id = KDBUS_DST_ID_BROADCAST;
+ const DBusString *header;
+ const DBusString *body;
+ uint64_t ret_size = 0;
+ uint64_t body_size = 0;
+ uint64_t header_size = 0;
+ int ret;
+ dbus_bool_t use_memfd;
+ const int *unix_fds;
+ unsigned fds_count;
+ char *buf;
+
+ // determine name and destination id
if((name = dbus_message_get_destination(message)))
{
- if((name[0] == ':') && (name[1] == '1') && (name[2] == '.')) //if name starts with :1. it is a unique name and should be send as number
+ dst_id = KDBUS_DST_ID_WELL_KNOWN_NAME;
+
+ if((name[0] == ':') && (name[1] == '1') && (name[2] == '.')) /* if name starts with ":1." it is a unique name and should be send as number */
{
dst_id = strtoll(&name[3], NULL, 10);
name = NULL;
- }
- else
- dst_id = KDBUS_DST_ID_WELL_KNOWN_NAME;
+ }
}
-
- _dbus_message_get_network_data (message, &header, &body);
- ret_size = _dbus_string_get_length(header);
- body_size = _dbus_string_get_length(body);
-
- /* fprintf (stderr, "\nheader:\n");
- for(i=0; i < ret_size; i++)
+
+ // get size of data
+ if(encoded)
+ ret_size = _dbus_string_get_length (&transport->encoded_outgoing);
+ else
{
- fprintf (stderr, "%02x", _dbus_string_get_byte(header,i));
+ _dbus_message_get_network_data (message, &header, &body);
+ header_size = _dbus_string_get_length(header);
+ body_size = _dbus_string_get_length(body);
+ ret_size = header_size + body_size;
}
- fprintf (stderr, "\nret size: %lu, i: %lu\n", ret_size, i);*/
- size = sizeof(struct kdbus_msg);
- size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec));
- if(body_size) //body can be empty
- size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec));
- if (name)
- size += KDBUS_ITEM_SIZE(strlen(name) + 1);
- else if (dst_id == KDBUS_DST_ID_BROADCAST)
- size += KDBUS_PART_HEADER_SIZE + 64;
+ // check if message size is big enough to use memfd kdbus transport
+ use_memfd = ret_size > MEMFD_SIZE_THRESHOLD ? TRUE : FALSE;
+ if(use_memfd) kdbus_init_memfd(transport);
+
+ _dbus_message_get_unix_fds(message, &unix_fds, &fds_count);
+
+ // init basic message fields
+ msg = kdbus_init_msg(name, dst_id, body_size, use_memfd, fds_count);
+ msg->cookie = dbus_message_get_serial(message);
+ msg->src_id = strtoll(dbus_bus_get_unique_name(transport->base.connection), NULL , 10);
+
+ // build message contents
+ item = msg->items;
+
+ // case 1 - bulk data transfer - memfd - encoded and plain
+ if(use_memfd)
+ {
+ ret = ioctl(transport->memfd, KDBUS_CMD_MEMFD_SEAL_SET, 0);
+ if (ret < 0)
+ {
+ _dbus_verbose("memfd sealing failed: \n");
+ goto out;
+ }
- msg = malloc(size);
- if (!msg)
- {
- _dbus_verbose("Error allocating memory for: %s,%s\n", _dbus_strerror (errno), _dbus_error_from_errno (errno));
- return -1;
- }
+ buf = mmap(NULL, ret_size, PROT_WRITE, MAP_SHARED, transport->memfd, 0);
+ if (buf == MAP_FAILED)
+ {
+ _dbus_verbose("mmap() fd=%i failed:%m", transport->memfd);
+ goto out;
+ }
- memset(msg, 0, size);
- msg->size = size;
- msg->src_id = strtoll(dbus_bus_get_unique_name(transport->connection), NULL , 10);
- msg->dst_id = name ? 0 : dst_id;
- msg->cookie = dbus_message_get_serial(message);
- msg->payload_type = KDBUS_PAYLOAD_DBUS1;
+ if(encoded)
+ memcpy(buf, &transport->encoded_outgoing, ret_size);
+ else
+ {
+ memcpy(buf, _dbus_string_get_const_data(header), header_size);
+ if(body_size) {
+ buf+=header_size;
+ memcpy(buf, _dbus_string_get_const_data(body), body_size);
+ buf-=header_size;
+ }
+ }
- item = msg->items;
+ munmap(buf, ret_size);
+
+ // seal data - kdbus module needs it
+ ret = ioctl(transport->memfd, KDBUS_CMD_MEMFD_SEAL_SET, 1);
+ if (ret < 0) {
+ _dbus_verbose("memfd sealing failed: %d (%m)\n", errno);
+ ret_size = -1;
+ goto out;
+ }
+
+ item->type = KDBUS_MSG_PAYLOAD_MEMFD;
+ item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_memfd);
+ item->memfd.size = ret_size;
+ item->memfd.fd = transport->memfd;
+ // case 2 - small encoded - don't use memfd
+ } else if(encoded) {
+ _dbus_verbose("sending encoded data\n");
+
+ item->type = KDBUS_MSG_PAYLOAD_VEC;
+ item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec);
+ item->vec.address = (unsigned long) &transport->encoded_outgoing;
+ item->vec.size = _dbus_string_get_length (&transport->encoded_outgoing);
+
+ // case 3 - small not encoded - don't use memfd
+ } else {
+ _dbus_verbose("sending normal vector data\n");
+
+ item->type = KDBUS_MSG_PAYLOAD_VEC;
+ item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec);
+ item->vec.address = (unsigned long) _dbus_string_get_const_data(header);
+ item->vec.size = header_size;
+
+ if(body_size)
+ {
+ _dbus_verbose("body attaching\n");
+ item = KDBUS_PART_NEXT(item);
+ item->type = KDBUS_MSG_PAYLOAD_VEC;
+ item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec);
+ item->vec.address = (unsigned long) _dbus_string_get_const_data(body);
+ item->vec.size = body_size;
+ }
+ }
+
+ if(fds_count)
+ {
+ item = KDBUS_PART_NEXT(item);
+ item->type = KDBUS_MSG_FDS;
+ item->size = KDBUS_PART_HEADER_SIZE + (sizeof(int) * fds_count);
+ memcpy(item->fds, unix_fds, sizeof(int) * fds_count);
+ }
if (name)
{
+ item = KDBUS_PART_NEXT(item);
item->type = KDBUS_MSG_DST_NAME;
item->size = KDBUS_PART_HEADER_SIZE + strlen(name) + 1;
strcpy(item->str, name);
- item = KDBUS_PART_NEXT(item);
- }
-
- item->type = KDBUS_MSG_PAYLOAD_VEC;
- item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec);
- item->vec.address = (unsigned long) _dbus_string_get_const_data(header);
- item->vec.size = ret_size;
-
- if(body_size)
- {
- item = KDBUS_PART_NEXT(item);
- item->type = KDBUS_MSG_PAYLOAD_VEC;
- item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec);
- item->vec.address = (unsigned long) _dbus_string_get_const_data(body);
- item->vec.size = body_size;
- ret_size += body_size;
}
-
- /* fprintf (stderr, "\nbody:\n");
- for(i=0; i < item->vec.size; i++)
- {
- fprintf (stderr, "%02x", _dbus_string_get_byte(body,i));
- }
- fprintf (stderr, "\nitem->vec.size: %llu, i: %lu\n", item->vec.size, i);*/
-
- if (dst_id == KDBUS_DST_ID_BROADCAST)
+ else if (dst_id == KDBUS_DST_ID_BROADCAST)
{
item = KDBUS_PART_NEXT(item);
item->type = KDBUS_MSG_BLOOM;
- item->size = KDBUS_PART_HEADER_SIZE + 64;
+ item->size = KDBUS_PART_HEADER_SIZE + KDBUS_BLOOM_SIZE_BYTES;
+ strncpy(item->data, dbus_message_get_interface(message), KDBUS_BLOOM_SIZE_BYTES);
}
again:
- if (ioctl(fd, KDBUS_CMD_MSG_SEND, msg))
+ if (ioctl(transport->fd, KDBUS_CMD_MSG_SEND, msg))
{
if(errno == EINTR)
goto again;
- if(errno == ENXIO) //when recipient is not available on the bus
+ if((errno == ESRCH) || (errno == ENXIO)) //when recipient is not available on the bus
{
- DBusMessage *errMessage;
+ DBusMessage *errMessage = NULL;
+ dbus_uint32_t replySerial;
- errMessage = generate_local_error_message(msg->cookie, "org.freedesktop.DBus.Error.ServiceUnknown", NULL);
+ errMessage = generate_local_error_message(msg->cookie, DBUS_ERROR_SERVICE_UNKNOWN, (char*)dbus_message_get_destination(message));
if(errMessage == NULL)
{
ret_size = -1;
goto out;
}
- dbus_message_set_reply_serial(errMessage, dbus_message_get_reply_serial(message));
- if (!add_message_to_received(errMessage, transport))
+ replySerial = dbus_message_get_reply_serial(message);
+ if(replySerial)
+ dbus_message_set_reply_serial(errMessage, replySerial);
+ if (!add_message_to_received(errMessage, (DBusTransport*)transport))
ret_size = -1;
goto out;
}
_dbus_verbose("kdbus error sending message: err %d (%m)\n", errno);
ret_size = -1;
}
-
out:
- free(msg);
- return ret_size;
+ free(msg);
+
+ return ret_size;
}
-static int kdbus_write_msg_encoded(DBusMessage *message, DBusTransportSocket *socket_transport)
+static int64_t kdbus_NameQuery(DBusTransport *transport, char* name, int fd)
{
- struct kdbus_msg *msg;
+ struct kdbus_cmd_name_info *msg;
struct kdbus_item *item;
uint64_t size;
- const char *name;
- uint64_t dst_id = KDBUS_DST_ID_BROADCAST;
- uint64_t ret_size;
+ int64_t ret;
+ uint64_t item_size;
- if((name = dbus_message_get_destination(message)))
- {
- if((name[0] == ':') && (name[1] == '1') && (name[2] == '.'))
- {
- dst_id = strtoll(&name[2], NULL, 10);
- name = NULL;
- }
- else
- dst_id = KDBUS_DST_ID_WELL_KNOWN_NAME;
- }
-
- size = sizeof(struct kdbus_msg);
- size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec));
- if (name)
- size += KDBUS_ITEM_SIZE(strlen(name) + 1);
- else if (dst_id == KDBUS_DST_ID_BROADCAST)
- size += KDBUS_PART_HEADER_SIZE + 64;
+ item_size = KDBUS_PART_HEADER_SIZE + strlen(name) + 1;
+ item_size = (item_size < 56) ? 56 : item_size;
+ size = sizeof(struct kdbus_cmd_name_info) + item_size;
msg = malloc(size);
if (!msg)
memset(msg, 0, size);
msg->size = size;
- msg->src_id = strtoll(dbus_bus_get_unique_name(socket_transport->base.connection), NULL , 10);
- _dbus_verbose("sending encoded msg, src_id=%llu\n", msg->src_id);
- msg->dst_id = name ? 0 : dst_id;
- msg->cookie = dbus_message_get_serial(message);
- msg->payload_type = KDBUS_PAYLOAD_DBUS1;
item = msg->items;
+ item->type = KDBUS_NAME_INFO_ITEM_NAME;
+ item->size = item_size;
+ strcpy(item->str, name);
- if (name)
+ again:
+ if ((ret = ioctl(fd, KDBUS_CMD_NAME_QUERY, msg)))
{
- item->type = KDBUS_MSG_DST_NAME;
- item->size = KDBUS_PART_HEADER_SIZE + strlen(name) + 1;
- strcpy(item->str, name);
- item = KDBUS_PART_NEXT(item);
+ if(errno == EINTR)
+ goto again;
+ ret = -errno;
}
+ else
+ ret = msg->id;
- item->type = KDBUS_MSG_PAYLOAD_VEC;
- item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec);
- item->vec.address = (unsigned long) &socket_transport->encoded_outgoing;
- item->vec.size = _dbus_string_get_length (&socket_transport->encoded_outgoing);
+ free(msg);
+ return ret;
+}
- if (dst_id == KDBUS_DST_ID_BROADCAST)
- {
- item = KDBUS_PART_NEXT(item);
- item->type = KDBUS_MSG_BLOOM;
- item->size = KDBUS_PART_HEADER_SIZE + 64;
- }
+static dbus_bool_t emulateOrgFreedesktopDBus(DBusTransport *transport, DBusMessage *message, int fd)
+{
+ int64_t ret;
- again:
- if (ioctl(socket_transport->fd, KDBUS_CMD_MSG_SEND, msg))
+ if(!strcmp(dbus_message_get_member(message), "GetNameOwner"))
{
- if(errno == EINTR)
- goto again;
- if(errno == ENXIO) //when recipient is not available on the bus
+ char* name = NULL;
+
+ dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID);
+ _dbus_verbose ("Name to discover: %s !!!! !!!!\n", name);
+ ret = kdbus_NameQuery(transport, name, fd);
+ if(ret > 0) //unique id of the name
{
- DBusMessage *errMessage = NULL;
+ DBusMessage *reply;
+ DBusMessageIter args;
+ char unique_name[(unsigned int)(snprintf(name, 0, "%llu", ULLONG_MAX) + 4)]; //+3 prefix ":1." and +1 closing NULL
+ const char* pString = unique_name;
+
+ sprintf(unique_name, ":1.%lld", (long long int)ret);
+ _dbus_verbose("Unique name discovered:%s!!! !!!!\n", unique_name);
+ reply = dbus_message_new_method_return(message);
+ if(reply == NULL)
+ return FALSE;
+ dbus_message_set_sender(reply, DBUS_SERVICE_DBUS);
+ dbus_message_iter_init_append(reply, &args);
+ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pString))
+ return FALSE;
+ if(add_message_to_received(reply, transport))
+ return TRUE;
+ }
+ else if(ret == -ENOENT) //name has no owner
+ {
+ DBusMessage *errMessage;
+ dbus_uint32_t replySerial;
- errMessage = generate_local_error_message(msg->cookie, "org.freedesktop.DBus.Error.ServiceUnknown", NULL);
+ errMessage = generate_local_error_message(1, DBUS_ERROR_NAME_HAS_NO_OWNER, name);
if(errMessage == NULL)
+ return FALSE;
+ replySerial = dbus_message_get_reply_serial(message);
+ if(replySerial)
+ dbus_message_set_reply_serial(errMessage, replySerial);
+ if (add_message_to_received(errMessage, transport))
+ return TRUE;
+ }
+ else
+ _dbus_verbose("kdbus error sending name query: err %d (%m)\n", errno);
+ }
+ else if(!strcmp(dbus_message_get_member(message), "NameHasOwner"))
+ {
+ char* name = NULL;
+ DBusMessage *reply;
+ DBusMessageIter args;
+ dbus_bool_t result;
+
+ dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID);
+ _dbus_verbose ("Name to discover: %s !!!! !!!!\n", name);
+ ret = kdbus_NameQuery(transport, name, fd);
+
+ result = (ret > 0) ? TRUE : FALSE;
+ _dbus_verbose("Discovery: %d !!! !!!!\n", (int)result);
+ reply = dbus_message_new_method_return(message);
+ if(reply == NULL)
+ return FALSE;
+ dbus_message_set_sender(reply, DBUS_SERVICE_DBUS);
+ dbus_message_iter_init_append(reply, &args);
+ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_BOOLEAN, &result))
+ return FALSE;
+ if(add_message_to_received(reply, transport))
+ return TRUE;
+ }
+ else if(!strcmp(dbus_message_get_member(message), "ListNames"))
+ {
+ struct kdbus_cmd_names* pCmd;
+ uint64_t cmd_size;
+
+ cmd_size = sizeof(struct kdbus_cmd_names) + KDBUS_ITEM_SIZE(1);
+ pCmd = malloc(cmd_size);
+ if(pCmd == NULL)
+ goto out;
+ pCmd->size = cmd_size;
+
+ again:
+ cmd_size = 0;
+ if(ioctl(fd, KDBUS_CMD_NAME_LIST, pCmd))
+ {
+ if(errno == EINTR)
+ goto again;
+ if(errno == ENOBUFS)
+ cmd_size = pCmd->size;
+ else
{
- ret_size = -1;
+ _dbus_verbose("kdbus error asking for name list: err %d (%m)\n",errno);
goto out;
}
- dbus_message_set_reply_serial(errMessage, dbus_message_get_reply_serial(message));
- if (!add_message_to_received(errMessage, &socket_transport->base))
- ret_size = -1;
- goto out;
}
- _dbus_verbose("error sending encoded message: err %d (%m)\n", errno);
- ret_size = -1;
- }
+ if(cmd_size)
+ {
+ pCmd = realloc(pCmd, cmd_size);
+ if(pCmd == NULL)
+ return FALSE;
+ goto again;
+ }
+ else
+ {
+ DBusMessage *reply;
+ DBusMessageIter args;
+ struct kdbus_cmd_name* pCmd_name;
+ char* pName;
+
+ reply = dbus_message_new_method_return(message);
+ if(reply == NULL)
+ goto out;
+ dbus_message_set_sender(reply, DBUS_SERVICE_DBUS);
+ dbus_message_iter_init_append(reply, &args);
+
+ for (pCmd_name = pCmd->names; (uint8_t *)(pCmd_name) < (uint8_t *)(pCmd) + pCmd->size; pCmd_name = KDBUS_PART_NEXT(pCmd_name))
+ {
+ pName = pCmd_name->name;
+ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pName))
+ goto out;
+ }
+
+ if(add_message_to_received(reply, transport))
+ {
+ free(pCmd);
+ return TRUE;
+ }
+ }
out:
- free(msg);
- return ret_size;
+ if(pCmd)
+ free(pCmd);
+ }
+ else //temporarily we send that info but methods below should be implemented
+ {
+ DBusMessage *reply;
+ dbus_uint32_t replySerial;
+
+ reply = generate_local_error_message(1, DBUS_ERROR_UNKNOWN_METHOD, NULL);
+ if(reply == NULL)
+ return FALSE;
+ replySerial = dbus_message_get_reply_serial(message);
+ if(replySerial)
+ dbus_message_set_reply_serial(reply, replySerial);
+ if(add_message_to_received(reply, transport))
+ return TRUE;
+ }
+/* else if(!strcmp(dbus_message_get_member(message), "ListActivatableNames"))
+ {
+ //todo
+ }
+ else if(!strcmp(dbus_message_get_member(message), "StartServiceByName"))
+ {
+ //todo
+ }
+ else if(!strcmp(dbus_message_get_member(message), "UpdateActivationEnvironment"))
+ {
+ //todo
+ }
+ else if(!strcmp(dbus_message_get_member(message), "GetConnectionUnixUser"))
+ {
+ //todo
+ }
+ else if(!strcmp(dbus_message_get_member(message), "GetId"))
+ {
+ //todo
+ }*/
+
+ return FALSE;
}
-//todo functions from kdbus-utli.c for printing messages - maybe to remove at the end
+#if KDBUS_MSG_DECODE_DEBUG == 1
static char *msg_id(uint64_t id, char *buf)
{
if (id == 0)
sprintf(buf, "%llu", (unsigned long long)id);
return buf;
}
-
+#endif
struct kdbus_enum_table {
long long id;
const char *name;
return ret_size;
}
-static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, void* mmap_ptr)
+static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTransportSocket* socket_transport, int* fds, int* n_fds)
{
const struct kdbus_item *item = msg->items;
- char buf[32]; //todo to be removed after development
int ret_size = 0;
DBusMessage *message = NULL;
DBusMessageIter args;
- char* pStringMallocked = NULL;
- const char* dbus = "org.freedesktop.DBus";
const char* emptyString = "";
-
const char* pString = NULL;
+ char dbus_name[(unsigned int)(snprintf((char*)pString, 0, "%llu", ULLONG_MAX) + 4)]; //+3 prefix ":1." and +1 closing NULL
+ const char* pDBusName = dbus_name;
+ void* mmap_ptr;
+#if KDBUS_MSG_DECODE_DEBUG == 1
+ char buf[32];
+#endif
+#if KDBUS_MSG_DECODE_DEBUG == 1
_dbus_verbose("MESSAGE: %s (%llu bytes) flags=0x%llx, %s → %s, cookie=%llu, timeout=%llu\n",
enum_PAYLOAD(msg->payload_type), (unsigned long long) msg->size,
(unsigned long long) msg->flags,
msg_id(msg->src_id, buf), msg_id(msg->dst_id, buf),
(unsigned long long) msg->cookie, (unsigned long long) msg->timeout_ns);
+#endif
+
+ *n_fds = 0;
+ mmap_ptr = socket_transport->kdbus_mmap_ptr;
KDBUS_PART_FOREACH(item, msg, items)
{
if (item->size <= KDBUS_PART_HEADER_SIZE)
{
_dbus_verbose(" +%s (%llu bytes) invalid data record\n", enum_MSG(item->type), item->size);
- break; //todo to be discovered and rewritten
+ break; //??? continue (because dbus will find error) or break
}
switch (item->type)
{
case KDBUS_MSG_PAYLOAD_OFF:
+ {
+ uint64_t size = item->vec.size;
+
memcpy(data, (char *)mmap_ptr + item->vec.offset, item->vec.size);
data += item->vec.size;
- ret_size += item->vec.size;
+ ret_size += item->vec.size;
_dbus_verbose(" +%s (%llu bytes) off=%llu size=%llu\n",
- enum_MSG(item->type), item->size,
- (unsigned long long)item->vec.offset,
- (unsigned long long)item->vec.size);
+ enum_MSG(item->type), item->size,
+ (unsigned long long)item->vec.offset,
+ (unsigned long long)size);
break;
+ }
- case KDBUS_MSG_PAYLOAD_MEMFD: //todo
+ case KDBUS_MSG_PAYLOAD_MEMFD:
{
char *buf;
uint64_t size;
- buf = mmap(NULL, item->memfd.size, PROT_READ, MAP_SHARED, item->memfd.fd, 0);
- if (buf == MAP_FAILED) {
- _dbus_verbose("mmap() fd=%i failed:%m", item->memfd.fd);
- break;
- }
+ size = item->memfd.size;
- if (ioctl(item->memfd.fd, KDBUS_CMD_MEMFD_SIZE_GET, &size) < 0) {
- _dbus_verbose("KDBUS_CMD_MEMFD_SIZE_GET failed: %m\n");
- break;
- }
+ _dbus_verbose("memfd.size : %llu\n", (unsigned long long)size);
+
+ buf = mmap(NULL, size, PROT_READ , MAP_SHARED, item->memfd.fd, 0);
- _dbus_verbose(" +%s (%llu bytes) fd=%i size=%llu filesize=%llu '%s'\n",
- enum_MSG(item->type), item->size, item->memfd.fd,
- (unsigned long long)item->memfd.size, (unsigned long long)size, buf);
+ if (buf == MAP_FAILED)
+ {
+ _dbus_verbose("mmap() fd=%i failed:%m", item->memfd.fd);
+ return -1;
+ }
- memcpy(data, buf, size);
+ memcpy(data, buf, size);
data += size;
ret_size += size;
- break;
+
+ munmap(buf, size);
+
+ _dbus_verbose(" +%s (%llu bytes) off=%llu size=%llu\n",
+ enum_MSG(item->type), item->size,
+ (unsigned long long)item->vec.offset,
+ (unsigned long long)item->vec.size);
+ break;
}
- /* case KDBUS_MSG_SRC_CREDS:
+ case KDBUS_MSG_FDS:
+ {
+ int i;
+
+ *n_fds = (item->size - KDBUS_PART_HEADER_SIZE) / sizeof(int);
+ memcpy(fds, item->fds, *n_fds * sizeof(int));
+ for (i = 0; i < *n_fds; i++)
+ _dbus_fd_set_close_on_exec(fds[i]);
+ break;
+ }
+
+#if KDBUS_MSG_DECODE_DEBUG == 1
+ case KDBUS_MSG_SRC_CREDS:
_dbus_verbose(" +%s (%llu bytes) uid=%lld, gid=%lld, pid=%lld, tid=%lld, starttime=%lld\n",
enum_MSG(item->type), item->size,
item->creds.uid, item->creds.gid,
case KDBUS_MSG_SRC_CMDLINE:
case KDBUS_MSG_SRC_NAMES: {
- size_t size = item->size - KDBUS_PART_HEADER_SIZE;
+ __u64 size = item->size - KDBUS_PART_HEADER_SIZE;
const char *str = item->str;
int count = 0;
enum_MSG(item->type), item->size,
(unsigned long long)item->timestamp.realtime_ns,
(unsigned long long)item->timestamp.monotonic_ns);
- break;*/
+ break;
+#endif
case KDBUS_MSG_REPLY_TIMEOUT:
_dbus_verbose(" +%s (%llu bytes) cookie=%llu\n",
enum_MSG(item->type), item->size, msg->cookie_reply);
- message = generate_local_error_message(msg->cookie_reply, "org.freedesktop.DBus.Error.NoReply", NULL);
+ message = generate_local_error_message(msg->cookie_reply, DBUS_ERROR_NO_REPLY, NULL);
if(message == NULL)
{
ret_size = -1;
item->name_change.name, item->name_change.old_id,
item->name_change.new_id, item->name_change.flags);
- pStringMallocked = malloc (sizeof(item->name_change.new_id)*2.5 + 4);
- if(pStringMallocked)
- {
- strcpy(pStringMallocked,":1.");
- sprintf(&pStringMallocked[3],"%llu",item->name_change.new_id);
- }
- else
- return -1;
-
message = dbus_message_new_signal("/org/freedesktop/DBus", // object name of the signal
- dbus, // interface name of the signal
+ DBUS_INTERFACE_DBUS, // interface name of the signal
"NameOwnerChanged"); // name of the signal
if(message == NULL)
{
goto out;
}
+ sprintf(dbus_name,":1.%llu",item->name_change.new_id);
pString = item->name_change.name;
_dbus_verbose ("Name added: %s\n", pString);
dbus_message_iter_init_append(message, &args);
ret_size = -1;
goto out;
}
- if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pStringMallocked))
+ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pDBusName))
{
ret_size = -1;
goto out;
}
- dbus_message_set_sender(message, dbus);
+ dbus_message_set_sender(message, DBUS_SERVICE_DBUS);
dbus_message_set_serial(message, 1);
ret_size = put_message_into_data(message, data);
item->name_change.name, item->name_change.old_id,
item->name_change.new_id, item->name_change.flags);
- pStringMallocked = malloc (sizeof(item->name_change.old_id)*2.5 + 4);
- if(pStringMallocked)
- {
- strcpy(pStringMallocked,":1.");
- sprintf(&pStringMallocked[3],"%llu",item->name_change.old_id);
- }
- else
- return -1;
-
message = dbus_message_new_signal("/org/freedesktop/DBus", // object name of the signal
- dbus, // interface name of the signal
+ DBUS_INTERFACE_DBUS, // interface name of the signal
"NameOwnerChanged"); // name of the signal
if(message == NULL)
{
goto out;
}
+ sprintf(dbus_name,":1.%llu",item->name_change.old_id);
pString = item->name_change.name;
_dbus_verbose ("Name removed: %s\n", pString);
dbus_message_iter_init_append(message, &args);
ret_size = -1;
goto out;
}
- if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pStringMallocked))
+ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pDBusName))
{
ret_size = -1;
goto out;
goto out;
}
- dbus_message_set_sender(message, dbus);
+ dbus_message_set_sender(message, DBUS_SERVICE_DBUS);
dbus_message_set_serial(message, 1);
ret_size = put_message_into_data(message, data);
item->name_change.name, item->name_change.old_id,
item->name_change.new_id, item->name_change.flags);
- pStringMallocked = malloc (sizeof(item->name_change.new_id)*2.5 + 4);
- if(pStringMallocked)
- {
- strcpy(pStringMallocked,":1.");
- sprintf(&pStringMallocked[3],"%llu",item->name_change.old_id);
- }
- else
- return -1;
-
message = dbus_message_new_signal("/org/freedesktop/DBus", // object name of the signal
- dbus, // interface name of the signal
+ DBUS_INTERFACE_DBUS, // interface name of the signal
"NameOwnerChanged"); // name of the signal
if(message == NULL)
{
goto out;
}
+ sprintf(dbus_name,":1.%llu",item->name_change.old_id);
pString = item->name_change.name;
_dbus_verbose ("Name changed: %s\n", pString);
dbus_message_iter_init_append(message, &args);
ret_size = -1;
goto out;
}
- if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pStringMallocked))
+ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pDBusName))
{
ret_size = -1;
goto out;
}
- sprintf(&pStringMallocked[3],"%llu",item->name_change.new_id);
- _dbus_verbose ("New id: %s\n", pStringMallocked); //todo to be removed
- if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pStringMallocked))
+ sprintf(&dbus_name[3],"%llu",item->name_change.new_id);
+ _dbus_verbose ("New id: %s\n", pDBusName);
+ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pDBusName))
{
ret_size = -1;
goto out;
}
- dbus_message_set_sender(message, dbus);
+ dbus_message_set_sender(message, DBUS_SERVICE_DBUS);
dbus_message_set_serial(message, 1);
ret_size = put_message_into_data(message, data);
(unsigned long long) item->id_change.id,
(unsigned long long) item->id_change.flags);
- pStringMallocked = malloc (sizeof(item->id_change.id)*2.5 + 4);
- if(pStringMallocked)
- {
- strcpy(pStringMallocked,":1.");
- sprintf(&pStringMallocked[3],"%llu",item->id_change.id);
- }
- else
- return -1;
-
message = dbus_message_new_signal("/org/freedesktop/DBus", // object name of the signal
- dbus, // interface name of the signal
+ DBUS_INTERFACE_DBUS, // interface name of the signal
"NameOwnerChanged"); // name of the signal
if(message == NULL)
{
goto out;
}
+ sprintf(dbus_name,":1.%llu",item->id_change.id);
dbus_message_iter_init_append(message, &args);
- if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pStringMallocked))
+ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pDBusName))
{
ret_size = -1;
goto out;
ret_size = -1;
goto out;
}
- if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pStringMallocked))
+ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pDBusName))
{
ret_size = -1;
goto out;
}
- dbus_message_set_sender(message, dbus);
+ dbus_message_set_sender(message, DBUS_SERVICE_DBUS);
dbus_message_set_serial(message, 1);
ret_size = put_message_into_data(message, data);
(unsigned long long) item->id_change.id,
(unsigned long long) item->id_change.flags);
- pStringMallocked = malloc (sizeof(item->id_change.id)*2.5 + 4);
- if(pStringMallocked)
- {
- strcpy(pStringMallocked,":1.");
- sprintf(&pStringMallocked[3],"%llu",item->id_change.id);
- }
- else
- return -1;
-
message = dbus_message_new_signal("/org/freedesktop/DBus", // object name of the signal
- dbus, // interface name of the signal
+ DBUS_INTERFACE_DBUS, // interface name of the signal
"NameOwnerChanged"); // name of the signal
if(message == NULL)
{
goto out;
}
+ sprintf(dbus_name,":1.%llu",item->id_change.id);
dbus_message_iter_init_append(message, &args);
- if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pStringMallocked))
+ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pDBusName))
{
ret_size = -1;
goto out;
}
- if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pStringMallocked))
+ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pDBusName))
{
ret_size = -1;
goto out;
goto out;
}
- dbus_message_set_sender(message, dbus);
+ dbus_message_set_sender(message, DBUS_SERVICE_DBUS);
dbus_message_set_serial(message, 1);
ret_size = put_message_into_data(message, data);
break;
-
- /* default:
+#if KDBUS_MSG_DECODE_DEBUG == 1
+ default:
_dbus_verbose(" +%s (%llu bytes)\n", enum_MSG(item->type), item->size);
- break;*/
+ break;
+#endif
}
}
- /*if ((char *)item - ((char *)msg + msg->size) >= 8)
- _dbus_verbose("invalid padding at end of message\n");*/
+#if KDBUS_MSG_DECODE_DEBUG == 1
+
+ if ((char *)item - ((char *)msg + msg->size) >= 8)
+ _dbus_verbose("invalid padding at end of message\n");
+#endif
out:
if(message)
dbus_message_unref(message);
- if(pStringMallocked)
- free((void*)pStringMallocked);
return ret_size;
}
-static int kdbus_read_message(DBusTransportSocket *socket_transport, DBusString *buffer)
+static int kdbus_read_message(DBusTransportSocket *socket_transport, DBusString *buffer, int* fds, int* n_fds)
{
int ret_size;
- uint64_t offset;
+ uint64_t __attribute__ ((__aligned__(8))) offset;
struct kdbus_msg *msg;
-// int start;
char *data;
_dbus_assert (socket_transport->max_bytes_read_per_iteration >= 0);
-// start = _dbus_string_get_length (buffer);
-// _dbus_verbose("read start: %d !!!!!!!!!!!!!!! \n", start);
if (!_dbus_string_lengthen (buffer, socket_transport->max_bytes_read_per_iteration))
{
errno = ENOMEM;
return -1;
}
- data = _dbus_string_get_data_len (buffer, /*start*/0, socket_transport->max_bytes_read_per_iteration);
+ data = _dbus_string_get_data_len (buffer, 0, socket_transport->max_bytes_read_per_iteration);
again:
if (ioctl(socket_transport->fd, KDBUS_CMD_MSG_RECV, &offset) < 0)
if(errno == EINTR)
goto again;
_dbus_verbose("kdbus error receiving message: %d (%m)\n", errno);
- _dbus_string_set_length (buffer, /*start*/0);
+ _dbus_string_set_length (buffer, 0);
return -1;
}
msg = (struct kdbus_msg *)((char*)socket_transport->kdbus_mmap_ptr + offset);
- ret_size = kdbus_decode_msg(msg, data, socket_transport->kdbus_mmap_ptr);
- _dbus_string_set_length (buffer, /*start +*/ ret_size);
+ ret_size = kdbus_decode_msg(msg, data, socket_transport, fds, n_fds);
+ _dbus_string_set_length (buffer, ret_size);
again2:
if (ioctl(socket_transport->fd, KDBUS_CMD_MSG_RELEASE, &offset) < 0)
_dbus_transport_unref (transport);
}
+#ifdef DBUS_AUTHENTICATION
/* return value is whether we successfully read any new data. */
static dbus_bool_t
read_data_into_auth (DBusTransport *transport,
/* Return value is whether we successfully wrote any bytes */
static dbus_bool_t
-write_data_from_auth (DBusTransport *transport) //todo change to kdbus
+write_data_from_auth (DBusTransport *transport)
{
DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport;
int bytes_written;
{
if (!exchange_credentials (transport, do_reading, do_writing))
{
- /* OOM */
oom = TRUE;
goto out;
}
else
return TRUE;
}
+#endif
/* returns false on oom */
static dbus_bool_t
do_writing (DBusTransport *transport)
{
- int total;
+// int total;
DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport;
dbus_bool_t oom;
#endif
oom = FALSE;
- total = 0;
+// total = 0;
while (!transport->disconnected && _dbus_connection_has_messages_to_send_unlocked (transport->connection))
{
const DBusString *header;
const DBusString *body;
int total_bytes_to_write;
+ const char* pDestination;
-
- if (total > socket_transport->max_bytes_written_per_iteration)
+ /* if (total > socket_transport->max_bytes_written_per_iteration)
{
_dbus_verbose ("%d bytes exceeds %d bytes written per iteration, returning\n",
total, socket_transport->max_bytes_written_per_iteration);
goto out;
- }
+ }*/
message = _dbus_connection_get_message_to_send (transport->connection);
_dbus_assert (message != NULL);
dbus_message_lock (message);
_dbus_message_get_network_data (message, &header, &body);
+ total_bytes_to_write = _dbus_string_get_length(header) + _dbus_string_get_length(body);
+ pDestination = dbus_message_get_destination(message);
+ if(pDestination)
+ {
+ if(!strcmp(pDestination, "org.freedesktop.DBus"))
+ {
+ if(emulateOrgFreedesktopDBus(transport, message, socket_transport->fd))
+ bytes_written = total_bytes_to_write;
+ else
+ bytes_written = -1;
+ goto written;
+ }
+ }
if (_dbus_auth_needs_encoding (transport->auth))
{
- // Does fd passing even make sense with encoded data?
- _dbus_assert(!DBUS_TRANSPORT_CAN_SEND_UNIX_FD(transport));
-
if (_dbus_string_get_length (&socket_transport->encoded_outgoing) == 0)
{
if (!_dbus_auth_encode_data (transport->auth,
}
total_bytes_to_write = _dbus_string_get_length (&socket_transport->encoded_outgoing);
- bytes_written = kdbus_write_msg_encoded(message, socket_transport);
+ if(total_bytes_to_write > socket_transport->max_bytes_written_per_iteration)
+ return -E2BIG;
+
+ bytes_written = kdbus_write_msg(socket_transport, message, TRUE);
}
else
{
- total_bytes_to_write = _dbus_string_get_length(header) + _dbus_string_get_length(body);
- bytes_written = kdbus_write_msg(transport, message, socket_transport->fd);
+ if(total_bytes_to_write > socket_transport->max_bytes_written_per_iteration)
+ return -E2BIG;
+
+ bytes_written = kdbus_write_msg(socket_transport, message, FALSE);
}
+written:
if (bytes_written < 0)
{
/* EINTR already handled for us */
goto out;
else
{
- _dbus_verbose ("Error writing to remote app: %s\n",
- _dbus_strerror_from_errno ());
+ _dbus_verbose ("Error writing to remote app: %s\n", _dbus_strerror_from_errno ());
do_io_error (transport);
goto out;
}
_dbus_verbose (" wrote %d bytes of %d\n", bytes_written,
total_bytes_to_write);
- total += bytes_written;
+// total += bytes_written;
socket_transport->message_bytes_written += bytes_written;
_dbus_assert (socket_transport->message_bytes_written <=
DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport;
DBusString *buffer;
int bytes_read;
- int total;
dbus_bool_t oom;
+ int *fds, n_fds;
_dbus_verbose ("fd = %d\n",socket_transport->fd);
oom = FALSE;
- total = 0;
-
again:
/* See if we've exceeded max messages and need to disable reading */
check_read_watch (transport);
- if (total > socket_transport->max_bytes_read_per_iteration)
- {
- _dbus_verbose ("%d bytes exceeds %d bytes read per iteration, returning\n",
- total, socket_transport->max_bytes_read_per_iteration);
- goto out;
- }
-
_dbus_assert (socket_transport->read_watch != NULL ||
transport->disconnected);
if (!dbus_watch_get_enabled (socket_transport->read_watch))
return TRUE;
+ if (!_dbus_message_loader_get_unix_fds(transport->loader, &fds, &n_fds))
+ {
+ _dbus_verbose ("Out of memory reading file descriptors\n");
+ oom = TRUE;
+ goto out;
+ }
+ _dbus_message_loader_get_buffer (transport->loader, &buffer);
+
if (_dbus_auth_needs_decoding (transport->auth))
- {
- /* Does fd passing even make sense with encoded data? */
- /* _dbus_assert(!DBUS_TRANSPORT_CAN_SEND_UNIX_FD(transport));
+ {
+ bytes_read = kdbus_read_message(socket_transport, &socket_transport->encoded_incoming, fds, &n_fds);
- if (_dbus_string_get_length (&socket_transport->encoded_incoming) > 0)
- bytes_read = _dbus_string_get_length (&socket_transport->encoded_incoming);
- else
- bytes_read = _dbus_read_socket (socket_transport->fd,
- &socket_transport->encoded_incoming,
- socket_transport->max_bytes_read_per_iteration);*/
+ _dbus_assert (_dbus_string_get_length (&socket_transport->encoded_incoming) == bytes_read);
+ if (bytes_read > 0)
+ {
+ if (!_dbus_auth_decode_data (transport->auth,
+ &socket_transport->encoded_incoming,
+ buffer))
+ {
+ _dbus_verbose ("Out of memory decoding incoming data\n");
+ _dbus_message_loader_return_buffer (transport->loader,
+ buffer,
+ _dbus_string_get_length (buffer));
+ oom = TRUE;
+ goto out;
+ }
+
+ _dbus_string_set_length (&socket_transport->encoded_incoming, 0);
+ _dbus_string_compact (&socket_transport->encoded_incoming, 2048);
+ }
+ }
+ else
+ bytes_read = kdbus_read_message(socket_transport, buffer, fds, &n_fds);
+
+ if (bytes_read >= 0 && n_fds > 0)
+ _dbus_verbose("Read %i unix fds\n", n_fds);
+
+ _dbus_message_loader_return_buffer (transport->loader,
+ buffer,
+ bytes_read < 0 ? 0 : _dbus_string_get_length (buffer));
+ _dbus_message_loader_return_unix_fds(transport->loader, fds, bytes_read < 0 ? 0 : n_fds);
+
+ /* if (_dbus_auth_needs_decoding (transport->auth))
+ {
bytes_read = kdbus_read_message(socket_transport, &socket_transport->encoded_incoming);
_dbus_assert (_dbus_string_get_length (&socket_transport->encoded_incoming) ==
bytes_read);
if (bytes_read > 0)
- {
+ {
int orig_len;
- _dbus_message_loader_get_buffer (transport->loader,
- &buffer);
-
+ _dbus_message_loader_get_buffer (transport->loader, &buffer);
orig_len = _dbus_string_get_length (buffer);
-
if (!_dbus_auth_decode_data (transport->auth,
&socket_transport->encoded_incoming,
buffer))
- {
+ {
_dbus_verbose ("Out of memory decoding incoming data\n");
_dbus_message_loader_return_buffer (transport->loader,
buffer,
_dbus_string_get_length (buffer) - orig_len);
-
oom = TRUE;
goto out;
- }
+ }
_dbus_message_loader_return_buffer (transport->loader,
buffer,
_dbus_string_get_length (buffer) - orig_len);
-
_dbus_string_set_length (&socket_transport->encoded_incoming, 0);
_dbus_string_compact (&socket_transport->encoded_incoming, 2048);
- }
- }
+ }
+ }
else
- {
- _dbus_message_loader_get_buffer (transport->loader,
- &buffer);
+ {
+ int *fds, n_fds;
- bytes_read = kdbus_read_message(socket_transport, buffer);
+ if (!_dbus_message_loader_get_unix_fds(transport->loader, &fds, &n_fds))
+ {
+ _dbus_verbose ("Out of memory reading file descriptors\n");
+ _dbus_message_loader_return_buffer (transport->loader, buffer, 0);
+ oom = TRUE;
+ goto out;
+ }
+ _dbus_message_loader_get_buffer (transport->loader, &buffer);
+ bytes_read = kdbus_read_message(socket_transport, buffer, fds, &n_fds);
+
+ if (bytes_read >= 0 && n_fds > 0)
+ _dbus_verbose("Read %i unix fds\n", n_fds);
+
+ _dbus_message_loader_return_unix_fds(transport->loader, fds, bytes_read < 0 ? 0 : n_fds);
_dbus_message_loader_return_buffer (transport->loader,
buffer,
bytes_read < 0 ? 0 : bytes_read);
- }
+ }*/
if (bytes_read < 0)
{
{
_dbus_verbose (" read %d bytes\n", bytes_read);
- total += bytes_read;
+// total += bytes_read;
if (!_dbus_transport_queue_messages (transport))
{
if (watch == socket_transport->read_watch &&
(flags & DBUS_WATCH_READABLE))
{
+#ifdef DBUS_AUTHENTICATION
dbus_bool_t auth_finished;
+#endif
#if 1
_dbus_verbose ("handling read watch %p flags = %x\n",
watch, flags);
#endif
+#ifdef DBUS_AUTHENTICATION
if (!do_authentication (transport, TRUE, FALSE, &auth_finished))
return FALSE;
*/
if (!auth_finished)
{
+#endif
if (!do_reading (transport))
{
_dbus_verbose ("no memory to read\n");
return FALSE;
}
+#ifdef DBUS_AUTHENTICATION
}
else
{
_dbus_verbose ("Not reading anything since we just completed the authentication\n");
}
+#endif
}
else if (watch == socket_transport->write_watch &&
(flags & DBUS_WATCH_WRITABLE))
_dbus_verbose ("handling write watch, have_outgoing_messages = %d\n",
_dbus_connection_has_messages_to_send_unlocked (transport->connection));
#endif
+#ifdef DBUS_AUTHENTICATION
if (!do_authentication (transport, FALSE, TRUE, NULL))
return FALSE;
-
+#endif
if (!do_writing (transport))
{
_dbus_verbose ("no memory to write\n");
{
dbus_bool_t need_read = (poll_fd.revents & _DBUS_POLLIN) > 0;
dbus_bool_t need_write = (poll_fd.revents & _DBUS_POLLOUT) > 0;
- dbus_bool_t authentication_completed;
+#ifdef DBUS_AUTHENTICATION
+ dbus_bool_t authentication_completed;
+#endif
_dbus_verbose ("in iteration, need_read=%d need_write=%d\n",
need_read, need_write);
+#ifdef DBUS_AUTHENTICATION
do_authentication (transport, need_read, need_write,
&authentication_completed);
/* See comment in socket_handle_watch. */
if (authentication_completed)
goto out;
-
+#endif
if (need_read && (flags & DBUS_ITERATION_DO_READING))
do_reading (transport);
if (need_write && (flags & DBUS_ITERATION_DO_WRITING))
socket_transport->message_bytes_written = 0;
/* These values should probably be tunable or something. */
- socket_transport->max_bytes_read_per_iteration = POOL_SIZE;
- socket_transport->max_bytes_written_per_iteration = 2048;
+ socket_transport->max_bytes_read_per_iteration = RECEIVE_POOL_SIZE;
+ socket_transport->max_bytes_written_per_iteration = DBUS_MAXIMUM_MESSAGE_LENGTH;
socket_transport->kdbus_mmap_ptr = NULL;
-
+ socket_transport->memfd = -1;
+
return (DBusTransport*) socket_transport;
failed_4:
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
_dbus_verbose ("connecting to kdbus bus %s\n", path);
- fd = open(path, O_RDWR|O_CLOEXEC|O_NONBLOCK); //[RP] | O_NONBLOCK added here, in dbus added separately in section commented out below
+ fd = open(path, O_RDWR|O_CLOEXEC|O_NONBLOCK);
if (fd < 0)
- {
dbus_set_error(error, _dbus_error_from_errno (errno), "Failed to open file descriptor: %s", _dbus_strerror (errno));
- _DBUS_ASSERT_ERROR_IS_SET(error);
- return -1; //[RP] not needed here if commented block below is removed
- }
-
- /*if (!_dbus_set_fd_nonblocking (fd, error))
- {
- _DBUS_ASSERT_ERROR_IS_SET (error);
- _dbus_close (fd, NULL);
- return -1;
- }*/
return fd;
}
{
DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport;
- socket_transport->kdbus_mmap_ptr = mmap(NULL, POOL_SIZE, PROT_READ, MAP_SHARED, socket_transport->fd, 0);
+ socket_transport->kdbus_mmap_ptr = mmap(NULL, RECEIVE_POOL_SIZE, PROT_READ, MAP_SHARED, socket_transport->fd, 0);
if (socket_transport->kdbus_mmap_ptr == MAP_FAILED)
return FALSE;
policy = (struct kdbus_policy *) cmd_policy->policies;
cmd_policy->size = offsetof(struct kdbus_cmd_policy, policies);
- policy = make_policy_name(name); //todo to be verified or changed when meaning will be known
+ policy = make_policy_name(name);
append_policy(cmd_policy, policy, size);
policy = make_policy_access(KDBUS_POLICY_ACCESS_USER, KDBUS_POLICY_OWN, getuid());
dbus_bool_t bus_register_kdbus(char* name, DBusConnection *connection, DBusError *error)
{
- struct kdbus_cmd_hello hello;
+ struct kdbus_cmd_hello __attribute__ ((__aligned__(8))) hello;
int fd;
memset(&hello, 0, sizeof(hello));
- hello.conn_flags = KDBUS_HELLO_ACCEPT_FD |
+ hello.conn_flags = KDBUS_HELLO_ACCEPT_FD/* |
KDBUS_HELLO_ATTACH_COMM |
KDBUS_HELLO_ATTACH_EXE |
KDBUS_HELLO_ATTACH_CMDLINE |
KDBUS_HELLO_ATTACH_CAPS |
KDBUS_HELLO_ATTACH_CGROUP |
KDBUS_HELLO_ATTACH_SECLABEL |
- KDBUS_HELLO_ATTACH_AUDIT;
+ KDBUS_HELLO_ATTACH_AUDIT*/;
hello.size = sizeof(struct kdbus_cmd_hello);
- hello.pool_size = POOL_SIZE;
+ hello.pool_size = RECEIVE_POOL_SIZE;
if(!dbus_connection_get_socket(connection, &fd))
{
return TRUE;
}
-uint64_t bus_request_name_kdbus(DBusConnection *connection, const char *name, const uint64_t flags, DBusError *error)
+int bus_request_name_kdbus(DBusConnection *connection, const char *name, const uint64_t flags, DBusError *error)
{
struct kdbus_cmd_name *cmd_name;
int fd;
if(!dbus_connection_get_socket(connection, &fd))
{
dbus_set_error (error, "failed to get fd for name request", NULL);
- return FALSE;
+ return -1;
}
_dbus_verbose("Request name - flags sent: 0x%llx !!!!!!!!!\n", cmd_name->conn_flags);
dbus_set_error(error,_dbus_error_from_errno (errno), "error acquiring name: %s", _dbus_strerror (errno));
if(errno == EEXIST)
return DBUS_REQUEST_NAME_REPLY_EXISTS;
- return FALSE;
+ return -1;
}
_dbus_verbose("Request name - received flag: 0x%llx !!!!!!!!!\n", cmd_name->conn_flags);
return FALSE;
}
+static int parse_match_key(const char *rule, const char* key, char** pValue)
+{
+ const char* pBegin;
+ const char* pValueEnd;
+ int value_length = 0;
+
+ pBegin = strstr(rule, key);
+ if(pBegin)
+ {
+ pBegin += strlen(key);
+ pValueEnd = strchr(pBegin, '\'');
+ if(pValueEnd)
+ {
+ value_length = pValueEnd - pBegin;
+ *pValue = strndup(pBegin, value_length);
+ if(*pValue)
+ {
+ if(strcmp(*pValue, "org.freedesktop.DBus") == 0)
+ value_length = -1;
+ _dbus_verbose ("found for key: %s value:'%s'\n", key, *pValue);
+ }
+ }
+ }
+ return value_length;
+}
+
+/* only part of the dbus's matching capabilities implemented in kdbus now because of different mechanism
+ * interface match key mapped to bloom
+ * sender match key mapped to src_name
+ * also handled org.freedesktop.dbus members: NameOwnerChanged, NameLost, NameAcquired
+ */
void dbus_bus_add_match_kdbus (DBusConnection *connection, const char *rule, DBusError *error)
{
- struct kdbus_cmd_match cmd_match;
+ struct kdbus_cmd_match* pCmd_match;
+ struct kdbus_item *pItem;
int fd;
+ __u64 src_id = KDBUS_MATCH_SRC_ID_ANY;
+ uint64_t size;
+ unsigned int kernel_item = 0;
+ int name_size;
+ char* pName = NULL;
+ char* pInterface = NULL;
- memset(&cmd_match, 0, sizeof(cmd_match));
+ dbus_connection_get_socket(connection, &fd);
- if(!dbus_connection_get_socket(connection, &fd))
+ /*parsing rule and calculating size of command*/
+ size = sizeof(struct kdbus_cmd_match);
+
+ if(strstr(rule, "member='NameOwnerChanged'"))
{
- dbus_set_error (error, "failed to get fd for add match", NULL);
- return;
+ kernel_item = KDBUS_MATCH_NAME_CHANGE;
+ size += KDBUS_ITEM_SIZE(1);
+ }
+ else if(strstr(rule, "member='NameLost'"))
+ {
+ kernel_item = KDBUS_MATCH_NAME_REMOVE;
+ size += KDBUS_ITEM_SIZE(1);
+ }
+ else if(strstr(rule, "member='NameAcquired'"))
+ {
+ kernel_item = KDBUS_MATCH_NAME_ADD;
+ size += KDBUS_ITEM_SIZE(1);
}
- cmd_match.size = sizeof(cmd_match);
+ name_size = parse_match_key(rule, "interface='", &pInterface); /*actual size is not important for interface*/
+ if((name_size == -1) && (kernel_item == 0))
+ {
+ kernel_item = ~0;
+ size += KDBUS_ITEM_SIZE(1)*3 + KDBUS_ITEM_SIZE(sizeof(__u64))*2;
+ }
+ else if(name_size > 0)
+ size += KDBUS_PART_HEADER_SIZE + KDBUS_BLOOM_SIZE_BYTES;
- //todo add matching rules from *rule when it will be docuemnted in kdbus
+ name_size = parse_match_key(rule, "sender='", &pName);
+ if((name_size == -1) && (kernel_item == 0))
+ {
+ kernel_item = ~0;
+ size += KDBUS_ITEM_SIZE(1)*3 + KDBUS_ITEM_SIZE(sizeof(__u64))*2;
+ }
+ if(name_size > 0)
+ {
+ if(!strncmp(pName, ":1.", 3)) /*if name is unique name it must be converted to unique id*/
+ {
+ src_id = strtoll(&pName[3], NULL, 10);
+ free(pName);
+ pName = NULL;
+ }
+ else
+ size += KDBUS_ITEM_SIZE(name_size + 1);
+ }
+ pCmd_match = malloc(size);
+ if(pCmd_match == NULL)
+ goto out;
+ memset(pCmd_match, 0, size);
- cmd_match.src_id = KDBUS_MATCH_SRC_ID_ANY;
+ pCmd_match->size = size;
+ pCmd_match->cookie = strtoll(dbus_bus_get_unique_name(connection), NULL , 10);
- if (ioctl(fd, KDBUS_CMD_MATCH_ADD, &cmd_match))
- dbus_set_error(error,_dbus_error_from_errno (errno), "error adding match: %s", _dbus_strerror (errno));
+ pItem = pCmd_match->items;
+ if(kernel_item == ~0) //all signals from kernel
+ {
+ pCmd_match->src_id = 0;
+ pItem->type = KDBUS_MATCH_NAME_CHANGE;
+ pItem->size = KDBUS_PART_HEADER_SIZE + 1;
+ pItem = KDBUS_PART_NEXT(pItem);
+ pItem->type = KDBUS_MATCH_NAME_ADD;
+ pItem->size = KDBUS_PART_HEADER_SIZE + 1;
+ pItem = KDBUS_PART_NEXT(pItem);
+ pItem->type = KDBUS_MATCH_NAME_REMOVE;
+ pItem->size = KDBUS_PART_HEADER_SIZE + 1;
+ pItem = KDBUS_PART_NEXT(pItem);
+ pItem->type = KDBUS_MATCH_ID_ADD;
+ pItem->size = KDBUS_PART_HEADER_SIZE + sizeof(__u64);
+ pItem = KDBUS_PART_NEXT(pItem);
+ pItem->type = KDBUS_MATCH_ID_REMOVE;
+ pItem->size = KDBUS_PART_HEADER_SIZE + sizeof(__u64);
+ }
+ else if(kernel_item)
+ {
+ pCmd_match->src_id = 0;
+ pItem->type = kernel_item;
+ pItem->size = KDBUS_PART_HEADER_SIZE + 1;
+ }
+ else
+ {
+ pCmd_match->src_id = src_id;
+ if(pName)
+ {
+ pItem->type = KDBUS_MATCH_SRC_NAME;
+ pItem->size = KDBUS_PART_HEADER_SIZE + name_size + 1;
+ strcpy(pItem->str, pName);
+ pItem = KDBUS_PART_NEXT(pItem);
+ }
+
+ if(pInterface)
+ {
+ pItem->type = KDBUS_MATCH_BLOOM;
+ pItem->size = KDBUS_PART_HEADER_SIZE + KDBUS_BLOOM_SIZE_BYTES;
+ strncpy(pItem->data, pInterface, KDBUS_BLOOM_SIZE_BYTES);
+ }
+ }
+
+ if(ioctl(fd, KDBUS_CMD_MATCH_ADD, pCmd_match))
+ {
+ if(error)
+ dbus_set_error(error,_dbus_error_from_errno (errno), "error adding match: %s", _dbus_strerror (errno));
+ _dbus_verbose("Failed adding match bus rule %s,\nerror: %d, %m\n", rule, errno);
+ }
+ else
+ _dbus_verbose("Added match bus rule %s\n", rule);
+
+ free(pCmd_match);
+out:
+ if(pName)
+ free(pName);
+ if(pInterface)
+ free(pInterface);
+}
- _dbus_verbose("Finished adding match bus rule %s\n", rule);
+void dbus_bus_remove_match_kdbus (DBusConnection *connection, const char *rule, DBusError *error)
+{
+ struct kdbus_cmd_match __attribute__ ((__aligned__(8))) cmd;
+ int fd;
+
+ dbus_connection_get_socket(connection, &fd);
+ cmd.cookie = strtoll(dbus_bus_get_unique_name(connection), NULL , 10);
+ cmd.id = cmd.cookie;
+ cmd.size = sizeof(struct kdbus_cmd_match);
+
+ if(ioctl(fd, KDBUS_CMD_MATCH_ADD, &cmd))
+ {
+ if(error)
+ dbus_set_error(error,_dbus_error_from_errno (errno), "error removing match: %s", _dbus_strerror (errno));
+ _dbus_verbose("Failed removing match rule; error: %d, %m\n", errno);
+ }
+ else
+ _dbus_verbose("Match rule removed correctly.\n");
}
projects / platform / upstream / dbus.git / blobdiff