#include "dbus-transport-kdbus.h"
#include <dbus/dbus-transport-protected.h>
#include "dbus-connection-internal.h"
-#include <kdbus.h>
+#include "kdbus.h"
#include "dbus-watch.h"
#include "dbus-errors.h"
+#include "dbus-bus.h"
+#include <linux/types.h>
#include <fcntl.h>
#include <errno.h>
#include <fcntl.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
-
+#include <sys/mman.h>
#define KDBUS_ALIGN8(l) (((l) + 7) & ~7)
+#define KDBUS_PART_HEADER_SIZE offsetof(struct kdbus_item, data)
+#define KDBUS_ITEM_SIZE(s) KDBUS_ALIGN8((s) + KDBUS_PART_HEADER_SIZE)
+#define KDBUS_PART_NEXT(part) \
+ (typeof(part))(((uint8_t *)part) + KDBUS_ALIGN8((part)->size))
+#define KDBUS_PART_FOREACH(part, head, first) \
+ for (part = (head)->first; \
+ (uint8_t *)(part) < (uint8_t *)(head) + (head)->size; \
+ part = KDBUS_PART_NEXT(part))
+#define RECEIVE_POOL_SIZE (50 * 1024LU * 1024LU) //todo pool size to be decided
+#define MEMFD_POOL_SIZE DBUS_MAXIMUM_MESSAGE_LENGTH
+#define MEMFD_SIZE_THRESHOLD (2 * 1024 * 1024LU) // over this memfd is used
+
+#define KDBUS_DECODE_DEBUG 1
-/*struct and type below copied from dbus_transport_socket.c
- * needed for _dbus_transport_new_for_socket_kdbus and kdbus_vtable(?)
- * todo maybe DBusTransportSocket and _dbus_transport_new_for_socket_kdbus not needed here -
- * maybe only static const DBusTransportVTable implementation will be enough
- */
/**
* Opaque object representing a socket file descriptor transport.
DBusString encoded_incoming; /**< Encoded version of current
* incoming data.
*/
+ void* kdbus_mmap_ptr;
+ int memfd; /* File descriptor to memory
+ * pool from Kdbus kernel module */
};
-//prototypes of local functions, needed for compiler
-int _dbus_connect_kdbus (const char *path, DBusError *error);
-DBusTransport* _dbus_transport_new_for_kdbus (const char *path, DBusError *error);
-DBusTransport* _dbus_transport_new_for_socket_kdbus (int fd, const DBusString *server_guid, const DBusString *address);
-struct kdbus_policy *make_policy_name(const char *name);
-struct kdbus_policy *make_policy_access(__u64 type, __u64 bits, __u64 id);
-void append_policy(struct kdbus_cmd_policy *cmd_policy, struct kdbus_policy *policy, __u64 max_size);
+static dbus_bool_t
+socket_get_socket_fd (DBusTransport *transport,
+ int *fd_p)
+{
+ DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport;
+
+ *fd_p = socket_transport->fd;
+
+ return TRUE;
+}
+
+//static void check_read_watch (DBusTransport *transport);
+
+/*
+ * Adds locally generated message to received messages queue
+ *
+ */
+static dbus_bool_t add_message_to_received(DBusMessage *message, DBusTransport *transport)
+{
+ DBusList *message_link;
+
+ message_link = _dbus_list_alloc_link (message);
+ if (message_link == NULL)
+ {
+ /* it's OK to unref this, nothing that could have attached a callback
+ * has ever seen it */
+ dbus_message_unref (message);
+ return FALSE;
+ }
+
+ _dbus_connection_queue_synthesized_message_link(transport->connection, message_link);
+// check_read_watch(transport);
+
+ return TRUE;
+}
+
+/*static void kdbus_debug_print_bytes(struct DBusString *data, int 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(DBusTransportSocket *socket_transport, const char* name, __u64 dst_id, uint64_t body_size, dbus_bool_t use_memfd)
+{
+ struct kdbus_msg* msg;
+ uint64_t msg_size;
+
+ msg_size = sizeof(struct kdbus_msg);
+
+ 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 (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;
+ }
-/* Functions from dbus_transport_socket - to be modified or reused
+ memset(msg, 0, msg_size);
+ msg->size = msg_size;
+ msg->src_id = strtoll(dbus_bus_get_unique_name(socket_transport->base.connection), NULL , 10);
+ 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;
+
+ _dbus_message_get_unix_fds(message, &unix_fds, &fds_count); //todo or to remove
+
+ // determine name and destination id
+ if((name = dbus_message_get_destination(message)))
+ {
+ 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;
+ }
+ }
+
+ // get size of data
+ if(encoded)
+ ret_size = _dbus_string_get_length (&transport->encoded_outgoing);
+ else
+ {
+ _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;
+ }
+
+ // 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);
+
+ // init basic message fields
+ msg = kdbus_init_msg(transport, name, dst_id, body_size, use_memfd); //todo add fds
+ msg->cookie = dbus_message_get_serial(message);
+
+ // 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;
+ }
+
+ 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;
+ }
+
+ 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;
+ }
+
+ }
+
+ 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) //todo
+ {
+
+ }
+
+ 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);
+ }
+ else if (dst_id == KDBUS_DST_ID_BROADCAST)
+ {
+ item = KDBUS_PART_NEXT(item);
+ item->type = KDBUS_MSG_BLOOM;
+ 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(transport->fd, KDBUS_CMD_MSG_SEND, msg))
+ {
+ if(errno == EINTR)
+ goto again;
+ if((errno == ESRCH) || (errno == ENXIO)) //when recipient is not available on the bus
+ {
+ DBusMessage *errMessage = NULL;
+ dbus_uint32_t replySerial;
+
+ errMessage = generate_local_error_message(msg->cookie, DBUS_ERROR_SERVICE_UNKNOWN, NULL);
+ if(errMessage == NULL)
+ {
+ ret_size = -1;
+ goto out;
+ }
+ 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;
+}
+
+static int64_t kdbus_NameQuery(DBusTransport *transport, char* name, int fd)
+{
+ struct kdbus_cmd_name_info *msg;
+ struct kdbus_item *item;
+ uint64_t size;
+ int64_t ret;
+ uint64_t item_size;
+
+ 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)
+ {
+ _dbus_verbose("Error allocating memory for: %s,%s\n", _dbus_strerror (errno), _dbus_error_from_errno (errno));
+ return -1;
+ }
+
+ memset(msg, 0, size);
+ msg->size = size;
+
+ item = msg->items;
+ item->type = KDBUS_NAME_INFO_ITEM_NAME;
+ item->size = item_size;
+ strcpy(item->str, name);
+
+ again:
+ if ((ret = ioctl(fd, KDBUS_CMD_NAME_QUERY, msg)))
+ {
+ if(errno == EINTR)
+ goto again;
+ ret = -errno;
+ }
+ else
+ ret = msg->id;
+
+ free(msg);
+ return ret;
+}
+
+static dbus_bool_t emulateOrgFreedesktopDBus(DBusTransport *transport, DBusMessage *message, int fd)
+{
+ int64_t ret;
+
+ if(!strcmp(dbus_message_get_member(message), "GetNameOwner"))
+ {
+ 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 *reply;
+ DBusMessageIter args;
+ char unique_name[(unsigned int)(sizeof(ret)*2.5 + 4)];
+ 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_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(1, DBUS_ERROR_NAME_HAS_NO_OWNER, NULL);
+ 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_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 //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), "ListNames"))
+ {
+ //todo
+ }
+ 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;
+}
+
+#if KDBUS_DECODE_DEBUG == 1
+static char *msg_id(uint64_t id, char *buf)
+{
+ if (id == 0)
+ return "KERNEL";
+ if (id == ~0ULL)
+ return "BROADCAST";
+ sprintf(buf, "%llu", (unsigned long long)id);
+ return buf;
+}
+#endif
+struct kdbus_enum_table {
+ long long id;
+ const char *name;
+};
+#define _STRINGIFY(x) #x
+#define STRINGIFY(x) _STRINGIFY(x)
+#define ELEMENTSOF(x) (sizeof(x)/sizeof((x)[0]))
+#define TABLE(what) static struct kdbus_enum_table kdbus_table_##what[]
+#define ENUM(_id) { .id=_id, .name=STRINGIFY(_id) }
+#define LOOKUP(what) \
+ const char *enum_##what(long long id) { \
+ size_t i; \
+ for (i = 0; i < ELEMENTSOF(kdbus_table_##what); i++) \
+ if (id == kdbus_table_##what[i].id) \
+ return kdbus_table_##what[i].name; \
+ return "UNKNOWN"; \
+ }
+const char *enum_MSG(long long id);
+TABLE(MSG) = {
+ ENUM(_KDBUS_MSG_NULL),
+ ENUM(KDBUS_MSG_PAYLOAD_VEC),
+ ENUM(KDBUS_MSG_PAYLOAD_OFF),
+ ENUM(KDBUS_MSG_PAYLOAD_MEMFD),
+ ENUM(KDBUS_MSG_FDS),
+ ENUM(KDBUS_MSG_BLOOM),
+ ENUM(KDBUS_MSG_DST_NAME),
+ ENUM(KDBUS_MSG_SRC_CREDS),
+ ENUM(KDBUS_MSG_SRC_PID_COMM),
+ ENUM(KDBUS_MSG_SRC_TID_COMM),
+ ENUM(KDBUS_MSG_SRC_EXE),
+ ENUM(KDBUS_MSG_SRC_CMDLINE),
+ ENUM(KDBUS_MSG_SRC_CGROUP),
+ ENUM(KDBUS_MSG_SRC_CAPS),
+ ENUM(KDBUS_MSG_SRC_SECLABEL),
+ ENUM(KDBUS_MSG_SRC_AUDIT),
+ ENUM(KDBUS_MSG_SRC_NAMES),
+ ENUM(KDBUS_MSG_TIMESTAMP),
+ ENUM(KDBUS_MSG_NAME_ADD),
+ ENUM(KDBUS_MSG_NAME_REMOVE),
+ ENUM(KDBUS_MSG_NAME_CHANGE),
+ ENUM(KDBUS_MSG_ID_ADD),
+ ENUM(KDBUS_MSG_ID_REMOVE),
+ ENUM(KDBUS_MSG_REPLY_TIMEOUT),
+ ENUM(KDBUS_MSG_REPLY_DEAD),
+};
+LOOKUP(MSG);
+const char *enum_PAYLOAD(long long id);
+TABLE(PAYLOAD) = {
+ ENUM(KDBUS_PAYLOAD_KERNEL),
+ ENUM(KDBUS_PAYLOAD_DBUS1),
+ ENUM(KDBUS_PAYLOAD_GVARIANT),
+};
+LOOKUP(PAYLOAD);
+
+static int put_message_into_data(DBusMessage *message, char* data)
+{
+ int ret_size;
+ const DBusString *header;
+ const DBusString *body;
+ int size;
+
+ dbus_message_lock (message);
+ _dbus_message_get_network_data (message, &header, &body);
+ ret_size = _dbus_string_get_length(header);
+ memcpy(data, _dbus_string_get_const_data(header), ret_size);
+ data += ret_size;
+ size = _dbus_string_get_length(body);
+ memcpy(data, _dbus_string_get_const_data(body), size);
+ ret_size += size;
+
+ return ret_size;
+}
+
+static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTransportSocket* socket_transport)
+{
+ const struct kdbus_item *item = msg->items;
+ int ret_size = 0;
+ DBusMessage *message = NULL;
+ DBusMessageIter args;
+ char dbus_name[(unsigned int)(sizeof(item->name_change.new_id)*2.5 + 4)];
+ const char* pDBusName = dbus_name;
+ const char* dbus = "org.freedesktop.DBus";
+ const char* emptyString = "";
+ const char* pString = NULL;
+ void* mmap_ptr;
+#if KDBUS_DECODE_DEBUG == 1
+ char buf[32];
+#endif
+
+#if KDBUS_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
+
+ 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);
+ continue; //todo to be discovered and rewritten
+ }
+
+ 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;
+
+ _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)size);
+ break;
+ }
+
+ case KDBUS_MSG_PAYLOAD_MEMFD:
+ {
+ char *buf;
+ uint64_t size;
+
+ size = item->memfd.size;
+
+ _dbus_verbose("memfd.size : %llu\n", (unsigned long long)size);
+
+ buf = mmap(NULL, MEMFD_POOL_SIZE, PROT_READ , MAP_SHARED, item->memfd.fd, 0);
+
+ if (buf == MAP_FAILED)
+ {
+ _dbus_verbose("mmap() fd=%i failed:%m", item->memfd.fd);
+ return -1;
+ }
+
+ memcpy(data, buf, size);
+ data += size;
+ ret_size += size;
+
+ munmap(buf, MEMFD_POOL_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;
+ }
+#if KDBUS_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,
+ item->creds.pid, item->creds.tid,
+ item->creds.starttime);
+ break;
+
+ case KDBUS_MSG_SRC_PID_COMM:
+ case KDBUS_MSG_SRC_TID_COMM:
+ case KDBUS_MSG_SRC_EXE:
+ case KDBUS_MSG_SRC_CGROUP:
+ case KDBUS_MSG_SRC_SECLABEL:
+ case KDBUS_MSG_DST_NAME:
+ _dbus_verbose(" +%s (%llu bytes) '%s' (%zu)\n",
+ enum_MSG(item->type), item->size, item->str, strlen(item->str));
+ break;
+
+ case KDBUS_MSG_SRC_CMDLINE:
+ case KDBUS_MSG_SRC_NAMES: {
+ size_t size = item->size - KDBUS_PART_HEADER_SIZE;
+ const char *str = item->str;
+ int count = 0;
+
+ _dbus_verbose(" +%s (%llu bytes) ", enum_MSG(item->type), item->size);
+ while (size) {
+ _dbus_verbose("'%s' ", str);
+ size -= strlen(str) + 1;
+ str += strlen(str) + 1;
+ count++;
+ }
+
+ _dbus_verbose("(%d string%s)\n", count, (count == 1) ? "" : "s");
+ break;
+ }
+
+ case KDBUS_MSG_SRC_AUDIT:
+ _dbus_verbose(" +%s (%llu bytes) loginuid=%llu sessionid=%llu\n",
+ enum_MSG(item->type), item->size,
+ (unsigned long long)item->data64[0],
+ (unsigned long long)item->data64[1]);
+ break;
+
+ case KDBUS_MSG_SRC_CAPS: {
+ int n;
+ const uint32_t *cap;
+ int i;
+
+ _dbus_verbose(" +%s (%llu bytes) len=%llu bytes)\n",
+ enum_MSG(item->type), item->size,
+ (unsigned long long)item->size - KDBUS_PART_HEADER_SIZE);
+
+ cap = item->data32;
+ n = (item->size - KDBUS_PART_HEADER_SIZE) / 4 / sizeof(uint32_t);
+
+ _dbus_verbose(" CapInh=");
+ for (i = 0; i < n; i++)
+ _dbus_verbose("%08x", cap[(0 * n) + (n - i - 1)]);
+
+ _dbus_verbose(" CapPrm=");
+ for (i = 0; i < n; i++)
+ _dbus_verbose("%08x", cap[(1 * n) + (n - i - 1)]);
+
+ _dbus_verbose(" CapEff=");
+ for (i = 0; i < n; i++)
+ _dbus_verbose("%08x", cap[(2 * n) + (n - i - 1)]);
+
+ _dbus_verbose(" CapInh=");
+ for (i = 0; i < n; i++)
+ _dbus_verbose("%08x", cap[(3 * n) + (n - i - 1)]);
+ _dbus_verbose("\n");
+ break;
+ }
+
+ case KDBUS_MSG_TIMESTAMP:
+ _dbus_verbose(" +%s (%llu bytes) realtime=%lluns monotonic=%lluns\n",
+ enum_MSG(item->type), item->size,
+ (unsigned long long)item->timestamp.realtime_ns,
+ (unsigned long long)item->timestamp.monotonic_ns);
+ 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, DBUS_ERROR_NO_REPLY, NULL);
+ if(message == NULL)
+ {
+ ret_size = -1;
+ goto out;
+ }
+
+ ret_size = put_message_into_data(message, data);
+ break;
+
+ case KDBUS_MSG_NAME_ADD:
+ _dbus_verbose(" +%s (%llu bytes) '%s', old id=%lld, new id=%lld, flags=0x%llx\n",
+ enum_MSG(item->type), (unsigned long long) item->size,
+ item->name_change.name, item->name_change.old_id,
+ item->name_change.new_id, item->name_change.flags);
+
+ message = dbus_message_new_signal("/org/freedesktop/DBus", // object name of the signal
+ dbus, // interface name of the signal
+ "NameOwnerChanged"); // name of the signal
+ if(message == NULL)
+ {
+ ret_size = -1;
+ 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);
+ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING,&pString))
+ {
+ ret_size = -1;
+ goto out;
+ }
+ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &emptyString))
+ {
+ ret_size = -1;
+ goto out;
+ }
+ 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_serial(message, 1);
+
+ ret_size = put_message_into_data(message, data);
+ break;
+
+ case KDBUS_MSG_NAME_REMOVE:
+ _dbus_verbose(" +%s (%llu bytes) '%s', old id=%lld, new id=%lld, flags=0x%llx\n",
+ enum_MSG(item->type), (unsigned long long) item->size,
+ item->name_change.name, item->name_change.old_id,
+ item->name_change.new_id, item->name_change.flags);
+
+ message = dbus_message_new_signal("/org/freedesktop/DBus", // object name of the signal
+ dbus, // interface name of the signal
+ "NameOwnerChanged"); // name of the signal
+ if(message == NULL)
+ {
+ ret_size = -1;
+ 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);
+ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING,&pString))
+ {
+ ret_size = -1;
+ goto out;
+ }
+ 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, &emptyString))
+ {
+ ret_size = -1;
+ goto out;
+ }
+
+ dbus_message_set_sender(message, dbus);
+ dbus_message_set_serial(message, 1);
+
+ ret_size = put_message_into_data(message, data);
+ break;
+
+ case KDBUS_MSG_NAME_CHANGE:
+ _dbus_verbose(" +%s (%llu bytes) '%s', old id=%lld, new id=%lld, flags=0x%llx\n",
+ enum_MSG(item->type), (unsigned long long) item->size,
+ item->name_change.name, item->name_change.old_id,
+ item->name_change.new_id, item->name_change.flags);
+
+ message = dbus_message_new_signal("/org/freedesktop/DBus", // object name of the signal
+ dbus, // interface name of the signal
+ "NameOwnerChanged"); // name of the signal
+ if(message == NULL)
+ {
+ ret_size = -1;
+ 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);
+ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING,&pString))
+ {
+ ret_size = -1;
+ goto out;
+ }
+ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pDBusName))
+ {
+ ret_size = -1;
+ goto out;
+ }
+ sprintf(&dbus_name[3],"%llu",item->name_change.new_id);
+ _dbus_verbose ("New id: %s\n", pDBusName); //todo to be removed
+ 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_serial(message, 1);
+
+ ret_size = put_message_into_data(message, data);
+ break;
+
+ case KDBUS_MSG_ID_ADD:
+ _dbus_verbose(" +%s (%llu bytes) id=%llu flags=%llu\n",
+ enum_MSG(item->type), (unsigned long long) item->size,
+ (unsigned long long) item->id_change.id,
+ (unsigned long long) item->id_change.flags);
+
+ message = dbus_message_new_signal("/org/freedesktop/DBus", // object name of the signal
+ dbus, // interface name of the signal
+ "NameOwnerChanged"); // name of the signal
+ if(message == NULL)
+ {
+ ret_size = -1;
+ 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, &pDBusName))
+ {
+ ret_size = -1;
+ goto out;
+ }
+ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &emptyString))
+ {
+ ret_size = -1;
+ goto out;
+ }
+ 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_serial(message, 1);
+
+ ret_size = put_message_into_data(message, data);
+ break;
+
+ case KDBUS_MSG_ID_REMOVE:
+ _dbus_verbose(" +%s (%llu bytes) id=%llu flags=%llu\n",
+ enum_MSG(item->type), (unsigned long long) item->size,
+ (unsigned long long) item->id_change.id,
+ (unsigned long long) item->id_change.flags);
+
+ message = dbus_message_new_signal("/org/freedesktop/DBus", // object name of the signal
+ dbus, // interface name of the signal
+ "NameOwnerChanged"); // name of the signal
+ if(message == NULL)
+ {
+ ret_size = -1;
+ 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, &pDBusName))
+ {
+ ret_size = -1;
+ goto out;
+ }
+ 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, &emptyString))
+ {
+ ret_size = -1;
+ goto out;
+ }
+
+ dbus_message_set_sender(message, dbus);
+ dbus_message_set_serial(message, 1);
+
+ ret_size = put_message_into_data(message, data);
+ break;
+#if KDBUS_DECODE_DEBUG == 1
+ default:
+ _dbus_verbose(" +%s (%llu bytes)\n", enum_MSG(item->type), item->size);
+ break;
+#endif
+ }
+ }
+
+#if KDBUS_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);
+ return ret_size;
+}
+
+static int kdbus_read_message(DBusTransportSocket *socket_transport, DBusString *buffer)
+{
+ int ret_size;
+ uint64_t offset;
+ struct kdbus_msg *msg;
+ char *data;
+
+ _dbus_assert (socket_transport->max_bytes_read_per_iteration >= 0);
+ if (!_dbus_string_lengthen (buffer, socket_transport->max_bytes_read_per_iteration))
+ {
+ errno = ENOMEM;
+ return -1;
+ }
+ 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, 0);
+ return -1;
+ }
+
+ msg = (struct kdbus_msg *)((char*)socket_transport->kdbus_mmap_ptr + offset);
+
+ ret_size = kdbus_decode_msg(msg, data, socket_transport);
+ _dbus_string_set_length (buffer, ret_size);
+
+ again2:
+ if (ioctl(socket_transport->fd, KDBUS_CMD_MSG_RELEASE, &offset) < 0)
+ {
+ if(errno == EINTR)
+ goto again2;
+ _dbus_verbose("kdbus error freeing message: %d (%m)\n", errno);
+ return -1;
+ }
+
+ return ret_size;
+}
+
static void
free_watches (DBusTransport *transport)
{
_dbus_auth_get_buffer (transport->auth, &buffer);
- bytes_read = _dbus_read_socket (socket_transport->fd,
- buffer, socket_transport->max_bytes_read_per_iteration);
+ bytes_read = kdbus_read_message(socket_transport, buffer);
_dbus_auth_return_buffer (transport->auth, buffer,
bytes_read > 0 ? bytes_read : 0);
if (bytes_read > 0)
{
_dbus_verbose (" read %d bytes in auth phase\n", bytes_read);
-
return TRUE;
}
else if (bytes_read < 0)
static dbus_bool_t
do_writing (DBusTransport *transport)
{
- int total;
- DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport;
- dbus_bool_t oom;
+// int total;
+ DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport;
+ dbus_bool_t oom;
- /* No messages without authentication! */
- if (!_dbus_transport_get_is_authenticated (transport))
+ /* No messages without authentication! */
+ if (!_dbus_transport_get_is_authenticated (transport))
{
- _dbus_verbose ("Not authenticated, not writing anything\n");
- return TRUE;
+ _dbus_verbose ("Not authenticated, not writing anything\n");
+ return TRUE;
}
- if (transport->disconnected)
+ if (transport->disconnected)
{
- _dbus_verbose ("Not connected, not writing anything\n");
- return TRUE;
+ _dbus_verbose ("Not connected, not writing anything\n");
+ return TRUE;
}
#if 1
- _dbus_verbose ("do_writing(), have_messages = %d, fd = %d\n",
+ _dbus_verbose ("do_writing(), have_messages = %d, fd = %d\n",
_dbus_connection_has_messages_to_send_unlocked (transport->connection),
socket_transport->fd);
#endif
- oom = FALSE;
- total = 0;
+ oom = FALSE;
+// total = 0;
- while (!transport->disconnected &&
- _dbus_connection_has_messages_to_send_unlocked (transport->connection))
+ while (!transport->disconnected && _dbus_connection_has_messages_to_send_unlocked (transport->connection))
{
- int bytes_written;
- DBusMessage *message;
- const DBusString *header;
- const DBusString *body;
- int header_len, body_len;
- int total_bytes_to_write;
-
- if (total > socket_transport->max_bytes_written_per_iteration)
+ int bytes_written;
+ DBusMessage *message;
+ const DBusString *header;
+ const DBusString *body;
+ int total_bytes_to_write;
+ const char* pDestination;
+
+ /* if (total > socket_transport->max_bytes_written_per_iteration)
{
- _dbus_verbose ("%d bytes exceeds %d bytes written per iteration, returning\n",
+ _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);
-
-#if 0
- _dbus_verbose ("writing message %p\n", message);
-#endif
-
- _dbus_message_get_network_data (message,
- &header, &body);
-
- header_len = _dbus_string_get_length (header);
- body_len = _dbus_string_get_length (body);
-
- if (_dbus_auth_needs_encoding (transport->auth))
+ 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_string_get_length (&socket_transport->encoded_outgoing) == 0)
{
- if (!_dbus_auth_encode_data (transport->auth,
+ if (!_dbus_auth_encode_data (transport->auth,
header, &socket_transport->encoded_outgoing))
{
- oom = TRUE;
- goto out;
+ oom = TRUE;
+ goto out;
}
- if (!_dbus_auth_encode_data (transport->auth,
+ if (!_dbus_auth_encode_data (transport->auth,
body, &socket_transport->encoded_outgoing))
{
- _dbus_string_set_length (&socket_transport->encoded_outgoing, 0);
- oom = TRUE;
- goto out;
+ _dbus_string_set_length (&socket_transport->encoded_outgoing, 0);
+ oom = TRUE;
+ goto out;
}
}
- total_bytes_to_write = _dbus_string_get_length (&socket_transport->encoded_outgoing);
+ total_bytes_to_write = _dbus_string_get_length (&socket_transport->encoded_outgoing);
+ if(total_bytes_to_write > socket_transport->max_bytes_written_per_iteration)
+ return -E2BIG; //todo to be changed because large messages are now sent through memfd
-#if 0
- _dbus_verbose ("encoded message is %d bytes\n",
- total_bytes_to_write);
-#endif
-
- bytes_written =
- _dbus_write_socket (socket_transport->fd,
- &socket_transport->encoded_outgoing,
- socket_transport->message_bytes_written,
- total_bytes_to_write - socket_transport->message_bytes_written);
+ bytes_written = kdbus_write_msg(socket_transport, message, TRUE);
}
- else
- {
- total_bytes_to_write = header_len + body_len;
-
-#if 0
- _dbus_verbose ("message is %d bytes\n",
- total_bytes_to_write);
-#endif
+ else
+ {
+ if(total_bytes_to_write > socket_transport->max_bytes_written_per_iteration)
+ return -E2BIG; //todo to be changed because large messages are now sent through memfd
-#ifdef HAVE_UNIX_FD_PASSING
- if (socket_transport->message_bytes_written <= 0 && DBUS_TRANSPORT_CAN_SEND_UNIX_FD(transport))
- {
- /* Send the fds along with the first byte of the message */
- const int *unix_fds;
- unsigned n;
-
- _dbus_message_get_unix_fds(message, &unix_fds, &n);
-
- bytes_written =
- _dbus_write_socket_with_unix_fds_two (socket_transport->fd,
- header,
- socket_transport->message_bytes_written,
- header_len - socket_transport->message_bytes_written,
- body,
- 0, body_len,
- unix_fds,
- n);
-
- if (bytes_written > 0 && n > 0)
- _dbus_verbose("Wrote %i unix fds\n", n);
- }
- else
-#endif
- {
- if (socket_transport->message_bytes_written < header_len)
- {
- bytes_written =
- _dbus_write_socket_two (socket_transport->fd,
- header,
- socket_transport->message_bytes_written,
- header_len - socket_transport->message_bytes_written,
- body,
- 0, body_len);
- }
- else
- {
- bytes_written =
- _dbus_write_socket (socket_transport->fd,
- body,
- (socket_transport->message_bytes_written - header_len),
- body_len -
- (socket_transport->message_bytes_written - header_len));
- }
- }
- }
+ bytes_written = kdbus_write_msg(socket_transport, message, FALSE);
+ }
- if (bytes_written < 0)
- {
- /* EINTR already handled for us */
+written:
+ if (bytes_written < 0)
+ {
+ /* EINTR already handled for us */
/* For some discussion of why we also ignore EPIPE here, see
* http://lists.freedesktop.org/archives/dbus/2008-March/009526.html
*/
- if (_dbus_get_is_errno_eagain_or_ewouldblock () || _dbus_get_is_errno_epipe ())
- goto out;
- else
- {
- _dbus_verbose ("Error writing to remote app: %s\n",
- _dbus_strerror_from_errno ());
- do_io_error (transport);
- goto out;
- }
- }
- else
- {
- _dbus_verbose (" wrote %d bytes of %d\n", bytes_written,
+ if (_dbus_get_is_errno_eagain_or_ewouldblock () || _dbus_get_is_errno_epipe ())
+ goto out;
+ else
+ {
+ _dbus_verbose ("Error writing to remote app: %s\n", _dbus_strerror_from_errno ());
+ do_io_error (transport);
+ goto out;
+ }
+ }
+ else
+ {
+ _dbus_verbose (" wrote %d bytes of %d\n", bytes_written,
total_bytes_to_write);
- total += bytes_written;
- socket_transport->message_bytes_written += bytes_written;
+// total += bytes_written;
+ socket_transport->message_bytes_written += bytes_written;
- _dbus_assert (socket_transport->message_bytes_written <=
+ _dbus_assert (socket_transport->message_bytes_written <=
total_bytes_to_write);
- if (socket_transport->message_bytes_written == total_bytes_to_write)
- {
- socket_transport->message_bytes_written = 0;
- _dbus_string_set_length (&socket_transport->encoded_outgoing, 0);
- _dbus_string_compact (&socket_transport->encoded_outgoing, 2048);
+ if (socket_transport->message_bytes_written == total_bytes_to_write)
+ {
+ socket_transport->message_bytes_written = 0;
+ _dbus_string_set_length (&socket_transport->encoded_outgoing, 0);
+ _dbus_string_compact (&socket_transport->encoded_outgoing, 2048);
- _dbus_connection_message_sent_unlocked (transport->connection,
- message);
- }
- }
+ _dbus_connection_message_sent_unlocked (transport->connection,
+ message);
+ }
+ }
}
- out:
- if (oom)
- return FALSE;
- else
- return TRUE;
+ out:
+ if (oom)
+ return FALSE;
+ else
+ return TRUE;
}
/* returns false on out-of-memory */
DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport;
DBusString *buffer;
int bytes_read;
- int total;
+// int total;
dbus_bool_t oom;
_dbus_verbose ("fd = %d\n",socket_transport->fd);
oom = FALSE;
- total = 0;
+// 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)
+/* 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);
return TRUE;
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));
-
- 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);
+ {
+ 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);
-
-#ifdef HAVE_UNIX_FD_PASSING
- if (DBUS_TRANSPORT_CAN_SEND_UNIX_FD(transport))
- {
- int *fds, n_fds;
-
- 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;
- }
-
- bytes_read = _dbus_read_socket_with_unix_fds(socket_transport->fd,
- buffer,
- socket_transport->max_bytes_read_per_iteration,
- 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);
- }
- else
-#endif
- {
- bytes_read = _dbus_read_socket (socket_transport->fd,
- buffer, socket_transport->max_bytes_read_per_iteration);
- }
-
+ bytes_read = kdbus_read_message(socket_transport, buffer);
_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))
{
* messages).
*/
static void
-socket_do_iteration (DBusTransport *transport,
+kdbus_do_iteration (DBusTransport *transport,
unsigned int flags,
int timeout_milliseconds)
{
- DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport;
- DBusPollFD poll_fd;
- int poll_res;
- int poll_timeout;
+ DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport;
+ DBusPollFD poll_fd;
+ int poll_res;
+ int poll_timeout;
- _dbus_verbose (" iteration flags = %s%s timeout = %d read_watch = %p write_watch = %p fd = %d\n",
+ _dbus_verbose (" iteration flags = %s%s timeout = %d read_watch = %p write_watch = %p fd = %d\n",
flags & DBUS_ITERATION_DO_READING ? "read" : "",
flags & DBUS_ITERATION_DO_WRITING ? "write" : "",
timeout_milliseconds,
poll_res = _dbus_poll (&poll_fd, 1, poll_timeout);
if (poll_res < 0 && _dbus_get_is_errno_eintr ())
- goto again;
+ {
+ _dbus_verbose ("Error from _dbus_poll(): %s\n",
+ _dbus_strerror_from_errno ());
+ goto again;
+ }
if (flags & DBUS_ITERATION_BLOCK)
{
check_read_watch (transport);
}
-
-static dbus_bool_t
-socket_get_socket_fd (DBusTransport *transport,
- int *fd_p)
-{
- DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport;
-
- *fd_p = socket_transport->fd;
-
- return TRUE;
-}
-
static const DBusTransportVTable kdbus_vtable = {
socket_finalize,
socket_handle_watch,
socket_disconnect,
socket_connection_set,
- socket_do_iteration,
+ kdbus_do_iteration,
socket_live_messages_changed,
socket_get_socket_fd
};
* @param address the transport's address
* @returns the new transport, or #NULL if no memory.
*/
-DBusTransport*
+static DBusTransport*
_dbus_transport_new_for_socket_kdbus (int fd,
const DBusString *server_guid,
const DBusString *address)
socket_transport->message_bytes_written = 0;
/* These values should probably be tunable or something. */
- socket_transport->max_bytes_read_per_iteration = 2048;
- 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 = MEMFD_POOL_SIZE;
+ socket_transport->kdbus_mmap_ptr = NULL;
+ socket_transport->memfd = -1;
+
return (DBusTransport*) socket_transport;
failed_4:
* @param error return location for error code
* @returns connection file descriptor or -1 on error
*/
-int _dbus_connect_kdbus (const char *path, DBusError *error)
+static int _dbus_connect_kdbus (const char *path, DBusError *error)
{
int fd;
_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;
}
+static dbus_bool_t kdbus_mmap(DBusTransport* transport)
+{
+ DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport;
+
+ 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;
+
+ return TRUE;
+}
/**
* Creates a new transport for kdbus.
* @param error address where an error can be returned.
* @returns a new transport, or #NULL on failure.
*/
-DBusTransport* _dbus_transport_new_for_kdbus (const char *path, DBusError *error)
+static DBusTransport* _dbus_transport_new_for_kdbus (const char *path, DBusError *error)
{
int fd;
DBusTransport *transport;
}
fd = _dbus_connect_kdbus (path, error);
-// fd = _dbus_connect_unix_socket (path, error);
if (fd < 0)
{
_DBUS_ASSERT_ERROR_IS_SET (error);
_dbus_verbose ("Successfully connected to kdbus bus %s\n", path);
- transport = _dbus_transport_new_for_socket_kdbus (fd, NULL, &address); //todo
+ transport = _dbus_transport_new_for_socket_kdbus (fd, NULL, &address);
if (transport == NULL)
{
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
}
}
-struct kdbus_policy *make_policy_name(const char *name)
+static struct kdbus_policy *make_policy_name(const char *name)
{
struct kdbus_policy *p;
__u64 size;
return p;
}
-struct kdbus_policy *make_policy_access(__u64 type, __u64 bits, __u64 id)
+static struct kdbus_policy *make_policy_access(__u64 type, __u64 bits, __u64 id)
{
struct kdbus_policy *p;
__u64 size = sizeof(*p);
return p;
}
-void append_policy(struct kdbus_cmd_policy *cmd_policy, struct kdbus_policy *policy, __u64 max_size)
+static void append_policy(struct kdbus_cmd_policy *cmd_policy, struct kdbus_policy *policy, __u64 max_size)
{
struct kdbus_policy *dst = (struct kdbus_policy *) ((char *) cmd_policy + cmd_policy->size);
free(policy);
}
-dbus_bool_t bus_register_kdbus_policy(const char* name, DBusConnection *connection, DBusError *error)
+dbus_bool_t bus_register_policy_kdbus(const char* name, DBusConnection *connection, DBusError *error)
{
struct kdbus_cmd_policy *cmd_policy;
struct kdbus_policy *policy;
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());
return TRUE;
}
-dbus_bool_t bus_register_kdbus(char** unique_name, DBusConnection *connection, DBusError *error)
+dbus_bool_t bus_register_kdbus(char* name, DBusConnection *connection, DBusError *error)
{
- char name[18];
struct kdbus_cmd_hello hello;
int fd;
KDBUS_HELLO_ATTACH_SECLABEL |
KDBUS_HELLO_ATTACH_AUDIT;
hello.size = sizeof(struct kdbus_cmd_hello);
- hello.pool_size = (16 * 1024LU * 1024LU); //todo was: #define POOL_SIZE
+ hello.pool_size = RECEIVE_POOL_SIZE;
if(!dbus_connection_get_socket(connection, &fd))
{
}
_dbus_verbose("-- Our peer ID is: %llu\n", (unsigned long long)hello.id);
- sprintf(name, "%llx", (unsigned long long)hello.id);
- *unique_name = _dbus_strdup(name);
- if (*unique_name == NULL)
+ sprintf(name, "%llu", (unsigned long long)hello.id);
+
+ if(!kdbus_mmap(dbus_connection_get_transport(connection)))
{
- _DBUS_SET_OOM (error);
- return FALSE;
+ dbus_set_error(error,_dbus_error_from_errno (errno), "Error when mmap: %s", _dbus_strerror (errno));
+ return FALSE;
}
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_ASSERT_ERROR_IS_CLEAR (error);
if (ioctl(fd, KDBUS_CMD_NAME_ACQUIRE, cmd_name))
{
dbus_set_error(error,_dbus_error_from_errno (errno), "error acquiring name: %s", _dbus_strerror (errno));
- return FALSE;
+ if(errno == EEXIST)
+ return DBUS_REQUEST_NAME_REPLY_EXISTS;
+ return -1;
}
_dbus_verbose("Request name - received flag: 0x%llx !!!!!!!!!\n", cmd_name->conn_flags);
return DBUS_REQUEST_NAME_REPLY_IN_QUEUE;
else
return DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER;
- //todo now 2 codes are never returned - DBUS_REQUEST_NAME_REPLY_EXISTS and DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER
+ //todo now 1 code is never returned - DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER
}
/**
else
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 ("founf 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* 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;
+
+ dbus_connection_get_socket(connection, &fd);
+
+ /*parsing rule and calculating size of command*/
+ size = sizeof(struct kdbus_cmd_match);
+
+ if(strstr(rule, "member='NameOwnerChanged'"))
+ {
+ 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);
+ }
+
+ 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;
+
+ 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);
+
+ pCmd_match->size = size;
+ pCmd_match->cookie = strtoll(dbus_bus_get_unique_name(connection), NULL , 10);
+
+ 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);
+}
+
+void dbus_bus_remove_match_kdbus (DBusConnection *connection, const char *rule, DBusError *error)
+{
+ struct kdbus_cmd_match 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