|
|
@ -83,6 +83,11 @@ void wsfs_jsonrpc_server_invoke(
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (!method->invoke(method->user_data, request))
|
|
|
|
if (!method->invoke(method->user_data, request))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
server->request.is_pending = false;
|
|
|
|
|
|
|
|
server->request.finished = NULL;
|
|
|
|
|
|
|
|
server->request.user_data = NULL;
|
|
|
|
|
|
|
|
server->request.id = 0;
|
|
|
|
|
|
|
|
|
|
|
|
finished(user_data, WSFS_BAD, NULL);
|
|
|
|
finished(user_data, WSFS_BAD, NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
json_decref(request);
|
|
|
|
json_decref(request);
|
|
|
@ -97,9 +102,33 @@ void wsfs_jsonrpc_server_invoke(
|
|
|
|
{
|
|
|
|
{
|
|
|
|
finished(user_data, WSFS_BAD_BUSY, NULL);
|
|
|
|
finished(user_data, WSFS_BAD_BUSY, NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
extern void wsfs_jsonrpc_server_notify(
|
|
|
|
|
|
|
|
struct wsfs_jsonrpc_server * server,
|
|
|
|
|
|
|
|
char const * method_name,
|
|
|
|
|
|
|
|
char const * param_info,
|
|
|
|
|
|
|
|
...
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
struct wsfs_jsonrpc_method const * method = wsfs_jsonrpc_server_getmethod(server, method_name);
|
|
|
|
|
|
|
|
if (NULL != method)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
va_list args;
|
|
|
|
|
|
|
|
va_start(args, param_info);
|
|
|
|
|
|
|
|
json_t * request = wsfs_jsonrpc_request_create(method_name, 0, param_info, args);
|
|
|
|
|
|
|
|
va_end(args);
|
|
|
|
|
|
|
|
if (NULL != request)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
method->invoke(method->user_data, request);
|
|
|
|
|
|
|
|
json_decref(request);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void wsfs_jsonrpc_server_onresult(
|
|
|
|
void wsfs_jsonrpc_server_onresult(
|
|
|
|
struct wsfs_jsonrpc_server * server,
|
|
|
|
struct wsfs_jsonrpc_server * server,
|
|
|
|
char const * message,
|
|
|
|
char const * message,
|
|
|
@ -108,8 +137,6 @@ void wsfs_jsonrpc_server_onresult(
|
|
|
|
struct wsfs_jsonrpc_response response;
|
|
|
|
struct wsfs_jsonrpc_response response;
|
|
|
|
wsfs_jsonrpc_response_init(&response, message, length);
|
|
|
|
wsfs_jsonrpc_response_init(&response, message, length);
|
|
|
|
|
|
|
|
|
|
|
|
if (-1 != response.id)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if ((server->request.is_pending) && (response.id == server->request.id))
|
|
|
|
if ((server->request.is_pending) && (response.id == server->request.id))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
wsfs_jsonrpc_method_finished_fn * finished = server->request.finished;
|
|
|
|
wsfs_jsonrpc_method_finished_fn * finished = server->request.finished;
|
|
|
@ -122,7 +149,6 @@ void wsfs_jsonrpc_server_onresult(
|
|
|
|
|
|
|
|
|
|
|
|
finished(user_data, response.status, response.result);
|
|
|
|
finished(user_data, response.status, response.result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
wsfs_jsonrpc_response_cleanup(&response);
|
|
|
|
wsfs_jsonrpc_response_cleanup(&response);
|
|
|
|
}
|
|
|
|
}
|
|
|
|