From 45d7f9ac3228a3b27ef3374e8cec13af1dd4f1fa Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 24 Jan 2007 14:18:50 +0000 Subject: Move service registration/authorization methods to database interface --- hcid/dbus-manager.c | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) (limited to 'hcid/dbus-manager.c') diff --git a/hcid/dbus-manager.c b/hcid/dbus-manager.c index 432e3ac5..a81cbc8e 100644 --- a/hcid/dbus-manager.c +++ b/hcid/dbus-manager.c @@ -50,7 +50,6 @@ #include "dbus-security.h" #include "dbus-service.h" #include "dbus-manager.h" -#include "dbus-service.h" #include "dbus-hci.h" #include "sdp-xml.h" @@ -285,54 +284,6 @@ static DBusHandlerResult activate_service(DBusConnection *conn, return DBUS_HANDLER_RESULT_HANDLED; } -static DBusHandlerResult register_service(DBusConnection *conn, - DBusMessage *msg, void *data) -{ - DBusMessage *reply; - const char *sender, *ident, *name, *desc; - - if (!hcid_dbus_use_experimental()) - return error_unknown_method(conn, msg); - - if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &ident, - DBUS_TYPE_STRING, &name, DBUS_TYPE_STRING, &desc, - DBUS_TYPE_INVALID) == FALSE) - return error_invalid_arguments(conn, msg); - - sender = dbus_message_get_sender(msg); - - if (service_register(sender, ident, name, desc) < 0) - return error_failed(conn, msg, EIO); - - reply = dbus_message_new_method_return(msg); - if (!reply) - return DBUS_HANDLER_RESULT_NEED_MEMORY; - - return send_message_and_unref(conn, reply); -} - -static DBusHandlerResult unregister_service(DBusConnection *conn, - DBusMessage *msg, void *data) -{ - DBusMessage *reply; - const char *sender, *ident; - - if (!hcid_dbus_use_experimental()) - return error_unknown_method(conn, msg); - - if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &ident, - DBUS_TYPE_INVALID) == FALSE) - return error_invalid_arguments(conn, msg); - - sender = dbus_message_get_sender(msg); - - reply = dbus_message_new_method_return(msg); - if (!reply) - return DBUS_HANDLER_RESULT_NEED_MEMORY; - - return send_message_and_unref(conn, reply); -} - static struct service_data methods[] = { { "InterfaceVersion", interface_version }, { "DefaultAdapter", default_adapter }, @@ -341,8 +292,6 @@ static struct service_data methods[] = { { "FindService", find_service }, { "ListServices", list_services }, { "ActivateService", activate_service }, - { "RegisterService", register_service }, - { "UnregisterService", unregister_service }, { NULL, NULL } }; -- cgit