X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dbus%2Fdbus-transport-kdbus.c;h=0e77f158d62a332e9d45f5ecdcfa3493c832a4fe;hb=05902801b49789f37426754fc6b77f3665afe3b0;hp=af127e9f02b05eb0f7c19366d20ea91438288613;hpb=8028eedcda2599c4ce6db586e2e5d6fa087565da;p=platform%2Fupstream%2Fdbus.git diff --git a/dbus/dbus-transport-kdbus.c b/dbus/dbus-transport-kdbus.c index af127e9..0e77f15 100644 --- a/dbus/dbus-transport-kdbus.c +++ b/dbus/dbus-transport-kdbus.c @@ -1,22 +1,38 @@ -/* - * 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 * - * Transport layer using kdbus + * Licensed under the Academic Free License version 2.1 * - * Created on: Jun 20, 2013 - * Author: r.pajak + * 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. * + * 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 @@ -29,14 +45,7 @@ #include #include #include -#include -#define KDBUS_ALIGN8(l) (((l) + 7) & ~7) -#define KDBUS_PART_HEADER_SIZE offsetof(struct kdbus_item, data) -#define KDBUS_ITEM_SIZE(s) KDBUS_ALIGN8((s) + KDBUS_PART_HEADER_SIZE) - -#define KDBUS_PART_NEXT(part) \ - (typeof(part))(((uint8_t *)part) + KDBUS_ALIGN8((part)->size)) #define KDBUS_PART_FOREACH(part, head, first) \ for (part = (head)->first; \ (uint8_t *)(part) < (uint8_t *)(head) + (head)->size; \ @@ -45,6 +54,7 @@ #define MEMFD_SIZE_THRESHOLD (2 * 1024 * 1024LU) // over this memfd is used #define KDBUS_MSG_DECODE_DEBUG 0 +//#define DBUS_AUTHENTICATION #define ITER_APPEND_STR(string) \ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &string)) \ @@ -53,15 +63,22 @@ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &string)) \ goto out; \ }\ +#define MSG_ITEM_BUILD_VEC(data, datasize) \ + item->type = KDBUS_MSG_PAYLOAD_VEC; \ + item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec); \ + item->vec.address = (unsigned long) data; \ + item->vec.size = datasize; + /** - * Opaque object representing a socket file descriptor transport. + * Opaque object representing a transport. In kdbus transport it has nothing common + * with socket, but the name was preserved to comply with upper functions. */ -typedef struct DBusTransportSocket DBusTransportSocket; +typedef struct DBusTransportKdbus DBusTransportKdbus; /** * Implementation details of DBusTransportSocket. All members are private. */ -struct DBusTransportSocket +struct DBusTransportKdbus { DBusTransport base; /**< Parent instance */ int fd; /**< File descriptor. */ @@ -90,15 +107,16 @@ struct DBusTransportSocket * Kdbus kernel module. */ __u64 bloom_size; /**< bloom filter field size */ + char* sender; /**< uniqe name of the sender */ }; static dbus_bool_t -socket_get_socket_fd (DBusTransport *transport, +kdbus_get_kdbus_fd (DBusTransport *transport, int *fd_p) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; - *fd_p = socket_transport->fd; + *fd_p = kdbus_transport->fd; return TRUE; } @@ -123,7 +141,11 @@ static dbus_bool_t add_message_to_received(DBusMessage *message, DBusConnection* return TRUE; } -static dbus_bool_t reply_with_error(char* error_type, const char* template, const char* object, DBusMessage *message, DBusConnection* connection) +/* + * Generates local error message as a reply to message given as parameter + * and adds generated error message to received messages queue. + */ +static int reply_with_error(char* error_type, const char* template, const char* object, DBusMessage *message, DBusConnection* connection) { DBusMessage *errMessage; char* error_msg = ""; @@ -138,41 +160,58 @@ static dbus_bool_t reply_with_error(char* error_type, const char* template, cons errMessage = generate_local_error_message(dbus_message_get_serial(message), error_type, error_msg); if(errMessage == NULL) - return FALSE; + return -1; if (add_message_to_received(errMessage, connection)) - return TRUE; + return 0; - return FALSE; + return -1; } -static dbus_bool_t reply_1_data(DBusMessage *message, int data_type, void* pData, DBusConnection* connection) +/* + * 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. + */ +static int reply_1_data(DBusMessage *message, int data_type, void* pData, DBusConnection* connection) { DBusMessageIter args; DBusMessage *reply; reply = dbus_message_new_method_return(message); if(reply == NULL) - return FALSE; + 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)) { dbus_message_unref(reply); - return FALSE; + return -1; } if(add_message_to_received(reply, connection)) - return TRUE; + return 0; - return FALSE; + return -1; } +/* +static int reply_ack(DBusMessage *message, DBusConnection* connection) +{ + DBusMessage *reply; + + reply = dbus_message_new_method_return(message); + if(reply == NULL) + return -1; + if(add_message_to_received(reply, connection)) + return 0; + return -1; +}*/ + /** * Retrieves file descriptor to memory pool from kdbus module. * It is then used for bulk data sending. * Triggered when message payload is over MEMFD_SIZE_THRESHOLD * */ -static int kdbus_init_memfd(DBusTransportSocket* socket_transport) +static int kdbus_init_memfd(DBusTransportKdbus* socket_transport) { int memfd; @@ -197,7 +236,7 @@ static int kdbus_init_memfd(DBusTransportSocket* socket_transport) * @param transport transport * @return initialized kdbus message */ -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, DBusTransportSocket *transport) +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; @@ -237,7 +276,7 @@ static struct kdbus_msg* kdbus_init_msg(const char* name, __u64 dst_id, uint64_t } /** - * Builds and sends kdbus message using Dbus message. + * Builds and sends kdbus message using DBus message. * Decide whether used payload vector or memfd memory pool. * Handles broadcasts and unicast messages, and passing of Unix fds. * Does error handling. @@ -248,11 +287,10 @@ static struct kdbus_msg* kdbus_init_msg(const char* name, __u64 dst_id, uint64_t * @param encoded flag if the message is encoded * @return size of data sent */ -static int kdbus_write_msg(DBusTransportSocket *transport, DBusMessage *message, dbus_bool_t encoded) +static int kdbus_write_msg(DBusTransportKdbus *transport, DBusMessage *message, const char* destination, dbus_bool_t encoded) { struct kdbus_msg *msg; struct kdbus_item *item; - const char *name; uint64_t dst_id = KDBUS_DST_ID_BROADCAST; const DBusString *header; const DBusString *body; @@ -262,15 +300,16 @@ static int kdbus_write_msg(DBusTransportSocket *transport, DBusMessage *message, dbus_bool_t use_memfd; const int *unix_fds; unsigned fds_count; + dbus_bool_t autostart; - // determine name and destination id - if((name = dbus_message_get_destination(message))) + // determine destination and destination id + if(destination) { 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 */ + 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(&name[3], NULL, 10); - name = NULL; + dst_id = strtoull(&destination[3], NULL, 10); + destination = NULL; } } @@ -292,8 +331,11 @@ static int kdbus_write_msg(DBusTransportSocket *transport, DBusMessage *message, _dbus_message_get_unix_fds(message, &unix_fds, &fds_count); // init basic message fields - msg = kdbus_init_msg(name, dst_id, body_size, use_memfd, fds_count, transport); + 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; @@ -344,29 +386,18 @@ static int kdbus_write_msg(DBusTransportSocket *transport, DBusMessage *message, // case 2 - small encoded - don't use memfd } else if(encoded) { _dbus_verbose("sending encoded data\n"); - - item->type = KDBUS_MSG_PAYLOAD_VEC; - item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec); - item->vec.address = (unsigned long) &transport->encoded_outgoing; - item->vec.size = _dbus_string_get_length (&transport->encoded_outgoing); + MSG_ITEM_BUILD_VEC(&transport->encoded_outgoing, _dbus_string_get_length (&transport->encoded_outgoing)); // case 3 - small not encoded - don't use memfd } else { _dbus_verbose("sending normal vector data\n"); - - item->type = KDBUS_MSG_PAYLOAD_VEC; - item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec); - item->vec.address = (unsigned long) _dbus_string_get_const_data(header); - item->vec.size = header_size; + MSG_ITEM_BUILD_VEC(_dbus_string_get_const_data(header), header_size); if(body_size) { _dbus_verbose("body attaching\n"); - item = KDBUS_PART_NEXT(item); - item->type = KDBUS_MSG_PAYLOAD_VEC; - item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec); - item->vec.address = (unsigned long) _dbus_string_get_const_data(body); - item->vec.size = body_size; + item = KDBUS_PART_NEXT(item); + MSG_ITEM_BUILD_VEC(_dbus_string_get_const_data(body), body_size); } } @@ -378,12 +409,12 @@ static int kdbus_write_msg(DBusTransportSocket *transport, DBusMessage *message, memcpy(item->fds, unix_fds, sizeof(int) * fds_count); } - if (name) + if (destination) { item = KDBUS_PART_NEXT(item); item->type = KDBUS_MSG_DST_NAME; - item->size = KDBUS_PART_HEADER_SIZE + strlen(name) + 1; - strcpy(item->str, name); + item->size = KDBUS_PART_HEADER_SIZE + strlen(destination) + 1; + memcpy(item->str, destination, item->size - KDBUS_PART_HEADER_SIZE); } else if (dst_id == KDBUS_DST_ID_BROADCAST) { @@ -398,47 +429,42 @@ static int kdbus_write_msg(DBusTransportSocket *transport, DBusMessage *message, { if(errno == EINTR) goto again; - if((errno == ESRCH) || (errno == ENXIO)) //when recipient is not available on the bus + else if(errno == ENXIO) //no such id on the bus { - if (dbus_message_get_auto_start (message)) + 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) { - //todo start service here, otherwise - 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)) + 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; - + 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); - close(transport->memfd); + if(use_memfd) + close(transport->memfd); return ret_size; } -struct nameInfo -{ - __u64 uniqueId; - __u64 userId; - __u64 processId; - __u32 sec_label_len; - char *sec_label; -}; - /** * Performs kdbus query of id of the given name * * @param name name to query for - * @param fd bus file - * @param ownerID place to store id of the name + * @param transport transport + * @param pInfo nameInfo structure address to store info about the name * @return 0 on success, -errno if failed */ -static int kdbus_NameQuery(char* name, int fd, struct nameInfo* pInfo) +int kdbus_NameQuery(const char* name, DBusTransport* transport, struct nameInfo* pInfo) { struct kdbus_cmd_name_info *msg; struct kdbus_item *item; @@ -457,7 +483,7 @@ static int kdbus_NameQuery(char* name, int fd, struct nameInfo* pInfo) if (!msg) { _dbus_verbose("Error allocating memory for: %s,%s\n", _dbus_strerror (errno), _dbus_error_from_errno (errno)); - return -1; + return -errno; } memset(msg, 0, size); @@ -470,14 +496,16 @@ static int kdbus_NameQuery(char* name, int fd, struct nameInfo* pInfo) item = msg->items; item->type = KDBUS_NAME_INFO_ITEM_NAME; item->size = item_size; - strcpy(item->str, name); + memcpy(item->str, name, strlen(name) + 1); again: - ret = ioctl(fd, KDBUS_CMD_NAME_QUERY, msg); + ret = ioctl(((DBusTransportKdbus*)transport)->fd, KDBUS_CMD_NAME_QUERY, msg); if (ret < 0) { if(errno == EINTR) goto again; + if(errno == EAGAIN) + goto again; else if(ret == -ENOBUFS) { msg = realloc(msg, msg->size); //prepare memory @@ -492,20 +520,20 @@ static int kdbus_NameQuery(char* name, int fd, struct nameInfo* pInfo) pInfo->uniqueId = msg->id; pInfo->userId = msg->creds.uid; pInfo->processId = msg->creds.pid; -_dbus_verbose ("I'm alive 1\n"); item = msg->items; while((uint8_t *)(item) < (uint8_t *)(msg) + msg->size) { if(item->type == KDBUS_NAME_INFO_ITEM_SECLABEL) { - pInfo->sec_label_len = item->size - KDBUS_PART_HEADER_SIZE - 1; + pInfo->sec_label_len = item->size - KDBUS_PART_HEADER_SIZE - 1; if(pInfo->sec_label_len != 0) + { pInfo->sec_label = malloc(pInfo->sec_label_len); - if(pInfo->sec_label == NULL) - ret = -1; - else - memcpy(pInfo->sec_label, item->data, pInfo->sec_label_len); - + if(pInfo->sec_label == NULL) + ret = -1; + else + memcpy(pInfo->sec_label, item->data, pInfo->sec_label_len); + } break; } item = KDBUS_PART_NEXT(item); @@ -517,171 +545,503 @@ _dbus_verbose ("I'm alive 1\n"); } /** - * Handles messages sent to bus daemon - "org.freedesktop.DBus" and translates them to appropriate - * kdbus ioctl commands. Than translate kdbus reply into dbus message and put it into recived messages queue. - * - * !!! Not all methods are handled !!! Doubt if it is even possible. - * If method is not handled, returns error reply org.freedesktop.DBus.Error.UnknownMethod + * Performs kdbus hello - registration on the kdbus bus * - * Handled methods: - * - GetNameOwner - * - NameHasOwner - * - ListNames - * - * Not handled methods: - * - ListActivatableNames - * - StartServiceByName - * - UpdateActivationEnvironment - * - GetConnectionUnixUser - * - GetId + * @param name place to store unique name given by bus + * @param transportS transport structure + * @returns #TRUE on success */ -static dbus_bool_t emulateOrgFreedesktopDBus(DBusTransport *transport, DBusMessage *message) +static dbus_bool_t bus_register_kdbus(char* name, DBusTransportKdbus* transportS) { - int inter_ret; - struct nameInfo info; - dbus_bool_t ret_value; + struct kdbus_cmd_hello __attribute__ ((__aligned__(8))) 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 = RECEIVE_POOL_SIZE; - if(!strcmp(dbus_message_get_member(message), "GetNameOwner")) //returns id of the well known name + if (ioctl(transportS->fd, KDBUS_CMD_HELLO, &hello)) { - char* name = NULL; + _dbus_verbose ("Failed to send hello: %m, %d",errno); + return FALSE; + } - dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - inter_ret = kdbus_NameQuery(name, ((DBusTransportSocket*)transport)->fd, &info); - if(inter_ret == 0) //unique id of the name - { - char unique_name[(unsigned int)(snprintf(name, 0, "%llu", ULLONG_MAX) + sizeof(":1."))]; - const char* pString = unique_name; + sprintf(name, "%llu", (unsigned long long)hello.id); + _dbus_verbose("-- Our peer ID is: %s\n", name); + transportS->bloom_size = hello.bloom_size; - sprintf(unique_name, ":1.%llu", (unsigned long long int)info.uniqueId); - _dbus_verbose("Unique name discovered:%s\n", unique_name); - ret_value = reply_1_data(message, DBUS_TYPE_STRING, &pString, transport->connection); - } - else if(inter_ret == -ENOENT) //name has no owner - return reply_with_error(DBUS_ERROR_NAME_HAS_NO_OWNER, "Could not get owner of name '%s': no such name", name, message, transport->connection); - else - { - _dbus_verbose("kdbus error sending name query: err %d (%m)\n", errno); - ret_value = reply_with_error(DBUS_ERROR_FAILED, "Could not determine unique name for '%s'", name, message, transport->connection); - } - } - else if(!strcmp(dbus_message_get_member(message), "NameHasOwner")) //returns if name is currently registered on the bus + transportS->kdbus_mmap_ptr = mmap(NULL, RECEIVE_POOL_SIZE, PROT_READ, MAP_SHARED, transportS->fd, 0); + if (transportS->kdbus_mmap_ptr == MAP_FAILED) { - char* name = NULL; - dbus_bool_t result; + _dbus_verbose("Error when mmap: %m, %d",errno); + return FALSE; + } - dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - inter_ret = kdbus_NameQuery(name, ((DBusTransportSocket*)transport)->fd, &info); - if((inter_ret == 0) || (inter_ret == -ENOENT)) - { - result = (inter_ret == 0) ? TRUE : FALSE; - ret_value = reply_1_data(message, DBUS_TYPE_BOOLEAN, &result, transport->connection); - } - else + return TRUE; +} + +/** + * Seeks key in rule string, and duplicates value of the key into pValue. + * If value is "org.freedesktop.DBus" it is indicated by returning -1, because it + * needs to be handled in different manner. + * Value is duplicated from rule string to newly allocated memory pointe by pValue, + * so it must be freed after use. + * + * @param rule rule to look through + * @param key key to look for + * @param pValue pointer to value of the key found + * @return length of the value string, 0 means not found, -1 means "org.freedesktop.DBus" + */ +static int parse_match_key(const char *rule, const char* key, char** pValue) +{ + const char* pBegin; + const char* pValueEnd; + int value_length = 0; + + pBegin = strstr(rule, key); + if(pBegin) + { + pBegin += strlen(key); + pValueEnd = strchr(pBegin, '\''); + if(pValueEnd) { - _dbus_verbose("kdbus error checking if name exists: err %d (%m)\n", errno); - ret_value = reply_with_error(DBUS_ERROR_FAILED, "Could not determine whether name '%s' exists", name, message, transport->connection); + value_length = pValueEnd - pBegin; + *pValue = strndup(pBegin, value_length); + if(*pValue) + { + if(strcmp(*pValue, "org.freedesktop.DBus") == 0) + value_length = -1; + _dbus_verbose ("found for key: %s value:'%s'\n", key, *pValue); + } } } - else if(!strcmp(dbus_message_get_member(message), "GetConnectionUnixUser")) - { - char* name = NULL; + return value_length; +} - dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - inter_ret = kdbus_NameQuery(name, ((DBusTransportSocket*)transport)->fd, &info); - if(inter_ret == 0) //name found - { - _dbus_verbose("User id:%llu\n", (unsigned long long) info.userId); - ret_value = reply_1_data(message, DBUS_TYPE_UINT32, &info.userId, transport->connection); - } - else if(inter_ret == -ENOENT) //name has no owner - return reply_with_error(DBUS_ERROR_NAME_HAS_NO_OWNER, "Could not get UID of name '%s': no such name", name, message, transport->connection); - else - { - _dbus_verbose("kdbus error determining UID: err %d (%m)\n", errno); - ret_value = reply_with_error(DBUS_ERROR_FAILED, "Could not determine UID for '%s'", name, message, transport->connection); - } +/** + * Adds a match rule to match broadcast messages going through the message bus. + * Do no affect messages addressed directly. + * + * The "rule" argument is the string form of a match rule. + * + * Only part of the dbus's matching capabilities is implemented in kdbus now, because of different mechanism. + * Current mapping: + * interface match key mapped to bloom + * sender match key mapped to src_name + * also handled org.freedesktop.dbus member: NameOwnerChanged + * and separately NameLost, NameAcquired, IdAdded, IdRemoved + * + * @param transport transport + * @param id id of connection for which the rule is to be added + * @param rule textual form of match rule + */ +dbus_bool_t add_match_kdbus (DBusTransport* transport, __u64 id, const char *rule) +{ + struct kdbus_cmd_match* pCmd_match; + struct kdbus_item *pItem; + __u64 src_id = KDBUS_MATCH_SRC_ID_ANY; + uint64_t size; + unsigned int kernel_item = 0; + int name_size; + char* pName = NULL; + char* pInterface = NULL; + dbus_bool_t ret_value = FALSE; + DBusTransportKdbus* transportS = (DBusTransportKdbus*)transport; + + /*parsing rule and calculating size of command*/ + size = sizeof(struct kdbus_cmd_match); + + if(strstr(rule, "member='NameOwnerChanged'")) + { + kernel_item = ~0; + size += KDBUS_ITEM_SIZE(1)*3 + KDBUS_ITEM_SIZE(sizeof(__u64))*2; /*std DBus: 3 name related items plus 2 id related items*/ } - else if(!strcmp(dbus_message_get_member(message), "GetConnectionUnixProcessID")) + else if(strstr(rule, "member='NameChanged'")) { - char* name = NULL; - - dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - inter_ret = kdbus_NameQuery(name, ((DBusTransportSocket*)transport)->fd, &info); - if(inter_ret == 0) //name found - ret_value = reply_1_data(message, DBUS_TYPE_UINT32, &info.processId, transport->connection); - else if(inter_ret == -ENOENT) //name has no owner - return reply_with_error(DBUS_ERROR_NAME_HAS_NO_OWNER, "Could not get PID of name '%s': no such name", name, message, transport->connection); - else - { - _dbus_verbose("kdbus error determining PID: err %d (%m)\n", errno); - ret_value = reply_with_error(DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN,"Could not determine PID for '%s'", name, message, transport->connection); - } + kernel_item = KDBUS_MATCH_NAME_CHANGE; + size += KDBUS_ITEM_SIZE(1); } - else if(!strcmp(dbus_message_get_member(message), "ListNames")) //return all well known names on he bus + else if(strstr(rule, "member='NameLost'")) { - struct kdbus_cmd_names* pCmd; - uint64_t cmd_size; + kernel_item = KDBUS_MATCH_NAME_REMOVE; + size += KDBUS_ITEM_SIZE(1); + } + else if(strstr(rule, "member='NameAcquired'")) + { + kernel_item = KDBUS_MATCH_NAME_ADD; + size += KDBUS_ITEM_SIZE(1); + } + else if(strstr(rule, "member='IdAdded'")) + { + kernel_item = KDBUS_MATCH_ID_ADD; + size += KDBUS_ITEM_SIZE(sizeof(__u64)); + } + else if(strstr(rule, "member='IdRemoved'")) + { + kernel_item = KDBUS_MATCH_ID_REMOVE; + size += KDBUS_ITEM_SIZE(sizeof(__u64)); + } - cmd_size = sizeof(struct kdbus_cmd_names) + KDBUS_ITEM_SIZE(1); - pCmd = malloc(cmd_size); - if(pCmd == NULL) - goto out; - pCmd->size = cmd_size; + name_size = parse_match_key(rule, "interface='", &pInterface); + if((name_size == -1) && (kernel_item == 0)) //means org.freedesktop.DBus without specified member + { + kernel_item = ~0; + size += KDBUS_ITEM_SIZE(1)*3 + KDBUS_ITEM_SIZE(sizeof(__u64))*2; /* 3 above name related items plus 2 id related items*/ + } + else if(name_size > 0) /*actual size is not important for interface because bloom size is defined by bus*/ + size += KDBUS_PART_HEADER_SIZE + transportS->bloom_size; - again: - cmd_size = 0; - if(ioctl(((DBusTransportSocket*)transport)->fd, KDBUS_CMD_NAME_LIST, pCmd)) - { - if(errno == EINTR) - goto again; - if(errno == ENOBUFS) //buffer to small to put all names into it - cmd_size = pCmd->size; //here kernel tells how much memory it needs - else - { - _dbus_verbose("kdbus error asking for name list: err %d (%m)\n",errno); - goto out; - } - } - if(cmd_size) //kernel needs more memory + name_size = parse_match_key(rule, "sender='", &pName); + if((name_size == -1) && (kernel_item == 0)) //means org.freedesktop.DBus without specified name - same as interface few line above + { + kernel_item = ~0; + size += KDBUS_ITEM_SIZE(1)*3 + KDBUS_ITEM_SIZE(sizeof(__u64))*2; /* 3 above name related items plus 2 id related items*/ + } + else if(name_size > 0) + { + if(!strncmp(pName, ":1.", 3)) /*if name is unique name it must be converted to unique id*/ { - pCmd = realloc(pCmd, cmd_size); //prepare memory - if(pCmd == NULL) - return FALSE; - goto again; //and try again + src_id = strtoull(&pName[3], NULL, 10); + free(pName); + pName = NULL; } else - { - DBusMessage *reply; - DBusMessageIter args; - struct kdbus_cmd_name* pCmd_name; - char* pName; - + size += KDBUS_ITEM_SIZE(name_size + 1); //well known name + } + + pCmd_match = alloca(size); + if(pCmd_match == NULL) + goto out; + + pCmd_match->id = id; + pCmd_match->cookie = id; + pCmd_match->size = size; + + pItem = pCmd_match->items; + if(kernel_item == ~0) //all signals from kernel + { + pCmd_match->src_id = 0; + pItem->type = KDBUS_MATCH_NAME_CHANGE; + pItem->size = KDBUS_PART_HEADER_SIZE + 1; + pItem = KDBUS_PART_NEXT(pItem); + pItem->type = KDBUS_MATCH_NAME_ADD; + pItem->size = KDBUS_PART_HEADER_SIZE + 1; + pItem = KDBUS_PART_NEXT(pItem); + pItem->type = KDBUS_MATCH_NAME_REMOVE; + pItem->size = KDBUS_PART_HEADER_SIZE + 1; + pItem = KDBUS_PART_NEXT(pItem); + pItem->type = KDBUS_MATCH_ID_ADD; + pItem->size = KDBUS_PART_HEADER_SIZE + sizeof(__u64); + pItem = KDBUS_PART_NEXT(pItem); + pItem->type = KDBUS_MATCH_ID_REMOVE; + pItem->size = KDBUS_PART_HEADER_SIZE + sizeof(__u64); + } + else if(kernel_item) //only one item + { + pCmd_match->src_id = 0; + pItem->type = kernel_item; + pItem->size = KDBUS_PART_HEADER_SIZE + 1; + } + else + { + pCmd_match->src_id = src_id; + if(pName) + { + pItem->type = KDBUS_MATCH_SRC_NAME; + pItem->size = KDBUS_PART_HEADER_SIZE + name_size + 1; + memcpy(pItem->str, pName, strlen(pName) + 1); + pItem = KDBUS_PART_NEXT(pItem); + } + + if(pInterface) + { + pItem->type = KDBUS_MATCH_BLOOM; + pItem->size = KDBUS_PART_HEADER_SIZE + transportS->bloom_size; + strncpy(pItem->data, pInterface, transportS->bloom_size); + } + } + + if(ioctl(transportS->fd, KDBUS_CMD_MATCH_ADD, pCmd_match)) + _dbus_verbose("Failed adding match bus rule %s,\nerror: %d, %m\n", rule, errno); + else + { + _dbus_verbose("Added match bus rule %s for id:%llu\n", rule, (unsigned long long)id); + ret_value = TRUE; + } + +out: + if(pName) + free(pName); + if(pInterface) + free(pInterface); + return ret_value; +} + +/** + * Opposing to dbus, in kdbus removes all match rules with given + * cookie, which in this implementation is equal to uniqe id. + * + * @param transport transport + * @param id connection id for which rules are to be removed + */ +dbus_bool_t remove_match_kdbus (DBusTransport* transport, __u64 id) +{ + struct kdbus_cmd_match __attribute__ ((__aligned__(8))) cmd; + DBusTransportKdbus* transportS = (DBusTransportKdbus*) transport; + + cmd.cookie = id; + cmd.id = id; + cmd.size = sizeof(struct kdbus_cmd_match); + + if(ioctl(transportS->fd, KDBUS_CMD_MATCH_REMOVE, &cmd)) + { + _dbus_verbose("Failed removing match rule for id: %llu; error: %d, %m\n", (unsigned long long)id, errno); + return FALSE; + } + else + { + _dbus_verbose("Match rule removed correctly.\n"); + return TRUE; + } +} + +/** + * Handles messages sent to bus daemon - "org.freedesktop.DBus" and translates them to appropriate + * kdbus ioctl commands. Than translate kdbus reply into dbus message and put it into recived messages queue. + * + * Now it captures only Hello message, which must be handled locally. + * All the rest is passed to dbus-daemon. + */ +static int emulateOrgFreedesktopDBus(DBusTransport *transport, DBusMessage *message) +{ +#ifdef DBUS_SERVICES_IN_LIB + int inter_ret; + struct nameInfo info; +#endif + int ret_value = -1; + + if(!strcmp(dbus_message_get_member(message), "Hello")) + { + char* sender = NULL; + char* name = NULL; + + name = malloc(snprintf(name, 0, "%llu", ULLONG_MAX) + 1); + if(name == NULL) + return -1; + if(!bus_register_kdbus(name, (DBusTransportKdbus*)transport)) + goto outH1; + if(!register_kdbus_policy(name, ((DBusTransportKdbus*)transport)->fd)) + goto outH1; + + sender = malloc (strlen(name) + 4); + if(!sender) + goto outH1; + sprintf(sender, ":1.%s", name); + ((DBusTransportKdbus*)transport)->sender = sender; + + if(!reply_1_data(message, DBUS_TYPE_STRING, &name, transport->connection)) + return 0; //todo why we cannot free name after sending reply, shouldn't we? + else + free(sender); + + outH1: + free(name); + } +#ifdef DBUS_SERVICES_IN_LIB + else if(!strcmp(dbus_message_get_member(message), "RequestName")) + { + char* name; + int flags; + int result; + + if(!dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_UINT32, &flags, DBUS_TYPE_INVALID)) + return -1; + + if(!register_kdbus_policy(name, ((DBusTransportKdbus*)transport)->fd)) + return -1; + + result = request_kdbus_name(((DBusTransportKdbus*)transport)->fd, name, flags, 0); + if(result == -EPERM) + return reply_with_error(DBUS_ERROR_ACCESS_DENIED, + "Connection is not allowed to own the service \"%s\" due to security policies in the configuration file", + name, message, transport->connection); + else if(result < 0) + return reply_with_error(DBUS_ERROR_FAILED , "Name \"%s\" could not be acquired", name, message, transport->connection); + else + return reply_1_data(message, DBUS_TYPE_UINT32, &result, transport->connection); + } + else if(!strcmp(dbus_message_get_member(message), "AddMatch")) + { + char* rule; + + if(!dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &rule, DBUS_TYPE_INVALID)) + return -1; + + if(!add_match_kdbus(transport, 0, rule)) + return -1; + + return reply_ack(message,transport->connection); + } + else if(!strcmp(dbus_message_get_member(message), "RemoveMatch")) + { + if(!remove_match_kdbus(transport, 0)) + return -1; + return reply_ack(message, transport->connection); + } + else if(!strcmp(dbus_message_get_member(message), "GetNameOwner")) //returns id of the well known name + { + char* name = NULL; + + dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); + inter_ret = kdbus_NameQuery(name, transport, &info); + if(inter_ret == 0) //unique id of the name + { + char unique_name[(unsigned int)(snprintf(name, 0, "%llu", ULLONG_MAX) + sizeof(":1."))]; + const char* pString = unique_name; + + sprintf(unique_name, ":1.%llu", (unsigned long long int)info.uniqueId); + _dbus_verbose("Unique name discovered:%s\n", unique_name); + ret_value = reply_1_data(message, DBUS_TYPE_STRING, &pString, transport->connection); + } + else if(inter_ret == -ENOENT) //name has no owner + return reply_with_error(DBUS_ERROR_NAME_HAS_NO_OWNER, "Could not get owner of name '%s': no such name", name, message, transport->connection); + else + { + _dbus_verbose("kdbus error sending name query: err %d (%m)\n", errno); + ret_value = reply_with_error(DBUS_ERROR_FAILED, "Could not determine unique name for '%s'", name, message, transport->connection); + } + } + else if(!strcmp(dbus_message_get_member(message), "NameHasOwner")) //returns if name is currently registered on the bus + { + char* name = NULL; + dbus_bool_t result; + + dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); + inter_ret = kdbus_NameQuery(name, transport, &info); + if((inter_ret == 0) || (inter_ret == -ENOENT)) + { + result = (inter_ret == 0) ? TRUE : FALSE; + ret_value = reply_1_data(message, DBUS_TYPE_BOOLEAN, &result, transport->connection); + } + else + { + _dbus_verbose("kdbus error checking if name exists: err %d (%m)\n", errno); + ret_value = reply_with_error(DBUS_ERROR_FAILED, "Could not determine whether name '%s' exists", name, message, transport->connection); + } + } + else if(!strcmp(dbus_message_get_member(message), "GetConnectionUnixUser")) + { + char* name = NULL; + + dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); + inter_ret = kdbus_NameQuery(name, transport, &info); + if(inter_ret == 0) //name found + { + _dbus_verbose("User id:%llu\n", (unsigned long long) info.userId); + ret_value = reply_1_data(message, DBUS_TYPE_UINT32, &info.userId, transport->connection); + } + else if(inter_ret == -ENOENT) //name has no owner + return reply_with_error(DBUS_ERROR_NAME_HAS_NO_OWNER, "Could not get UID of name '%s': no such name", name, message, transport->connection); + else + { + _dbus_verbose("kdbus error determining UID: err %d (%m)\n", errno); + ret_value = reply_with_error(DBUS_ERROR_FAILED, "Could not determine UID for '%s'", name, message, transport->connection); + } + } + else if(!strcmp(dbus_message_get_member(message), "GetConnectionUnixProcessID")) + { + char* name = NULL; + + dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); + inter_ret = kdbus_NameQuery(name, transport, &info); + if(inter_ret == 0) //name found + ret_value = reply_1_data(message, DBUS_TYPE_UINT32, &info.processId, transport->connection); + else if(inter_ret == -ENOENT) //name has no owner + return reply_with_error(DBUS_ERROR_NAME_HAS_NO_OWNER, "Could not get PID of name '%s': no such name", name, message, transport->connection); + else + { + _dbus_verbose("kdbus error determining PID: err %d (%m)\n", errno); + ret_value = reply_with_error(DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN,"Could not determine PID for '%s'", name, message, transport->connection); + } + } + else if(!strcmp(dbus_message_get_member(message), "ListNames")) //return all well known names on he bus + { + struct kdbus_cmd_names* pCmd; + uint64_t cmd_size; + + cmd_size = sizeof(struct kdbus_cmd_names) + KDBUS_ITEM_SIZE(1); + pCmd = malloc(cmd_size); + if(pCmd == NULL) + goto out; + pCmd->size = cmd_size; + + again: + cmd_size = 0; + if(ioctl(((DBusTransportKdbus*)transport)->fd, KDBUS_CMD_NAME_LIST, pCmd)) + { + if(errno == EINTR) + goto again; + if(errno == ENOBUFS) //buffer to small to put all names into it + cmd_size = pCmd->size; //here kernel tells how much memory it needs + else + { + _dbus_verbose("kdbus error asking for name list: err %d (%m)\n",errno); + goto out; + } + } + if(cmd_size) //kernel needs more memory + { + pCmd = realloc(pCmd, cmd_size); //prepare memory + if(pCmd == NULL) + return -1; + goto again; //and try again + } + else + { + DBusMessage *reply; + DBusMessageIter iter, sub; + struct kdbus_cmd_name* pCmd_name; + char* pName; + reply = dbus_message_new_method_return(message); if(reply == NULL) goto out; dbus_message_set_sender(reply, DBUS_SERVICE_DBUS); - dbus_message_iter_init_append(reply, &args); - + dbus_message_iter_init_append(reply, &iter); + if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING_AS_STRING, &sub)) + { + dbus_message_unref(reply); + goto out; + } for (pCmd_name = pCmd->names; (uint8_t *)(pCmd_name) < (uint8_t *)(pCmd) + pCmd->size; pCmd_name = KDBUS_PART_NEXT(pCmd_name)) { pName = pCmd_name->name; - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pName)) + if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &pName)) { dbus_message_unref(reply); goto out; } } - if(add_message_to_received(reply, transport->connection)) + if (!dbus_message_iter_close_container (&iter, &sub)) { - free(pCmd); - return TRUE; + dbus_message_unref (reply); + goto out; } + + if(add_message_to_received(reply, transport->connection)) + ret_value = 0; } out: if(pCmd) free(pCmd); - return FALSE; + return ret_value; } else if(!strcmp(dbus_message_get_member(message), "GetId")) { @@ -691,7 +1051,6 @@ out: MD5_CTX md5; DBusString binary, encoded; - ret_value = FALSE; path = &transport->address[11]; //start of kdbus bus path if(stat(path, &stats) < -1) { @@ -718,19 +1077,21 @@ out: outgid: return ret_value; } - else if(!strcmp(dbus_message_get_member(message), "GetAdtAuditSessionData")) +#endif +/* else if(!strcmp(dbus_message_get_member(message), "GetAdtAuditSessionData")) //todo to be implemented if needed and possible { char* name = NULL; dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); return reply_with_error(DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN, "Could not determine audit session data for '%s'", name, message, transport->connection); - } + }*/ +#ifdef DBUS_SERVICES_IN_LIB else if(!strcmp(dbus_message_get_member(message), "GetConnectionSELinuxSecurityContext")) { char* name = NULL; dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - inter_ret = kdbus_NameQuery(name, ((DBusTransportSocket*)transport)->fd, &info); + inter_ret = kdbus_NameQuery(name, transport, &info); if(inter_ret == -ENOENT) //name has no owner return reply_with_error(DBUS_ERROR_NAME_HAS_NO_OWNER, "Could not get security context of name '%s': no such name", name, message, transport->connection); else if(inter_ret < 0) @@ -739,7 +1100,6 @@ out: { DBusMessage *reply; - ret_value = FALSE; reply = dbus_message_new_method_return(message); if(reply != NULL) { @@ -747,32 +1107,18 @@ out: if (!dbus_message_append_args (reply, DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, &info.sec_label, info.sec_label_len, DBUS_TYPE_INVALID)) dbus_message_unref(reply); else if(add_message_to_received(reply, transport->connection)) - ret_value = TRUE; + ret_value = 0; } } } +#endif else - return reply_with_error(DBUS_ERROR_UNKNOWN_METHOD, NULL, (char*)dbus_message_get_member(message), message, transport->connection); -/* else if(!strcmp(dbus_message_get_member(message), "ListActivatableNames")) //todo - { - - } - else if(!strcmp(dbus_message_get_member(message), "StartServiceByName")) - { - - } - else if(!strcmp(dbus_message_get_member(message), "UpdateActivationEnvironment")) - { - - } - else if(!strcmp(dbus_message_get_member(message), "ReloadConfig")) - { - - } - */ + return 1; //send to daemon +#ifdef DBUS_SERVICES_IN_LIB if(info.sec_label) free(info.sec_label); +#endif return ret_value; } @@ -856,6 +1202,7 @@ static int put_message_into_data(DBusMessage *message, char* data) const DBusString *body; int size; + 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); @@ -864,23 +1211,57 @@ static int put_message_into_data(DBusMessage *message, char* data) size = _dbus_string_get_length(body); memcpy(data, _dbus_string_get_const_data(body), size); ret_size += size; - dbus_message_unref(message); return ret_size; } + /** - * Decodes kdbus message in order to extract dbus message and put it into data and fds. - * Also captures and decodes kdbus error messages and kdbus kernel broadcasts and converts - * all of them into dbus messages. + * Get the length of the kdbus message content. * * @param msg kdbus message - * @param data place to copy dbus message to - * @param socket_transport transport + * @return the length of the kdbus message + */ +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_PART_HEADER_SIZE) + { + _dbus_verbose(" +%s (%llu bytes) invalid data record\n", enum_MSG(item->type), item->size); + return -1; + } + switch (item->type) + { + case KDBUS_MSG_PAYLOAD_OFF: + ret_size += item->vec.size; + break; + case KDBUS_MSG_PAYLOAD_MEMFD: + ret_size += item->memfd.size; + break; + default: + break; + } + } + + return ret_size; +} + +/** + * Decodes kdbus message in order to extract dbus message and put it into data and fds. + * Also captures and decodes kdbus error messages and kdbus kernel broadcasts and converts + * all of them into 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 descriptor * @return number of dbus message's bytes received or -1 on error */ -static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTransportSocket* socket_transport, int* fds, int* n_fds) +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; @@ -915,9 +1296,9 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo switch (item->type) { case KDBUS_MSG_PAYLOAD_OFF: - memcpy(data, (char *)socket_transport->kdbus_mmap_ptr + item->vec.offset, item->vec.size); + memcpy(data, (char *)kdbus_transport->kdbus_mmap_ptr + item->vec.offset, item->vec.size); data += item->vec.size; - ret_size += item->vec.size; + ret_size += item->vec.size; _dbus_verbose(" +%s (%llu bytes) off=%llu size=%llu\n", enum_MSG(item->type), item->size, @@ -930,17 +1311,17 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo char *buf; uint64_t size; - size = item->memfd.size; + 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) + if (buf == MAP_FAILED) { _dbus_verbose("mmap() fd=%i failed:%m", item->memfd.fd); return -1; } - memcpy(data, buf, size); + memcpy(data, buf, size); data += size; ret_size += size; @@ -1048,7 +1429,6 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo #endif case KDBUS_MSG_REPLY_TIMEOUT: - case KDBUS_MSG_REPLY_DEAD: _dbus_verbose(" +%s (%llu bytes) cookie=%llu\n", enum_MSG(item->type), item->size, msg->cookie_reply); @@ -1062,6 +1442,20 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo ret_size = put_message_into_data(message, data); break; + case KDBUS_MSG_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; + } + + ret_size = put_message_into_data(message, data); + break; + case KDBUS_MSG_NAME_ADD: _dbus_verbose(" +%s (%llu bytes) '%s', old id=%lld, new id=%lld, flags=0x%llx\n", enum_MSG(item->type), (unsigned long long) item->size, @@ -1213,21 +1607,15 @@ out: * @param n_fds place to store number of file descriptors * @return size of received message on success, -1 on error */ -static int kdbus_read_message(DBusTransportSocket *socket_transport, DBusString *buffer, int* fds, int* n_fds) +static int kdbus_read_message(DBusTransportKdbus *socket_transport, DBusString *buffer, int* fds, int* n_fds) { - int ret_size; + int ret_size, buf_size; uint64_t __attribute__ ((__aligned__(8))) offset; struct kdbus_msg *msg; char *data; int start; 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: if (ioctl(socket_transport->fd, KDBUS_CMD_MSG_RECV, &offset) < 0) @@ -1241,6 +1629,24 @@ static int kdbus_read_message(DBusTransportSocket *socket_transport, DBusString msg = (struct kdbus_msg *)((char*)socket_transport->kdbus_mmap_ptr + offset); + 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, socket_transport, fds, n_fds); if(ret_size == -1) /* error */ @@ -1248,9 +1654,10 @@ static int kdbus_read_message(DBusTransportSocket *socket_transport, DBusString _dbus_string_set_length (buffer, start); return -1; } - else + else if (buf_size != ret_size) /* case of locally generated message */ + { _dbus_string_set_length (buffer, start + ret_size); - + } again2: if (ioctl(socket_transport->fd, KDBUS_CMD_MSG_RELEASE, &offset) < 0) @@ -1263,61 +1670,69 @@ static int kdbus_read_message(DBusTransportSocket *socket_transport, DBusString return ret_size; } - +/* + * copy-paste from socket transport with needed renames only. + */ 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 with needed renames only. + */ static void -socket_finalize (DBusTransport *transport) +transport_finalize (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; _dbus_verbose ("\n"); free_watches (transport); - _dbus_string_free (&socket_transport->encoded_outgoing); - _dbus_string_free (&socket_transport->encoded_incoming); + _dbus_string_free (&kdbus_transport->encoded_outgoing); + _dbus_string_free (&kdbus_transport->encoded_incoming); _dbus_transport_finalize_base (transport); - _dbus_assert (socket_transport->read_watch == NULL); - _dbus_assert (socket_transport->write_watch == NULL); + _dbus_assert (kdbus_transport->read_watch == NULL); + _dbus_assert (kdbus_transport->write_watch == NULL); dbus_free (transport); } +/* + * copy-paste from socket transport with needed renames only. + */ 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) @@ -1325,14 +1740,14 @@ 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); #ifdef DBUS_AUTHENTICATION - if (_dbus_transport_get_is_authenticated (transport)) + if (_dbus_transport_try_to_authenticate (transport)) #endif needed = _dbus_connection_has_messages_to_send_unlocked (transport->connection); #ifdef DBUS_AUTHENTICATION @@ -1359,38 +1774,41 @@ check_write_watch (DBusTransport *transport) } #endif _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 with needed renames only. + */ 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); #ifdef DBUS_AUTHENTICATION - if (_dbus_transport_get_is_authenticated (transport)) + if (_dbus_transport_try_to_authenticate (transport)) #endif need_read_watch = (_dbus_counter_get_size_value (transport->live_messages) < transport->max_live_messages_size) && @@ -1428,12 +1846,15 @@ check_read_watch (DBusTransport *transport) _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) { @@ -1448,15 +1869,16 @@ static dbus_bool_t read_data_into_auth (DBusTransport *transport, dbus_bool_t *oom) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *socket_transport = (DBusTransportKdbus*) transport; DBusString *buffer; int bytes_read; + int *fds, n_fds; *oom = FALSE; _dbus_auth_get_buffer (transport->auth, &buffer); - bytes_read = kdbus_read_message(socket_transport, buffer); + bytes_read = kdbus_read_message(socket_transport, buffer, fds, &n_fds); _dbus_auth_return_buffer (transport->auth, buffer, bytes_read > 0 ? bytes_read : 0); @@ -1496,11 +1918,38 @@ read_data_into_auth (DBusTransport *transport, } } +static int kdbus_send_auth (DBusTransport *transport, const DBusString *buffer) +{ + int len; + int bytes_written = -1; + struct kdbus_msg *msg; + struct kdbus_item *item; + + len = _dbus_string_get_length (buffer); +// data = _dbus_string_get_const_data_len (buffer, 0, len); + + msg = kdbus_init_msg(NULL, 1, 0, FALSE, 0, (DBusTransportKdbus*)transport); + item = msg->items; + MSG_ITEM_BUILD_VEC(_dbus_string_get_const_data_len (buffer, 0, len), len); + + again: + if(ioctl(((DBusTransportKdbus*)transport)->fd, KDBUS_CMD_MSG_SEND, msg)) + { + if(errno == EINTR) + goto again; + _dbus_verbose ("Error writing auth: %d, %m\n", errno); + } + else + bytes_written = len; + + return bytes_written; +} + /* Return value is whether we successfully wrote any bytes */ static dbus_bool_t write_data_from_auth (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; +// DBusTransportKdbus *socket_transport = (DBusTransportSocket*) transport; int bytes_written; const DBusString *buffer; @@ -1508,9 +1957,7 @@ write_data_from_auth (DBusTransport *transport) &buffer)) return FALSE; - bytes_written = _dbus_write_socket (socket_transport->fd, - buffer, - 0, _dbus_string_get_length (buffer)); + bytes_written = kdbus_send_auth (transport, buffer); if (bytes_written > 0) { @@ -1540,7 +1987,7 @@ exchange_credentials (DBusTransport *transport, dbus_bool_t do_reading, dbus_bool_t do_writing) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *socket_transport = (DBusTransportKdbus*) transport; DBusError error = DBUS_ERROR_INIT; _dbus_verbose ("exchange_credentials: do_reading = %d, do_writing = %d\n", @@ -1606,7 +2053,7 @@ do_authentication (DBusTransport *transport, oom = FALSE; - orig_auth_state = _dbus_transport_get_is_authenticated (transport); + orig_auth_state = _dbus_transport_try_to_authenticate (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 @@ -1621,7 +2068,7 @@ do_authentication (DBusTransport *transport, _dbus_transport_ref (transport); - while (!_dbus_transport_get_is_authenticated (transport) && + while (!_dbus_transport_try_to_authenticate (transport) && _dbus_transport_get_is_connected (transport)) { if (!exchange_credentials (transport, do_reading, do_writing)) @@ -1678,7 +2125,7 @@ do_authentication (DBusTransport *transport, out: if (auth_completed) - *auth_completed = (orig_auth_state != _dbus_transport_get_is_authenticated (transport)); + *auth_completed = (orig_auth_state != _dbus_transport_try_to_authenticate (transport)); check_read_watch (transport); check_write_watch (transport); @@ -1695,12 +2142,12 @@ do_authentication (DBusTransport *transport, static dbus_bool_t do_writing (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; dbus_bool_t oom; #ifdef DBUS_AUTHENTICATION /* No messages without authentication! */ - if (!_dbus_transport_get_is_authenticated (transport)) + if (!_dbus_transport_try_to_authenticate (transport)) { _dbus_verbose ("Not authenticated, not writing anything\n"); return TRUE; @@ -1716,7 +2163,7 @@ do_writing (DBusTransport *transport) #if 1 _dbus_verbose ("do_writing(), have_messages = %d, fd = %d\n", _dbus_connection_has_messages_to_send_unlocked (transport->connection), - socket_transport->fd); + kdbus_transport->fd); #endif oom = FALSE; @@ -1732,54 +2179,71 @@ do_writing (DBusTransport *transport) message = _dbus_connection_get_message_to_send (transport->connection); _dbus_assert (message != NULL); - dbus_message_lock (message); + if(dbus_message_get_sender(message) == NULL) //needed for daemon to pass pending activation messages + { + 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); if(pDestination) { - if(!strcmp(pDestination, "org.freedesktop.DBus")) + if(!strcmp(pDestination, DBUS_SERVICE_DBUS)) { - if(emulateOrgFreedesktopDBus(transport, message)) - bytes_written = total_bytes_to_write; - else - bytes_written = -1; - goto written; + if(!strcmp(dbus_message_get_interface(message), DBUS_INTERFACE_DBUS)) + { + int ret; + + ret = emulateOrgFreedesktopDBus(transport, message); + if(ret < 0) + { + bytes_written = -1; + goto written; + } + else if(ret == 0) + { + bytes_written = total_bytes_to_write; + goto written; + } + //else send to "daemon" as to normal recipient + } } } if (_dbus_auth_needs_encoding (transport->auth)) { - if (_dbus_string_get_length (&socket_transport->encoded_outgoing) == 0) + if (_dbus_string_get_length (&kdbus_transport->encoded_outgoing) == 0) { if (!_dbus_auth_encode_data (transport->auth, - header, &socket_transport->encoded_outgoing)) + header, &kdbus_transport->encoded_outgoing)) { oom = TRUE; goto out; } if (!_dbus_auth_encode_data (transport->auth, - body, &socket_transport->encoded_outgoing)) + body, &kdbus_transport->encoded_outgoing)) { - _dbus_string_set_length (&socket_transport->encoded_outgoing, 0); + _dbus_string_set_length (&kdbus_transport->encoded_outgoing, 0); oom = TRUE; goto out; } } - total_bytes_to_write = _dbus_string_get_length (&socket_transport->encoded_outgoing); - if(total_bytes_to_write > socket_transport->max_bytes_written_per_iteration) + total_bytes_to_write = _dbus_string_get_length (&kdbus_transport->encoded_outgoing); + if(total_bytes_to_write > kdbus_transport->max_bytes_written_per_iteration) return -E2BIG; - bytes_written = kdbus_write_msg(socket_transport, message, TRUE); + bytes_written = kdbus_write_msg(kdbus_transport, message, pDestination, TRUE); } else { - if(total_bytes_to_write > socket_transport->max_bytes_written_per_iteration) + if(total_bytes_to_write > kdbus_transport->max_bytes_written_per_iteration) return -E2BIG; - bytes_written = kdbus_write_msg(socket_transport, message, FALSE); + bytes_written = kdbus_write_msg(kdbus_transport, message, pDestination, FALSE); } written: @@ -1805,16 +2269,16 @@ written: _dbus_verbose (" wrote %d bytes of %d\n", bytes_written, total_bytes_to_write); - socket_transport->message_bytes_written += bytes_written; + kdbus_transport->message_bytes_written += bytes_written; - _dbus_assert (socket_transport->message_bytes_written <= + _dbus_assert (kdbus_transport->message_bytes_written <= total_bytes_to_write); - if (socket_transport->message_bytes_written == total_bytes_to_write) + if (kdbus_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); + kdbus_transport->message_bytes_written = 0; + _dbus_string_set_length (&kdbus_transport->encoded_outgoing, 0); + _dbus_string_compact (&kdbus_transport->encoded_outgoing, 2048); _dbus_connection_message_sent_unlocked (transport->connection, message); @@ -1832,17 +2296,17 @@ written: static dbus_bool_t do_reading (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; DBusString *buffer; int bytes_read; dbus_bool_t oom = FALSE; int *fds, n_fds; - _dbus_verbose ("fd = %d\n",socket_transport->fd); + _dbus_verbose ("fd = %d\n",kdbus_transport->fd); #ifdef DBUS_AUTHENTICATION /* No messages without authentication! */ - if (!_dbus_transport_get_is_authenticated (transport)) + if (!_dbus_transport_try_to_authenticate (transport)) return TRUE; #endif @@ -1851,13 +2315,13 @@ do_reading (DBusTransport *transport) /* See if we've exceeded max messages and need to disable reading */ check_read_watch (transport); - _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_message_loader_get_unix_fds(transport->loader, &fds, &n_fds)) @@ -1870,14 +2334,14 @@ do_reading (DBusTransport *transport) if (_dbus_auth_needs_decoding (transport->auth)) { - bytes_read = kdbus_read_message(socket_transport, &socket_transport->encoded_incoming, fds, &n_fds); + bytes_read = kdbus_read_message(kdbus_transport, &kdbus_transport->encoded_incoming, fds, &n_fds); - _dbus_assert (_dbus_string_get_length (&socket_transport->encoded_incoming) == bytes_read); + _dbus_assert (_dbus_string_get_length (&kdbus_transport->encoded_incoming) == bytes_read); if (bytes_read > 0) { if (!_dbus_auth_decode_data (transport->auth, - &socket_transport->encoded_incoming, + &kdbus_transport->encoded_incoming, buffer)) { _dbus_verbose ("Out of memory decoding incoming data\n"); @@ -1888,12 +2352,12 @@ do_reading (DBusTransport *transport) goto out; } - _dbus_string_set_length (&socket_transport->encoded_incoming, 0); - _dbus_string_compact (&socket_transport->encoded_incoming, 2048); + _dbus_string_set_length (&kdbus_transport->encoded_incoming, 0); + _dbus_string_compact (&kdbus_transport->encoded_incoming, 2048); } } else - bytes_read = kdbus_read_message(socket_transport, buffer, fds, &n_fds); + bytes_read = kdbus_read_message(kdbus_transport, buffer, fds, &n_fds); if (bytes_read >= 0 && n_fds > 0) _dbus_verbose("Read %i unix fds\n", n_fds); @@ -1953,12 +2417,15 @@ do_reading (DBusTransport *transport) return TRUE; } +/* + * copy-paste from socket transport. + */ 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; @@ -1971,15 +2438,18 @@ unix_error_with_read_to_come (DBusTransport *itransport, return TRUE; } +/* + * copy-paste from socket transport with needed renames only. + */ 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 @@ -1993,7 +2463,7 @@ socket_handle_watch (DBusTransport *transport, return TRUE; } - if (watch == socket_transport->read_watch && + if (watch == kdbus_transport->read_watch && (flags & DBUS_WATCH_READABLE)) { #ifdef DBUS_AUTHENTICATION @@ -2029,7 +2499,7 @@ socket_handle_watch (DBusTransport *transport, } #endif } - else if (watch == socket_transport->write_watch && + else if (watch == kdbus_transport->write_watch && (flags & DBUS_WATCH_WRITABLE)) { #if 1 @@ -2052,10 +2522,10 @@ socket_handle_watch (DBusTransport *transport, #ifdef DBUS_ENABLE_VERBOSE_MODE else { - if (watch == socket_transport->read_watch) + if (watch == kdbus_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) + else if (watch == kdbus_transport->write_watch) _dbus_verbose ("asked to handle write watch with non-write condition 0x%x\n", flags); else @@ -2067,41 +2537,49 @@ socket_handle_watch (DBusTransport *transport, return TRUE; } +/* + * copy-paste from socket transport with needed renames only. + */ 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; + _dbus_close_socket (kdbus_transport->fd, NULL); + kdbus_transport->fd = -1; } +/* + * copy-paste from socket transport with needed renames only. + */ 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_connection_set_is_authenticated(transport->connection); //now we don't have authentication in kdbus - _dbus_watch_set_handler (socket_transport->write_watch, + _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; } @@ -2111,7 +2589,7 @@ socket_connection_set (DBusTransport *transport) return TRUE; } -/** +/** original dbus copy-pasted comment * @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 @@ -2123,7 +2601,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; @@ -2132,9 +2610,9 @@ 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); + kdbus_transport->read_watch, + kdbus_transport->write_watch, + kdbus_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 @@ -2142,10 +2620,10 @@ kdbus_do_iteration (DBusTransport *transport, * we don't want to read any messages yet if not given DO_READING. */ - poll_fd.fd = socket_transport->fd; + poll_fd.fd = kdbus_transport->fd; poll_fd.events = 0; - if (_dbus_transport_get_is_authenticated (transport)) + if (_dbus_transport_try_to_authenticate (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 @@ -2170,11 +2648,11 @@ kdbus_do_iteration (DBusTransport *transport, } /* If we get here, we decided to do the poll() after all */ - _dbus_assert (socket_transport->read_watch); + _dbus_assert (kdbus_transport->read_watch); if (flags & DBUS_ITERATION_DO_READING) poll_fd.events |= _DBUS_POLLIN; - _dbus_assert (socket_transport->write_watch); + _dbus_assert (kdbus_transport->write_watch); if (flags & DBUS_ITERATION_DO_WRITING) poll_fd.events |= _DBUS_POLLOUT; } @@ -2278,21 +2756,24 @@ kdbus_do_iteration (DBusTransport *transport, _dbus_verbose (" ... leaving do_iteration()\n"); } +/* + * copy-paste from socket transport with needed renames only. + */ 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); } 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 }; /** @@ -2304,74 +2785,72 @@ static const DBusTransportVTable kdbus_vtable = { * @returns the new transport, or #NULL if no memory. */ static DBusTransport* -_dbus_transport_new_for_socket_kdbus (int fd, - const DBusString *address) +_dbus_transport_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)) + if (!_dbus_string_init (&kdbus_transport->encoded_outgoing)) goto failed_0; - if (!_dbus_string_init (&socket_transport->encoded_incoming)) + if (!_dbus_string_init (&kdbus_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, NULL, address)) goto failed_4; #ifdef DBUS_AUTHENTICATION #ifdef HAVE_UNIX_FD_PASSING - _dbus_auth_set_unix_fd_possible(socket_transport->base.auth, _dbus_socket_can_pass_unix_fd(fd)); + _dbus_auth_set_unix_fd_possible(kdbus_transport->base.auth, _dbus_socket_can_pass_unix_fd(fd)); #endif #endif - socket_transport->fd = fd; - socket_transport->message_bytes_written = 0; + kdbus_transport->fd = fd; + kdbus_transport->message_bytes_written = 0; /* These values should probably be tunable or something. */ - socket_transport->max_bytes_read_per_iteration = DBUS_MAXIMUM_MESSAGE_LENGTH; - socket_transport->max_bytes_written_per_iteration = DBUS_MAXIMUM_MESSAGE_LENGTH; + kdbus_transport->max_bytes_read_per_iteration = DBUS_MAXIMUM_MESSAGE_LENGTH; + kdbus_transport->max_bytes_written_per_iteration = DBUS_MAXIMUM_MESSAGE_LENGTH; - socket_transport->kdbus_mmap_ptr = NULL; - socket_transport->memfd = -1; + kdbus_transport->kdbus_mmap_ptr = NULL; + kdbus_transport->memfd = -1; - return (DBusTransport*) socket_transport; + 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); + _dbus_string_free (&kdbus_transport->encoded_incoming); failed_1: - _dbus_string_free (&socket_transport->encoded_outgoing); + _dbus_string_free (&kdbus_transport->encoded_outgoing); failed_0: - dbus_free (socket_transport); + dbus_free (kdbus_transport); return NULL; } - /** * Opens a connection to the kdbus bus * @@ -2396,23 +2875,6 @@ static int _dbus_connect_kdbus (const char *path, DBusError *error) } /** - * maps memory pool for messages received by the kdbus transport - * - * @param transport transport - * @returns #TRUE on success, otherwise FALSE - */ -static dbus_bool_t kdbus_mmap(DBusTransport* transport) -{ - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; - - socket_transport->kdbus_mmap_ptr = mmap(NULL, RECEIVE_POOL_SIZE, PROT_READ, MAP_SHARED, socket_transport->fd, 0); - if (socket_transport->kdbus_mmap_ptr == MAP_FAILED) - return FALSE; - - return TRUE; -} - -/** * Creates a new transport for kdbus. * This creates a client-side of a transport. * @@ -2451,7 +2913,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, &address); + transport = _dbus_transport_new_kdbus_transport (fd, &address); if (transport == NULL) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); @@ -2516,457 +2978,3 @@ DBusTransportOpenResult _dbus_transport_open_kdbus(DBusAddressEntry *entry, return DBUS_TRANSPORT_OPEN_NOT_HANDLED; } } - -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); -} - -/** - * Registers kdbus policy for given connection. - * - * Policy sets rights of the name (unique or well known) on the bus. Without policy it is - * not possible to send or receive messages. It must be set separately for unique id and - * well known name of the connection. It is set after registering on the bus, but before - * requesting for name. The policy is valid for the given name, not for the connection. - * - * Name of the policy equals name on the bus. - * - * @param name name of the policy = name of the connection - * @param connection the connection - * @param error place to store errors - * - * @returns #TRUE on success - */ -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 = 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); - 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; -} - -/** - * Kdbus part of dbus_bus_register. - * Shouldn't be used separately because it needs to be surrounded - * by other functions as it is done in dbus_bus_register. - * - * @param name place to store unique name given by bus - * @param connection the connection - * @param error place to store errors - * @returns #TRUE on success - */ -dbus_bool_t bus_register_kdbus(char* name, DBusConnection *connection, DBusError *error) -{ - struct kdbus_cmd_hello __attribute__ ((__aligned__(8))) hello; - int fd; - - hello.conn_flags = KDBUS_HELLO_ACCEPT_FD/* | - KDBUS_HELLO_ATTACH_COMM | - KDBUS_HELLO_ATTACH_EXE | - KDBUS_HELLO_ATTACH_CMDLINE | - KDBUS_HELLO_ATTACH_CAPS | - KDBUS_HELLO_ATTACH_CGROUP | - KDBUS_HELLO_ATTACH_SECLABEL | - KDBUS_HELLO_ATTACH_AUDIT*/; - hello.size = sizeof(struct kdbus_cmd_hello); - hello.pool_size = RECEIVE_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; - } - - sprintf(name, "%llu", (unsigned long long)hello.id); - _dbus_verbose("-- Our peer ID is: %s\n", name); - ((DBusTransportSocket*)dbus_connection_get_transport(connection))->bloom_size = hello.bloom_size; - - 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; -} - -/** - * kdbus version of dbus_bus_request_name. - * - * Asks the bus to assign the given name to this connection. - * - * Use same flags as original dbus version with one exception below. - * Result flag #DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER is currently - * never returned by kdbus, instead DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER - * is returned by kdbus. - * - * @param connection the connection - * @param name the name to request - * @param flags flags - * @param error location to store the error - * @returns a result code, -1 if error is set - */ -int 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 -1; - } - - _dbus_verbose("Request name - flags sent: 0x%llx !!!!!!!!!\n", cmd_name->conn_flags); - - _DBUS_ASSERT_ERROR_IS_CLEAR (error); - if (ioctl(fd, KDBUS_CMD_NAME_ACQUIRE, cmd_name)) - { - dbus_set_error(error,_dbus_error_from_errno (errno), "error acquiring name: %s", _dbus_strerror (errno)); - if(errno == EEXIST) - return DBUS_REQUEST_NAME_REPLY_EXISTS; - return -1; - } - - _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 code is never returned - DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER - * because kdbus never returns it now - */ -} - -/** - * 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) - if(address == strstr(address, "kdbus:path=")) - return TRUE; - return FALSE; -} - -/** - * Seeks key in rule string, and duplicates value of the key into pValue. - * If value is "org.freedesktop.DBus" it is indicated by returning -1, because it - * needs to be handled in different manner. - * Value is duplicated from rule string to newly allocated memory pointe by pValue, - * so it must be freed after use. - * - * @param rule rule to look through - * @param key key to look for - * @param pValue pointer to value of the key found - * @return length of the value string, 0 means not found, -1 means "org.freedesktop.DBus" - */ -static int parse_match_key(const char *rule, const char* key, char** pValue) -{ - const char* pBegin; - const char* pValueEnd; - int value_length = 0; - - pBegin = strstr(rule, key); - if(pBegin) - { - pBegin += strlen(key); - pValueEnd = strchr(pBegin, '\''); - if(pValueEnd) - { - value_length = pValueEnd - pBegin; - *pValue = strndup(pBegin, value_length); - if(*pValue) - { - if(strcmp(*pValue, "org.freedesktop.DBus") == 0) - value_length = -1; - _dbus_verbose ("found for key: %s value:'%s'\n", key, *pValue); - } - } - } - return value_length; -} - -/** - * Adds a match rule to match broadcast messages going through the message bus. - * Do no affect messages addressed directly. - * - * The "rule" argument is the string form of a match rule. - * - * In kdbus function do not blocks. - * - * Upper function returns nothing because of blocking issues - * so there is no point to return true or false here. - * - * Only part of the dbus's matching capabilities is implemented in kdbus now, because of different mechanism. - * Current mapping: - * interface match key mapped to bloom - * sender match key mapped to src_name - * also handled org.freedesktop.dbus members: NameOwnerChanged, NameLost, NameAcquired - * - * @param connection connection to the message bus - * @param rule textual form of match rule - * @param error location to store any errors - may be NULL - */ -void dbus_bus_add_match_kdbus (DBusConnection *connection, const char *rule, DBusError *error) -{ - struct kdbus_cmd_match* pCmd_match; - struct kdbus_item *pItem; - int fd; - __u64 src_id = KDBUS_MATCH_SRC_ID_ANY; - uint64_t size; - unsigned int kernel_item = 0; - int name_size; - char* pName = NULL; - char* pInterface = NULL; - __u64 bloom_size = ((DBusTransportSocket*)dbus_connection_get_transport(connection))->bloom_size; - - dbus_connection_get_socket(connection, &fd); - - /*parsing rule and calculating size of command*/ - size = sizeof(struct kdbus_cmd_match); - - if(strstr(rule, "member='NameOwnerChanged'")) - { - kernel_item = KDBUS_MATCH_NAME_CHANGE; - size += KDBUS_ITEM_SIZE(1); - } - else if(strstr(rule, "member='NameLost'")) - { - kernel_item = KDBUS_MATCH_NAME_REMOVE; - size += KDBUS_ITEM_SIZE(1); - } - else if(strstr(rule, "member='NameAcquired'")) - { - kernel_item = KDBUS_MATCH_NAME_ADD; - size += KDBUS_ITEM_SIZE(1); - } - - name_size = parse_match_key(rule, "interface='", &pInterface); - if((name_size == -1) && (kernel_item == 0)) //means org.freedesktop.DBus without specified member - { - kernel_item = ~0; - size += KDBUS_ITEM_SIZE(1)*3 + KDBUS_ITEM_SIZE(sizeof(__u64))*2; /* 3 above name related items plus 2 id related items*/ - } - else if(name_size > 0) /*actual size is not important for interface because bloom size is defined by bus*/ - size += KDBUS_PART_HEADER_SIZE + bloom_size; - - name_size = parse_match_key(rule, "sender='", &pName); - if((name_size == -1) && (kernel_item == 0)) //means org.freedesktop.DBus without specified name - same as interface few line above - { - kernel_item = ~0; - size += KDBUS_ITEM_SIZE(1)*3 + KDBUS_ITEM_SIZE(sizeof(__u64))*2; /* 3 above name related items plus 2 id related items*/ - } - else if(name_size > 0) - { - if(!strncmp(pName, ":1.", 3)) /*if name is unique name it must be converted to unique id*/ - { - src_id = strtoull(&pName[3], NULL, 10); - free(pName); - pName = NULL; - } - else - size += KDBUS_ITEM_SIZE(name_size + 1); //well known name - } - - pCmd_match = alloca(size); - if(pCmd_match == NULL) - goto out; - - pCmd_match->id = 0; - pCmd_match->size = size; - pCmd_match->cookie = strtoull(dbus_bus_get_unique_name(connection), NULL , 10); - - pItem = pCmd_match->items; - if(kernel_item == ~0) //all signals from kernel - { - pCmd_match->src_id = 0; - pItem->type = KDBUS_MATCH_NAME_CHANGE; - pItem->size = KDBUS_PART_HEADER_SIZE + 1; - pItem = KDBUS_PART_NEXT(pItem); - pItem->type = KDBUS_MATCH_NAME_ADD; - pItem->size = KDBUS_PART_HEADER_SIZE + 1; - pItem = KDBUS_PART_NEXT(pItem); - pItem->type = KDBUS_MATCH_NAME_REMOVE; - pItem->size = KDBUS_PART_HEADER_SIZE + 1; - pItem = KDBUS_PART_NEXT(pItem); - pItem->type = KDBUS_MATCH_ID_ADD; - pItem->size = KDBUS_PART_HEADER_SIZE + sizeof(__u64); - pItem = KDBUS_PART_NEXT(pItem); - pItem->type = KDBUS_MATCH_ID_REMOVE; - pItem->size = KDBUS_PART_HEADER_SIZE + sizeof(__u64); - } - else if(kernel_item) //only one item - { - pCmd_match->src_id = 0; - pItem->type = kernel_item; - pItem->size = KDBUS_PART_HEADER_SIZE + 1; - } - else - { - pCmd_match->src_id = src_id; - if(pName) - { - pItem->type = KDBUS_MATCH_SRC_NAME; - pItem->size = KDBUS_PART_HEADER_SIZE + name_size + 1; - strcpy(pItem->str, pName); - pItem = KDBUS_PART_NEXT(pItem); - } - - if(pInterface) - { - pItem->type = KDBUS_MATCH_BLOOM; - pItem->size = KDBUS_PART_HEADER_SIZE + bloom_size; - strncpy(pItem->data, pInterface, bloom_size); - } - } - - if(ioctl(fd, KDBUS_CMD_MATCH_ADD, pCmd_match)) - { - if(error) - dbus_set_error(error,_dbus_error_from_errno (errno), "error adding match: %s", _dbus_strerror (errno)); - _dbus_verbose("Failed adding match bus rule %s,\nerror: %d, %m\n", rule, errno); - } - else - _dbus_verbose("Added match bus rule %s\n", rule); - -out: - if(pName) - free(pName); - if(pInterface) - free(pInterface); -} - -/** - * Opposing to dbus, in kdbus removes all match rules with given - * cookie, which now is equal to uniqe id. - * - * In kdbus this function will not block - * - * @param connection connection to the message bus - * @param error location to store any errors - may be NULL - */ -void dbus_bus_remove_match_kdbus (DBusConnection *connection, DBusError *error) -{ - struct kdbus_cmd_match __attribute__ ((__aligned__(8))) cmd; - int fd; - - dbus_connection_get_socket(connection, &fd); - cmd.cookie = strtoull(dbus_bus_get_unique_name(connection), NULL , 10); - cmd.id = cmd.cookie; - cmd.size = sizeof(struct kdbus_cmd_match); - - if(ioctl(fd, KDBUS_CMD_MATCH_ADD, &cmd)) - { - if(error) - dbus_set_error(error,_dbus_error_from_errno (errno), "error removing match: %s", _dbus_strerror (errno)); - _dbus_verbose("Failed removing match rule; error: %d, %m\n", errno); - } - else - _dbus_verbose("Match rule removed correctly.\n"); -}