diff options
Diffstat (limited to 'src/client_rpc.c')
| -rw-r--r-- | src/client_rpc.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/client_rpc.c b/src/client_rpc.c index a9b00f4..fb9c99f 100644 --- a/src/client_rpc.c +++ b/src/client_rpc.c @@ -23,7 +23,9 @@ #include <dlog.h> #include <com-core_packet.h> #include <packet.h> -#include <livebox-errno.h> +#include <dynamicbox_errno.h> +#include <dynamicbox_conf.h> +#include <dynamicbox_service.h> #include "client_life.h" #include "instance.h" @@ -151,7 +153,7 @@ static inline void push_command(struct command *command) return; } - s_info.command_consumer = ecore_timer_add(PACKET_TIME, command_consumer_cb, NULL); + s_info.command_consumer = ecore_timer_add(DYNAMICBOX_CONF_PACKET_TIME, command_consumer_cb, NULL); if (!s_info.command_consumer) { ErrPrint("Failed to add command consumer\n"); s_info.command_list = eina_list_remove(s_info.command_list, command); @@ -165,13 +167,13 @@ HAPI int client_rpc_async_request(struct client_node *client, struct packet *pac struct client_rpc *rpc; if (!client || !packet) { - return LB_STATUS_ERROR_INVALID; + return DBOX_STATUS_ERROR_INVALID_PARAMETER; } if (client_is_faulted(client)) { ErrPrint("Client[%p] is faulted\n", client); packet_unref(packet); - return LB_STATUS_ERROR_FAULT; + return DBOX_STATUS_ERROR_FAULT; } rpc = client_data(client, RPC_TAG); @@ -182,12 +184,12 @@ HAPI int client_rpc_async_request(struct client_node *client, struct packet *pac command = create_command(client, packet); if (!command) { packet_unref(packet); - return LB_STATUS_ERROR_MEMORY; + return DBOX_STATUS_ERROR_OUT_OF_MEMORY; } push_command(command); packet_unref(packet); - return LB_STATUS_SUCCESS; + return DBOX_STATUS_ERROR_NONE; } static int deactivated_cb(struct client_node *client, void *data) @@ -200,7 +202,7 @@ static int deactivated_cb(struct client_node *client, void *data) rpc = client_data(client, RPC_TAG); if (!rpc) { ErrPrint("client is not valid\n"); - return LB_STATUS_SUCCESS; + return DBOX_STATUS_ERROR_NONE; } DbgPrint("Reset handle for %d\n", client_pid(client)); @@ -215,7 +217,7 @@ static int deactivated_cb(struct client_node *client, void *data) } DbgPrint("End: Destroying command\n"); - return LB_STATUS_SUCCESS; + return DBOX_STATUS_ERROR_NONE; } HAPI int client_rpc_init(struct client_node *client, int handle) @@ -226,7 +228,7 @@ HAPI int client_rpc_init(struct client_node *client, int handle) rpc = calloc(1, sizeof(*rpc)); if (!rpc) { ErrPrint("Heap: %s\n", strerror(errno)); - return LB_STATUS_ERROR_MEMORY; + return DBOX_STATUS_ERROR_OUT_OF_MEMORY; } ret = client_set_data(client, RPC_TAG, rpc); @@ -259,12 +261,12 @@ HAPI int client_rpc_fini(struct client_node *client) rpc = client_del_data(client, RPC_TAG); if (!rpc) { - return LB_STATUS_ERROR_INVALID; + return DBOX_STATUS_ERROR_INVALID_PARAMETER; } client_event_callback_del(client, CLIENT_EVENT_DEACTIVATE, deactivated_cb, NULL); DbgFree(rpc); - return LB_STATUS_SUCCESS; + return DBOX_STATUS_ERROR_NONE; } HAPI int client_rpc_handle(struct client_node *client) @@ -274,7 +276,7 @@ HAPI int client_rpc_handle(struct client_node *client) rpc = client_data(client, RPC_TAG); if (!rpc) { DbgPrint("Client has no RPC\n"); - return LB_STATUS_ERROR_INVALID; + return DBOX_STATUS_ERROR_INVALID_PARAMETER; } return rpc->handle; |