diff options
| -rw-r--r-- | hcid/dbus-common.c | 2 | ||||
| -rw-r--r-- | hcid/dbus-database.c | 4 | ||||
| -rw-r--r-- | hcid/dbus-hci.c | 5 | ||||
| -rw-r--r-- | hcid/dbus-security.c | 10 | ||||
| -rw-r--r-- | hcid/dbus-security.h | 10 |
5 files changed, 16 insertions, 15 deletions
diff --git a/hcid/dbus-common.c b/hcid/dbus-common.c index 73f501f4..31a9c0c7 100644 --- a/hcid/dbus-common.c +++ b/hcid/dbus-common.c @@ -302,7 +302,7 @@ void hcid_dbus_exit(void) if (!conn || !dbus_connection_get_is_connected(conn)) return; - release_default_agent(); + release_default_agent_old(); release_default_auth_agent(); release_services(conn); diff --git a/hcid/dbus-database.c b/hcid/dbus-database.c index 44e4d4b6..c5bcd6ae 100644 --- a/hcid/dbus-database.c +++ b/hcid/dbus-database.c @@ -468,7 +468,7 @@ static DBusHandlerResult request_authorization(DBusConnection *conn, return send_message_and_unref(conn, reply); } - return handle_authorize_request(conn, msg, service, address, path); + return handle_authorize_request_old(conn, msg, service, address, path); } static DBusHandlerResult cancel_authorization_request(DBusConnection *conn, @@ -487,7 +487,7 @@ static DBusHandlerResult cancel_authorization_request(DBusConnection *conn, if (!service) return error_not_authorized(conn, msg); - return cancel_authorize_request(conn, msg, service, address, path); + return cancel_authorize_request_old(conn, msg, service, address, path); } static DBusMethodVTable database_methods[] = { diff --git a/hcid/dbus-hci.c b/hcid/dbus-hci.c index defa5375..6997699a 100644 --- a/hcid/dbus-hci.c +++ b/hcid/dbus-hci.c @@ -814,7 +814,7 @@ int hcid_dbus_request_pin(int dev, bdaddr_t *sba, struct hci_conn_info *ci) snprintf(path, sizeof(path), "%s/hci%d", BASE_PATH, id); - return handle_passkey_request(connection, dev, path, sba, &ci->bdaddr); + return handle_passkey_request_old(connection, dev, path, sba, &ci->bdaddr); } int hcid_dbus_confirm_pin(int dev, bdaddr_t *sba, struct hci_conn_info *ci, char *pin) @@ -832,7 +832,8 @@ int hcid_dbus_confirm_pin(int dev, bdaddr_t *sba, struct hci_conn_info *ci, char snprintf(path, sizeof(path), "%s/hci%d", BASE_PATH, id); - return handle_confirm_request(connection, dev, path, sba, &ci->bdaddr, pin); + return handle_confirm_request_old(connection, dev, path, sba, + &ci->bdaddr, pin); } void hcid_dbus_bonding_process_complete(bdaddr_t *local, bdaddr_t *peer, diff --git a/hcid/dbus-security.c b/hcid/dbus-security.c index ec425f84..bab3a79d 100644 --- a/hcid/dbus-security.c +++ b/hcid/dbus-security.c @@ -725,7 +725,7 @@ static DBusPendingCall *auth_agent_call_authorize(struct authorization_agent *ag return call; } -DBusHandlerResult handle_authorize_request(DBusConnection *conn, +DBusHandlerResult handle_authorize_request_old(DBusConnection *conn, DBusMessage *msg, struct service *service, const char *address, @@ -811,7 +811,7 @@ static DBusHandlerResult auth_agent_send_cancel(DBusMessage *msg, return send_message_and_unref(agent->conn, message); } -DBusHandlerResult cancel_authorize_request(DBusConnection *conn, +DBusHandlerResult cancel_authorize_request_old(DBusConnection *conn, DBusMessage *msg, struct service *service, const char *address, @@ -1032,7 +1032,7 @@ send: return -1; } -int handle_passkey_request(DBusConnection *conn, int dev, const char *path, +int handle_passkey_request_old(DBusConnection *conn, int dev, const char *path, bdaddr_t *sba, bdaddr_t *dba) { struct passkey_agent *agent = default_agent; @@ -1211,7 +1211,7 @@ send: return -1; } -int handle_confirm_request(DBusConnection *conn, int dev, const char *path, +int handle_confirm_request_old(DBusConnection *conn, int dev, const char *path, bdaddr_t *sba, bdaddr_t *dba, const char *pin) { struct passkey_agent *agent = default_agent; @@ -1310,7 +1310,7 @@ static void release_agent(struct passkey_agent *agent) } } -void release_default_agent(void) +void release_default_agent_old(void) { if (!default_agent) return; diff --git a/hcid/dbus-security.h b/hcid/dbus-security.h index e21565f8..aafbae91 100644 --- a/hcid/dbus-security.h +++ b/hcid/dbus-security.h @@ -26,13 +26,13 @@ dbus_bool_t security_init(DBusConnection *conn, const char *path); -int handle_passkey_request(DBusConnection *conn, int dev, const char *path, +int handle_passkey_request_old(DBusConnection *conn, int dev, const char *path, bdaddr_t *sba, bdaddr_t *dba); -int handle_confirm_request(DBusConnection *conn, int dev, const char *path, +int handle_confirm_request_old(DBusConnection *conn, int dev, const char *path, bdaddr_t *sba, bdaddr_t *dba, const char *pin); -void release_default_agent(void); +void release_default_agent_old(void); void release_default_auth_agent(void); @@ -40,13 +40,13 @@ void release_passkey_agents(struct adapter *adapter, bdaddr_t *bda); void cancel_passkey_agent_requests(GSList *agents, const char *path, bdaddr_t *dba); -DBusHandlerResult handle_authorize_request(DBusConnection *conn, +DBusHandlerResult handle_authorize_request_old(DBusConnection *conn, DBusMessage *msg, struct service *service, const char *address, const char *path); -DBusHandlerResult cancel_authorize_request(DBusConnection *conn, +DBusHandlerResult cancel_authorize_request_old(DBusConnection *conn, DBusMessage *msg, struct service *service, const char *address, |