X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dbus%2Fdbus-transport-kdbus.c;h=72e3d5643c29a268a2a3fc53e5c5e87afff31e23;hb=bb8dd7fec5389db4df9b5e8863974149e8a650dc;hp=2747be532bb8ee9e1ecfb6e29e45f3685fd42144;hpb=66419bafb66e95147d0b086158d4fd7671007ec2;p=platform%2Fupstream%2Fdbus.git diff --git a/dbus/dbus-transport-kdbus.c b/dbus/dbus-transport-kdbus.c index 2747be5..72e3d56 100644 --- a/dbus/dbus-transport-kdbus.c +++ b/dbus/dbus-transport-kdbus.c @@ -1,22 +1,39 @@ -/* - * dbus-transport-kdbus.c +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* dbus-transport-kdbus.c kdbus subclasses of DBusTransport + * + * Copyright (C) 2002, 2003, 2004, 2006 Red Hat Inc + * Copyright (C) 2013 Samsung Electronics + * + * Licensed under the Academic Free License version 2.1 * - * Transport layer using kdbus + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version and under the terms of the GNU + * Lesser General Public License as published by the + * Free Software Foundation; either version 2.1 of the License, or (at + * your option) any later version. * - * Created on: Jun 20, 2013 - * Author: r.pajak + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ - #include "dbus-transport.h" #include "dbus-transport-kdbus.h" -#include +#include "dbus-transport-protected.h" #include "dbus-connection-internal.h" #include "kdbus.h" #include "dbus-watch.h" #include "dbus-errors.h" #include "dbus-bus.h" +#include "kdbus-common.h" +#include #include #include #include @@ -26,35 +43,66 @@ #include #include #include -#include +#include +#include + +/** + * @defgroup DBusTransportKdbus DBusTransport implementations for kdbus + * @ingroup DBusInternals + * @brief Implementation details of DBusTransport on kdbus + * + * @{ + */ + +/** Size of the memory area for received non-memfd messages. */ +#define RECEIVE_POOL_SIZE (10 * 1024LU * 1024LU) + +/** Over this memfd is used to send (if it is not broadcast). */ +#define MEMFD_SIZE_THRESHOLD (2 * 1024 * 1024LU) -#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 max bytes read or written in one iteration. +* This is to avoid blocking on reading or writing for too long. It is checked after each message is sent or received, +* so if message is bigger than MAX_BYTES_PER_ITERATION it will be handled in one iteration, but sending/writing +* will break after that message. +**/ +#define MAX_BYTES_PER_ITERATION 16384 + +#if (MEMFD_SIZE_THRESHOLD > KDBUS_MSG_MAX_PAYLOAD_VEC_SIZE) + #error Memfd size threshold higher than max kdbus message payload vector size +#endif + +/** Enables verbosing more information about kdbus message. + * Works only if DBUS_VERBOSE=1 is used. + */ +#define KDBUS_MSG_DECODE_DEBUG 0 + +#define ITER_APPEND_STR(string) \ +if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &string)) \ +{ \ + ret_size = -1; \ + goto out; \ +}\ + +#define MSG_ITEM_BUILD_VEC(data, datasize) \ + item->type = KDBUS_ITEM_PAYLOAD_VEC; \ + item->size = KDBUS_ITEM_HEADER_SIZE + sizeof(struct kdbus_vec); \ + item->vec.address = (unsigned long) data; \ + item->vec.size = datasize; -#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 POOL_SIZE (16 * 1024LU * 1024LU) - -/*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. + * Opaque object representing a transport. */ -typedef struct DBusTransportSocket DBusTransportSocket; +typedef struct DBusTransportKdbus DBusTransportKdbus; /** - * Implementation details of DBusTransportSocket. All members are private. + * Implementation details of DBusTransportKdbus. All members are private. */ -struct DBusTransportSocket +struct DBusTransportKdbus { DBusTransport base; /**< Parent instance */ int fd; /**< File descriptor. */ @@ -64,227 +112,494 @@ struct DBusTransportSocket int max_bytes_read_per_iteration; /**< To avoid blocking too long. */ int max_bytes_written_per_iteration; /**< To avoid blocking too long. */ - int message_bytes_written; /**< Number of bytes of current - * outgoing message that have - * been written. - */ - DBusString encoded_outgoing; /**< Encoded version of current - * outgoing message. + void* kdbus_mmap_ptr; /**< Mapped memory where kdbus (kernel) writes + * messages incoming to us. */ - DBusString encoded_incoming; /**< Encoded version of current - * incoming data. + int memfd; /**< File descriptor to special + * memory pool for bulk data + * transfer. Retrieved from + * Kdbus kernel module. */ - void* kdbus_mmap_ptr; + __u64 bloom_size; /**< bloom filter field size */ + char* sender; /**< unique name of the sender */ }; +/** + * Gets size in bytes of bloom filter field. + * This size is got from the bus during connection procedure. + * @param transport transport + * @returns size of bloom + */ +__u64 dbus_transport_get_bloom_size(DBusTransport* transport) +{ + return ((DBusTransportKdbus*)transport)->bloom_size; +} + +/** + * Gets pointer to the memory pool, wher received messages are + * placed and some ioctls return their info + * @param transport transport + * @returns pointer to the pool + */ +void* dbus_transport_get_pool_pointer(DBusTransport* transport) +{ + return ((DBusTransportKdbus*)transport)->kdbus_mmap_ptr; +} -static dbus_bool_t -socket_get_socket_fd (DBusTransport *transport, - int *fd_p) +/** + * Puts locally generated message into received messages queue + * @param message message that will be added + * @param connection connection to which message will be added + * @returns TRUE on success, FALSE on memory allocation error + */ +static dbus_bool_t add_message_to_received(DBusMessage *message, DBusConnection* connection) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusList *message_link; - *fd_p = socket_transport->fd; + message_link = _dbus_list_alloc_link (message); + if (message_link == NULL) + { + dbus_message_unref (message); + return FALSE; + } - return TRUE; + _dbus_connection_queue_synthesized_message_link(connection, message_link); + + return TRUE; } -static int kdbus_write_msg(DBusConnection *connection, DBusMessage *message, int fd) +/** + * Generates local error message as a reply to message given as parameter + * and adds generated error message to received messages queue. + * @param error_type type of error, preferably DBUS_ERROR_(...) + * @param template Template of error description. It can has formatting + * characters to print object string into it. Can be NULL. + * @param object String to print into error description. Can be NULL. + * If object is not NULL while template is NULL, the object string + * will be the only error description. + * @param message Message for which the error reply is generated. + * @param connection The connection. + * @returns 0 on success, otherwise -1 + */ +static int reply_with_error(char* error_type, const char* template, const char* object, DBusMessage *message, DBusConnection* connection) { - 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; + DBusMessage *errMessage; + char* error_msg = ""; -// uint64_t i; + if(template) + { + error_msg = alloca(strlen(template) + strlen(object)); + sprintf(error_msg, template, object); + } + else if(object) + error_msg = (char*)object; - if((name = dbus_message_get_destination(message))) - { - _dbus_verbose ("do writing destination: %s\n", name); //todo can be removed at the end - 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); - _dbus_verbose ("do writing uniqe id: %lu\n", dst_id); //todo can be removed at the end - name = NULL; - } - } + errMessage = generate_local_error_message(dbus_message_get_serial(message), error_type, error_msg); + if(errMessage == NULL) + return -1; + if (add_message_to_received(errMessage, connection)) + return 0; - _dbus_message_get_network_data (message, &header, &body); - ret_size = (uint64_t)_dbus_string_get_length(header); + return -1; +} + +/** + * Generates reply to the message given as a parameter with one item in the reply body + * and adds generated reply message to received messages queue. + * @param message The message we are replying to. + * @param data_type Type of data sent in the reply.Use DBUS_TYPE_(...) + * @param pData Address of data sent in the reply. + * @param connection The connection + * @returns 0 on success, otherwise -1 + */ +static int reply_1_data(DBusMessage *message, int data_type, void* pData, DBusConnection* connection) +{ + DBusMessageIter args; + DBusMessage *reply; - /* fprintf (stderr, "\nheader:\n"); - for(i=0; i < ret_size; i++) + reply = dbus_message_new_method_return(message); + if(reply == NULL) + return -1; + dbus_message_set_sender(reply, DBUS_SERVICE_DBUS); + dbus_message_iter_init_append(reply, &args); + if (!dbus_message_iter_append_basic(&args, data_type, pData)) { - fprintf (stderr, "%02x", _dbus_string_get_byte(header,i)); + dbus_message_unref(reply); + return -1; } - fprintf (stderr, "\nret size: %lu, i: %lu\n", ret_size, i);*/ + if(add_message_to_received(reply, connection)) + return 0; -// _dbus_verbose("padding bytes for header: %lu \n", KDBUS_ALIGN8(ret_size) - ret_size); + return -1; +} - size = sizeof(struct kdbus_msg); - size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec)); - size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec)); +/* +static int reply_ack(DBusMessage *message, DBusConnection* connection) +{ + DBusMessage *reply; - if (dst_id == KDBUS_DST_ID_BROADCAST) - size += KDBUS_PART_HEADER_SIZE + 64; + reply = dbus_message_new_method_return(message); + if(reply == NULL) + return -1; + if(add_message_to_received(reply, connection)) + return 0; + return -1; +}*/ - if (name) - size += KDBUS_ITEM_SIZE(strlen(name) + 1); +/** + * Retrieves file descriptor to memory pool from kdbus module and stores + * it in kdbus_transport->memfd. It is then used to send large message. + * Triggered when message payload is over MEMFD_SIZE_THRESHOLD + * @param kdbus_transport DBusTransportKdbus transport structure + * @returns 0 on success, otherwise -1 + */ +static int kdbus_init_memfd(DBusTransportKdbus* kdbus_transport) +{ + int memfd; + + if (ioctl(kdbus_transport->fd, KDBUS_CMD_MEMFD_NEW, &memfd) < 0) { + _dbus_verbose("KDBUS_CMD_MEMFD_NEW failed: \n"); + return -1; + } - msg = malloc(size); - if (!msg) - { - _dbus_verbose("Error allocating memory for: %s,%s\n", _dbus_strerror (errno), _dbus_error_from_errno (errno)); - return -1; - } + kdbus_transport->memfd = memfd; + _dbus_verbose("kdbus_init_memfd: %d!!\n", kdbus_transport->memfd); + return 0; +} - memset(msg, 0, size); - msg->size = size; - msg->src_id = strtoll(dbus_bus_get_unique_name(connection), NULL , 10); - _dbus_verbose("sending 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; +/** + * Allocates and initializes kdbus message structure. + * @param name Well-known name or NULL. If NULL, dst_id must be supplied. + * @param dst_id Numeric id of recipient. Ignored if name is not NULL. + * @param body_size Size of message body (May be 0). + * @param use_memfd Flag to build memfd message. + * @param fds_count Number of file descriptors sent in the message. + * @param transport transport + * @returns initialized kdbus message or NULL if malloc failed + */ +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, DBusTransportKdbus *transport) +{ + struct kdbus_msg* msg; + uint64_t msg_size; - item = msg->items; + msg_size = sizeof(struct kdbus_msg); - 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); - } + if(use_memfd == TRUE) // bulk data - memfd + msg_size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_memfd)); + else + { + msg_size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec)); //header is a must + while(body_size > KDBUS_MSG_MAX_PAYLOAD_VEC_SIZE) + { + msg_size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec)); + body_size -= KDBUS_MSG_MAX_PAYLOAD_VEC_SIZE; + } + if(body_size) + msg_size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec)); + } - item->type = KDBUS_MSG_PAYLOAD_VEC; - item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec); - item->vec.address = (uint64_t)_dbus_string_get_const_data(header); - item->vec.size = ret_size; - item = KDBUS_PART_NEXT(item); + if(fds_count) + msg_size += KDBUS_ITEM_SIZE(sizeof(int)*fds_count); - item->type = KDBUS_MSG_PAYLOAD_VEC; - item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec); - item->vec.address = (uint64_t)_dbus_string_get_const_data(body); - item->vec.size = (uint64_t)_dbus_string_get_length(body); - ret_size += item->vec.size; + if (name) + msg_size += KDBUS_ITEM_SIZE(strlen(name) + 1); + else if (dst_id == KDBUS_DST_ID_BROADCAST) + msg_size += KDBUS_ITEM_HEADER_SIZE + transport->bloom_size; - /* fprintf (stderr, "\nbody:\n"); - for(i=0; i < item->vec.size; i++) + msg = malloc(msg_size); + if (!msg) { - fprintf (stderr, "%02x", _dbus_string_get_byte(body,i)); + _dbus_verbose("Error allocating memory for: %s,%s\n", _dbus_strerror (errno), _dbus_error_from_errno (errno)); + return NULL; } - fprintf (stderr, "\nitem->vec.size: %llu, i: %lu\n", item->vec.size, i);*/ - item = KDBUS_PART_NEXT(item); + memset(msg, 0, msg_size); + msg->size = msg_size; + msg->payload_type = KDBUS_PAYLOAD_DBUS; + msg->dst_id = name ? 0 : dst_id; + msg->src_id = strtoull(dbus_bus_get_unique_name(transport->base.connection), NULL , 10); - if (dst_id == KDBUS_DST_ID_BROADCAST) - { - item->type = KDBUS_MSG_BLOOM; - item->size = KDBUS_PART_HEADER_SIZE + 64; - } + return msg; +} - again: - if (ioctl(fd, KDBUS_CMD_MSG_SEND, msg)) - { - if(errno == EINTR) - goto again; - _dbus_verbose("kdbus error sending message: err %d (%m)\n", errno); - return -1; - } +/** + * Sends DBus message using kdbus. + * Handles broadcasts and unicast messages, and passing of Unix fds. + * Also can locally generate error replies on some error returned by kernel. + * + * TODO refactor to be more compact - maybe we can send header always as a payload vector + * and only message body as memfd if needed. + * + * @param transport Transport. + * @param message DBus message to be sent + * @param destination Destination of the message. + * @returns bytes sent or -1 if sending failed + */ +static int kdbus_write_msg(DBusTransportKdbus *transport, DBusMessage *message, const char* destination) +{ + struct kdbus_msg *msg; + struct kdbus_item *item; + 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; + dbus_bool_t use_memfd = FALSE; + const int *unix_fds; + unsigned fds_count; + dbus_bool_t autostart; + + // determine destination and destination id + if(destination) + { + dst_id = KDBUS_DST_ID_NAME; + if((destination[0] == ':') && (destination[1] == '1') && (destination[2] == '.')) /* if name starts with ":1." it is a unique name and should be send as number */ + { + dst_id = strtoull(&destination[3], NULL, 10); + destination = NULL; + } + } - free(msg); + _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; - return ret_size; -} + // check whether we can and should use memfd + if((dst_id != KDBUS_DST_ID_BROADCAST) && (ret_size > MEMFD_SIZE_THRESHOLD)) + { + use_memfd = TRUE; + kdbus_init_memfd(transport); + } -static int kdbus_write_msg_encoded(DBusMessage *message, DBusTransportSocket *socket_transport) -{ - 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; + _dbus_message_get_unix_fds(message, &unix_fds, &fds_count); + + // init basic message fields + msg = kdbus_init_msg(destination, dst_id, body_size, use_memfd, fds_count, transport); + msg->cookie = dbus_message_get_serial(message); + autostart = dbus_message_get_auto_start (message); + if(!autostart) + msg->flags |= KDBUS_MSG_FLAGS_NO_AUTO_START; + + // build message contents + item = msg->items; - if((name = dbus_message_get_destination(message))) + if(use_memfd) { - _dbus_verbose ("do writing encoded message destination: %s\n", name); //todo can be removed at the end - if((name[0] == '1') && (name[1] == ':')) - { - dst_id = strtoll(&name[2], NULL, 10); - _dbus_verbose ("do writing encoded message uniqe id form name: %lu\n", dst_id); //todo can be removed at the end - name = NULL; - } + char *buf; + + if(ioctl(transport->memfd, KDBUS_CMD_MEMFD_SEAL_SET, 0) < 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; + } + + 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 + if(ioctl(transport->memfd, KDBUS_CMD_MEMFD_SEAL_SET, 1) < 0) { + _dbus_verbose("memfd sealing failed: %d (%m)\n", errno); + ret_size = -1; + goto out; + } + + item->type = KDBUS_ITEM_PAYLOAD_MEMFD; + item->size = KDBUS_ITEM_HEADER_SIZE + sizeof(struct kdbus_memfd); + item->memfd.size = ret_size; + item->memfd.fd = transport->memfd; } + else + { + _dbus_verbose("sending normal vector data\n"); + MSG_ITEM_BUILD_VEC(_dbus_string_get_const_data(header), header_size); - size = sizeof(struct kdbus_msg); - size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec)); + if(body_size) + { + const char* body_data; - if (dst_id == KDBUS_DST_ID_BROADCAST) - size += KDBUS_PART_HEADER_SIZE + 64; + body_data = _dbus_string_get_const_data(body); + while(body_size > KDBUS_MSG_MAX_PAYLOAD_VEC_SIZE) + { + _dbus_verbose("body attaching\n"); + item = KDBUS_PART_NEXT(item); + MSG_ITEM_BUILD_VEC(body_data, KDBUS_MSG_MAX_PAYLOAD_VEC_SIZE); + body_data += KDBUS_MSG_MAX_PAYLOAD_VEC_SIZE; + body_size -= KDBUS_MSG_MAX_PAYLOAD_VEC_SIZE; + } + if(body_size) + { + _dbus_verbose("body attaching\n"); + item = KDBUS_PART_NEXT(item); + MSG_ITEM_BUILD_VEC(body_data, body_size); + } + } + } - if (name) - size += KDBUS_ITEM_SIZE(strlen(name) + 1); + if(fds_count) + { + item = KDBUS_PART_NEXT(item); + item->type = KDBUS_ITEM_FDS; + item->size = KDBUS_ITEM_HEADER_SIZE + (sizeof(int) * fds_count); + memcpy(item->fds, unix_fds, sizeof(int) * fds_count); + } - 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 (destination) + { + item = KDBUS_PART_NEXT(item); + item->type = KDBUS_ITEM_DST_NAME; + item->size = KDBUS_ITEM_HEADER_SIZE + strlen(destination) + 1; + memcpy(item->str, destination, item->size - KDBUS_ITEM_HEADER_SIZE); + } + else if (dst_id == KDBUS_DST_ID_BROADCAST) + { + item = KDBUS_PART_NEXT(item); + item->type = KDBUS_ITEM_BLOOM; + item->size = KDBUS_ITEM_HEADER_SIZE + transport->bloom_size; + strncpy(item->data, dbus_message_get_interface(message), transport->bloom_size); + } - 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; + again: + if (ioctl(transport->fd, KDBUS_CMD_MSG_SEND, msg)) + { + if(errno == EINTR) + goto again; + else if(errno == ENXIO) //no such id on the bus + { + if(!reply_with_error(DBUS_ERROR_NAME_HAS_NO_OWNER, "Name \"%s\" does not exist", dbus_message_get_destination(message), message, transport->base.connection)) + goto out; + } + else if((errno == ESRCH) || (errno = EADDRNOTAVAIL)) //when well known name is not available on the bus + { + if(autostart) + { + if(!reply_with_error(DBUS_ERROR_SERVICE_UNKNOWN, "The name %s was not provided by any .service files", dbus_message_get_destination(message), message, transport->base.connection)) + goto out; + } + else + if(!reply_with_error(DBUS_ERROR_NAME_HAS_NO_OWNER, "Name \"%s\" does not exist", dbus_message_get_destination(message), message, transport->base.connection)) + goto out; + } + _dbus_verbose("kdbus error sending message: err %d (%m)\n", errno); + ret_size = -1; + } + out: + free(msg); + if(use_memfd) + close(transport->memfd); - item = msg->items; + return ret_size; +} - 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); - } +/** + * Performs kdbus hello - registration on the kdbus bus + * needed to send and receive messages on the bus, + * and configures transport. + * As a result unique id on he bus is obtained. + * + * @param name place to print id given by bus + * @param transportS transport structure + * @returns #TRUE on success + */ +static dbus_bool_t bus_register_kdbus(char* name, DBusTransportKdbus* transportS) +{ + struct kdbus_cmd_hello __attribute__ ((__aligned__(8))) hello; + memset(&hello, 0, sizeof(hello)); - item->type = KDBUS_MSG_PAYLOAD_VEC; - item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec); - item->vec.address = (uint64_t)&socket_transport->encoded_outgoing; - item->vec.size = _dbus_string_get_length (&socket_transport->encoded_outgoing); - item = KDBUS_PART_NEXT(item); + 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*/; + hello.size = sizeof(struct kdbus_cmd_hello); + hello.pool_size = RECEIVE_POOL_SIZE; - if (dst_id == KDBUS_DST_ID_BROADCAST) + if (ioctl(transportS->fd, KDBUS_CMD_HELLO, &hello)) { - item->type = KDBUS_MSG_BLOOM; - item->size = KDBUS_PART_HEADER_SIZE + 64; + _dbus_verbose ("Failed to send hello: %m, %d",errno); + return FALSE; } - again: - if (ioctl(socket_transport->fd, KDBUS_CMD_MSG_SEND, msg)) + sprintf(name, "%llu", (unsigned long long)hello.id); + _dbus_verbose("-- Our peer ID is: %s\n", name); + transportS->bloom_size = hello.bloom_size; + + transportS->kdbus_mmap_ptr = mmap(NULL, RECEIVE_POOL_SIZE, PROT_READ, MAP_SHARED, transportS->fd, 0); + if (transportS->kdbus_mmap_ptr == MAP_FAILED) { - if(errno == EINTR) - goto again; - _dbus_verbose("error sending encoded message: err %d (%m)\n", errno); - return -1; + _dbus_verbose("Error when mmap: %m, %d",errno); + return FALSE; } - free(msg); + return TRUE; +} - return ret_size; +/** + * Looks over messages sent to org.freedesktop.DBus. Hello message, which performs + * registration on the bus, is captured as it must be locally converted into + * appropriate ioctl. All the rest org.freedesktop.DBus methods are left untouched + * and they are sent to dbus-daemon in the same way as every other messages. + * + * @param transport Transport + * @param message Message being sent. + * @returns 1 if it is not Hello message and it should be passed to daemon + * 0 if Hello message was handled correctly, + * -1 if Hello message was not handle correctly. + */ +static int capture_hello_message(DBusTransport *transport, const char* destination, DBusMessage *message) +{ + if(!strcmp(destination, DBUS_SERVICE_DBUS)) + { + if(!strcmp(dbus_message_get_interface(message), DBUS_INTERFACE_DBUS)) + { + if(!strcmp(dbus_message_get_member(message), "Hello")) + { + char* name = NULL; + + name = malloc(snprintf(name, 0, ":1.%llu0", ULLONG_MAX)); + if(name == NULL) + return -1; + strcpy(name, ":1."); + if(!bus_register_kdbus(&name[3], (DBusTransportKdbus*)transport)) + goto out; +#ifdef POLICY_TO_KDBUS + if(!register_kdbus_policy(&name[3], transport, geteuid())) + goto out; +#endif + ((DBusTransportKdbus*)transport)->sender = name; + + if(!reply_1_data(message, DBUS_TYPE_STRING, &name, transport->connection)) + return 0; //on success we can not free name + + out: + free(name); + return -1; + } + } + } + + return 1; //send message to daemon } -//todo functions from kdbus-utli.c for printing messages - maybe to remove at the end -char *msg_id(uint64_t id, char *buf); -char *msg_id(uint64_t id, char *buf) +#if KDBUS_MSG_DECODE_DEBUG == 1 +static char *msg_id(uint64_t id, char *buf) { if (id == 0) return "KERNEL"; @@ -293,7 +608,7 @@ char *msg_id(uint64_t id, char *buf) sprintf(buf, "%llu", (unsigned long long)id); return buf; } - +#endif struct kdbus_enum_table { long long id; const char *name; @@ -313,129 +628,200 @@ struct kdbus_enum_table { } 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), + ENUM(_KDBUS_ITEM_NULL), + ENUM(KDBUS_ITEM_PAYLOAD_VEC), + ENUM(KDBUS_ITEM_PAYLOAD_OFF), + ENUM(KDBUS_ITEM_PAYLOAD_MEMFD), + ENUM(KDBUS_ITEM_FDS), + ENUM(KDBUS_ITEM_BLOOM), + ENUM(KDBUS_ITEM_DST_NAME), + ENUM(KDBUS_ITEM_CREDS), + ENUM(KDBUS_ITEM_PID_COMM), + ENUM(KDBUS_ITEM_TID_COMM), + ENUM(KDBUS_ITEM_EXE), + ENUM(KDBUS_ITEM_CMDLINE), + ENUM(KDBUS_ITEM_CGROUP), + ENUM(KDBUS_ITEM_CAPS), + ENUM(KDBUS_ITEM_SECLABEL), + ENUM(KDBUS_ITEM_AUDIT), + ENUM(KDBUS_ITEM_NAME), + ENUM(KDBUS_ITEM_TIMESTAMP), + ENUM(KDBUS_ITEM_NAME_ADD), + ENUM(KDBUS_ITEM_NAME_REMOVE), + ENUM(KDBUS_ITEM_NAME_CHANGE), + ENUM(KDBUS_ITEM_ID_ADD), + ENUM(KDBUS_ITEM_ID_REMOVE), + ENUM(KDBUS_ITEM_REPLY_TIMEOUT), + ENUM(KDBUS_ITEM_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), + ENUM(KDBUS_PAYLOAD_DBUS), }; LOOKUP(PAYLOAD); - //todo handling of all msg items -static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, void* mmap_ptr) +/** + * Finalizes locally generated DBus message + * and puts it into data buffer. + * + * @param message Message to load. + * @param data Place to load message. + * @returns Size of message loaded. + */ +static int put_message_into_data(DBusMessage *message, char* data) { - 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 = ""; + int ret_size; const DBusString *header; const DBusString *body; int size; - const char* pString = NULL; -// uint64_t i; + dbus_message_set_serial(message, 1); + 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; +} + +/** + * Calculates length of the kdbus message content (payload). + * + * @param msg kdbus message + * @return the length of the kdbus message's payload. + */ +static int kdbus_message_size(const struct kdbus_msg* msg) +{ + const struct kdbus_item *item; + int ret_size = 0; + + KDBUS_PART_FOREACH(item, msg, items) + { + if (item->size < KDBUS_ITEM_HEADER_SIZE) + { + _dbus_verbose(" +%s (%llu bytes) invalid data record\n", enum_MSG(item->type), item->size); + return -1; + } + switch (item->type) + { + case KDBUS_ITEM_PAYLOAD_OFF: + ret_size += item->vec.size; + break; + case KDBUS_ITEM_PAYLOAD_MEMFD: + ret_size += item->memfd.size; + break; + default: + break; + } + } + return ret_size; +} + +/** + * Decodes kdbus message in order to extract DBus message and puts it into received data buffer + * and file descriptor's buffer. Also captures kdbus error messages and kdbus kernel broadcasts + * and converts all of them into appropriate DBus messages. + * + * @param msg kdbus message + * @param data place to copy DBus message to + * @param kdbus_transport transport + * @param fds place to store file descriptors received + * @param n_fds place to store quantity of file descriptors received + * @return number of DBus message's bytes received or -1 on error + */ +static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTransportKdbus* kdbus_transport, int* fds, int* n_fds) +{ + const struct kdbus_item *item; + int ret_size = 0; + DBusMessage *message = NULL; + DBusMessageIter args; + const char* emptyString = ""; + const char* pString = NULL; + char dbus_name[(unsigned int)(snprintf((char*)pString, 0, ":1.%llu0", ULLONG_MAX))]; + const char* pDBusName = dbus_name; +#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; KDBUS_PART_FOREACH(item, msg, items) { - if (item->size <= KDBUS_PART_HEADER_SIZE) + if (item->size < KDBUS_ITEM_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: + case KDBUS_ITEM_PAYLOAD_OFF: + memcpy(data, (char *)kdbus_transport->kdbus_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)item->vec.size); + break; + + case KDBUS_ITEM_PAYLOAD_MEMFD: { - char *s; + char *buf; + uint64_t size; - if (item->vec.offset == ~0ULL) - s = "[padding bytes]"; - else + size = item->memfd.size; + _dbus_verbose("memfd.size : %llu\n", (unsigned long long)size); + + buf = mmap(NULL, size, PROT_READ , MAP_SHARED, item->memfd.fd, 0); + if (buf == MAP_FAILED) { -// uint64_t i; - - s = (char *)mmap_ptr + item->vec.offset; - /* fprintf(stderr,"\nmmap: %lu", (uint64_t)mmap_ptr); - fprintf (stderr, "\nheader: %llu\n", item->vec.size); - for(i=0; i < item->vec.size; i++) - { - fprintf (stderr, "%02x", (int)s[i]); - } - fprintf (stderr, "\nret size: %llu, i: %lu\n", item->vec.size, i);*/ - - memcpy(data, s, item->vec.size); - data += item->vec.size; - ret_size += item->vec.size; + _dbus_verbose("mmap() fd=%i failed:%m", item->memfd.fd); + return -1; } - _dbus_verbose(" +%s (%llu bytes) off=%llu size=%llu '%s'\n", + memcpy(data, buf, size); + data += size; + ret_size += size; + + 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, s); - break; + (unsigned long long)item->vec.size); + break; } - case KDBUS_MSG_PAYLOAD_MEMFD: + case KDBUS_ITEM_FDS: { - 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; - } - - if (ioctl(item->memfd.fd, KDBUS_CMD_MEMFD_SIZE_GET, &size) < 0) { - _dbus_verbose("KDBUS_CMD_MEMFD_SIZE_GET failed: %m\n"); - break; - } + int i; - _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); - break; + *n_fds = (item->size - KDBUS_ITEM_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; } - case KDBUS_MSG_SRC_CREDS: +#if KDBUS_MSG_DECODE_DEBUG == 1 + case KDBUS_ITEM_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, @@ -443,19 +829,19 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, void* mmap_ 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: + case KDBUS_ITEM_PID_COMM: + case KDBUS_ITEM_TID_COMM: + case KDBUS_ITEM_EXE: + case KDBUS_ITEM_CGROUP: + case KDBUS_ITEM_SECLABEL: + case KDBUS_ITEM_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; + case KDBUS_ITEM_CMDLINE: + case KDBUS_ITEM_NAME: { + __u64 size = item->size - KDBUS_ITEM_HEADER_SIZE; const char *str = item->str; int count = 0; @@ -471,24 +857,24 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, void* mmap_ break; } - case KDBUS_MSG_SRC_AUDIT: + case KDBUS_ITEM_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: { + case KDBUS_ITEM_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); + (unsigned long long)item->size - KDBUS_ITEM_HEADER_SIZE); cap = item->data32; - n = (item->size - KDBUS_PART_HEADER_SIZE) / 4 / sizeof(uint32_t); + n = (item->size - KDBUS_ITEM_HEADER_SIZE) / 4 / sizeof(uint32_t); _dbus_verbose(" CapInh="); for (i = 0; i < n; i++) @@ -509,454 +895,320 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, void* mmap_ break; } - case KDBUS_MSG_TIMESTAMP: + case KDBUS_ITEM_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: //todo translate to kdbus message + case KDBUS_ITEM_REPLY_TIMEOUT: _dbus_verbose(" +%s (%llu bytes) cookie=%llu\n", enum_MSG(item->type), item->size, msg->cookie_reply); - 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); - 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); - _dbus_verbose ("Name added for id: %s\n", pStringMallocked); //todo to be removed - } - else - return -1; - - message = dbus_message_new_signal("/org/freedesktop/DBus", // object name of the signal - dbus, // interface name of the signal - "NameOwnerChanged"); // name of the signal + message = generate_local_error_message(msg->cookie_reply, DBUS_ERROR_NO_REPLY, NULL); if(message == NULL) { ret_size = -1; goto out; } - 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 = put_message_into_data(message, data); + break; + + case KDBUS_ITEM_REPLY_DEAD: + _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_NAME_HAS_NO_OWNER, NULL); + if(message == NULL) { ret_size = -1; - goto out; + goto out; } - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pStringMallocked)) + + ret_size = put_message_into_data(message, data); + break; + + case KDBUS_ITEM_NAME_ADD: + _dbus_verbose(" +%s (%llu bytes) '%s', old id=%lld, new id=%lld, old flags=0x%llx, new 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.old_flags, + item->name_change.new_flags); + + message = dbus_message_new_signal(DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "NameOwnerChanged"); + if(message == NULL) { ret_size = -1; - goto out; + goto out; } - dbus_message_set_sender(message, dbus); - dbus_message_set_serial(message, 1); + 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); + ITER_APPEND_STR(pString) + ITER_APPEND_STR(emptyString) + ITER_APPEND_STR(pDBusName) + dbus_message_set_sender(message, DBUS_SERVICE_DBUS); - dbus_message_lock (message); - _dbus_message_get_network_data (message, &header, &body); - size = _dbus_string_get_length(header); - memcpy(data, _dbus_string_get_const_data(header), size); - data += size; - ret_size += size; - size = _dbus_string_get_length(body); - memcpy(data, _dbus_string_get_const_data(body), size); - data += size; - ret_size += size; + 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", + case KDBUS_ITEM_NAME_REMOVE: + _dbus_verbose(" +%s (%llu bytes) '%s', old id=%lld, new id=%lld, old flags=0x%llx, new 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); - - 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); - _dbus_verbose ("Name removed for id: %s\n", pStringMallocked); //todo to be removed - } - else - return -1; + item->name_change.new_id, item->name_change.old_flags, + item->name_change.new_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 + message = dbus_message_new_signal(DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "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, &pStringMallocked)) - { - 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); - - dbus_message_lock (message); - _dbus_message_get_network_data (message, &header, &body); - size = _dbus_string_get_length(header); - memcpy(data, _dbus_string_get_const_data(header), size); - data += size; - ret_size += size; - size = _dbus_string_get_length(body); - memcpy(data, _dbus_string_get_const_data(body), size); - data += size; - ret_size += size; - - /* fprintf (stderr, "\nheader: %llu\n", _dbus_string_get_length(header)); - for(i=0; i < _dbus_string_get_length(header); i++) - { - fprintf (stderr, "%02x", (int)_dbus_string_get_byte(header,i)); - } - fprintf (stderr, "\nbody: %llu\n", _dbus_string_get_length(body)); - for(i=0; i < _dbus_string_get_length(body); i++) - { - fprintf (stderr, "%02x", (int)_dbus_string_get_byte(body,i)); - } - fprintf (stderr, "\ndata: %llu\n", retsize); - for(i=0; i < _dbus_string_get_length(body); i++) - { - fprintf (stderr, "%02x", (int)_dbus_string_get_byte(body,i)); - }*/ + ITER_APPEND_STR(pString) + ITER_APPEND_STR(pDBusName) + ITER_APPEND_STR(emptyString) + dbus_message_set_sender(message, DBUS_SERVICE_DBUS); + 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", + case KDBUS_ITEM_NAME_CHANGE: + _dbus_verbose(" +%s (%llu bytes) '%s', old id=%lld, new id=%lld, old flags=0x%llx, new 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); - - 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); - _dbus_verbose ("Old id: %s\n", pStringMallocked); //todo to be removed - } - else - return -1; + item->name_change.new_id, item->name_change.old_flags, + item->name_change.new_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 + message = dbus_message_new_signal(DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "NameOwnerChanged"); 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, &pStringMallocked)) - { - 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)) - { - ret_size = -1; - goto out; - } - - dbus_message_set_sender(message, dbus); - dbus_message_set_serial(message, 1); - - dbus_message_lock (message); - _dbus_message_get_network_data (message, &header, &body); - size = _dbus_string_get_length(header); - memcpy(data, _dbus_string_get_const_data(header), size); - data += size; - ret_size += size; - size = _dbus_string_get_length(body); - memcpy(data, _dbus_string_get_const_data(body), size); - data += size; - ret_size += size; + ITER_APPEND_STR(pString) + ITER_APPEND_STR(pDBusName) + sprintf(&dbus_name[3],"%llu",item->name_change.new_id); + _dbus_verbose ("New id: %s\n", pDBusName); + ITER_APPEND_STR(pDBusName) + dbus_message_set_sender(message, DBUS_SERVICE_DBUS); + + ret_size = put_message_into_data(message, data); break; - case KDBUS_MSG_ID_ADD: + case KDBUS_ITEM_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); - pStringMallocked = malloc (sizeof(item->id_change.id)*2.5 + 4); - if(pStringMallocked) - { - strcpy(pStringMallocked,":1."); - sprintf(&pStringMallocked[3],"%llu",item->id_change.id); - _dbus_verbose ("Id added: %s\n", pStringMallocked); //todo to be removed - } - else - return -1; - - message = dbus_message_new_signal("/org/freedesktop/DBus", // object name of the signal - dbus, // interface name of the signal - "NameOwnerChanged"); // name of the signal + message = dbus_message_new_signal(DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "NameOwnerChanged"); 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, &pStringMallocked)) - { - 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, &pStringMallocked)) - { - ret_size = -1; - goto out; - } - - dbus_message_set_sender(message, dbus); - dbus_message_set_serial(message, 1); - - dbus_message_lock (message); - _dbus_message_get_network_data (message, &header, &body); - size = _dbus_string_get_length(header); - memcpy(data, _dbus_string_get_const_data(header), size); - data += size; - ret_size += size; - size = _dbus_string_get_length(body); - memcpy(data, _dbus_string_get_const_data(body), size); - data += size; - ret_size += size; + ITER_APPEND_STR(pDBusName) + ITER_APPEND_STR(emptyString) + ITER_APPEND_STR(pDBusName) + dbus_message_set_sender(message, DBUS_SERVICE_DBUS); + + ret_size = put_message_into_data(message, data); break; - case KDBUS_MSG_ID_REMOVE: + case KDBUS_ITEM_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); - pStringMallocked = malloc (sizeof(item->id_change.id)*2.5 + 4); - if(pStringMallocked) - { - strcpy(pStringMallocked,":1."); - sprintf(&pStringMallocked[3],"%llu",item->id_change.id); - _dbus_verbose ("Id removed: %s\n", pStringMallocked); //todo to be removed - } - else - return -1; - - message = dbus_message_new_signal("/org/freedesktop/DBus", // object name of the signal - dbus, // interface name of the signal - "NameOwnerChanged"); // name of the signal + message = dbus_message_new_signal(DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "NameOwnerChanged"); 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, &pStringMallocked)) - { - ret_size = -1; - goto out; - } - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pStringMallocked)) - { - ret_size = -1; - goto out; - } - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &emptyString)) - { - ret_size = -1; - goto out; - } + ITER_APPEND_STR(pDBusName) + ITER_APPEND_STR(pDBusName) + ITER_APPEND_STR(emptyString) + dbus_message_set_sender(message, DBUS_SERVICE_DBUS); - dbus_message_set_sender(message, dbus); - dbus_message_set_serial(message, 1); - - dbus_message_lock (message); - _dbus_message_get_network_data (message, &header, &body); - size = _dbus_string_get_length(header); - memcpy(data, _dbus_string_get_const_data(header), size); - data += size; - ret_size += size; - size = _dbus_string_get_length(body); - memcpy(data, _dbus_string_get_const_data(body), size); - data += size; - ret_size += size; + ret_size = put_message_into_data(message, data); break; - +#if KDBUS_MSG_DECODE_DEBUG == 1 default: _dbus_verbose(" +%s (%llu bytes)\n", enum_MSG(item->type), item->size); - break; + break; +#endif } } +#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) +/** + * Reads message from kdbus and puts it into DBus buffers + * + * @param kdbus_transport transport + * @param buffer place to copy received message to + * @param fds place to store file descriptors received with the message + * @param n_fds place to store quantity of file descriptors received + * @return size of received message on success, -1 on error + */ +static int kdbus_read_message(DBusTransportKdbus *kdbus_transport, DBusString *buffer, int* fds, int* n_fds) { - int ret_size; - uint64_t offset; + int ret_size, buf_size; + uint64_t __attribute__ ((__aligned__(8))) offset; struct kdbus_msg *msg; - int ret; - int start; char *data; + int start; -// int i; - - _dbus_assert (socket_transport->max_bytes_read_per_iteration >= 0); start = _dbus_string_get_length (buffer); - if (!_dbus_string_lengthen (buffer, socket_transport->max_bytes_read_per_iteration)) - { - errno = ENOMEM; - return -1; - } - data = _dbus_string_get_data_len (buffer, start, socket_transport->max_bytes_read_per_iteration); again: - ret = ioctl(socket_transport->fd, KDBUS_CMD_MSG_RECV, &offset); - if (ret < 0) + if (ioctl(kdbus_transport->fd, KDBUS_CMD_MSG_RECV, &offset) < 0) { if(errno == EINTR) goto again; - _dbus_verbose("kdbus error receiving message: %d (%m)\n", ret); + _dbus_verbose("kdbus error receiving message: %d (%m)\n", errno); _dbus_string_set_length (buffer, start); return -1; } - msg = (struct kdbus_msg *)((char*)socket_transport->kdbus_mmap_ptr + offset); + msg = (struct kdbus_msg *)((char*)kdbus_transport->kdbus_mmap_ptr + offset); - ret_size = kdbus_decode_msg(msg, data, socket_transport->kdbus_mmap_ptr); -/* fprintf (stderr, "\nmessage! start: %u, ret_size: %u\n", start, ret_size); - for(i=0; i < ret_size; i++) - { - fprintf (stderr, "%02x", (int)data[i]); - } - fprintf (stderr, "\nret size: %u, i: %u\n", ret_size, i);*/ - _dbus_string_set_length (buffer, start + ret_size); + buf_size = kdbus_message_size(msg); + if (buf_size == -1) + { + _dbus_verbose("kdbus error - too short message: %d (%m)\n", errno); + return -1; + } + + /* What is the maximum size of the locally generated message? + I just assume 2048 bytes */ + buf_size = MAX(buf_size, 2048); + + if (!_dbus_string_lengthen (buffer, buf_size)) + { + errno = ENOMEM; + return -1; + } + data = _dbus_string_get_data_len (buffer, start, buf_size); + + ret_size = kdbus_decode_msg(msg, data, kdbus_transport, fds, n_fds); + + if(ret_size == -1) /* error */ + { + _dbus_string_set_length (buffer, start); + return -1; + } + else if (buf_size != ret_size) /* case of locally generated message */ + { + _dbus_string_set_length (buffer, start + ret_size); + } again2: - ret = ioctl(socket_transport->fd, KDBUS_CMD_MSG_RELEASE, &offset); - if (ret < 0) + if (ioctl(kdbus_transport->fd, KDBUS_CMD_FREE, &offset) < 0) { if(errno == EINTR) goto again2; - _dbus_verbose("kdbus error freeing message: %d (%m)\n", ret); + _dbus_verbose("kdbus error freeing message: %d (%m)\n", errno); return -1; } return ret_size; } +/** + * Copy-paste from socket transport. Only renames done. + */ static void free_watches (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; _dbus_verbose ("start\n"); - if (socket_transport->read_watch) + if (kdbus_transport->read_watch) { if (transport->connection) _dbus_connection_remove_watch_unlocked (transport->connection, - socket_transport->read_watch); - _dbus_watch_invalidate (socket_transport->read_watch); - _dbus_watch_unref (socket_transport->read_watch); - socket_transport->read_watch = NULL; + kdbus_transport->read_watch); + _dbus_watch_invalidate (kdbus_transport->read_watch); + _dbus_watch_unref (kdbus_transport->read_watch); + kdbus_transport->read_watch = NULL; } - if (socket_transport->write_watch) + if (kdbus_transport->write_watch) { if (transport->connection) _dbus_connection_remove_watch_unlocked (transport->connection, - socket_transport->write_watch); - _dbus_watch_invalidate (socket_transport->write_watch); - _dbus_watch_unref (socket_transport->write_watch); - socket_transport->write_watch = NULL; + kdbus_transport->write_watch); + _dbus_watch_invalidate (kdbus_transport->write_watch); + _dbus_watch_unref (kdbus_transport->write_watch); + kdbus_transport->write_watch = NULL; } _dbus_verbose ("end\n"); } +/** + * Copy-paste from socket transport. Only done needed renames and removed + * lines related to encoded messages. + */ static void -socket_finalize (DBusTransport *transport) +transport_finalize (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; - _dbus_verbose ("\n"); free_watches (transport); - _dbus_string_free (&socket_transport->encoded_outgoing); - _dbus_string_free (&socket_transport->encoded_incoming); - _dbus_transport_finalize_base (transport); - _dbus_assert (socket_transport->read_watch == NULL); - _dbus_assert (socket_transport->write_watch == NULL); + _dbus_assert (((DBusTransportKdbus*) transport)->read_watch == NULL); + _dbus_assert (((DBusTransportKdbus*) transport)->write_watch == NULL); dbus_free (transport); } +/** + * Copy-paste from socket transport. Removed code related to authentication, + * socket_transport replaced by kdbus_transport. + */ static void check_write_watch (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; dbus_bool_t needed; if (transport->connection == NULL) @@ -964,108 +1216,64 @@ check_write_watch (DBusTransport *transport) if (transport->disconnected) { - _dbus_assert (socket_transport->write_watch == NULL); + _dbus_assert (kdbus_transport->write_watch == NULL); return; } _dbus_transport_ref (transport); - if (_dbus_transport_get_is_authenticated (transport)) - needed = _dbus_connection_has_messages_to_send_unlocked (transport->connection); - else - { - if (transport->send_credentials_pending) - needed = TRUE; - else - { - DBusAuthState auth_state; - - auth_state = _dbus_auth_do_work (transport->auth); - - /* If we need memory we install the write watch just in case, - * if there's no need for it, it will get de-installed - * next time we try reading. - */ - if (auth_state == DBUS_AUTH_STATE_HAVE_BYTES_TO_SEND || - auth_state == DBUS_AUTH_STATE_WAITING_FOR_MEMORY) - needed = TRUE; - else - needed = FALSE; - } - } + needed = _dbus_connection_has_messages_to_send_unlocked (transport->connection); _dbus_verbose ("check_write_watch(): needed = %d on connection %p watch %p fd = %d outgoing messages exist %d\n", - needed, transport->connection, socket_transport->write_watch, - socket_transport->fd, + needed, transport->connection, kdbus_transport->write_watch, + kdbus_transport->fd, _dbus_connection_has_messages_to_send_unlocked (transport->connection)); _dbus_connection_toggle_watch_unlocked (transport->connection, - socket_transport->write_watch, + kdbus_transport->write_watch, needed); _dbus_transport_unref (transport); } +/** + * Copy-paste from socket transport. Removed code related to authentication, + * socket_transport replaced by kdbus_transport. + */ static void check_read_watch (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; dbus_bool_t need_read_watch; - _dbus_verbose ("fd = %d\n",socket_transport->fd); + _dbus_verbose ("fd = %d\n",kdbus_transport->fd); if (transport->connection == NULL) return; if (transport->disconnected) { - _dbus_assert (socket_transport->read_watch == NULL); + _dbus_assert (kdbus_transport->read_watch == NULL); return; } _dbus_transport_ref (transport); - if (_dbus_transport_get_is_authenticated (transport)) - need_read_watch = + need_read_watch = (_dbus_counter_get_size_value (transport->live_messages) < transport->max_live_messages_size) && (_dbus_counter_get_unix_fd_value (transport->live_messages) < transport->max_live_messages_unix_fds); - else - { - if (transport->receive_credentials_pending) - need_read_watch = TRUE; - else - { - /* The reason to disable need_read_watch when not WAITING_FOR_INPUT - * is to avoid spinning on the file descriptor when we're waiting - * to write or for some other part of the auth process - */ - DBusAuthState auth_state; - - auth_state = _dbus_auth_do_work (transport->auth); - - /* If we need memory we install the read watch just in case, - * if there's no need for it, it will get de-installed - * next time we try reading. If we're authenticated we - * install it since we normally have it installed while - * authenticated. - */ - if (auth_state == DBUS_AUTH_STATE_WAITING_FOR_INPUT || - auth_state == DBUS_AUTH_STATE_WAITING_FOR_MEMORY || - auth_state == DBUS_AUTH_STATE_AUTHENTICATED) - need_read_watch = TRUE; - else - need_read_watch = FALSE; - } - } _dbus_verbose (" setting read watch enabled = %d\n", need_read_watch); _dbus_connection_toggle_watch_unlocked (transport->connection, - socket_transport->read_watch, + kdbus_transport->read_watch, need_read_watch); _dbus_transport_unref (transport); } +/** + * Copy-paste from socket transport. + */ static void do_io_error (DBusTransport *transport) { @@ -1074,486 +1282,169 @@ do_io_error (DBusTransport *transport) _dbus_transport_unref (transport); } -/* return value is whether we successfully read any new data. */ -static dbus_bool_t -read_data_into_auth (DBusTransport *transport, - dbus_bool_t *oom) -{ - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; - DBusString *buffer; - int bytes_read; - - *oom = FALSE; - - _dbus_auth_get_buffer (transport->auth, &buffer); - - bytes_read = _dbus_read_socket (socket_transport->fd, - buffer, socket_transport->max_bytes_read_per_iteration); - - _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) - { - /* EINTR already handled for us */ - - if (_dbus_get_is_errno_enomem ()) - { - *oom = TRUE; - } - else if (_dbus_get_is_errno_eagain_or_ewouldblock ()) - ; /* do nothing, just return FALSE below */ - else - { - _dbus_verbose ("Error reading from remote app: %s\n", - _dbus_strerror_from_errno ()); - do_io_error (transport); - } - - return FALSE; - } - else - { - _dbus_assert (bytes_read == 0); - - _dbus_verbose ("Disconnected from remote app\n"); - do_io_error (transport); - - return FALSE; - } -} - -/* Return value is whether we successfully wrote any bytes */ -static dbus_bool_t -write_data_from_auth (DBusTransport *transport) -{ - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; - int bytes_written; - const DBusString *buffer; - - if (!_dbus_auth_get_bytes_to_send (transport->auth, - &buffer)) - return FALSE; - - bytes_written = _dbus_write_socket (socket_transport->fd, - buffer, - 0, _dbus_string_get_length (buffer)); - - if (bytes_written > 0) - { - _dbus_auth_bytes_sent (transport->auth, bytes_written); - return TRUE; - } - else if (bytes_written < 0) - { - /* EINTR already handled for us */ - - if (_dbus_get_is_errno_eagain_or_ewouldblock ()) - ; - else - { - _dbus_verbose ("Error writing to remote app: %s\n", - _dbus_strerror_from_errno ()); - do_io_error (transport); - } - } - - return FALSE; -} - -/* FALSE on OOM */ -static dbus_bool_t -exchange_credentials (DBusTransport *transport, - dbus_bool_t do_reading, - dbus_bool_t do_writing) -{ - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; - DBusError error = DBUS_ERROR_INIT; - - _dbus_verbose ("exchange_credentials: do_reading = %d, do_writing = %d\n", - do_reading, do_writing); - - if (do_writing && transport->send_credentials_pending) - { - if (_dbus_send_credentials_socket (socket_transport->fd, - &error)) - { - transport->send_credentials_pending = FALSE; - } - else - { - _dbus_verbose ("Failed to write credentials: %s\n", error.message); - dbus_error_free (&error); - do_io_error (transport); - } - } - - if (do_reading && transport->receive_credentials_pending) - { - /* FIXME this can fail due to IO error _or_ OOM, broken - * (somewhat tricky to fix since the OOM error can be set after - * we already read the credentials byte, so basically we need to - * separate reading the byte and storing it in the - * transport->credentials). Does not really matter for now - * because storing in credentials never actually fails on unix. - */ - if (_dbus_read_credentials_socket (socket_transport->fd, - transport->credentials, - &error)) - { - transport->receive_credentials_pending = FALSE; - } - else - { - _dbus_verbose ("Failed to read credentials %s\n", error.message); - dbus_error_free (&error); - do_io_error (transport); - } - } - - if (!(transport->send_credentials_pending || - transport->receive_credentials_pending)) - { - if (!_dbus_auth_set_credentials (transport->auth, - transport->credentials)) - return FALSE; - } - - return TRUE; -} - +/** + * Based on do_writing from socket transport. + * Removed authentication code and code related to encoded messages + * and adapted to kdbus transport. + * In socket transport returns false on out-of-memory. Here this won't happen, + * so it always returns TRUE. + */ static dbus_bool_t -do_authentication (DBusTransport *transport, - dbus_bool_t do_reading, - dbus_bool_t do_writing, - dbus_bool_t *auth_completed) +do_writing (DBusTransport *transport) { - dbus_bool_t oom; - dbus_bool_t orig_auth_state; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; + int total = 0; - oom = FALSE; - - orig_auth_state = _dbus_transport_get_is_authenticated (transport); - - /* This is essential to avoid the check_write_watch() at the end, - * we don't want to add a write watch in do_iteration before - * we try writing and get EAGAIN - */ - if (orig_auth_state) + if (transport->disconnected) { - if (auth_completed) - *auth_completed = FALSE; + _dbus_verbose ("Not connected, not writing anything\n"); return TRUE; } - _dbus_transport_ref (transport); + _dbus_verbose ("do_writing(), have_messages = %d, fd = %d\n", + _dbus_connection_has_messages_to_send_unlocked (transport->connection), + kdbus_transport->fd); - while (!_dbus_transport_get_is_authenticated (transport) && - _dbus_transport_get_is_connected (transport)) + while (!transport->disconnected && _dbus_connection_has_messages_to_send_unlocked (transport->connection)) { - if (!exchange_credentials (transport, do_reading, do_writing)) - { - /* OOM */ - oom = TRUE; - goto out; - } - - if (transport->send_credentials_pending || - transport->receive_credentials_pending) - { - _dbus_verbose ("send_credentials_pending = %d receive_credentials_pending = %d\n", - transport->send_credentials_pending, - transport->receive_credentials_pending); - goto out; - } - -#define TRANSPORT_SIDE(t) ((t)->is_server ? "server" : "client") - switch (_dbus_auth_do_work (transport->auth)) + int bytes_written; + DBusMessage *message; + const DBusString *header; + const DBusString *body; + int total_bytes_to_write; + const char* pDestination; + + if (total > kdbus_transport->max_bytes_written_per_iteration) { - case DBUS_AUTH_STATE_WAITING_FOR_INPUT: - _dbus_verbose (" %s auth state: waiting for input\n", - TRANSPORT_SIDE (transport)); - if (!do_reading || !read_data_into_auth (transport, &oom)) - goto out; - break; - - case DBUS_AUTH_STATE_WAITING_FOR_MEMORY: - _dbus_verbose (" %s auth state: waiting for memory\n", - TRANSPORT_SIDE (transport)); - oom = TRUE; + _dbus_verbose ("%d bytes exceeds %d bytes written per iteration, returning\n", + total, kdbus_transport->max_bytes_written_per_iteration); goto out; - break; - - case DBUS_AUTH_STATE_HAVE_BYTES_TO_SEND: - _dbus_verbose (" %s auth state: bytes to send\n", - TRANSPORT_SIDE (transport)); - if (!do_writing || !write_data_from_auth (transport)) - goto out; - break; - - case DBUS_AUTH_STATE_NEED_DISCONNECT: - _dbus_verbose (" %s auth state: need to disconnect\n", - TRANSPORT_SIDE (transport)); - do_io_error (transport); - break; - - case DBUS_AUTH_STATE_AUTHENTICATED: - _dbus_verbose (" %s auth state: authenticated\n", - TRANSPORT_SIDE (transport)); - break; } - } - - out: - if (auth_completed) - *auth_completed = (orig_auth_state != _dbus_transport_get_is_authenticated (transport)); - - check_read_watch (transport); - check_write_watch (transport); - _dbus_transport_unref (transport); - - if (oom) - return FALSE; - else - return TRUE; -} - -/* returns false on oom */ -static dbus_bool_t -do_writing (DBusTransport *transport) -{ - int total; - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; - dbus_bool_t oom; - - /* No messages without authentication! */ - if (!_dbus_transport_get_is_authenticated (transport)) - { - _dbus_verbose ("Not authenticated, not writing anything\n"); - return TRUE; - } - - if (transport->disconnected) - { - _dbus_verbose ("Not connected, not writing anything\n"); - return TRUE; - } - -#if 1 - _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; - while (!transport->disconnected && _dbus_connection_has_messages_to_send_unlocked (transport->connection)) - { - int bytes_written; - DBusMessage *message; - const DBusString *header; - const DBusString *body; - int total_bytes_to_write; - - - if (total > socket_transport->max_bytes_written_per_iteration) + message = _dbus_connection_get_message_to_send (transport->connection); + _dbus_assert (message != NULL); + if(dbus_message_get_sender(message) == NULL) //needed for daemon to pass pending activation messages { - _dbus_verbose ("%d bytes exceeds %d bytes written per iteration, returning\n", - total, socket_transport->max_bytes_written_per_iteration); - goto out; + dbus_message_unlock(message); + dbus_message_set_sender(message, kdbus_transport->sender); + 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); - 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); - - if (_dbus_auth_needs_encoding (transport->auth)) + if(pDestination) { - // Does fd passing even make sense with encoded data? - _dbus_assert(!DBUS_TRANSPORT_CAN_SEND_UNIX_FD(transport)); + int ret; - if (_dbus_string_get_length (&socket_transport->encoded_outgoing) == 0) + ret = capture_hello_message(transport, pDestination, message); + if(ret < 0) //error { - if (!_dbus_auth_encode_data (transport->auth, - header, &socket_transport->encoded_outgoing)) - { - oom = TRUE; - goto out; - } - - 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; - } + bytes_written = -1; + goto written; } - - total_bytes_to_write = _dbus_string_get_length (&socket_transport->encoded_outgoing); - bytes_written = kdbus_write_msg_encoded(message, socket_transport); + else if(ret == 0) //hello message captured and handled correctly + { + bytes_written = total_bytes_to_write; + goto written; + } + //else send as regular message } - else - { - total_bytes_to_write = _dbus_string_get_length(header) + _dbus_string_get_length(body); - bytes_written = kdbus_write_msg(transport->connection, message, socket_transport->fd); - } - if (bytes_written < 0) - { - /* EINTR already handled for us */ + bytes_written = kdbus_write_msg(kdbus_transport, message, pDestination); + + 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, - total_bytes_to_write); - - total += bytes_written; - socket_transport->message_bytes_written += 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); - _dbus_assert (socket_transport->message_bytes_written <= - total_bytes_to_write); + total += bytes_written; - 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_assert (bytes_written == total_bytes_to_write); - _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: + return TRUE; } -/* returns false on out-of-memory */ +/** + * Based on do_reading from socket transport. + * Removed authentication code and code related to encoded messages + * and adapted to kdbus transport. + * returns false on out-of-memory + */ static dbus_bool_t do_reading (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; DBusString *buffer; int bytes_read; - int total; - dbus_bool_t oom; - - _dbus_verbose ("fd = %d\n",socket_transport->fd); + dbus_bool_t oom = FALSE; + int *fds, n_fds; + int total = 0; - /* No messages without authentication! */ - if (!_dbus_transport_get_is_authenticated (transport)) - return TRUE; - - oom = FALSE; - - total = 0; + _dbus_verbose ("fd = %d\n",kdbus_transport->fd); 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 > kdbus_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); + total, kdbus_transport->max_bytes_read_per_iteration); goto out; } - _dbus_assert (socket_transport->read_watch != NULL || + _dbus_assert (kdbus_transport->read_watch != NULL || transport->disconnected); if (transport->disconnected) goto out; - if (!dbus_watch_get_enabled (socket_transport->read_watch)) + if (!dbus_watch_get_enabled (kdbus_transport->read_watch)) 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); - - 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); + 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); - _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); + bytes_read = kdbus_read_message(kdbus_transport, buffer, fds, &n_fds); - bytes_read = kdbus_read_message(socket_transport, buffer); + 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 : bytes_read); - } + _dbus_message_loader_return_buffer (transport->loader, + buffer, + bytes_read < 0 ? 0 : bytes_read); + _dbus_message_loader_return_unix_fds(transport->loader, fds, bytes_read < 0 ? 0 : n_fds); if (bytes_read < 0) { @@ -1604,38 +1495,43 @@ do_reading (DBusTransport *transport) out: if (oom) return FALSE; - else - return TRUE; + return TRUE; } +/** + * Copy-paste from socket transport, with socket replaced by kdbus. + */ static dbus_bool_t unix_error_with_read_to_come (DBusTransport *itransport, DBusWatch *watch, unsigned int flags) { - DBusTransportSocket *transport = (DBusTransportSocket *) itransport; + DBusTransportKdbus *transport = (DBusTransportKdbus *) itransport; - if (!(flags & DBUS_WATCH_HANGUP || flags & DBUS_WATCH_ERROR)) - return FALSE; + if (!((flags & DBUS_WATCH_HANGUP) || (flags & DBUS_WATCH_ERROR))) + return FALSE; /* If we have a read watch enabled ... we -might have data incoming ... => handle the HANGUP there */ - if (watch != transport->read_watch && - _dbus_watch_get_enabled (transport->read_watch)) - return FALSE; + if (watch != transport->read_watch && _dbus_watch_get_enabled (transport->read_watch)) + return FALSE; - return TRUE; + return TRUE; } +/** + * Copy-paste from socket transport. Removed authentication related code + * and renamed socket_transport to kdbus_transport. + */ static dbus_bool_t -socket_handle_watch (DBusTransport *transport, +kdbus_handle_watch (DBusTransport *transport, DBusWatch *watch, unsigned int flags) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; - _dbus_assert (watch == socket_transport->read_watch || - watch == socket_transport->write_watch); + _dbus_assert (watch == kdbus_transport->read_watch || + watch == kdbus_transport->write_watch); _dbus_assert (watch != NULL); /* If we hit an error here on a write watch, don't disconnect the transport yet because data can @@ -1649,45 +1545,24 @@ socket_handle_watch (DBusTransport *transport, return TRUE; } - if (watch == socket_transport->read_watch && + if (watch == kdbus_transport->read_watch && (flags & DBUS_WATCH_READABLE)) { - dbus_bool_t auth_finished; -#if 1 _dbus_verbose ("handling read watch %p flags = %x\n", watch, flags); -#endif - if (!do_authentication (transport, TRUE, FALSE, &auth_finished)) - return FALSE; - - /* We don't want to do a read immediately following - * a successful authentication. This is so we - * have a chance to propagate the authentication - * state further up. Specifically, we need to - * process any pending data from the auth object. - */ - if (!auth_finished) - { + if (!do_reading (transport)) { _dbus_verbose ("no memory to read\n"); return FALSE; } - } - else - { - _dbus_verbose ("Not reading anything since we just completed the authentication\n"); - } + } - else if (watch == socket_transport->write_watch && + else if (watch == kdbus_transport->write_watch && (flags & DBUS_WATCH_WRITABLE)) { -#if 1 _dbus_verbose ("handling write watch, have_outgoing_messages = %d\n", _dbus_connection_has_messages_to_send_unlocked (transport->connection)); -#endif - if (!do_authentication (transport, FALSE, TRUE, NULL)) - return FALSE; if (!do_writing (transport)) { @@ -1698,59 +1573,63 @@ socket_handle_watch (DBusTransport *transport, /* See if we still need the write watch */ check_write_watch (transport); } -#ifdef DBUS_ENABLE_VERBOSE_MODE - else - { - if (watch == socket_transport->read_watch) - _dbus_verbose ("asked to handle read watch with non-read condition 0x%x\n", - flags); - else if (watch == socket_transport->write_watch) - _dbus_verbose ("asked to handle write watch with non-write condition 0x%x\n", - flags); - else - _dbus_verbose ("asked to handle watch %p on fd %d that we don't recognize\n", - watch, dbus_watch_get_socket (watch)); - } -#endif /* DBUS_ENABLE_VERBOSE_MODE */ return TRUE; } +/** + * Copy-paste from socket transport, but socket_transport renamed to kdbus_transport + * and _dbus_close_socket replaced with close(). + */ static void -socket_disconnect (DBusTransport *transport) +kdbus_disconnect (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; _dbus_verbose ("\n"); free_watches (transport); - _dbus_close_socket (socket_transport->fd, NULL); - socket_transport->fd = -1; + again: + if (close (kdbus_transport->fd) < 0) + { + if (errno == EINTR) + goto again; + } + + kdbus_transport->fd = -1; } +/** + * Copy-paste from socket transport. Renamed socket_transport to + * kdbus_transport and added dbus_connection_set_is_authenticated, because + * we do not perform authentication in kdbus, so we have mark is as already done + * to make everything work. + */ static dbus_bool_t -socket_connection_set (DBusTransport *transport) +kdbus_connection_set (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; - _dbus_watch_set_handler (socket_transport->write_watch, + dbus_connection_set_is_authenticated(transport->connection); //now we don't have authentication in kdbus, so mark it done + + _dbus_watch_set_handler (kdbus_transport->write_watch, _dbus_connection_handle_watch, transport->connection, NULL); - _dbus_watch_set_handler (socket_transport->read_watch, + _dbus_watch_set_handler (kdbus_transport->read_watch, _dbus_connection_handle_watch, transport->connection, NULL); if (!_dbus_connection_add_watch_unlocked (transport->connection, - socket_transport->write_watch)) + kdbus_transport->write_watch)) return FALSE; if (!_dbus_connection_add_watch_unlocked (transport->connection, - socket_transport->read_watch)) + kdbus_transport->read_watch)) { _dbus_connection_remove_watch_unlocked (transport->connection, - socket_transport->write_watch); + kdbus_transport->write_watch); return FALSE; } @@ -1761,6 +1640,10 @@ socket_connection_set (DBusTransport *transport) } /** + * Copy-paste from socket_transport. + * Socket_transport renamed to kdbus_transport + * + * Original dbus copy-pasted @todo comment below. * @todo We need to have a way to wake up the select sleep if * a new iteration request comes in with a flag (read/write) that * we're not currently serving. Otherwise a call that just reads @@ -1772,7 +1655,7 @@ kdbus_do_iteration (DBusTransport *transport, unsigned int flags, int timeout_milliseconds) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; DBusPollFD poll_fd; int poll_res; int poll_timeout; @@ -1781,73 +1664,50 @@ kdbus_do_iteration (DBusTransport *transport, flags & DBUS_ITERATION_DO_READING ? "read" : "", flags & DBUS_ITERATION_DO_WRITING ? "write" : "", timeout_milliseconds, - socket_transport->read_watch, - socket_transport->write_watch, - socket_transport->fd); - - /* the passed in DO_READING/DO_WRITING flags indicate whether to - * read/write messages, but regardless of those we may need to block - * for reading/writing to do auth. But if we do reading for auth, - * we don't want to read any messages yet if not given DO_READING. - */ - - poll_fd.fd = socket_transport->fd; - poll_fd.events = 0; - - if (_dbus_transport_get_is_authenticated (transport)) - { - /* This is kind of a hack; if we have stuff to write, then try - * to avoid the poll. This is probably about a 5% speedup on an - * echo client/server. - * - * If both reading and writing were requested, we want to avoid this - * since it could have funky effects: - * - both ends spinning waiting for the other one to read - * data so they can finish writing - * - prioritizing all writing ahead of reading - */ - if ((flags & DBUS_ITERATION_DO_WRITING) && - !(flags & (DBUS_ITERATION_DO_READING | DBUS_ITERATION_BLOCK)) && - !transport->disconnected && - _dbus_connection_has_messages_to_send_unlocked (transport->connection)) - { - do_writing (transport); - - if (transport->disconnected || - !_dbus_connection_has_messages_to_send_unlocked (transport->connection)) - goto out; - } - - /* If we get here, we decided to do the poll() after all */ - _dbus_assert (socket_transport->read_watch); - if (flags & DBUS_ITERATION_DO_READING) - poll_fd.events |= _DBUS_POLLIN; - - _dbus_assert (socket_transport->write_watch); - if (flags & DBUS_ITERATION_DO_WRITING) - poll_fd.events |= _DBUS_POLLOUT; - } - else - { - DBusAuthState auth_state; - - auth_state = _dbus_auth_do_work (transport->auth); - - if (transport->receive_credentials_pending || - auth_state == DBUS_AUTH_STATE_WAITING_FOR_INPUT) - poll_fd.events |= _DBUS_POLLIN; - - if (transport->send_credentials_pending || - auth_state == DBUS_AUTH_STATE_HAVE_BYTES_TO_SEND) - poll_fd.events |= _DBUS_POLLOUT; - } - - if (poll_fd.events) - { + kdbus_transport->read_watch, + kdbus_transport->write_watch, + kdbus_transport->fd); + + poll_fd.fd = kdbus_transport->fd; + poll_fd.events = 0; + + /* This is kind of a hack; if we have stuff to write, then try + * to avoid the poll. This is probably about a 5% speedup on an + * echo client/server. + * + * If both reading and writing were requested, we want to avoid this + * since it could have funky effects: + * - both ends spinning waiting for the other one to read + * data so they can finish writing + * - prioritizing all writing ahead of reading + */ + if ((flags & DBUS_ITERATION_DO_WRITING) && + !(flags & (DBUS_ITERATION_DO_READING | DBUS_ITERATION_BLOCK)) && + !transport->disconnected && + _dbus_connection_has_messages_to_send_unlocked (transport->connection)) + { + do_writing (transport); + + if (transport->disconnected || + !_dbus_connection_has_messages_to_send_unlocked (transport->connection)) + goto out; + } + + /* If we get here, we decided to do the poll() after all */ + _dbus_assert (kdbus_transport->read_watch); + if (flags & DBUS_ITERATION_DO_READING) + poll_fd.events |= _DBUS_POLLIN; + + _dbus_assert (kdbus_transport->write_watch); + if (flags & DBUS_ITERATION_DO_WRITING) + poll_fd.events |= _DBUS_POLLOUT; + + if (poll_fd.events) + { if (flags & DBUS_ITERATION_BLOCK) - poll_timeout = timeout_milliseconds; + poll_timeout = timeout_milliseconds; else - poll_timeout = 0; + poll_timeout = 0; /* For blocking selects we drop the connection lock here * to avoid blocking out connection access during a potentially @@ -1855,70 +1715,50 @@ kdbus_do_iteration (DBusTransport *transport, * by the io_path_cond condvar, so we won't reenter this. */ if (flags & DBUS_ITERATION_BLOCK) - { - _dbus_verbose ("unlock pre poll\n"); - _dbus_connection_unlock (transport->connection); - } - _dbus_verbose ("poll_fd.events: %x, timeout: %d\n", poll_fd.events, poll_timeout); + { + _dbus_verbose ("unlock pre poll\n"); + _dbus_connection_unlock (transport->connection); + } + again: poll_res = _dbus_poll (&poll_fd, 1, poll_timeout); if (poll_res < 0 && _dbus_get_is_errno_eintr ()) - { - _dbus_verbose ("Error from _dbus_poll(): %s\n", - _dbus_strerror_from_errno ()); - goto again; - } - _dbus_verbose ("poll_fd.revents: %x\n", poll_fd.revents); - - /* poll_res = poll_timeout; // todo temporary walkaround of above problem - poll_res = 1; // todo temporary walkaround of above problem - poll_fd.revents = poll_fd.events; // todo temporary walkaround of above problem*/ + goto again; if (flags & DBUS_ITERATION_BLOCK) - { - _dbus_verbose ("lock post poll\n"); - _dbus_connection_lock (transport->connection); - } + { + _dbus_verbose ("lock post poll\n"); + _dbus_connection_lock (transport->connection); + } if (poll_res >= 0) - { - if (poll_res == 0) + { + if (poll_res == 0) poll_fd.revents = 0; /* some concern that posix does not guarantee this; * valgrind flags it as an error. though it probably * is guaranteed on linux at least. */ - if (poll_fd.revents & _DBUS_POLLERR) + if (poll_fd.revents & _DBUS_POLLERR) do_io_error (transport); - else - { - 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; + else + { + dbus_bool_t need_read = (poll_fd.revents & _DBUS_POLLIN) > 0; + dbus_bool_t need_write = (poll_fd.revents & _DBUS_POLLOUT) > 0; - _dbus_verbose ("in iteration, need_read=%d need_write=%d\n", + _dbus_verbose ("in iteration, need_read=%d need_write=%d\n", need_read, need_write); - do_authentication (transport, need_read, need_write, - &authentication_completed); - - /* See comment in socket_handle_watch. */ - if (authentication_completed) - goto out; - if (need_read && (flags & DBUS_ITERATION_DO_READING)) - do_reading (transport); - if (need_write && (flags & DBUS_ITERATION_DO_WRITING)) - do_writing (transport); - } - } + if (need_read && (flags & DBUS_ITERATION_DO_READING)) + do_reading (transport); + if (need_write && (flags & DBUS_ITERATION_DO_WRITING)) + do_writing (transport); + } + } else - { - _dbus_verbose ("Error from _dbus_poll(): %s\n", - _dbus_strerror_from_errno ()); - } - } - + _dbus_verbose ("Error from _dbus_poll(): %s\n", _dbus_strerror_from_errno ()); + } out: /* We need to install the write watch only if we did not @@ -1931,111 +1771,112 @@ kdbus_do_iteration (DBusTransport *transport, * relies on the fact that running an iteration will notice that * messages are pending. */ - check_write_watch (transport); + check_write_watch (transport); - _dbus_verbose (" ... leaving do_iteration()\n"); + _dbus_verbose (" ... leaving do_iteration()\n"); } +/** + * Copy-paste from socket transport. + */ static void -socket_live_messages_changed (DBusTransport *transport) +kdbus_live_messages_changed (DBusTransport *transport) { /* See if we should look for incoming messages again */ check_read_watch (transport); } +/** + * Gets file descriptor of the kdbus bus. + * @param transport transport + * @param fd_p place to write fd to + * @returns always TRUE + */ +static dbus_bool_t +kdbus_get_kdbus_fd (DBusTransport *transport, + int *fd_p) +{ + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; + + *fd_p = kdbus_transport->fd; + + return TRUE; +} + static const DBusTransportVTable kdbus_vtable = { - socket_finalize, - socket_handle_watch, - socket_disconnect, - socket_connection_set, + transport_finalize, + kdbus_handle_watch, + kdbus_disconnect, + kdbus_connection_set, kdbus_do_iteration, - socket_live_messages_changed, - socket_get_socket_fd + kdbus_live_messages_changed, + kdbus_get_kdbus_fd }; /** - * Creates a new transport for the given kdbus file descriptor. The file - * descriptor must be nonblocking (use _dbus_set_fd_nonblocking() to - * make it so). + * Copy-paste from dbus_transport_socket with needed changes. + * + * Creates a new transport for the given kdbus file descriptor and address. + * The file descriptor must be nonblocking. * * @param fd the file descriptor. - * @param server_guid non-#NULL if this transport is on the server side of a connection * @param address the transport's address * @returns the new transport, or #NULL if no memory. */ static DBusTransport* -_dbus_transport_new_for_socket_kdbus (int fd, - const DBusString *server_guid, - const DBusString *address) +new_kdbus_transport (int fd, const DBusString *address) { - DBusTransportSocket *socket_transport; + DBusTransportKdbus *kdbus_transport; - socket_transport = dbus_new0 (DBusTransportSocket, 1); - if (socket_transport == NULL) + kdbus_transport = dbus_new0 (DBusTransportKdbus, 1); + if (kdbus_transport == NULL) return NULL; - if (!_dbus_string_init (&socket_transport->encoded_outgoing)) - goto failed_0; - - if (!_dbus_string_init (&socket_transport->encoded_incoming)) - goto failed_1; - - socket_transport->write_watch = _dbus_watch_new (fd, + kdbus_transport->write_watch = _dbus_watch_new (fd, DBUS_WATCH_WRITABLE, FALSE, NULL, NULL, NULL); - if (socket_transport->write_watch == NULL) + if (kdbus_transport->write_watch == NULL) goto failed_2; - socket_transport->read_watch = _dbus_watch_new (fd, + kdbus_transport->read_watch = _dbus_watch_new (fd, DBUS_WATCH_READABLE, FALSE, NULL, NULL, NULL); - if (socket_transport->read_watch == NULL) + if (kdbus_transport->read_watch == NULL) goto failed_3; - if (!_dbus_transport_init_base (&socket_transport->base, + if (!_dbus_transport_init_base (&kdbus_transport->base, &kdbus_vtable, - server_guid, address)) + NULL, address)) goto failed_4; -#ifdef HAVE_UNIX_FD_PASSING - _dbus_auth_set_unix_fd_possible(socket_transport->base.auth, _dbus_socket_can_pass_unix_fd(fd)); -#endif - - socket_transport->fd = fd; - socket_transport->message_bytes_written = 0; + kdbus_transport->fd = fd; /* 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->kdbus_mmap_ptr = NULL; + kdbus_transport->max_bytes_read_per_iteration = MAX_BYTES_PER_ITERATION; + kdbus_transport->max_bytes_written_per_iteration = MAX_BYTES_PER_ITERATION; - return (DBusTransport*) socket_transport; + kdbus_transport->kdbus_mmap_ptr = NULL; + kdbus_transport->memfd = -1; + + return (DBusTransport*) kdbus_transport; failed_4: - _dbus_watch_invalidate (socket_transport->read_watch); - _dbus_watch_unref (socket_transport->read_watch); + _dbus_watch_invalidate (kdbus_transport->read_watch); + _dbus_watch_unref (kdbus_transport->read_watch); failed_3: - _dbus_watch_invalidate (socket_transport->write_watch); - _dbus_watch_unref (socket_transport->write_watch); + _dbus_watch_invalidate (kdbus_transport->write_watch); + _dbus_watch_unref (kdbus_transport->write_watch); failed_2: - _dbus_string_free (&socket_transport->encoded_incoming); - failed_1: - _dbus_string_free (&socket_transport->encoded_outgoing); - failed_0: - dbus_free (socket_transport); + dbus_free (kdbus_transport); return NULL; } - /** - * Creates a connection to the kdbus bus - * - * This will set FD_CLOEXEC for the socket returned. + * Opens a connection to the kdbus bus * - * @param path the path to UNIX domain socket + * @param path the path to kdbus bus * @param error return location for error code * @returns connection file descriptor or -1 on error */ @@ -2046,40 +1887,17 @@ static int _dbus_connect_kdbus (const char *path, DBusError *error) _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, 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. - * This creates a client-side of a transport. + * Connects to kdbus, creates and sets-up transport. * - * @param path the path to the domain socket. + * @param path the path to the bus. * @param error address where an error can be returned. * @returns a new transport, or #NULL on failure. */ @@ -2114,7 +1932,7 @@ static DBusTransport* _dbus_transport_new_for_kdbus (const char *path, DBusError _dbus_verbose ("Successfully connected to kdbus bus %s\n", path); - transport = _dbus_transport_new_for_socket_kdbus (fd, NULL, &address); + transport = new_kdbus_transport (fd, &address); if (transport == NULL) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); @@ -2126,20 +1944,25 @@ static DBusTransport* _dbus_transport_new_for_kdbus (const char *path, DBusError return transport; failed_1: - _dbus_close_socket (fd, NULL); - failed_0: - _dbus_string_free (&address); - return NULL; + again: + if (close (fd) < 0) + { + if (errno == EINTR) + goto again; + } + failed_0: + _dbus_string_free (&address); + return NULL; } /** - * Opens kdbus transport. + * Opens kdbus transport if method from address entry is kdbus * - * @param entry the address entry to try opening + * @param entry the address entry to open * @param transport_p return location for the opened transport - * @param error error to be set - * @returns result of the attempt + * @param error place to store error + * @returns result of the attempt as a DBusTransportOpenResult enum */ DBusTransportOpenResult _dbus_transport_open_kdbus(DBusAddressEntry *entry, DBusTransport **transport_p, @@ -2180,221 +2003,4 @@ DBusTransportOpenResult _dbus_transport_open_kdbus(DBusAddressEntry *entry, } } -static struct kdbus_policy *make_policy_name(const char *name) -{ - struct kdbus_policy *p; - __u64 size; - - size = offsetof(struct kdbus_policy, name) + strlen(name) + 1; - p = malloc(size); - if (!p) - return NULL; - memset(p, 0, size); - p->size = size; - p->type = KDBUS_POLICY_NAME; - strcpy(p->name, name); - - return p; -} - -static struct kdbus_policy *make_policy_access(__u64 type, __u64 bits, __u64 id) -{ - struct kdbus_policy *p; - __u64 size = sizeof(*p); - - p = malloc(size); - if (!p) - return NULL; - - memset(p, 0, size); - p->size = size; - p->type = KDBUS_POLICY_ACCESS; - p->access.type = type; - p->access.bits = bits; - p->access.id = id; - - return p; -} - -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); - - if (cmd_policy->size + policy->size > max_size) - return; - - memcpy(dst, policy, policy->size); - cmd_policy->size += KDBUS_ALIGN8(policy->size); - free(policy); -} - -dbus_bool_t bus_register_policy_kdbus(const char* name, DBusConnection *connection, DBusError *error) -{ - struct kdbus_cmd_policy *cmd_policy; - struct kdbus_policy *policy; - int size = 0xffff; - int fd; - - if(!dbus_connection_get_socket(connection, &fd)) - { - dbus_set_error (error, "Failed to get fd for registering policy", NULL); - return FALSE; - } - - cmd_policy = (struct kdbus_cmd_policy *) alloca(size); - memset(cmd_policy, 0, size); - - 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 - append_policy(cmd_policy, policy, size); - - policy = make_policy_access(KDBUS_POLICY_ACCESS_USER, KDBUS_POLICY_OWN, getuid()); - append_policy(cmd_policy, policy, size); - - policy = make_policy_access(KDBUS_POLICY_ACCESS_WORLD, KDBUS_POLICY_RECV, 0); - append_policy(cmd_policy, policy, size); - - policy = make_policy_access(KDBUS_POLICY_ACCESS_WORLD, KDBUS_POLICY_SEND, 0); - append_policy(cmd_policy, policy, size); - - if (ioctl(fd, KDBUS_CMD_EP_POLICY_SET, cmd_policy) < 0) - { - dbus_set_error(error,_dbus_error_from_errno (errno), "Error setting EP policy: %s", _dbus_strerror (errno)); - return FALSE; - } - - _dbus_verbose("Policy %s set correctly\n", name); - return TRUE; -} - -dbus_bool_t bus_register_kdbus(char* name, DBusConnection *connection, DBusError *error) -{ - struct kdbus_cmd_hello hello; - int fd; - - memset(&hello, 0, sizeof(hello)); - 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; - hello.size = sizeof(struct kdbus_cmd_hello); - hello.pool_size = POOL_SIZE; - - if(!dbus_connection_get_socket(connection, &fd)) - { - dbus_set_error (error, "failed to get fd for bus registration", NULL); - return FALSE; - } - if (ioctl(fd, KDBUS_CMD_HELLO, &hello)) - { - dbus_set_error(error,_dbus_error_from_errno (errno), "Failed to send hello: %s", _dbus_strerror (errno)); - return FALSE; - } - - _dbus_verbose("-- Our peer ID is: %llu\n", (unsigned long long)hello.id); - sprintf(name, "%llu", (unsigned long long)hello.id); - - if(!kdbus_mmap(dbus_connection_get_transport(connection))) - { - 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) -{ - struct kdbus_cmd_name *cmd_name; - int fd; - uint64_t size = sizeof(*cmd_name) + strlen(name) + 1; - uint64_t flags_kdbus = 0; - - cmd_name = alloca(size); - - memset(cmd_name, 0, size); - strcpy(cmd_name->name, name); - cmd_name->size = size; - - if(flags & DBUS_NAME_FLAG_ALLOW_REPLACEMENT) - flags_kdbus |= KDBUS_NAME_ALLOW_REPLACEMENT; - if(!(flags & DBUS_NAME_FLAG_DO_NOT_QUEUE)) - flags_kdbus |= KDBUS_NAME_QUEUE; - if(flags & DBUS_NAME_FLAG_REPLACE_EXISTING) - flags_kdbus |= KDBUS_NAME_REPLACE_EXISTING; - - cmd_name->conn_flags = flags_kdbus; - - if(!dbus_connection_get_socket(connection, &fd)) - { - dbus_set_error (error, "failed to get fd for name request", NULL); - return FALSE; - } - - _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)); - if(errno == EEXIST) - return DBUS_REQUEST_NAME_REPLY_EXISTS; - return FALSE; - } - - _dbus_verbose("Request name - received flag: 0x%llx !!!!!!!!!\n", cmd_name->conn_flags); - - if(cmd_name->conn_flags & KDBUS_NAME_IN_QUEUE) - return DBUS_REQUEST_NAME_REPLY_IN_QUEUE; - else - return DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER; - //todo now 1 codes are never returned - DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER -} - -/** - * Checks if the connection's transport is kdbus on the basis of its address - * - * @param pointer to the connection - * @returns TRUE if kdbus transport, otherwise FALSE - */ -dbus_bool_t dbus_transport_is_kdbus(DBusConnection *connection) -{ - const char* address = _dbus_connection_get_address(connection); - - if(address == strstr(address, "kdbus:path=")) - return TRUE; - else - return FALSE; -} - -void dbus_bus_add_match_kdbus (DBusConnection *connection, const char *rule, DBusError *error) -{ - struct kdbus_cmd_match cmd_match; - int fd; - - memset(&cmd_match, 0, sizeof(cmd_match)); - - if(!dbus_connection_get_socket(connection, &fd)) - { - dbus_set_error (error, "failed to get fd for add match", NULL); - return; - } - - cmd_match.size = sizeof(cmd_match); - - //todo add matching rules from *rule when it will be docuemnted in kdbus - - - cmd_match.src_id = KDBUS_MATCH_SRC_ID_ANY; - - 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_verbose("Finished adding match bus rule %s !!!!!!!!!\n", rule); -} +/** @} */