X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bus%2Fkdbus-d.c;h=a0975fdac998d6e37ff351490a12a447c992560f;hb=c1a77d2c58c78abc606f1cb7918704596ebf2bfe;hp=4b8a029fb7082bcad011db2b3224ca6f3d0aa2ad;hpb=2c0860bec584ded8312ce3a6252266c79bad5d86;p=platform%2Fupstream%2Fdbus.git diff --git a/bus/kdbus-d.c b/bus/kdbus-d.c index 4b8a029..a0975fd 100644 --- a/bus/kdbus-d.c +++ b/bus/kdbus-d.c @@ -23,14 +23,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ - #include #include "kdbus-d.h" -#define KDBUS_FOR_SBB #include #include #include "dispatch.h" -#include #include #include #include "connection.h" @@ -127,7 +124,7 @@ dbus_bool_t add_match_kdbus (DBusTransport* transport, __u64 id, const char *rul /*parsing rule and calculating size of command*/ size = sizeof(struct kdbus_cmd_match); if(parse_match_key(rule, "interface='", &pInterface)) /*actual size is not important for interface because bloom size is defined by bus*/ - size += KDBUS_PART_HEADER_SIZE + bloom_size; + size += KDBUS_ITEM_HEADER_SIZE + bloom_size; name_size = parse_match_key(rule, "sender='", &pName); if(name_size) { @@ -138,7 +135,7 @@ dbus_bool_t add_match_kdbus (DBusTransport* transport, __u64 id, const char *rul pName = NULL; } else - size += KDBUS_PART_SIZE(name_size + 1); //well known name + size += KDBUS_ITEM_SIZE(name_size + 1); //well known name } pCmd_match = alloca(size); @@ -154,14 +151,14 @@ dbus_bool_t add_match_kdbus (DBusTransport* transport, __u64 id, const char *rul if(pName) { pItem->type = KDBUS_MATCH_SRC_NAME; - pItem->size = KDBUS_PART_HEADER_SIZE + name_size + 1; + pItem->size = KDBUS_ITEM_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 + bloom_size; + pItem->size = KDBUS_ITEM_HEADER_SIZE + bloom_size; strncpy(pItem->data, pInterface, bloom_size); } @@ -212,101 +209,6 @@ dbus_bool_t remove_match_kdbus (DBusTransport* transport, __u64 id) } } -/** - * Performs kdbus query of id of the given name - * - * @param name name to query for - * @param transport transport - * @param pInfo nameInfo structure address to store info about the name - * @return 0 on success, -errno if failed - */ -int kdbus_NameQuery(const char* name, DBusTransport* transport, struct nameInfo* pInfo) -{ - struct kdbus_cmd_conn_info *cmd; - int ret; - int fd; - uint64_t size; - __u64 id = 0; - - pInfo->sec_label_len = 0; - pInfo->sec_label = NULL; - - if(!_dbus_transport_get_socket_fd(transport, &fd)) - return -EPERM; - - size = sizeof(struct kdbus_cmd_conn_info); - if((name[0] == ':') && (name[1] == '1') && (name[2] == '.')) /* if name starts with ":1." it is a unique name and should be send as number */ - id = strtoull(&name[3], NULL, 10); - if(id == 0) - size += strlen(name) + 1; - - cmd = alloca(size); - if (!cmd) - { - _dbus_verbose("Error allocating memory for: %s,%s\n", _dbus_strerror (errno), _dbus_error_from_errno (errno)); - return -errno; - } - - cmd->size = size; - cmd->id = id; - if(id == 0) - memcpy(cmd->name, name, strlen(name) + 1); - - again: - ret = ioctl(fd, KDBUS_CMD_CONN_INFO, cmd); - if (ret < 0) - { - if(errno == EINTR) - goto again; - pInfo->uniqueId = 0; - return -errno; - } - else - { - struct kdbus_conn_info *info; - struct kdbus_item *item; - - info = (struct kdbus_conn_info *)((char*)dbus_transport_get_pool_pointer(transport) + cmd->offset); - pInfo->uniqueId = info->id; - - item = info->items; - while((uint8_t *)(item) < (uint8_t *)(info) + info->size) - { - if(item->type == KDBUS_ITEM_CREDS) - { - pInfo->userId = item->creds.uid; - pInfo->processId = item->creds.uid; - } - - if(item->type == KDBUS_ITEM_SECLABEL) - { - 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); - } - } - - item = KDBUS_PART_NEXT(item); - } - - again2: - if (ioctl(fd, KDBUS_CMD_FREE, &cmd->offset) < 0) - { - if(errno == EINTR) - goto again2; - _dbus_verbose("kdbus error freeing pool: %d (%m)\n", errno); - return -errno; - } - } - - return ret; -} - /* * Creates kdbus bus of given type. */ @@ -315,9 +217,9 @@ char* make_kdbus_bus(DBusBusType type, const char* address, DBusError *error) // TODO Function alloca() used. In upstream there was a patch proposing to // replace alloca() with malloc() to assure memory alignment. If there will be // suggestion to use malloc instead of alloca this function has to be modified - struct kdbus_cmd_bus_make *bus_make; + struct kdbus_cmd_make *bus_make; struct kdbus_item *item; - __u64 name_size, item_size, bus_make_size; + __u64 name_size, bus_make_size; int fdc, ret; char *addr_value = NULL; char *bus = NULL; @@ -336,37 +238,37 @@ char* make_kdbus_bus(DBusBusType type, const char* address, DBusError *error) return NULL; } - item_size = KDBUS_PART_HEADER_SIZE + name_size; - bus_make_size = sizeof(struct kdbus_cmd_bus_make) + item_size; - + bus_make_size = sizeof(struct kdbus_cmd_make) + KDBUS_ITEM_SIZE(name_size) + KDBUS_ITEM_SIZE(sizeof(__u64)); bus_make = alloca(bus_make_size); if (!bus_make) { return NULL; } + bus_make->size = bus_make_size; +#ifdef POLICY_TO_KDBUS + bus_make->flags = KDBUS_MAKE_ACCESS_WORLD; +#else + bus_make->flags = KDBUS_MAKE_ACCESS_WORLD | KDBUS_MAKE_POLICY_OPEN; +#endif item = bus_make->items; - item->size = item_size; - item->type = KDBUS_ITEM_MAKE_NAME; + item->type = KDBUS_ITEM_MAKE_NAME; + item->size = KDBUS_ITEM_HEADER_SIZE + name_size; if(type == DBUS_BUS_SYSTEM) sprintf(name, "%u-kdbus-%s", getuid(), "system"); else if(type == DBUS_BUS_SESSION) sprintf(name, "%u-kdbus", getuid()); else sprintf(name, "%u-kdbus-%u", getuid(), getpid()); - memcpy((bus_make->items)->str, name, name_size); - bus_make->bloom_size = 64; - bus_make->size = bus_make_size; - -#ifdef POLICY_TO_KDBUS - bus_make->flags = KDBUS_MAKE_ACCESS_WORLD; -#else - bus_make->flags = KDBUS_MAKE_ACCESS_WORLD | KDBUS_MAKE_POLICY_OPEN; -#endif + item = KDBUS_PART_NEXT(item); + item->type = KDBUS_ITEM_BLOOM_SIZE; + item->size = KDBUS_ITEM_HEADER_SIZE + sizeof(__u64); + item->data64[0] = 64; +#ifdef KDBUS_FOR_SBB addr_value = strchr(address, ':') + 1; if(*addr_value) { @@ -378,6 +280,7 @@ char* make_kdbus_bus(DBusBusType type, const char* address, DBusError *error) return NULL; } } +#endif _dbus_verbose("Opening /dev/kdbus/control\n"); fdc = open("/dev/kdbus/control", O_RDWR|O_CLOEXEC); @@ -423,7 +326,6 @@ static dbus_bool_t add_matches_for_kdbus_broadcasts(DBusConnection* connection) uint64_t size; int fd; DBusTransport *transport; - const char* unique_name; transport = dbus_connection_get_transport(connection); @@ -434,7 +336,7 @@ static dbus_bool_t add_matches_for_kdbus_broadcasts(DBusConnection* connection) } size = sizeof(struct kdbus_cmd_match); - size += KDBUS_PART_SIZE(1)*3 + KDBUS_PART_SIZE(sizeof(__u64))*2; /*3 name related items plus 2 id related items*/ + size += KDBUS_ITEM_SIZE(1)*3 + KDBUS_ITEM_SIZE(sizeof(__u64))*2; /*3 name related items plus 2 id related items*/ pCmd_match = alloca(size); if(pCmd_match == NULL) @@ -443,28 +345,28 @@ static dbus_bool_t add_matches_for_kdbus_broadcasts(DBusConnection* connection) return FALSE; } - unique_name = dbus_bus_get_unique_name(connection); - - pCmd_match->id = strtoull(&unique_name[3], NULL, 10); + pCmd_match->id = 0; pCmd_match->cookie = 1; pCmd_match->size = size; + pCmd_match->src_id = 0; pItem = pCmd_match->items; - pCmd_match->src_id = 0; pItem->type = KDBUS_MATCH_NAME_CHANGE; - pItem->size = KDBUS_PART_HEADER_SIZE + 1; + pItem->size = KDBUS_ITEM_HEADER_SIZE + 1; pItem = KDBUS_PART_NEXT(pItem); pItem->type = KDBUS_MATCH_NAME_ADD; - pItem->size = KDBUS_PART_HEADER_SIZE + 1; + pItem->size = KDBUS_ITEM_HEADER_SIZE + 1; pItem = KDBUS_PART_NEXT(pItem); pItem->type = KDBUS_MATCH_NAME_REMOVE; - pItem->size = KDBUS_PART_HEADER_SIZE + 1; + pItem->size = KDBUS_ITEM_HEADER_SIZE + 1; pItem = KDBUS_PART_NEXT(pItem); pItem->type = KDBUS_MATCH_ID_ADD; - pItem->size = KDBUS_PART_HEADER_SIZE + sizeof(__u64); + pItem->size = KDBUS_ITEM_HEADER_SIZE + sizeof(__u64); + pItem->id = KDBUS_MATCH_SRC_ID_ANY; pItem = KDBUS_PART_NEXT(pItem); pItem->type = KDBUS_MATCH_ID_REMOVE; - pItem->size = KDBUS_PART_HEADER_SIZE + sizeof(__u64); + pItem->size = KDBUS_ITEM_HEADER_SIZE + sizeof(__u64); + pItem->id = KDBUS_MATCH_SRC_ID_ANY; if(ioctl(fd, KDBUS_CMD_MATCH_ADD, pCmd_match)) { @@ -544,8 +446,12 @@ dbus_bool_t register_daemon_name(DBusConnection* connection) retval = TRUE; out: - bus_transaction_cancel_and_free(transaction); - return retval; + if(retval) + bus_transaction_execute_and_free(transaction); + else + bus_transaction_cancel_and_free(transaction); + + return retval; } dbus_uint32_t kdbus_request_name(DBusConnection* connection, const DBusString *service_name, dbus_uint32_t flags, __u64 sender_id) @@ -766,7 +672,7 @@ dbus_bool_t kdbus_add_match_rule (DBusConnection* connection, DBusMessage* messa if(!add_match_kdbus (dbus_connection_get_transport(connection), sender_id, text)) { - dbus_set_error (error, _dbus_error_from_errno (errno), "Could not add match for id:%d, %s", + dbus_set_error (error, _dbus_error_from_errno (errno), "Could not add match for id:%llu, %s", sender_id, _dbus_strerror_from_errno ()); return FALSE; } @@ -787,7 +693,7 @@ dbus_bool_t kdbus_remove_match (DBusConnection* connection, DBusMessage* message if(!remove_match_kdbus (dbus_connection_get_transport(connection), sender_id)) { - dbus_set_error (error, _dbus_error_from_errno (errno), "Could not remove match rules for id:%d", sender_id); + dbus_set_error (error, _dbus_error_from_errno (errno), "Could not remove match rules for id:%llu", sender_id); return FALSE; } @@ -812,64 +718,6 @@ int kdbus_get_name_owner(DBusConnection* connection, const char* name, char* own } /* - * Asks kdbus for uid of the owner of the name given in the message - */ -dbus_bool_t kdbus_get_unix_user(DBusConnection* connection, const char* name, unsigned long* uid, DBusError* error) -{ - struct nameInfo info; - int inter_ret; - dbus_bool_t ret = FALSE; - - inter_ret = kdbus_NameQuery(name, dbus_connection_get_transport(connection), &info); - if(inter_ret == 0) //name found - { - _dbus_verbose("User id:%llu\n", (unsigned long long) info.userId); - *uid = info.userId; - return TRUE; - } - else if((inter_ret == -ENOENT) || (inter_ret == -ENXIO)) //name has no owner - { - _dbus_verbose ("Name %s has no owner.\n", name); - dbus_set_error (error, DBUS_ERROR_FAILED, "Could not get UID of name '%s': no such name", name); - } - - else - { - _dbus_verbose("kdbus error determining UID: err %d (%m)\n", errno); - dbus_set_error (error, DBUS_ERROR_FAILED, "Could not determine UID for '%s'", name); - } - - return ret; -} - -/* - * Asks kdbus for pid of the owner of the name given in the message - */ -dbus_bool_t kdbus_get_connection_unix_process_id(DBusConnection* connection, const char* name, unsigned long* pid, DBusError* error) -{ - struct nameInfo info; - int inter_ret; - dbus_bool_t ret = FALSE; - - inter_ret = kdbus_NameQuery(name, dbus_connection_get_transport(connection), &info); - if(inter_ret == 0) //name found - { - _dbus_verbose("Process id:%llu\n", (unsigned long long) info.processId); - *pid = info.processId; - return TRUE; - } - else if((inter_ret == -ENOENT) || (inter_ret == -ENXIO)) //name has no owner - dbus_set_error (error, DBUS_ERROR_FAILED, "Could not get PID of name '%s': no such name", name); - else - { - _dbus_verbose("kdbus error determining PID: err %d (%m)\n", errno); - dbus_set_error (error, DBUS_ERROR_FAILED, "Could not determine PID for '%s'", name); - } - - return ret; -} - -/* * Asks kdbus for selinux_security_context of the owner of the name given in the message */ dbus_bool_t kdbus_get_connection_unix_selinux_security_context(DBusConnection* connection, DBusMessage* message, DBusMessage* reply, DBusError* error) @@ -901,57 +749,6 @@ dbus_bool_t kdbus_get_connection_unix_selinux_security_context(DBusConnection* c return ret; } -/** - * Gets the UNIX user ID of the connection from kdbus, if known. Returns #TRUE if - * the uid is filled in. Always returns #FALSE on non-UNIX platforms - * for now., though in theory someone could hook Windows to NIS or - * something. Always returns #FALSE prior to authenticating the - * connection. - * - * The UID of is only read by bus daemon from kdbus. You can not - * call this function from client side of the connection. - * - * You can ask the bus to tell you the UID of another connection though - * if you like; this is done with dbus_bus_get_unix_user(). - * - * @param connection the connection - * @param uid return location for the user ID - * @returns #TRUE if uid is filled in with a valid user ID - */ -dbus_bool_t -dbus_connection_get_unix_user (DBusConnection *connection, - unsigned long *uid) -{ - _dbus_return_val_if_fail (connection != NULL, FALSE); - _dbus_return_val_if_fail (uid != NULL, FALSE); - - if(bus_context_is_kdbus(bus_connection_get_context (connection))) - return kdbus_get_unix_user(connection, bus_connection_get_name(connection), uid, NULL); - - return dbus_connection_get_unix_user_dbus(connection, uid); -} - -/** - * Gets the process ID of the connection if any. - * Returns #TRUE if the pid is filled in. - * - * @param connection the connection - * @param pid return location for the process ID - * @returns #TRUE if uid is filled in with a valid process ID - */ -dbus_bool_t -dbus_connection_get_unix_process_id (DBusConnection *connection, - unsigned long *pid) -{ - _dbus_return_val_if_fail (connection != NULL, FALSE); - _dbus_return_val_if_fail (pid != NULL, FALSE); - - if(bus_context_is_kdbus(bus_connection_get_context (connection))) - return kdbus_get_connection_unix_process_id(connection, bus_connection_get_name(connection), pid, NULL); - - return dbus_connection_get_unix_process_id_dbus(connection, pid); -} - /* * Create connection structure for given name. It is needed to control starters - activatable services * and for ListQueued method (as long as kdbus is not supporting it). This connections don't have it's own @@ -974,6 +771,7 @@ DBusConnection* create_phantom_connection(DBusConnection* connection, const char dbus_set_error (error, DBUS_ERROR_FAILED , "Name \"%s\" could not be acquired", name); goto out; } + dbus_bus_set_unique_name(phantom_connection, name); if(!bus_connection_complete(phantom_connection, &Sname, error)) { bus_connection_disconnected(phantom_connection); @@ -1042,8 +840,12 @@ out: } dbus_free_string_array (services); _dbus_string_free(&name); + if(retval) + bus_transaction_execute_and_free(transaction); + else bus_transaction_cancel_and_free(transaction); - return retval; + + return retval; } /* @@ -1099,8 +901,12 @@ dbus_bool_t update_kdbus_starters(DBusConnection* connection) retval = TRUE; out: - bus_transaction_cancel_and_free(transaction); - return retval; + if(retval) + bus_transaction_execute_and_free(transaction); + else + bus_transaction_cancel_and_free(transaction); + + return retval; } /*