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 (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
* incoming data.
*/
void* kdbus_mmap_ptr;
+ int memfd; /* File descriptor to memory
+ * pool from Kdbus kernel module */
};
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;
-// uint64_t i;
-
- if((name = dbus_message_get_destination(message)))
+ fprintf (stderr, "\ndata:\n");
+ for(i=0; i < size; i++)
{
- 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;
+ fprintf (stderr, "%02x", _dbus_string_get_byte(data,i));
}
+ fprintf (stderr, "\nsize: %d, i: %lu\n", size, i);
+
+}*/
- _dbus_verbose("Destination: %llu, %s\n", (unsigned long long)dst_id, 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++)
- {
- fprintf (stderr, "%02x", _dbus_string_get_byte(header,i));
- }
- 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;
-
- msg = malloc(size);
- if (!msg)
+static int kdbus_init_memfd(DBusTransportSocket* socket_transport)
+{
+ int memfd;
+ int ret;
+
+ if(socket_transport->memfd == -1)
{
- _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;
- 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;
+ ret = ioctl(socket_transport->fd, KDBUS_CMD_MEMFD_NEW, &memfd);
+ if (ret < 0) {
+ _dbus_verbose("KDBUS_CMD_MEMFD_NEW failed: \n");
+ return -1;
+ }
- item = msg->items;
+ socket_transport->memfd = memfd;
+ _dbus_verbose("kdbus_init_memfd: %d!!\n", socket_transport->memfd);
- if (name)
- {
- item->type = KDBUS_MSG_DST_NAME;
- item->size = KDBUS_PART_HEADER_SIZE + strlen(name) + 1;
- strcpy(item->str, name);
- item = KDBUS_PART_NEXT(item);
}
+ return 0;
+}
- 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;
+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;
- 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;
- }
+ msg_size = sizeof(struct kdbus_msg);
- /* fprintf (stderr, "\nbody:\n");
- for(i=0; i < item->vec.size; i++)
+ if(use_memfd == TRUE) // bulk data - memfd - encoded and plain
{
- fprintf (stderr, "%02x", _dbus_string_get_byte(body,i));
+ 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));
}
- fprintf (stderr, "\nitem->vec.size: %llu, i: %lu\n", item->vec.size, i);*/
- if (dst_id == KDBUS_DST_ID_BROADCAST)
- {
- item = KDBUS_PART_NEXT(item);
- item->type = KDBUS_MSG_BLOOM;
- item->size = KDBUS_PART_HEADER_SIZE + 64;
- }
+ 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;
- again:
- if (ioctl(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;
- dbus_uint32_t replySerial;
+ 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;
+ }
- 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, transport))
- ret_size = -1;
- goto out;
- }
- _dbus_verbose("kdbus error sending message: err %d (%m)\n", errno);
- ret_size = -1;
- }
+ 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;
-out:
- free(msg);
- return ret_size;
+ return msg;
}
-static int kdbus_write_msg_encoded(DBusMessage *message, DBusTransportSocket *socket_transport)
+/*
+ *
+ *
+ *
+ */
+static int kdbus_write_msg(DBusTransportSocket *transport, DBusMessage *message, dbus_bool_t encoded)
{
- struct kdbus_msg *msg;
- struct kdbus_item *item;
- uint64_t size;
- const char *name;
- uint64_t dst_id = KDBUS_DST_ID_BROADCAST;
- uint64_t ret_size;
-
+ 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)))
{
- if((name[0] == ':') && (name[1] == '1') && (name[2] == '.'))
+ 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[2], NULL, 10);
+ dst_id = strtoll(&name[3], NULL, 10);
name = NULL;
- }
- else
- dst_id = KDBUS_DST_ID_WELL_KNOWN_NAME;
+ }
+ }
+
+ // 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;
}
- 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;
+ // check if message size is big enough to use memfd kdbus transport
+ use_memfd = ret_size > MEMFD_SIZE_THRESHOLD ? TRUE : FALSE;
- msg = malloc(size);
- if (!msg)
- {
- _dbus_verbose("Error allocating memory for: %s,%s\n", _dbus_strerror (errno), _dbus_error_from_errno (errno));
- return -1;
- }
+ 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;
- 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;
+ // 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;
+ }
- item = msg->items;
+ 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);
- 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) &socket_transport->encoded_outgoing;
- item->vec.size = _dbus_string_get_length (&socket_transport->encoded_outgoing);
-
- 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(socket_transport->fd, KDBUS_CMD_MSG_SEND, msg))
+ 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;
}
- dbus_message_set_reply_serial(errMessage, dbus_message_get_reply_serial(message));
- if (!add_message_to_received(errMessage, &socket_transport->base))
+ 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("error sending encoded message: err %d (%m)\n", errno);
+ _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 int64_t kdbus_NameQuery(DBusTransport *transport, char* name, int fd)
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)
{
const struct kdbus_item *item = msg->items;
int ret_size = 0;
const char* pDBusName = dbus_name;
const char* dbus = "org.freedesktop.DBus";
const char* emptyString = "";
- const char* pString = NULL;
+ const char* pString = NULL;
+ void* mmap_ptr;
#if KDBUS_DECODE_DEBUG == 1
char buf[32];
#endif
(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);
- break; //todo to be discovered and rewritten
+ 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;
+ 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, MEMFD_POOL_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, 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:
}
#if KDBUS_DECODE_DEBUG == 1
-// sleep(5);
+
if ((char *)item - ((char *)msg + msg->size) >= 8)
_dbus_verbose("invalid padding at end of message\n");
#endif
int ret_size;
uint64_t 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);
+ _dbus_string_set_length (buffer, ret_size);
again2:
if (ioctl(socket_transport->fd, KDBUS_CMD_MSG_RELEASE, &offset) < 0)
/* 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;
const DBusString *header;
const DBusString *body;
int total_bytes_to_write;
-
+ const char* pDestination;
/* if (total > socket_transport->max_bytes_written_per_iteration)
{
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(!strcmp(dbus_message_get_destination(message), "org.freedesktop.DBus"))
+ if(pDestination)
{
- if(emulateOrgFreedesktopDBus(transport, message, socket_transport->fd))
- bytes_written = total_bytes_to_write;
- else
- bytes_written = -1; //todo maybe =2 ???
+ 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;
+ }
}
- else if (_dbus_auth_needs_encoding (transport->auth))
+ 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);
if(total_bytes_to_write > socket_transport->max_bytes_written_per_iteration)
- return -E2BIG; //todo to be changed
- bytes_written = kdbus_write_msg_encoded(message, socket_transport);
+ return -E2BIG; //todo to be changed because large messages are now sent through memfd
+
+ bytes_written = kdbus_write_msg(socket_transport, message, TRUE);
}
else
{
if(total_bytes_to_write > socket_transport->max_bytes_written_per_iteration)
- return -E2BIG; //todo to be changed
- bytes_written = kdbus_write_msg(transport, message, socket_transport->fd);
+ return -E2BIG; //todo to be changed because large messages are now sent through memfd
+
+ bytes_written = kdbus_write_msg(socket_transport, message, FALSE);
}
+written:
if (bytes_written < 0)
{
/* EINTR already handled for us */
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) ==
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 = KDBUS_MSG_MAX_SIZE;
+ 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:
_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());
KDBUS_HELLO_ATTACH_SECLABEL |
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 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 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);
+
+ 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);
+}
- cmd_match.src_id = KDBUS_MATCH_SRC_ID_ANY;
+void dbus_bus_remove_match_kdbus (DBusConnection *connection, const char *rule, DBusError *error)
+{
+ struct kdbus_cmd_match cmd;
+ int fd;
- 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));
+ 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);
- _dbus_verbose("Finished adding match bus rule %s\n", rule);
+ 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");
}