parent
b74c459942
commit
b698119079
@ -1,246 +0,0 @@
|
||||
#include "wsfs/jsonrpc.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
|
||||
#include <pthread.h>
|
||||
|
||||
#include "wsfs/response_parser.h"
|
||||
|
||||
#define DEFAULT_TIMEOUT_SECS 10
|
||||
|
||||
struct wsfs_jsonrpc_response
|
||||
{
|
||||
int id;
|
||||
wsfs_status status;
|
||||
json_t * result;
|
||||
};
|
||||
|
||||
struct wsfs_jsonrpc
|
||||
{
|
||||
pthread_mutex_t lock;
|
||||
pthread_cond_t finished;
|
||||
pthread_condattr_t finished_attributes;
|
||||
|
||||
wsfs_create_message_fn * create_message;
|
||||
wsfs_send_message_fn * send_message;
|
||||
void * user_data;
|
||||
|
||||
bool is_finished;
|
||||
struct wsfs_jsonrpc_response response;
|
||||
};
|
||||
|
||||
static json_t * wsfs_request_create(
|
||||
char const * method,
|
||||
int id,
|
||||
char const * param_info,
|
||||
va_list args)
|
||||
{
|
||||
json_t * request = json_object();
|
||||
json_object_set_new(request, "method", json_string(method));
|
||||
json_t * params = json_array();
|
||||
|
||||
for (char const * param_type = param_info; '\0' != *param_type; param_type++)
|
||||
{
|
||||
switch(*param_type)
|
||||
{
|
||||
case 's':
|
||||
{
|
||||
char const * const value = va_arg(args, char const *);
|
||||
json_array_append_new(params, json_string(value));
|
||||
}
|
||||
break;
|
||||
case 'i':
|
||||
{
|
||||
int const value = va_arg(args, int);
|
||||
json_array_append_new(params, json_integer(value));
|
||||
}
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr, "fatal: unknown param_type '%c'\n", *param_type);
|
||||
exit(EXIT_FAILURE);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
json_object_set_new(request, "params", params);
|
||||
json_object_set_new(request, "id", json_integer(id));
|
||||
|
||||
return request;
|
||||
}
|
||||
|
||||
|
||||
wsfs_status wsfs_jsonrpc_invoke(
|
||||
struct wsfs_jsonrpc * rpc,
|
||||
json_t * * result,
|
||||
char const * method,
|
||||
char const * param_info,
|
||||
...
|
||||
)
|
||||
{
|
||||
return WSFS_BAD_NOTIMPLEMENTED;
|
||||
|
||||
// enqueue message
|
||||
pthread_mutex_lock(&rpc->lock);
|
||||
wsfs_status status = WSFS_BAD;
|
||||
|
||||
char * message = NULL;
|
||||
size_t length = 0;
|
||||
if (-1 == rpc->response.id) {
|
||||
|
||||
va_list args;
|
||||
va_start(args, param_info);
|
||||
json_t * request = wsfs_request_create(method, 42, param_info, args);
|
||||
va_end(args);
|
||||
|
||||
|
||||
length = json_dumpb(request, NULL, 0, JSON_COMPACT);
|
||||
if (0 < length)
|
||||
{
|
||||
rpc->is_finished = false;
|
||||
rpc->response.id = 42;
|
||||
rpc->response.result = NULL;
|
||||
rpc->response.status = WSFS_GOOD;
|
||||
|
||||
message = rpc->create_message(length);
|
||||
json_dumpb(request, message, length, JSON_COMPACT);
|
||||
|
||||
}
|
||||
json_decref(request);
|
||||
}
|
||||
pthread_mutex_unlock(&rpc->lock);
|
||||
|
||||
|
||||
if (NULL != message)
|
||||
{
|
||||
bool const success = rpc->send_message(message, length, rpc->user_data);
|
||||
|
||||
// wait for answer
|
||||
pthread_mutex_lock(&rpc->lock);
|
||||
|
||||
if (success)
|
||||
{
|
||||
struct timespec timeout;
|
||||
clock_gettime(CLOCK_MONOTONIC, &timeout);
|
||||
timeout.tv_sec += DEFAULT_TIMEOUT_SECS;
|
||||
int rc = 0;
|
||||
while ((0 == rc) && (!rpc->is_finished)) {
|
||||
rc = pthread_cond_timedwait(&rpc->finished, &rpc->lock, &timeout);
|
||||
}
|
||||
|
||||
if (rpc->is_finished)
|
||||
{
|
||||
status = rpc->response.status;
|
||||
*result = rpc->response.result;
|
||||
}
|
||||
else
|
||||
{
|
||||
status = WSFS_BAD_TIMEOUT;
|
||||
}
|
||||
}
|
||||
|
||||
rpc->response.id = -1;
|
||||
rpc->response.result = NULL;
|
||||
rpc->response.status = WSFS_GOOD;
|
||||
pthread_mutex_unlock(&rpc->lock);
|
||||
}
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
struct wsfs_jsonrpc * wsfs_jsonrpc_create(
|
||||
wsfs_create_message_fn * create_message,
|
||||
wsfs_send_message_fn * send_message,
|
||||
void * user_data)
|
||||
{
|
||||
struct wsfs_jsonrpc * rpc = malloc(sizeof(struct wsfs_jsonrpc));
|
||||
if (NULL != rpc)
|
||||
{
|
||||
pthread_mutex_init(&rpc->lock, NULL);
|
||||
|
||||
pthread_condattr_init(&rpc->finished_attributes);
|
||||
pthread_condattr_setclock(&rpc->finished_attributes, CLOCK_MONOTONIC);
|
||||
pthread_cond_init(&rpc->finished, &rpc->finished_attributes);
|
||||
|
||||
rpc->create_message = create_message;
|
||||
rpc->send_message = send_message;
|
||||
rpc->user_data = user_data;
|
||||
rpc->is_finished = true;
|
||||
rpc->response.id = -1;
|
||||
rpc->response.status = WSFS_GOOD;
|
||||
rpc->response.result = NULL;
|
||||
}
|
||||
|
||||
return rpc;
|
||||
}
|
||||
|
||||
void wsfs_jsonrpc_set_user_data(
|
||||
struct wsfs_jsonrpc * rpc,
|
||||
void * user_data)
|
||||
{
|
||||
rpc->user_data = user_data;
|
||||
}
|
||||
|
||||
void wsfs_jsonrpc_dispose(
|
||||
struct wsfs_jsonrpc * rpc)
|
||||
{
|
||||
if (NULL != rpc->response.result)
|
||||
{
|
||||
json_decref(rpc->response.result);
|
||||
}
|
||||
|
||||
pthread_cond_destroy(&rpc->finished);
|
||||
pthread_condattr_destroy(&rpc->finished_attributes);
|
||||
pthread_mutex_destroy(&rpc->lock);
|
||||
|
||||
|
||||
free(rpc);
|
||||
}
|
||||
|
||||
void wsfs_jsonrpc_on_message(
|
||||
char const * message,
|
||||
size_t length,
|
||||
void * user_data)
|
||||
{
|
||||
struct wsfs_jsonrpc * rpc = user_data;
|
||||
|
||||
struct wsfs_response response;
|
||||
wsfs_response_parse(message, length, &response);
|
||||
|
||||
if (-1 != response.id)
|
||||
{
|
||||
pthread_mutex_lock(&rpc->lock);
|
||||
|
||||
if (response.id == rpc->response.id)
|
||||
{
|
||||
rpc->is_finished = true;
|
||||
rpc->response.status = response.status;
|
||||
rpc->response.result = response.result;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (NULL != response.result)
|
||||
{
|
||||
json_decref(response.result);
|
||||
}
|
||||
}
|
||||
|
||||
pthread_cond_signal(&rpc->finished);
|
||||
pthread_mutex_unlock(&rpc->lock);
|
||||
}
|
||||
}
|
||||
|
||||
int wsfs_json_get_int(json_t * object, char const * key, int default_value)
|
||||
{
|
||||
int result = default_value;
|
||||
|
||||
json_t * holder = json_object_get(object, key);
|
||||
if ((NULL != holder) && (json_is_integer(holder)))
|
||||
{
|
||||
result = json_integer_value(holder);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
@ -1,59 +0,0 @@
|
||||
#ifndef _WSFS_JSONRPC_H
|
||||
#define _WSFS_JSONRPC_H
|
||||
|
||||
#ifndef __cplusplus
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
#include <stdbool.h>
|
||||
#else
|
||||
#include <cstdarg>
|
||||
#include <cstddef>
|
||||
using std::size_t;
|
||||
#endif
|
||||
|
||||
#include <jansson.h>
|
||||
#include "wsfs/status.h"
|
||||
|
||||
struct wsfs_jsonrpc;
|
||||
|
||||
typedef char * wsfs_create_message_fn(size_t size);
|
||||
typedef bool wsfs_send_message_fn(char * message, size_t length, void * user_data);
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
extern struct wsfs_jsonrpc * wsfs_jsonrpc_create(
|
||||
wsfs_create_message_fn * create_message,
|
||||
wsfs_send_message_fn * send_message,
|
||||
void * user_data);
|
||||
|
||||
extern void wsfs_jsonrpc_set_user_data(
|
||||
struct wsfs_jsonrpc * rpc,
|
||||
void * user_data);
|
||||
|
||||
extern void wsfs_jsonrpc_dispose(
|
||||
struct wsfs_jsonrpc * rpc);
|
||||
|
||||
extern wsfs_status wsfs_jsonrpc_invoke(
|
||||
struct wsfs_jsonrpc * rpc,
|
||||
json_t * * result,
|
||||
char const * method,
|
||||
char const * param_info,
|
||||
...
|
||||
);
|
||||
|
||||
extern void wsfs_jsonrpc_on_message(
|
||||
char const * message,
|
||||
size_t length,
|
||||
void * user_data);
|
||||
|
||||
|
||||
extern int wsfs_json_get_int(json_t * object, char const * key, int default_value);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@ -0,0 +1,28 @@
|
||||
#include "wsfs/jsonrpc/method_intern.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
struct wsfs_jsonrpc_method * wsfs_jsonrpc_method_create(
|
||||
char const * name,
|
||||
wsfs_jsonrpc_method_invoke_fn * invoke,
|
||||
void * user_data)
|
||||
{
|
||||
struct wsfs_jsonrpc_method * method = malloc(sizeof(struct wsfs_jsonrpc_method));
|
||||
if (NULL != method)
|
||||
{
|
||||
method->next = NULL;
|
||||
method->name = strdup(name);
|
||||
method->invoke = invoke;
|
||||
method->user_data = user_data;
|
||||
}
|
||||
|
||||
return method;
|
||||
}
|
||||
|
||||
void wsfs_jsonrpc_method_dispose(
|
||||
struct wsfs_jsonrpc_method * method)
|
||||
{
|
||||
free(method->name);
|
||||
free(method);
|
||||
}
|
@ -0,0 +1,24 @@
|
||||
#ifndef _WSFS_JSONRPC_METHOD_H
|
||||
#define _WSFS_JSONRPC_METHOD_H
|
||||
|
||||
#ifndef __cplusplus
|
||||
#include <stdbool.h>
|
||||
#endif
|
||||
|
||||
#include <jansson.h>
|
||||
#include "wsfs/status.h"
|
||||
|
||||
|
||||
typedef bool wsfs_jsonrpc_method_invoke_fn(
|
||||
void * user_data,
|
||||
struct json_t const * method_call);
|
||||
|
||||
typedef void wsfs_jsonrpc_method_finished_fn(
|
||||
void * user_data,
|
||||
wsfs_status status,
|
||||
struct json_t const * result);
|
||||
|
||||
|
||||
|
||||
|
||||
#endif
|
@ -0,0 +1,31 @@
|
||||
#ifndef _WSFS_JSONRPC_METHOD_INTERN_H
|
||||
#define _WSFS_JSONRPC_METHOD_INTERN_H
|
||||
|
||||
#include "wsfs/jsonrpc/method.h"
|
||||
|
||||
struct wsfs_jsonrpc_method
|
||||
{
|
||||
struct wsfs_jsonrpc_method * next;
|
||||
char * name;
|
||||
wsfs_jsonrpc_method_invoke_fn * invoke;
|
||||
void * user_data;
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
extern struct wsfs_jsonrpc_method * wsfs_jsonrpc_method_create(
|
||||
char const * name,
|
||||
wsfs_jsonrpc_method_invoke_fn * invoke,
|
||||
void * user_data);
|
||||
|
||||
extern void wsfs_jsonrpc_method_dispose(
|
||||
struct wsfs_jsonrpc_method * method);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
@ -0,0 +1,41 @@
|
||||
#include "wsfs/jsonrpc/request.h"
|
||||
|
||||
json_t * wsfs_jsonrpc_request_create(
|
||||
char const * method,
|
||||
int id,
|
||||
char const * param_info,
|
||||
va_list args)
|
||||
{
|
||||
json_t * request = json_object();
|
||||
json_object_set_new(request, "method", json_string(method));
|
||||
json_t * params = json_array();
|
||||
|
||||
for (char const * param_type = param_info; '\0' != *param_type; param_type++)
|
||||
{
|
||||
switch(*param_type)
|
||||
{
|
||||
case 's':
|
||||
{
|
||||
char const * const value = va_arg(args, char const *);
|
||||
json_array_append_new(params, json_string(value));
|
||||
}
|
||||
break;
|
||||
case 'i':
|
||||
{
|
||||
int const value = va_arg(args, int);
|
||||
json_array_append_new(params, json_integer(value));
|
||||
}
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr, "fatal: unknown param_type '%c'\n", *param_type);
|
||||
exit(EXIT_FAILURE);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
json_object_set_new(request, "params", params);
|
||||
json_object_set_new(request, "id", json_integer(id));
|
||||
|
||||
return request;
|
||||
}
|
@ -0,0 +1,31 @@
|
||||
#ifndef _WSFS_JSONRPC_REQUEST_H
|
||||
#define _WSFS_JSONRPC_REQUEST_H
|
||||
|
||||
#ifndef __cplusplus
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
#include <stdbool.h>
|
||||
#else
|
||||
#include <cstdarg>
|
||||
#include <cstddef>
|
||||
using std::size_t;
|
||||
#endif
|
||||
|
||||
#include <jansson.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
extern json_t * wsfs_jsonrpc_request_create(
|
||||
char const * method,
|
||||
int id,
|
||||
char const * param_info,
|
||||
va_list args);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
@ -0,0 +1,38 @@
|
||||
#ifndef _WSFS_JSONRPC_RESPONSE_H
|
||||
#define _WFSF_JSONRPC_RESPONSE_H
|
||||
|
||||
#ifndef __cplusplus
|
||||
#include <stddef.h>
|
||||
#else
|
||||
#include <cstddef>
|
||||
using std::size_t;
|
||||
#endif
|
||||
|
||||
#include <jansson.h>
|
||||
#include "wsfs/status.h"
|
||||
|
||||
struct wsfs_jsonrpc_response
|
||||
{
|
||||
wsfs_status status;
|
||||
int id;
|
||||
json_t * result;
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
extern void wsfs_jsonrpc_response_init(
|
||||
struct wsfs_jsonrpc_response * response,
|
||||
char const * buffer,
|
||||
size_t buffer_length);
|
||||
|
||||
extern void wsfs_jsonrpc_response_cleanup(
|
||||
struct wsfs_jsonrpc_response * response);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@ -0,0 +1,129 @@
|
||||
#include "wsfs/jsonrpc/server.h"
|
||||
#include <string.h>
|
||||
|
||||
#include "wsfs/jsonrpc/method_intern.h"
|
||||
#include "wsfs/jsonrpc/request.h"
|
||||
#include "wsfs/jsonrpc/response.h"
|
||||
|
||||
static struct wsfs_jsonrpc_method const * wsfs_jsonrpc_server_getmethod(
|
||||
struct wsfs_jsonrpc_server * server,
|
||||
char const * name)
|
||||
{
|
||||
struct wsfs_jsonrpc_method * method = server->methods;
|
||||
while ((NULL != method) && (0 == strcmp(name, method->name)))
|
||||
{
|
||||
method = method->next;
|
||||
}
|
||||
|
||||
return method;
|
||||
}
|
||||
|
||||
void wsfs_jsonrpc_server_init(
|
||||
struct wsfs_jsonrpc_server * server)
|
||||
{
|
||||
server->methods = NULL;
|
||||
server->request.is_pending = false;
|
||||
}
|
||||
|
||||
void wsfs_jsonrpc_server_cleanup(
|
||||
struct wsfs_jsonrpc_server * server)
|
||||
{
|
||||
if (server->request.is_pending)
|
||||
{
|
||||
server->request.finished(server->request.user_data, WSFS_BAD, NULL);
|
||||
server->request.is_pending = false;
|
||||
}
|
||||
|
||||
struct wsfs_jsonrpc_method * method = server->methods;
|
||||
while (NULL != method)
|
||||
{
|
||||
struct wsfs_jsonrpc_method * next = method->next;
|
||||
method->next = NULL;
|
||||
wsfs_jsonrpc_method_dispose(method);
|
||||
method = next;
|
||||
}
|
||||
server->methods = NULL;
|
||||
}
|
||||
|
||||
void wsfs_jsonrpc_server_add(
|
||||
struct wsfs_jsonrpc_server * server,
|
||||
char const * name,
|
||||
wsfs_jsonrpc_method_invoke_fn * invoke,
|
||||
void * user_data)
|
||||
{
|
||||
struct wsfs_jsonrpc_method * method = wsfs_jsonrpc_method_create(name, invoke, user_data);
|
||||
method->next = server->methods;
|
||||
server->methods = method;
|
||||
}
|
||||
|
||||
void wsfs_jsonrpc_server_invoke(
|
||||
struct wsfs_jsonrpc_server * server,
|
||||
wsfs_jsonrpc_method_finished_fn * finished,
|
||||
void * user_data,
|
||||
char const * method_name,
|
||||
char const * param_info,
|
||||
...
|
||||
)
|
||||
{
|
||||
if (!server->request.is_pending)
|
||||
{
|
||||
struct wsfs_jsonrpc_method const * method = wsfs_jsonrpc_server_getmethod(server, method_name);
|
||||
if (NULL != method)
|
||||
{
|
||||
server->request.is_pending = true;
|
||||
server->request.finished = finished;
|
||||
server->request.user_data = user_data;
|
||||
server->request.id = 42;
|
||||
|
||||
va_list args;
|
||||
va_start(args, param_info);
|
||||
json_t * request = wsfs_jsonrpc_request_create(method_name, server->request.id, param_info, args);
|
||||
va_end(args);
|
||||
if (NULL != request)
|
||||
{
|
||||
if (!method->invoke(method->user_data, request))
|
||||
{
|
||||
finished(user_data, WSFS_BAD, NULL);
|
||||
}
|
||||
json_decref(request);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
finished(user_data, WSFS_BAD_NOTIMPLEMENTED, NULL);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
finished(user_data, WSFS_BAD_BUSY, NULL);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void wsfs_jsonrpc_server_onresult(
|
||||
struct wsfs_jsonrpc_server * server,
|
||||
char const * message,
|
||||
size_t length)
|
||||
{
|
||||
struct wsfs_jsonrpc_response response;
|
||||
wsfs_jsonrpc_response_init(&response, message, length);
|
||||
|
||||
if (-1 != response.id)
|
||||
{
|
||||
if ((server->request.is_pending) && (response.id == server->request.id))
|
||||
{
|
||||
wsfs_jsonrpc_method_finished_fn * finished = server->request.finished;
|
||||
void * user_data = server->request.user_data;
|
||||
|
||||
server->request.is_pending = false;
|
||||
server->request.id = 0;
|
||||
server->request.user_data = NULL;
|
||||
server->request.finished = NULL;
|
||||
|
||||
finished(user_data, response.status, response.result);
|
||||
}
|
||||
}
|
||||
|
||||
wsfs_jsonrpc_response_cleanup(&response);
|
||||
}
|
||||
|
@ -0,0 +1,68 @@
|
||||
#ifndef _WSFS_JSONRPC_SERVER_H
|
||||
#define _WSFS_JSONRPC_SERVER_H
|
||||
|
||||
#ifndef __cplusplus
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
#include <stdbool.h>
|
||||
#else
|
||||
#include <cstdarg>
|
||||
#include <cstddef>
|
||||
using std::size_t;
|
||||
#endif
|
||||
|
||||
#include <jansson.h>
|
||||
#include "wsfs/jsonrpc/method.h"
|
||||
|
||||
struct wsfs_jsonrpc_request
|
||||
{
|
||||
bool is_pending;
|
||||
wsfs_jsonrpc_method_finished_fn * finished;
|
||||
void * user_data;
|
||||
int id;
|
||||
};
|
||||
|
||||
struct wsfs_jsonrpc_server
|
||||
{
|
||||
struct wsfs_jsonrpc_method * methods;
|
||||
struct wsfs_jsonrpc_request request;
|
||||
};
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
extern void wsfs_jsonrpc_server_init(
|
||||
struct wsfs_jsonrpc_server * server);
|
||||
|
||||
extern void wsfs_jsonrpc_server_cleanup(
|
||||
struct wsfs_jsonrpc_server * server);
|
||||
|
||||
extern void wsfs_jsonrpc_server_add(
|
||||
struct wsfs_jsonrpc_server * server,
|
||||
char const * name,
|
||||
wsfs_jsonrpc_method_invoke_fn * invoke,
|
||||
void * user_data );
|
||||
|
||||
extern void wsfs_jsonrpc_server_invoke(
|
||||
struct wsfs_jsonrpc_server * server,
|
||||
wsfs_jsonrpc_method_finished_fn * finished,
|
||||
void * user_data,
|
||||
char const * method,
|
||||
char const * param_info,
|
||||
...
|
||||
);
|
||||
|
||||
extern void wsfs_jsonrpc_server_onresult(
|
||||
struct wsfs_jsonrpc_server * server,
|
||||
char const * message,
|
||||
size_t length);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#endif
|
@ -0,0 +1,14 @@
|
||||
#include "wsfs/jsonrpc/util.h"
|
||||
|
||||
int wsfs_json_get_int(json_t const * object, char const * key, int default_value)
|
||||
{
|
||||
int result = default_value;
|
||||
|
||||
json_t * holder = json_object_get(object, key);
|
||||
if ((NULL != holder) && (json_is_integer(holder)))
|
||||
{
|
||||
result = json_integer_value(holder);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
@ -0,0 +1,17 @@
|
||||
#ifndef _WSFS_JSON_UTIL_H
|
||||
#define _WFSF_JSON_UTIL_H
|
||||
|
||||
#include <jansson.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
extern int wsfs_json_get_int(json_t const * object, char const * key, int default_value);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
@ -0,0 +1,24 @@
|
||||
#include "wsfs/message.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <libwebsockets.h>
|
||||
|
||||
struct wsfs_message * wsfs_message_create(size_t length)
|
||||
{
|
||||
char * data = malloc(sizeof(struct wsfs_message) + LWS_PRE + length);
|
||||
struct wsfs_message * message = (struct wsfs_message *) data;
|
||||
if (NULL != message)
|
||||
{
|
||||
message->data = &data[sizeof(struct wsfs_message) + LWS_PRE];
|
||||
message->length = length;
|
||||
message->next = NULL;
|
||||
}
|
||||
|
||||
return message;
|
||||
}
|
||||
|
||||
void wsfs_message_dispose(
|
||||
struct wsfs_message * message)
|
||||
{
|
||||
free(message);
|
||||
}
|
@ -0,0 +1,32 @@
|
||||
#ifndef _WSFS_MESSAGE_H
|
||||
#define _WSFS_MESSAGE_H
|
||||
|
||||
#ifndef __cplusplus
|
||||
#include <stddef.h>
|
||||
#else
|
||||
#include <cstddef>
|
||||
using std::size_t;
|
||||
#endif
|
||||
|
||||
struct wsfs_message
|
||||
{
|
||||
struct wsfs_message * next;
|
||||
char * data;
|
||||
size_t length;
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
extern struct wsfs_message * wsfs_message_create(size_t length);
|
||||
|
||||
extern void wsfs_message_dispose(
|
||||
struct wsfs_message * message);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
@ -0,0 +1,63 @@
|
||||
#include "wsfs/message_queue.h"
|
||||
#include "wsfs/message.h"
|
||||
|
||||
void wsfs_message_queue_init(
|
||||
struct wsfs_message_queue * queue)
|
||||
{
|
||||
queue->first = NULL;
|
||||
queue->last = NULL;
|
||||
|
||||
}
|
||||
|
||||
void wsfs_message_queue_cleanup(
|
||||
struct wsfs_message_queue * queue)
|
||||
{
|
||||
struct wsfs_message * message = queue->first;
|
||||
while (NULL != message)
|
||||
{
|
||||
struct wsfs_message * next = message->next;
|
||||
wsfs_message_dispose(message);
|
||||
message = next;
|
||||
}
|
||||
wsfs_message_queue_init(queue);
|
||||
}
|
||||
|
||||
bool wsfs_message_queue_empty(
|
||||
struct wsfs_message_queue * queue)
|
||||
{
|
||||
return (NULL == queue->first);
|
||||
}
|
||||
|
||||
void wsfs_message_queue_push(
|
||||
struct wsfs_message_queue * queue,
|
||||
struct wsfs_message * message)
|
||||
{
|
||||
message->next = NULL;
|
||||
|
||||
if (NULL != queue->last)
|
||||
{
|
||||
queue->last->next = message;
|
||||
queue->last = message;
|
||||
}
|
||||
else
|
||||
{
|
||||
queue->first = message;
|
||||
queue->last = message;
|
||||
}
|
||||
}
|
||||
|
||||
struct wsfs_message * wsfs_message_queue_pop(
|
||||
struct wsfs_message_queue * queue)
|
||||
{
|
||||
struct wsfs_message * const result = queue->first;
|
||||
if (NULL != result)
|
||||
{
|
||||
queue->first = queue->first->next;
|
||||
if (NULL == queue->first)
|
||||
{
|
||||
queue->last = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
@ -0,0 +1,42 @@
|
||||
#ifndef _WSFS_MESSAGE_QUEUE_H
|
||||
#define _WSFS_MESSAGE_QUEUE_H
|
||||
|
||||
#ifndef __cplusplus
|
||||
#include <stdbool.h>
|
||||
#endif
|
||||
|
||||
struct wsfs_message_queue;
|
||||
struct wsfs_message;
|
||||
|
||||
struct wsfs_message_queue
|
||||
{
|
||||
struct wsfs_message * first;
|
||||
struct wsfs_message * last;
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
extern void wsfs_message_queue_init(
|
||||
struct wsfs_message_queue * queue);
|
||||
|
||||
extern void wsfs_message_queue_cleanup(
|
||||
struct wsfs_message_queue * queue);
|
||||
|
||||
extern bool wsfs_message_queue_empty(
|
||||
struct wsfs_message_queue * queue);
|
||||
|
||||
extern void wsfs_message_queue_push(
|
||||
struct wsfs_message_queue * queue,
|
||||
struct wsfs_message * message);
|
||||
|
||||
extern struct wsfs_message * wsfs_message_queue_pop(
|
||||
struct wsfs_message_queue * queue);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
@ -1,42 +1,52 @@
|
||||
#include "wsfs/operations.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <jansson.h>
|
||||
|
||||
#include "wsfs/jsonrpc.h"
|
||||
#include "wsfs/jsonrpc/server.h"
|
||||
#include "wsfs/util.h"
|
||||
|
||||
void wsfs_operation_open(
|
||||
fuse_req_t request,
|
||||
fuse_ino_t inode,
|
||||
struct fuse_file_info * file_info)
|
||||
static void wsfs_operation_open_finished(
|
||||
void * user_data,
|
||||
wsfs_status status,
|
||||
json_t const * result)
|
||||
{
|
||||
struct wsfs_operations_context * user_data = fuse_req_userdata(request);
|
||||
struct wsfs_jsonrpc * rpc = user_data->rpc;
|
||||
fuse_req_t request = user_data;
|
||||
struct fuse_file_info file_info;
|
||||
memset(&file_info, 0, sizeof(struct fuse_file_info));
|
||||
|
||||
json_t * result = NULL;
|
||||
wsfs_status status = wsfs_jsonrpc_invoke(rpc, &result, "open", "ii", inode, file_info->flags);
|
||||
if (NULL != result)
|
||||
{
|
||||
json_t * handle_holder = json_object_get(result, "handle");
|
||||
if ((NULL != handle_holder) && (json_is_integer(handle_holder)))
|
||||
{
|
||||
file_info->fh = json_integer_value(handle_holder);
|
||||
file_info.fh = json_integer_value(handle_holder);
|
||||
}
|
||||
else
|
||||
{
|
||||
status = WSFS_BAD_FORMAT;
|
||||
}
|
||||
|
||||
json_decref(result);
|
||||
}
|
||||
|
||||
if (WSFS_GOOD == status)
|
||||
{
|
||||
fuse_reply_open(request, file_info);
|
||||
fuse_reply_open(request, &file_info);
|
||||
}
|
||||
else
|
||||
{
|
||||
fuse_reply_err(request, ENOENT);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void wsfs_operation_open(
|
||||
fuse_req_t request,
|
||||
fuse_ino_t inode,
|
||||
struct fuse_file_info * file_info)
|
||||
{
|
||||
struct wsfs_operations_context * user_data = fuse_req_userdata(request);
|
||||
struct wsfs_jsonrpc_server * rpc = user_data->rpc;
|
||||
|
||||
wsfs_jsonrpc_server_invoke(rpc, &wsfs_operation_open_finished, request, "open", "ii", inode, file_info->flags);
|
||||
}
|
||||
|
@ -1,243 +0,0 @@
|
||||
#include "wsfs/protocol.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
#include <pthread.h>
|
||||
|
||||
#include "wsfs/util.h"
|
||||
#include "wsfs/server.h"
|
||||
|
||||
struct wsfs_message
|
||||
{
|
||||
char * content;
|
||||
size_t length;
|
||||
};
|
||||
|
||||
struct wsfs_protocol
|
||||
{
|
||||
pthread_mutex_t lock;
|
||||
struct lws * wsi;
|
||||
struct wsfs_message pending_message;
|
||||
struct wsfs_server * server;
|
||||
};
|
||||
|
||||
static struct wsfs_protocol * wsfs_protocol_from_wsi(
|
||||
struct lws * wsi)
|
||||
{
|
||||
struct lws_protocols const * protocol = lws_get_protocol(wsi);
|
||||
return protocol->user;
|
||||
}
|
||||
|
||||
static bool wsfs_protocol_connect(
|
||||
struct wsfs_protocol * protocol,
|
||||
struct lws * wsi)
|
||||
{
|
||||
pthread_mutex_lock(&protocol->lock);
|
||||
|
||||
bool const success = (NULL == protocol->wsi);
|
||||
if (success)
|
||||
{
|
||||
protocol->wsi = wsi;
|
||||
}
|
||||
|
||||
pthread_mutex_unlock(&protocol->lock);
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
static bool wsfs_protocol_is_wsi_connected(
|
||||
struct wsfs_protocol * protocol,
|
||||
struct lws * wsi)
|
||||
{
|
||||
pthread_mutex_lock(&protocol->lock);
|
||||
bool const result = (wsi == protocol->wsi);
|
||||
pthread_mutex_unlock(&protocol->lock);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
static void wsfs_protocol_disconnect(
|
||||
struct wsfs_protocol * protocol,
|
||||
struct lws * wsi)
|
||||
{
|
||||
pthread_mutex_lock(&protocol->lock);
|
||||
if (wsi == protocol->wsi)
|
||||
{
|
||||
protocol->wsi = NULL;
|
||||
}
|
||||
pthread_mutex_unlock(&protocol->lock);
|
||||
}
|
||||
|
||||
static void wsfs_protocol_get_message(
|
||||
struct wsfs_protocol * protocol,
|
||||
struct wsfs_message * message)
|
||||
{
|
||||
pthread_mutex_lock(&protocol->lock);
|
||||
|
||||
message->content = protocol->pending_message.content;
|
||||
message->length = protocol->pending_message.length;
|
||||
|
||||
protocol->pending_message.content = NULL;
|
||||
protocol->pending_message.length = 0;
|
||||
|
||||
pthread_mutex_unlock(&protocol->lock);
|
||||
}
|
||||
|
||||
|
||||
static int wsfs_protocol_callback(
|
||||
struct lws *wsi,
|
||||
enum lws_callback_reasons reason,
|
||||
void * WSFS_UNUSED_PARAM(user),
|
||||
void *in,
|
||||
size_t len)
|
||||
{
|
||||
int result = 0;
|
||||
struct wsfs_protocol * const protocol = wsfs_protocol_from_wsi(wsi);
|
||||
|
||||
switch (reason)
|
||||
{
|
||||
case LWS_CALLBACK_ESTABLISHED:
|
||||
{
|
||||
if (!wsfs_protocol_connect(protocol, wsi))
|
||||
{
|
||||
puts("connect failed");
|
||||
lws_callback_on_writable(wsi);
|
||||
result = -1;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case LWS_CALLBACK_CLOSED:
|
||||
{
|
||||
wsfs_protocol_disconnect(protocol, wsi);
|
||||
}
|
||||
break;
|
||||
case LWS_CALLBACK_SERVER_WRITEABLE:
|
||||
{
|
||||
if (wsfs_protocol_is_wsi_connected(protocol, wsi))
|
||||
{
|
||||
struct wsfs_message message;
|
||||
wsfs_protocol_get_message(protocol, &message);
|
||||
if (NULL != message.content)
|
||||
{
|
||||
lws_write(wsi, (unsigned char*) message.content, message.length, LWS_WRITE_TEXT);
|
||||
wsfs_protocol_message_dispose(message.content);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
result = -1;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case LWS_CALLBACK_RECEIVE:
|
||||
{
|
||||
wsfs_server_handle_message(protocol->server, in, len);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
struct wsfs_protocol * wsfs_protocol_create(
|
||||
struct wsfs_server * server)
|
||||
{
|
||||
struct wsfs_protocol * protocol = malloc(sizeof(struct wsfs_protocol));
|
||||
if (NULL != protocol)
|
||||
{
|
||||
pthread_mutex_init(&protocol->lock, NULL);
|
||||
protocol->wsi = NULL;
|
||||
protocol->pending_message.content = NULL;
|
||||
protocol->pending_message.length = 0;
|
||||
protocol->server = server;
|
||||
}
|
||||
|
||||
return protocol;
|
||||
}
|
||||
|
||||
void wsfs_protocol_dispose(
|
||||
struct wsfs_protocol * protocol)
|
||||
{
|
||||
pthread_mutex_destroy(&protocol->lock);
|
||||
|
||||
if (NULL != protocol->pending_message.content)
|
||||
{
|
||||
wsfs_protocol_message_dispose(protocol->pending_message.content);
|
||||
protocol->pending_message.content = NULL;
|
||||
}
|
||||
|
||||
free(protocol);
|
||||
}
|
||||
|
||||
void wsfs_protocol_check(
|
||||
struct wsfs_protocol * protocol)
|
||||
{
|
||||
pthread_mutex_lock(&protocol->lock);
|
||||
|
||||
if ((NULL != protocol->wsi) && (NULL != protocol->pending_message.content))
|
||||
{
|
||||
lws_callback_on_writable(protocol->wsi);
|
||||
}
|
||||
|
||||
pthread_mutex_unlock(&protocol->lock);
|
||||
}
|
||||
|
||||
void wsfs_protocol_init_lws(
|
||||
struct wsfs_protocol * protocol,
|
||||
struct lws_protocols * lws_protocol)
|
||||
{
|
||||
lws_protocol->callback = &wsfs_protocol_callback;
|
||||
lws_protocol->per_session_data_size = 1;
|
||||
lws_protocol->user = protocol;
|
||||
}
|
||||
|
||||
char * wsfs_protocol_message_create(
|
||||
size_t size)
|
||||
{
|
||||
char * buffer = malloc(LWS_PRE + size);
|
||||
return &buffer[LWS_PRE];
|
||||
}
|
||||
|
||||
void wsfs_protocol_message_dispose(
|
||||
char * message)
|
||||
{
|
||||
char * buffer = message - LWS_PRE;
|
||||
free(buffer);
|
||||
}
|
||||
|
||||
bool wsfs_protocol_send(
|
||||
char * message,
|
||||
size_t length,
|
||||
void * user_data)
|
||||
{
|
||||
struct wsfs_protocol * protocol = user_data;
|
||||
|
||||
pthread_mutex_lock(&protocol->lock);
|
||||
|
||||
struct wsfs_server * server = protocol->server;
|
||||
bool result = (NULL != protocol->wsi) && (NULL == protocol->pending_message.content);
|
||||
if (result)
|
||||
{
|
||||
protocol->pending_message.content = message;
|
||||
protocol->pending_message.length = length;
|
||||
}
|
||||
else
|
||||
{
|
||||
wsfs_protocol_message_dispose(message);
|
||||
}
|
||||
|
||||
pthread_mutex_unlock(&protocol->lock);
|
||||
|
||||
if (result)
|
||||
{
|
||||
wsfs_server_wakeup(server);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
@ -1,48 +0,0 @@
|
||||
#ifndef _WSFS_PROTOCOL_H
|
||||
#define _WSFS_PROTOCOL_H
|
||||
|
||||
#ifndef __cplusplus
|
||||
#include <stdbool.h>
|
||||
#endif
|
||||
|
||||
#include <libwebsockets.h>
|
||||
#include <pthread.h>
|
||||
|
||||
struct wsfs_protocol;
|
||||
struct wsfs_server;
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
extern struct wsfs_protocol * wsfs_protocol_create(
|
||||
struct wsfs_server * server);
|
||||
|
||||
extern void wsfs_protocol_dispose(
|
||||
struct wsfs_protocol * protocol);
|
||||
|
||||
extern void wsfs_protocol_check(
|
||||
struct wsfs_protocol * protocol);
|
||||
|
||||
extern void wsfs_protocol_init_lws(
|
||||
struct wsfs_protocol * protocl,
|
||||
struct lws_protocols * lws_protocol);
|
||||
|
||||
extern char * wsfs_protocol_message_create(
|
||||
size_t size);
|
||||
|
||||
extern void wsfs_protocol_message_dispose(
|
||||
char * message);
|
||||
|
||||
extern bool wsfs_protocol_send(
|
||||
char * message,
|
||||
size_t length,
|
||||
void * user_data);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#endif
|
||||
|
@ -1,35 +0,0 @@
|
||||
#ifndef _WSFS_RESPONSE_PARSER_H
|
||||
#define _WFSF_RESPONSE_PARSER_H
|
||||
|
||||
#ifndef __cplusplus
|
||||
#include <stddef.h>
|
||||
#else
|
||||
#include <cstddef>
|
||||
using std::size_t;
|
||||
#endif
|
||||
|
||||
#include <jansson.h>
|
||||
#include "wsfs/status.h"
|
||||
|
||||
struct wsfs_response
|
||||
{
|
||||
wsfs_status status;
|
||||
int id;
|
||||
json_t * result;
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
extern void wsfs_response_parse(
|
||||
char const * buffer,
|
||||
size_t buffer_length,
|
||||
struct wsfs_response * response);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@ -0,0 +1,7 @@
|
||||
#include <gtest/gtest.h>
|
||||
#include "wsfs/fuse_wrapper.h"
|
||||
|
||||
TEST(libfuse, fuse_req_t_size)
|
||||
{
|
||||
ASSERT_EQ(sizeof(void*), sizeof(fuse_req_t));
|
||||
}
|
@ -1,11 +1,24 @@
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include <cstdlib>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "wsfs/server.h"
|
||||
#include "wsfs/server_config.h"
|
||||
|
||||
|
||||
TEST(server, create_dispose)
|
||||
{
|
||||
wsfs_server_config config = {nullptr, nullptr, nullptr, nullptr, 0};
|
||||
wsfs_server * server = wsfs_server_create(&config);
|
||||
mkdir("test", 0700);
|
||||
|
||||
struct wsfs_server_config config = {strdup("test"), nullptr, nullptr, nullptr, nullptr, 0};
|
||||
struct wsfs_server * server = wsfs_server_create(&config);
|
||||
ASSERT_NE(nullptr, server);
|
||||
|
||||
wsfs_server_dispose(server);
|
||||
wsfs_server_config_cleanup(&config);
|
||||
|
||||
rmdir("test");
|
||||
}
|
Loading…
Reference in new issue