Archives/falk-werner_webfuse
1
0
Fork 0
mirror of https://github.com/falk-werner/webfuse synced 2024-10-27 20:34:10 +00:00
Code Issues Releases Wiki Activity

refactor: restructure includes

Browse Source
This commit is contained in:
Falk Werner 2020-06-28 15:51:34 +02:00
parent 179dcf2be9
commit 61af058a2c
94 changed files with 235 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/webfuse/adapter/api.h → include/webfuse/api.h
View File

@ -1,10 +1,10 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// \file adapter/api.h /// \file webfuse/api.h
/// \brief API define for webfuse adapter. /// \brief API define for webfuse adapter.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#ifndef WF_ADAPTER_API_H #ifndef WF_API_H
#define WF_ADAPTER_API_H #define WF_API_H
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
/// \def WF_API /// \def WF_API

6
include/webfuse/adapter/authenticate.h → include/webfuse/authenticate.h
View File

@ -1,10 +1,10 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// \file adapter/authenticate.h /// \file webfuse/authenticate.h
/// \brief Authenticate function. /// \brief Authenticate function.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#ifndef WF_ADAPTER_AUTHENTICATE_H #ifndef WF_AUTHENTICATE_H
#define WF_ADAPTER_AUTHENTICATE_H #define WF_AUTHENTICATE_H
#ifndef __cplusplus #ifndef __cplusplus
#include <stdbool.h> #include <stdbool.h>

10
include/webfuse/adapter/client.h → include/webfuse/client.h
View File

@ -1,13 +1,13 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// \file adapter/client.h /// \file webfuse/client.h
/// \brief Adapter client. /// \brief Adapter client.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#ifndef WF_ADAPTER_CLIENT_H #ifndef WF_CLIENT_H
#define WF_ADAPTER_CLIENT_H #define WF_CLIENT_H
#include <webfuse/adapter/api.h> #include <webfuse/api.h>
#include <webfuse/adapter/client_callback.h> #include <webfuse/client_callback.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

6
include/webfuse/adapter/client_callback.h → include/webfuse/client_callback.h
View File

@ -1,10 +1,10 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// \file adapter/client_callbak.h /// \file webfuse/client_callbak.h
/// \brief Callback of adapter clients. /// \brief Callback of adapter clients.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#ifndef WF_ADAPTER_CLIENT_CALLBACK_H #ifndef WF_CLIENT_CALLBACK_H
#define WF_ADAPTER_CLIENT_CALLBACK_H #define WF_CLIENT_CALLBACK_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

8
include/webfuse/adapter/client_tlsconfig.h → include/webfuse/client_tlsconfig.h
View File

@ -1,12 +1,12 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// \file adapter/client_tslconfig.h /// \file webfuse/client_tslconfig.h
/// \brief Configuration of TLS (Transport Layer Security) for adapter clients. /// \brief Configuration of TLS (Transport Layer Security) for adapter clients.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#ifndef WF_ADAPTER_CLIENT_TLSCONFIG_H #ifndef WF_CLIENT_TLSCONFIG_H
#define WF_ADAPTER_CLIENT_TLSCONFIG_H #define WF_CLIENT_TLSCONFIG_H
#include <webfuse/adapter/api.h> #include <webfuse/api.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

8
include/webfuse/adapter/credentials.h → include/webfuse/credentials.h
View File

@ -1,12 +1,12 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// \file adapter/credentials.h /// \file webfuse/credentials.h
/// \brief Credentials used for user authentication. /// \brief Credentials used for user authentication.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#ifndef WF_ADAPTER_CREDENTIALS_H #ifndef WF_CREDENTIALS_H
#define WF_ADAPTER_CREDENTIALS_H #define WF_CREDENTIALS_H
#include "webfuse/adapter/api.h" #include "webfuse/api.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

8
include/webfuse/adapter/mountpoint.h → include/webfuse/mountpoint.h
View File

@ -1,12 +1,12 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// \file adapter/mountpoint.h /// \file webfuse/mountpoint.h
/// \brief Mointpoint. /// \brief Mointpoint.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#ifndef WF_ADAPTER_MOUNTPOINT_H #ifndef WF_MOUNTPOINT_H
#define WF_ADAPTER_MOUNTPOINT_H #define WF_MOUNTPOINT_H
#include <webfuse/adapter/api.h> #include <webfuse/api.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

8
include/webfuse/adapter/mountpoint_factory.h → include/webfuse/mountpoint_factory.h
View File

@ -1,12 +1,12 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// \file adapter/mountpoint_factory.h /// \file webfuse/mountpoint_factory.h
/// \brief Defines a factory function to create mointpoints. /// \brief Defines a factory function to create mointpoints.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#ifndef WF_ADAPTER_MOUNTPOINT_FACTORY_H #ifndef WF_MOUNTPOINT_FACTORY_H
#define WF_ADAPTER_MOUNTPOINT_FACTORY_H #define WF_MOUNTPOINT_FACTORY_H
#include <webfuse/adapter/api.h> #include <webfuse/api.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

2
include/webfuse/core/protocol_names.h → include/webfuse/protocol_names.h
View File

@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// \file protocol_names.h /// \file webufse/protocol_names.h
/// \brief Names of websocket protocol. /// \brief Names of websocket protocol.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#ifndef WF_PROTOCOL_NAMES_H #ifndef WF_PROTOCOL_NAMES_H

8
include/webfuse/adapter/server.h → include/webfuse/server.h
View File

@ -1,12 +1,12 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// \file adapter/server.h /// \file webfuse/server.h
/// \brief Adapter server. /// \brief Adapter server.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#ifndef WF_ADAPTER_SERVER_H #ifndef WF_SERVER_H
#define WF_ADAPTER_SERVER_H #define WF_SERVER_H
#include "webfuse/adapter/api.h" #include "webfuse/api.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

12
include/webfuse/adapter/server_config.h → include/webfuse/server_config.h
View File

@ -1,14 +1,14 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// \file adapter/server_config.h /// \file webfuse/server_config.h
/// \brief Server configuration. /// \brief Server configuration.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#ifndef WF_ADAPTER_SERVER_CONFIG_H #ifndef WF_SERVER_CONFIG_H
#define WF_ADAPTER_SERVER_CONFIG_H #define WF_SERVER_CONFIG_H
#include "webfuse/adapter/api.h" #include "webfuse/api.h"
#include "webfuse/adapter/authenticate.h" #include "webfuse/authenticate.h"
#include "webfuse/adapter/mountpoint_factory.h" #include "webfuse/mountpoint_factory.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

12
include/webfuse/adapter/server_protocol.h → include/webfuse/server_protocol.h
View File

@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// \file adapter/server_protocol.h /// \file webfuse/server_protocol.h
/// \brief Provides low level access to libwebsockets protocol. /// \brief Provides low level access to libwebsockets protocol.
/// ///
/// By default, libwebfuse encapsulates libwebsockets protocol by \ref /// By default, libwebfuse encapsulates libwebsockets protocol by \ref
@ -8,12 +8,12 @@
/// libwebsockets applications. /// libwebsockets applications.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#ifndef WF_ADAPTER_SERVER_PROTOCOL_H #ifndef WF_SERVER_PROTOCOL_H
#define WF_ADAPTER_SERVER_PROTOCOL_H #define WF_SERVER_PROTOCOL_H
#include <webfuse/adapter/api.h> #include <webfuse/api.h>
#include <webfuse/adapter/authenticate.h> #include <webfuse/authenticate.h>
#include <webfuse/adapter/mountpoint_factory.h> #include <webfuse/mountpoint_factory.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

2
include/webfuse/core/status.h → include/webfuse/status.h
View File

@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// \file status.h /// \file webfuse/status.h
/// \brief Generic status code. /// \brief Generic status code.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

25
include/webfuse/webfuse.h Normal file
View File

@ -0,0 +1,25 @@
////////////////////////////////////////////////////////////////////////////////
/// \file webfuse/webfuse.h
/// \brief Convenience header to include all functionality of libfuse_adapter.
////////////////////////////////////////////////////////////////////////////////
#ifndef WF_WEBFUSE_H
#define WF_WEBFUSE_H
#include <webfuse/status.h>
#include <webfuse/protocol_names.h>
#include <webfuse/api.h>
#include <webfuse/server.h>
#include <webfuse/server_config.h>
#include <webfuse/server_protocol.h>
#include <webfuse/authenticate.h>
#include <webfuse/credentials.h>
#include <webfuse/mountpoint.h>
#include <webfuse/client.h>
#include <webfuse/client_callback.h>
#include <webfuse/client_tlsconfig.h>
#endif

25
include/webfuse_adapter.h
View File

@ -1,25 +0,0 @@
////////////////////////////////////////////////////////////////////////////////
/// \file webfuse_adapter.h
/// \brief Convenience header to include all functionality of libfuse_adapter.
////////////////////////////////////////////////////////////////////////////////
#ifndef WF_ADAPTER_H
#define WF_ADAPTER_H
#include <webfuse/core/status.h>
#include <webfuse/core/protocol_names.h>
#include <webfuse/adapter/api.h>
#include <webfuse/adapter/server.h>
#include <webfuse/adapter/server_config.h>
#include <webfuse/adapter/server_protocol.h>
#include <webfuse/adapter/authenticate.h>
#include <webfuse/adapter/credentials.h>
#include <webfuse/adapter/mountpoint.h>
#include <webfuse/adapter/client.h>
#include <webfuse/adapter/client_callback.h>
#include <webfuse/adapter/client_tlsconfig.h>
#endif

16
lib/webfuse/adapter/api.c → lib/webfuse/api.c
View File

@ -1,15 +1,15 @@
#include "webfuse_adapter.h" #include "webfuse/webfuse.h"
#include "webfuse/adapter/impl/server.h" #include "webfuse/impl/server.h"
#include "webfuse/adapter/impl/server_protocol.h" #include "webfuse/impl/server_protocol.h"
#include "webfuse/adapter/impl/server_config.h" #include "webfuse/impl/server_config.h"
#include "webfuse/adapter/impl/credentials.h" #include "webfuse/impl/credentials.h"
#include "webfuse/adapter/impl/mountpoint.h" #include "webfuse/impl/mountpoint.h"
#include "webfuse/core/util.h" #include "webfuse/core/util.h"
#include "webfuse/adapter/impl/client.h" #include "webfuse/impl/client.h"
#include "webfuse/adapter/impl/client_tlsconfig.h" #include "webfuse/impl/client_tlsconfig.h"
// server // server

2
lib/webfuse/core/json_util.h
View File

@ -2,7 +2,7 @@
#define WF_JSON_UTIL_H #define WF_JSON_UTIL_H
#include <jansson.h> #include <jansson.h>
#include "webfuse/core/status.h" #include "webfuse/status.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

2
lib/webfuse/core/jsonrpc/proxy.c
View File

@ -1,7 +1,7 @@
#include "webfuse/core/jsonrpc/proxy_intern.h" #include "webfuse/core/jsonrpc/proxy_intern.h"
#include "webfuse/core/jsonrpc/response_intern.h" #include "webfuse/core/jsonrpc/response_intern.h"
#include "webfuse/core/jsonrpc/error.h" #include "webfuse/core/jsonrpc/error.h"
#include "webfuse/core/status.h" #include "webfuse/status.h"
#include "webfuse/core/timer/timer.h" #include "webfuse/core/timer/timer.h"

2
lib/webfuse/core/jsonrpc/response.c
View File

@ -1,6 +1,6 @@
#include "webfuse/core/jsonrpc/response_intern.h" #include "webfuse/core/jsonrpc/response_intern.h"
#include "webfuse/core/jsonrpc/error.h" #include "webfuse/core/jsonrpc/error.h"
#include "webfuse/core/status.h" #include "webfuse/status.h"
bool bool
wf_jsonrpc_is_response( wf_jsonrpc_is_response(

2
lib/webfuse/core/jsonrpc/server.c
View File

@ -1,7 +1,7 @@
#include "webfuse/core/jsonrpc/server.h" #include "webfuse/core/jsonrpc/server.h"
#include "webfuse/core/jsonrpc/method.h" #include "webfuse/core/jsonrpc/method.h"
#include "webfuse/core/jsonrpc/request.h" #include "webfuse/core/jsonrpc/request.h"
#include "webfuse/core/status.h" #include "webfuse/status.h"
#include "webfuse/core/util.h" #include "webfuse/core/util.h"
#include <stdlib.h> #include <stdlib.h>

2
lib/webfuse/core/status_intern.h
View File

@ -1,7 +1,7 @@
#ifndef WF_STATUS_INTERN_H #ifndef WF_STATUS_INTERN_H
#define WF_STATUS_INTERN_H #define WF_STATUS_INTERN_H
#include "webfuse/core/status.h" #include "webfuse/status.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
lib/webfuse/adapter/impl/authenticator.c → lib/webfuse/impl/authenticator.c
View File

@ -1,9 +1,9 @@
#include "webfuse/adapter/impl/authenticator.h" #include "webfuse/impl/authenticator.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "webfuse/adapter/impl/credentials.h" #include "webfuse/impl/credentials.h"
struct wf_impl_authenticator * wf_impl_authenticator_create( struct wf_impl_authenticator * wf_impl_authenticator_create(
char const * type, char const * type,

2
lib/webfuse/adapter/impl/authenticator.h → lib/webfuse/impl/authenticator.h
View File

@ -5,7 +5,7 @@
#include <stdbool.h> #include <stdbool.h>
#endif #endif
#include "webfuse/adapter/authenticate.h" #include "webfuse/authenticate.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

6
lib/webfuse/adapter/impl/authenticators.c → lib/webfuse/impl/authenticators.c
View File

@ -1,9 +1,9 @@
#include "webfuse/adapter/impl/authenticators.h" #include "webfuse/impl/authenticators.h"
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include "webfuse/adapter/impl/authenticator.h" #include "webfuse/impl/authenticator.h"
#include "webfuse/adapter/impl/credentials.h" #include "webfuse/impl/credentials.h"
static struct wf_impl_authenticator * wf_impl_authenticators_find( static struct wf_impl_authenticator * wf_impl_authenticators_find(
struct wf_impl_authenticators * authenticators, struct wf_impl_authenticators * authenticators,

2
lib/webfuse/adapter/impl/authenticators.h → lib/webfuse/impl/authenticators.h
View File

@ -5,7 +5,7 @@
#include <stdbool.h> #include <stdbool.h>
#endif #endif
#include "webfuse/adapter/authenticate.h" #include "webfuse/authenticate.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

6
lib/webfuse/adapter/impl/client.c → lib/webfuse/impl/client.c
View File

@ -1,6 +1,6 @@
#include "webfuse/adapter/impl/client.h" #include "webfuse/impl/client.h"
#include "webfuse/adapter/impl/client_protocol.h" #include "webfuse/impl/client_protocol.h"
#include "webfuse/adapter/impl/client_tlsconfig.h" #include "webfuse/impl/client_tlsconfig.h"
#include "webfuse/core/lws_log.h" #include "webfuse/core/lws_log.h"
#include <libwebsockets.h> #include <libwebsockets.h>

2
lib/webfuse/adapter/impl/client.h → lib/webfuse/impl/client.h
View File

@ -2,7 +2,7 @@
#define WF_ADAPTER_IMPL_CLIENT_H #define WF_ADAPTER_IMPL_CLIENT_H
#include "webfuse/adapter/client_callback.h" #include "webfuse/client_callback.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

12
lib/webfuse/adapter/impl/client_protocol.c → lib/webfuse/impl/client_protocol.c
View File

@ -1,9 +1,9 @@
#include "webfuse/adapter/impl/client_protocol.h" #include "webfuse/impl/client_protocol.h"
#include "webfuse/adapter/client_callback.h" #include "webfuse/client_callback.h"
#include "webfuse/adapter/impl/credentials.h" #include "webfuse/impl/credentials.h"
#include "webfuse/adapter/impl/filesystem.h" #include "webfuse/impl/filesystem.h"
#include "webfuse/adapter/impl/mountpoint.h" #include "webfuse/impl/mountpoint.h"
#include "webfuse/core/protocol_names.h" #include "webfuse/protocol_names.h"
#include "webfuse/core/url.h" #include "webfuse/core/url.h"
#include "webfuse/core/util.h" #include "webfuse/core/util.h"
#include "webfuse/core/timer/manager.h" #include "webfuse/core/timer/manager.h"

2
lib/webfuse/adapter/impl/client_protocol.h → lib/webfuse/impl/client_protocol.h
View File

@ -1,7 +1,7 @@
#ifndef WF_ADAPTER_IMPL_CLIENT_PROTOCOL_H #ifndef WF_ADAPTER_IMPL_CLIENT_PROTOCOL_H
#define WF_ADAPTER_IMPL_CLIENT_PROTOCOL_H #define WF_ADAPTER_IMPL_CLIENT_PROTOCOL_H
#include "webfuse/adapter/client_callback.h" #include "webfuse/client_callback.h"
#include "webfuse/core/slist.h" #include "webfuse/core/slist.h"
#ifndef __cplusplus #ifndef __cplusplus

2
lib/webfuse/adapter/impl/client_tlsconfig.c → lib/webfuse/impl/client_tlsconfig.c
View File

@ -1,4 +1,4 @@
#include "webfuse/adapter/impl/client_tlsconfig.h" #include "webfuse/impl/client_tlsconfig.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

0
lib/webfuse/adapter/impl/client_tlsconfig.h → lib/webfuse/impl/client_tlsconfig.h
View File

2
lib/webfuse/adapter/impl/credentials.c → lib/webfuse/impl/credentials.c
View File

@ -1,4 +1,4 @@
#include "webfuse/adapter/impl/credentials.h" #include "webfuse/impl/credentials.h"
#include <string.h> #include <string.h>
void wf_impl_credentials_init_default( void wf_impl_credentials_init_default(

0
lib/webfuse/adapter/impl/credentials.h → lib/webfuse/impl/credentials.h
View File

20
lib/webfuse/adapter/impl/filesystem.c → lib/webfuse/impl/filesystem.c
View File

@ -1,13 +1,13 @@
#include "webfuse/adapter/impl/filesystem.h" #include "webfuse/impl/filesystem.h"
#include "webfuse/adapter/impl/operation/context.h" #include "webfuse/impl/operation/context.h"
#include "webfuse/adapter/impl/operation/open.h" #include "webfuse/impl/operation/open.h"
#include "webfuse/adapter/impl/operation/close.h" #include "webfuse/impl/operation/close.h"
#include "webfuse/adapter/impl/operation/read.h" #include "webfuse/impl/operation/read.h"
#include "webfuse/adapter/impl/operation/readdir.h" #include "webfuse/impl/operation/readdir.h"
#include "webfuse/adapter/impl/operation/getattr.h" #include "webfuse/impl/operation/getattr.h"
#include "webfuse/adapter/impl/operation/lookup.h" #include "webfuse/impl/operation/lookup.h"
#include "webfuse/adapter/impl/session.h" #include "webfuse/impl/session.h"
#include "webfuse/adapter/impl/mountpoint.h" #include "webfuse/impl/mountpoint.h"
#include <libwebsockets.h> #include <libwebsockets.h>

4
lib/webfuse/adapter/impl/filesystem.h → lib/webfuse/impl/filesystem.h
View File

@ -5,8 +5,8 @@
#include <stdbool.h> #include <stdbool.h>
#endif #endif
#include "webfuse/adapter/impl/fuse_wrapper.h" #include "webfuse/impl/fuse_wrapper.h"
#include "webfuse/adapter/impl/operation/context.h" #include "webfuse/impl/operation/context.h"
#include "webfuse/core/slist.h" #include "webfuse/core/slist.h"
#ifdef __cplusplus #ifdef __cplusplus

0
lib/webfuse/adapter/impl/fuse_wrapper.h → lib/webfuse/impl/fuse_wrapper.h
View File

2
lib/webfuse/adapter/impl/mountpoint.c → lib/webfuse/impl/mountpoint.c
View File

@ -1,4 +1,4 @@
#include "webfuse/adapter/impl/mountpoint.h" #include "webfuse/impl/mountpoint.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

2
lib/webfuse/adapter/impl/mountpoint.h → lib/webfuse/impl/mountpoint.h
View File

@ -1,7 +1,7 @@
#ifndef WF_IMPL_MOUNTPOINT_H #ifndef WF_IMPL_MOUNTPOINT_H
#define WF_IMPL_MOUNTPOINT_H #define WF_IMPL_MOUNTPOINT_H
#include "webfuse/adapter/mountpoint.h" #include "webfuse/mountpoint.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

2
lib/webfuse/adapter/impl/mountpoint_factory.c → lib/webfuse/impl/mountpoint_factory.c
View File

@ -1,4 +1,4 @@
#include "webfuse/adapter/impl/mountpoint_factory.h" #include "webfuse/impl/mountpoint_factory.h"
#include <stddef.h> #include <stddef.h>
void void

2
lib/webfuse/adapter/impl/mountpoint_factory.h → lib/webfuse/impl/mountpoint_factory.h
View File

@ -1,7 +1,7 @@
#ifndef WF_ADAPTER_IMPL_MOUNTPOINT_FACTORY_H #ifndef WF_ADAPTER_IMPL_MOUNTPOINT_FACTORY_H
#define WF_ADAPTER_IMPL_MOUNTPOINT_FACTORY_H #define WF_ADAPTER_IMPL_MOUNTPOINT_FACTORY_H
#include "webfuse/adapter/mountpoint_factory.h" #include "webfuse/mountpoint_factory.h"
#include <stdbool.h> #include <stdbool.h>
#ifdef __cplusplus #ifdef __cplusplus

4
lib/webfuse/adapter/impl/operation/close.c → lib/webfuse/impl/operation/close.c
View File

@ -1,5 +1,5 @@
#include "webfuse/adapter/impl/operation/close.h" #include "webfuse/impl/operation/close.h"
#include "webfuse/adapter/impl/operation/context.h" #include "webfuse/impl/operation/context.h"
#include <limits.h> #include <limits.h>
#include <errno.h> #include <errno.h>

2
lib/webfuse/adapter/impl/operation/close.h → lib/webfuse/impl/operation/close.h
View File

@ -1,7 +1,7 @@
#ifndef WF_ADAPTER_IMPL_OPERATION_CLOSE_H #ifndef WF_ADAPTER_IMPL_OPERATION_CLOSE_H
#define WF_ADAPTER_IMPL_OPERATION_CLOSE_H #define WF_ADAPTER_IMPL_OPERATION_CLOSE_H
#include "webfuse/adapter/impl/fuse_wrapper.h" #include "webfuse/impl/fuse_wrapper.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

6
lib/webfuse/adapter/impl/operation/context.c → lib/webfuse/impl/operation/context.c
View File

@ -1,6 +1,6 @@
#include "webfuse/adapter/impl/operation/context.h" #include "webfuse/impl/operation/context.h"
#include "webfuse/adapter/impl/session_manager.h" #include "webfuse/impl/session_manager.h"
#include "webfuse/adapter/impl/session.h" #include "webfuse/impl/session.h"
#include <stddef.h> #include <stddef.h>
struct wf_jsonrpc_proxy * wf_impl_operation_context_get_proxy( struct wf_jsonrpc_proxy * wf_impl_operation_context_get_proxy(

2
lib/webfuse/adapter/impl/operation/context.h → lib/webfuse/impl/operation/context.h
View File

@ -1,7 +1,7 @@
#ifndef WF_ADAPTER_IMPL_OPERATION_CONTEXT_H #ifndef WF_ADAPTER_IMPL_OPERATION_CONTEXT_H
#define WF_ADAPTER_IMPL_OPERATION_CONTEXT_H #define WF_ADAPTER_IMPL_OPERATION_CONTEXT_H
#include "webfuse/adapter/impl/fuse_wrapper.h" #include "webfuse/impl/fuse_wrapper.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
lib/webfuse/adapter/impl/operation/getattr.c → lib/webfuse/impl/operation/getattr.c
View File

@ -1,5 +1,5 @@
#include "webfuse/adapter/impl/operation/getattr.h" #include "webfuse/impl/operation/getattr.h"
#include "webfuse/adapter/impl/operation/context.h" #include "webfuse/impl/operation/context.h"
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>

2
lib/webfuse/adapter/impl/operation/getattr.h → lib/webfuse/impl/operation/getattr.h
View File

@ -1,7 +1,7 @@
#ifndef WF_ADAPTER_IMPL_OPERATION_GETATTR_H #ifndef WF_ADAPTER_IMPL_OPERATION_GETATTR_H
#define WF_ADAPTER_IMPL_OPERATION_GETATTR_H #define WF_ADAPTER_IMPL_OPERATION_GETATTR_H
#include "webfuse/adapter/impl/fuse_wrapper.h" #include "webfuse/impl/fuse_wrapper.h"
#include <jansson.h> #include <jansson.h>
#include <sys/types.h> #include <sys/types.h>

4
lib/webfuse/adapter/impl/operation/lookup.c → lib/webfuse/impl/operation/lookup.c
View File

@ -1,5 +1,5 @@
#include "webfuse/adapter/impl/operation/lookup.h" #include "webfuse/impl/operation/lookup.h"
#include "webfuse/adapter/impl/operation/context.h" #include "webfuse/impl/operation/context.h"
#include <limits.h> #include <limits.h>
#include <errno.h> #include <errno.h>

2
lib/webfuse/adapter/impl/operation/lookup.h → lib/webfuse/impl/operation/lookup.h
View File

@ -1,7 +1,7 @@
#ifndef WF_ADAPTER_IMPL_OPERATION_LOOKUP_H #ifndef WF_ADAPTER_IMPL_OPERATION_LOOKUP_H
#define WF_ADAPTER_IMPL_OPERATION_LOOKUP_H #define WF_ADAPTER_IMPL_OPERATION_LOOKUP_H
#include "webfuse/adapter/impl/fuse_wrapper.h" #include "webfuse/impl/fuse_wrapper.h"
#include <jansson.h> #include <jansson.h>
#include <sys/types.h> #include <sys/types.h>

6
lib/webfuse/adapter/impl/operation/open.c → lib/webfuse/impl/operation/open.c
View File

@ -1,9 +1,9 @@
#include "webfuse/adapter/impl/operation/open.h" #include "webfuse/impl/operation/open.h"
#include "webfuse/adapter/impl/operation/context.h" #include "webfuse/impl/operation/context.h"
#include "webfuse/core/jsonrpc/proxy.h" #include "webfuse/core/jsonrpc/proxy.h"
#include "webfuse/core/util.h" #include "webfuse/core/util.h"
#include "webfuse/core/status.h" #include "webfuse/status.h"
#include "webfuse/core/json_util.h" #include "webfuse/core/json_util.h"
#include <string.h> #include <string.h>

2
lib/webfuse/adapter/impl/operation/open.h → lib/webfuse/impl/operation/open.h
View File

@ -1,7 +1,7 @@
#ifndef WF_ADAPTER_IMPL_OPERATION_OPEN_H #ifndef WF_ADAPTER_IMPL_OPERATION_OPEN_H
#define WF_ADAPTER_IMPL_OPERATION_OPEN_H #define WF_ADAPTER_IMPL_OPERATION_OPEN_H
#include "webfuse/adapter/impl/fuse_wrapper.h" #include "webfuse/impl/fuse_wrapper.h"
#include <jansson.h> #include <jansson.h>
#ifdef __cplusplus #ifdef __cplusplus

4
lib/webfuse/adapter/impl/operation/read.c → lib/webfuse/impl/operation/read.c
View File

@ -1,5 +1,5 @@
#include "webfuse/adapter/impl/operation/read.h" #include "webfuse/impl/operation/read.h"
#include "webfuse/adapter/impl/operation/context.h" #include "webfuse/impl/operation/context.h"
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>

4
lib/webfuse/adapter/impl/operation/read.h → lib/webfuse/impl/operation/read.h
View File

@ -1,8 +1,8 @@
#ifndef WF_ADAPTER_IMPL_OPERATION_READ_H #ifndef WF_ADAPTER_IMPL_OPERATION_READ_H
#define WF_ADAPTER_IMPL_OPERATION_READ_H #define WF_ADAPTER_IMPL_OPERATION_READ_H
#include "webfuse/adapter/impl/fuse_wrapper.h" #include "webfuse/impl/fuse_wrapper.h"
#include "webfuse/core/status.h" #include "webfuse/status.h"
#include <jansson.h> #include <jansson.h>

4
lib/webfuse/adapter/impl/operation/readdir.c → lib/webfuse/impl/operation/readdir.c
View File

@ -1,5 +1,5 @@
#include "webfuse/adapter/impl/operation/readdir.h" #include "webfuse/impl/operation/readdir.h"
#include "webfuse/adapter/impl/operation/context.h" #include "webfuse/impl/operation/context.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

2
lib/webfuse/adapter/impl/operation/readdir.h → lib/webfuse/impl/operation/readdir.h
View File

@ -1,7 +1,7 @@
#ifndef WF_ADAPTER_IMPL_OPERATION_READDIR_H #ifndef WF_ADAPTER_IMPL_OPERATION_READDIR_H
#define WF_ADAPTER_IMPL_OPERATION_READDIR_H #define WF_ADAPTER_IMPL_OPERATION_READDIR_H
#include "webfuse/adapter/impl/fuse_wrapper.h" #include "webfuse/impl/fuse_wrapper.h"
#include <jansson.h> #include <jansson.h>
#ifdef __cplusplus #ifdef __cplusplus

6
lib/webfuse/adapter/impl/server.c → lib/webfuse/impl/server.c
View File

@ -1,4 +1,4 @@
#include "webfuse/adapter/server.h" #include "webfuse/server.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h> #include <stdbool.h>
@ -8,8 +8,8 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include "webfuse/adapter/impl/server_config.h" #include "webfuse/impl/server_config.h"
#include "webfuse/adapter/impl/server_protocol.h" #include "webfuse/impl/server_protocol.h"
#include "webfuse/core/lws_log.h" #include "webfuse/core/lws_log.h"
#define WF_SERVER_PROTOCOL_COUNT 3 #define WF_SERVER_PROTOCOL_COUNT 3

0
lib/webfuse/adapter/impl/server.h → lib/webfuse/impl/server.h
View File

2
lib/webfuse/adapter/impl/server_config.c → lib/webfuse/impl/server_config.c
View File

@ -1,4 +1,4 @@
#include "webfuse/adapter/impl/server_config.h" #include "webfuse/impl/server_config.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

4
lib/webfuse/adapter/impl/server_config.h → lib/webfuse/impl/server_config.h
View File

@ -1,8 +1,8 @@
#ifndef WF_ADAPTER_IMPL_SERVER_CONFIG_H #ifndef WF_ADAPTER_IMPL_SERVER_CONFIG_H
#define WF_ADAPTER_IMPL_SERVER_CONFIG_H #define WF_ADAPTER_IMPL_SERVER_CONFIG_H
#include "webfuse/adapter/impl/authenticators.h" #include "webfuse/impl/authenticators.h"
#include "webfuse/adapter/impl/mountpoint_factory.h" #include "webfuse/impl/mountpoint_factory.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

6
lib/webfuse/adapter/impl/server_protocol.c → lib/webfuse/impl/server_protocol.c
View File

@ -1,4 +1,4 @@
#include "webfuse/adapter/impl/server_protocol.h" #include "webfuse/impl/server_protocol.h"
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
@ -6,9 +6,9 @@
#include "webfuse/core/message.h" #include "webfuse/core/message.h"
#include "webfuse/core/util.h" #include "webfuse/core/util.h"
#include "webfuse/core/protocol_names.h" #include "webfuse/protocol_names.h"
#include "webfuse/adapter/impl/credentials.h" #include "webfuse/impl/credentials.h"
#include "webfuse/core/status_intern.h" #include "webfuse/core/status_intern.h"
#include "webfuse/core/jsonrpc/request.h" #include "webfuse/core/jsonrpc/request.h"

6
lib/webfuse/adapter/impl/server_protocol.h → lib/webfuse/impl/server_protocol.h
View File

@ -1,9 +1,9 @@
#ifndef WF_ADAPTER_IMPL_SERVER_PROTOCOL_H #ifndef WF_ADAPTER_IMPL_SERVER_PROTOCOL_H
#define WF_ADAPTER_IMPL_SERVER_PROTOCOL_H #define WF_ADAPTER_IMPL_SERVER_PROTOCOL_H
#include "webfuse/adapter/impl/authenticators.h" #include "webfuse/impl/authenticators.h"
#include "webfuse/adapter/impl/mountpoint_factory.h" #include "webfuse/impl/mountpoint_factory.h"
#include "webfuse/adapter/impl/session_manager.h" #include "webfuse/impl/session_manager.h"
#include "webfuse/core/jsonrpc/proxy.h" #include "webfuse/core/jsonrpc/proxy.h"
#include "webfuse/core/jsonrpc/server.h" #include "webfuse/core/jsonrpc/server.h"

8
lib/webfuse/adapter/impl/session.c → lib/webfuse/impl/session.c
View File

@ -1,9 +1,9 @@
#include "webfuse/adapter/impl/session.h" #include "webfuse/impl/session.h"
#include "webfuse/adapter/impl/authenticators.h" #include "webfuse/impl/authenticators.h"
#include "webfuse/core/message_queue.h" #include "webfuse/core/message_queue.h"
#include "webfuse/core/message.h" #include "webfuse/core/message.h"
#include "webfuse/adapter/impl/mountpoint_factory.h" #include "webfuse/impl/mountpoint_factory.h"
#include "webfuse/adapter/impl/mountpoint.h" #include "webfuse/impl/mountpoint.h"
#include "webfuse/core/container_of.h" #include "webfuse/core/container_of.h"
#include "webfuse/core/util.h" #include "webfuse/core/util.h"

2
lib/webfuse/adapter/impl/session.h → lib/webfuse/impl/session.h
View File

@ -10,7 +10,7 @@ using std::size_t;
#endif #endif
#include "webfuse/core/message_queue.h" #include "webfuse/core/message_queue.h"
#include "webfuse/adapter/impl/filesystem.h" #include "webfuse/impl/filesystem.h"
#include "webfuse/core/slist.h" #include "webfuse/core/slist.h"
#include "webfuse/core/jsonrpc/proxy.h" #include "webfuse/core/jsonrpc/proxy.h"

2
lib/webfuse/adapter/impl/session_manager.c → lib/webfuse/impl/session_manager.c
View File

@ -1,4 +1,4 @@
#include "webfuse/adapter/impl/session_manager.h" #include "webfuse/impl/session_manager.h"
#include "webfuse/core/util.h" #include "webfuse/core/util.h"
#include "webfuse/core/container_of.h" #include "webfuse/core/container_of.h"
#include <stddef.h> #include <stddef.h>

4
lib/webfuse/adapter/impl/session_manager.h → lib/webfuse/impl/session_manager.h
View File

@ -5,8 +5,8 @@
#include <stdbool.h> #include <stdbool.h>
#endif #endif
#include "webfuse/adapter/impl/session.h" #include "webfuse/impl/session.h"
#include "webfuse/adapter/impl/fuse_wrapper.h" #include "webfuse/impl/fuse_wrapper.h"
#include "webfuse/core/slist.h" #include "webfuse/core/slist.h"
#ifdef __cplusplus #ifdef __cplusplus

55
meson.build
View File

@ -10,17 +10,13 @@ if not libwebsockets_dep.found()
endif endif
jansson_dep = dependency('jansson', version: '>=2.11', fallback: ['jansson', 'jansson_dep']) jansson_dep = dependency('jansson', version: '>=2.11', fallback: ['jansson', 'jansson_dep'])
libfuse_dep = dependency('fuse3', version: '>=3.8.0', fallback: ['fuse3', 'libfuse_dep'])
pkg_config = import('pkgconfig') pkg_config = import('pkgconfig')
inc_dir = include_directories('include') inc_dir = include_directories('include')
private_inc_dir = include_directories('include', 'lib') private_inc_dir = include_directories('include', 'lib')
install_subdir('include/webfuse/core', install_dir: 'include/webfuse')
libfuse_dep = dependency('fuse3', version: '>=3.8.0', fallback: ['fuse3', 'libfuse_dep'])
webfuse_static = static_library('webfuse', webfuse_static = static_library('webfuse',
'lib/webfuse/core/slist.c', 'lib/webfuse/core/slist.c',
'lib/webfuse/core/message.c', 'lib/webfuse/core/message.c',
@ -40,28 +36,28 @@ webfuse_static = static_library('webfuse',
'lib/webfuse/core/jsonrpc/request.c', 'lib/webfuse/core/jsonrpc/request.c',
'lib/webfuse/core/jsonrpc/response.c', 'lib/webfuse/core/jsonrpc/response.c',
'lib/webfuse/core/jsonrpc/error.c', 'lib/webfuse/core/jsonrpc/error.c',
'lib/webfuse/adapter/api.c', 'lib/webfuse/api.c',
'lib/webfuse/adapter/impl/filesystem.c', 'lib/webfuse/impl/filesystem.c',
'lib/webfuse/adapter/impl/server.c', 'lib/webfuse/impl/server.c',
'lib/webfuse/adapter/impl/server_config.c', 'lib/webfuse/impl/server_config.c',
'lib/webfuse/adapter/impl/server_protocol.c', 'lib/webfuse/impl/server_protocol.c',
'lib/webfuse/adapter/impl/session.c', 'lib/webfuse/impl/session.c',
'lib/webfuse/adapter/impl/session_manager.c', 'lib/webfuse/impl/session_manager.c',
'lib/webfuse/adapter/impl/authenticator.c', 'lib/webfuse/impl/authenticator.c',
'lib/webfuse/adapter/impl/authenticators.c', 'lib/webfuse/impl/authenticators.c',
'lib/webfuse/adapter/impl/credentials.c', 'lib/webfuse/impl/credentials.c',
'lib/webfuse/adapter/impl/mountpoint.c', 'lib/webfuse/impl/mountpoint.c',
'lib/webfuse/adapter/impl/mountpoint_factory.c', 'lib/webfuse/impl/mountpoint_factory.c',
'lib/webfuse/adapter/impl/operation/context.c', 'lib/webfuse/impl/operation/context.c',
'lib/webfuse/adapter/impl/operation/lookup.c', 'lib/webfuse/impl/operation/lookup.c',
'lib/webfuse/adapter/impl/operation/getattr.c', 'lib/webfuse/impl/operation/getattr.c',
'lib/webfuse/adapter/impl/operation/readdir.c', 'lib/webfuse/impl/operation/readdir.c',
'lib/webfuse/adapter/impl/operation/open.c', 'lib/webfuse/impl/operation/open.c',
'lib/webfuse/adapter/impl/operation/close.c', 'lib/webfuse/impl/operation/close.c',
'lib/webfuse/adapter/impl/operation/read.c', 'lib/webfuse/impl/operation/read.c',
'lib/webfuse/adapter/impl/client.c', 'lib/webfuse/impl/client.c',
'lib/webfuse/adapter/impl/client_protocol.c', 'lib/webfuse/impl/client_protocol.c',
'lib/webfuse/adapter/impl/client_tlsconfig.c', 'lib/webfuse/impl/client_tlsconfig.c',
c_args: ['-fvisibility=hidden'], c_args: ['-fvisibility=hidden'],
include_directories: private_inc_dir, include_directories: private_inc_dir,
dependencies: [libfuse_dep, libwebsockets_dep, jansson_dep]) dependencies: [libfuse_dep, libwebsockets_dep, jansson_dep])
@ -72,7 +68,7 @@ webfuse_static_dep = declare_dependency(
dependencies: [libfuse_dep, libwebsockets_dep, jansson_dep]) dependencies: [libfuse_dep, libwebsockets_dep, jansson_dep])
webfuse = shared_library('webfuse', webfuse = shared_library('webfuse',
'lib/webfuse/adapter/api.c', 'lib/webfuse/api.c',
version: meson.project_version(), version: meson.project_version(),
c_args: ['-fvisibility=hidden', '-DWF_API=WF_EXPORT'], c_args: ['-fvisibility=hidden', '-DWF_API=WF_EXPORT'],
include_directories: private_inc_dir, include_directories: private_inc_dir,
@ -84,8 +80,7 @@ webfuse_dep = declare_dependency(
link_with: [webfuse], link_with: [webfuse],
dependencies: [libfuse_dep, libwebsockets_dep, jansson_dep]) dependencies: [libfuse_dep, libwebsockets_dep, jansson_dep])
install_headers('include/webfuse_adapter.h', subdir: 'webfuse') install_subdir('include/webfuse', install_dir: 'include')
install_subdir('include/webfuse/adapter', install_dir: 'include/webfuse')
pkg_config.generate( pkg_config.generate(
libraries: [webfuse], libraries: [webfuse],

2
test/webfuse/mocks/mock_adapter_client_callback.cc
View File

@ -1,5 +1,5 @@
#include "webfuse/mocks/mock_adapter_client_callback.hpp" #include "webfuse/mocks/mock_adapter_client_callback.hpp"
#include "webfuse/adapter/client.h" #include "webfuse/client.h"
extern "C" extern "C"
{ {

2
test/webfuse/mocks/mock_adapter_client_callback.hpp
View File

@ -2,7 +2,7 @@
#define WF_MOCK_ADAPTER_CLIENT_CALLBACK_HPP #define WF_MOCK_ADAPTER_CLIENT_CALLBACK_HPP
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include "webfuse/adapter/client_callback.h" #include "webfuse/client_callback.h"
namespace webfuse_test namespace webfuse_test
{ {

2
test/webfuse/mocks/mock_authenticator.hpp
View File

@ -2,7 +2,7 @@
#define MOCK_AUTHENTICATOR_H #define MOCK_AUTHENTICATOR_H
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include "webfuse/adapter/impl/authenticator.h" #include "webfuse/impl/authenticator.h"
namespace webfuse_test namespace webfuse_test
{ {

2
test/webfuse/mocks/mock_fuse.hpp
View File

@ -1,7 +1,7 @@
#ifndef MOCK_FUSE_HPP #ifndef MOCK_FUSE_HPP
#define MOCK_FUSE_HPP #define MOCK_FUSE_HPP
#include "webfuse/adapter/impl/fuse_wrapper.h" #include "webfuse/impl/fuse_wrapper.h"
#include <gmock/gmock.h> #include <gmock/gmock.h>
namespace webfuse_test namespace webfuse_test

2
test/webfuse/mocks/mock_operation_context.hpp
View File

@ -1,7 +1,7 @@
#ifndef MOCK_OPERATIONS_CONTEXT_HPP #ifndef MOCK_OPERATIONS_CONTEXT_HPP
#define MOCK_OPERATIONS_CONTEXT_HPP #define MOCK_OPERATIONS_CONTEXT_HPP
#include "webfuse/adapter/impl/operation/context.h" #include "webfuse/impl/operation/context.h"
#include <gmock/gmock.h> #include <gmock/gmock.h>
namespace webfuse_test namespace webfuse_test

2
test/webfuse/mocks/mock_provider_client.hpp
View File

@ -3,7 +3,7 @@
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include "webfuse/provider/client_config.h" #include "webfuse/provider/client_config.h"
#include "webfuse/core/status.h" #include "webfuse/status.h"
#include <stdexcept> #include <stdexcept>
namespace webfuse_test namespace webfuse_test

2
test/webfuse/tests/adapter/operation/test_close.cc
View File

@ -1,4 +1,4 @@
#include "webfuse/adapter/impl/operation/close.h" #include "webfuse/impl/operation/close.h"
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "webfuse/mocks/mock_fuse.hpp" #include "webfuse/mocks/mock_fuse.hpp"

4
test/webfuse/tests/adapter/operation/test_context.cc
View File

@ -1,5 +1,5 @@
#include "webfuse/adapter/impl/operation/context.h" #include "webfuse/impl/operation/context.h"
#include "webfuse/adapter/impl/session.h" #include "webfuse/impl/session.h"
#include <gtest/gtest.h> #include <gtest/gtest.h>
TEST(wf_impl_operation_context, get_proxy) TEST(wf_impl_operation_context, get_proxy)

4
test/webfuse/tests/adapter/operation/test_getattr.cc
View File

@ -1,6 +1,6 @@
#include "webfuse/adapter/impl/operation/getattr.h" #include "webfuse/impl/operation/getattr.h"
#include "webfuse/core/status.h" #include "webfuse/status.h"
#include "webfuse/mocks/mock_fuse.hpp" #include "webfuse/mocks/mock_fuse.hpp"
#include "webfuse/mocks/mock_operation_context.hpp" #include "webfuse/mocks/mock_operation_context.hpp"

4
test/webfuse/tests/adapter/operation/test_lookup.cc
View File

@ -1,6 +1,6 @@
#include "webfuse/adapter/impl/operation/lookup.h" #include "webfuse/impl/operation/lookup.h"
#include "webfuse/core/status.h" #include "webfuse/status.h"
#include "webfuse/mocks/mock_fuse.hpp" #include "webfuse/mocks/mock_fuse.hpp"
#include "webfuse/mocks/mock_operation_context.hpp" #include "webfuse/mocks/mock_operation_context.hpp"

4
test/webfuse/tests/adapter/operation/test_open.cc
View File

@ -1,6 +1,6 @@
#include "webfuse/adapter/impl/operation/open.h" #include "webfuse/impl/operation/open.h"
#include "webfuse/core/status.h" #include "webfuse/status.h"
#include "webfuse/mocks/mock_fuse.hpp" #include "webfuse/mocks/mock_fuse.hpp"
#include "webfuse/mocks/mock_operation_context.hpp" #include "webfuse/mocks/mock_operation_context.hpp"

2
test/webfuse/tests/adapter/operation/test_read.cc
View File

@ -1,4 +1,4 @@
#include "webfuse/adapter/impl/operation/read.h" #include "webfuse/impl/operation/read.h"
#include "webfuse/mocks/mock_fuse.hpp" #include "webfuse/mocks/mock_fuse.hpp"
#include "webfuse/mocks/mock_operation_context.hpp" #include "webfuse/mocks/mock_operation_context.hpp"

4
test/webfuse/tests/adapter/operation/test_readdir.cc
View File

@ -1,6 +1,6 @@
#include "webfuse/adapter/impl/operation/readdir.h" #include "webfuse/impl/operation/readdir.h"
#include "webfuse/core/status.h" #include "webfuse/status.h"
#include "webfuse/mocks/mock_fuse.hpp" #include "webfuse/mocks/mock_fuse.hpp"
#include "webfuse/mocks/mock_operation_context.hpp" #include "webfuse/mocks/mock_operation_context.hpp"

4
test/webfuse/tests/adapter/test_authenticator.cc
View File

@ -3,8 +3,8 @@
#include "webfuse/mocks/mock_authenticator.hpp" #include "webfuse/mocks/mock_authenticator.hpp"
#include "webfuse/adapter/impl/authenticator.h" #include "webfuse/impl/authenticator.h"
#include "webfuse/adapter/impl/credentials.h" #include "webfuse/impl/credentials.h"
using ::testing::Return; using ::testing::Return;
using ::testing::_; using ::testing::_;

4
test/webfuse/tests/adapter/test_authenticators.cc
View File

@ -1,8 +1,8 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include "webfuse/adapter/impl/authenticators.h" #include "webfuse/impl/authenticators.h"
#include "webfuse/adapter/impl/credentials.h" #include "webfuse/impl/credentials.h"
#include "webfuse/mocks/mock_authenticator.hpp" #include "webfuse/mocks/mock_authenticator.hpp"
using ::testing::_; using ::testing::_;

6
test/webfuse/tests/adapter/test_client.cc
View File

@ -2,9 +2,9 @@
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include "webfuse/utils/adapter_client.hpp" #include "webfuse/utils/adapter_client.hpp"
#include "webfuse/adapter/client_tlsconfig.h" #include "webfuse/client_tlsconfig.h"
#include "webfuse/adapter/credentials.h" #include "webfuse/credentials.h"
#include "webfuse/core/protocol_names.h" #include "webfuse/protocol_names.h"
#include "webfuse/utils/ws_server2.hpp" #include "webfuse/utils/ws_server2.hpp"
#include "webfuse/mocks/mock_adapter_client_callback.hpp" #include "webfuse/mocks/mock_adapter_client_callback.hpp"
#include "webfuse/mocks/mock_invokation_handler.hpp" #include "webfuse/mocks/mock_invokation_handler.hpp"

4
test/webfuse/tests/adapter/test_client_tlsconfig.cc
View File

@ -1,6 +1,6 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "webfuse/adapter/client_tlsconfig.h" #include "webfuse/client_tlsconfig.h"
#include "webfuse/adapter/impl/client_tlsconfig.h" #include "webfuse/impl/client_tlsconfig.h"
TEST(ClientTlsConfig, InitAndCleanup) TEST(ClientTlsConfig, InitAndCleanup)
{ {

4
test/webfuse/tests/adapter/test_credentials.cc
View File

@ -1,7 +1,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "webfuse/adapter/credentials.h" #include "webfuse/credentials.h"
#include "webfuse/adapter/impl/credentials.h" #include "webfuse/impl/credentials.h"
#include <jansson.h> #include <jansson.h>
TEST(Credentials, Type) TEST(Credentials, Type)

2
test/webfuse/tests/adapter/test_fuse_req.cc
View File

@ -1,5 +1,5 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "webfuse/adapter/impl/fuse_wrapper.h" #include "webfuse/impl/fuse_wrapper.h"
TEST(libfuse, fuse_req_t_size) TEST(libfuse, fuse_req_t_size)
{ {

2
test/webfuse/tests/adapter/test_mountpoint.cc
View File

@ -1,6 +1,6 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include "webfuse/adapter/mountpoint.h" #include "webfuse/mountpoint.h"
namespace namespace
{ {

4
test/webfuse/tests/adapter/test_server.cc
View File

@ -5,8 +5,8 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include "webfuse/adapter/server.h" #include "webfuse/server.h"
#include "webfuse/adapter/server_config.h" #include "webfuse/server_config.h"
namespace namespace
{ {

6
test/webfuse/tests/adapter/test_server_config.cc
View File

@ -1,7 +1,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "webfuse/adapter/server_config.h" #include "webfuse/server_config.h"
#include "webfuse/adapter/impl/server_config.h" #include "webfuse/impl/server_config.h"
#include "webfuse/adapter/impl/authenticator.h" #include "webfuse/impl/authenticator.h"
#include "webfuse/utils/tempdir.hpp" #include "webfuse/utils/tempdir.hpp"
using webfuse_test::TempDir; using webfuse_test::TempDir;

2
test/webfuse/tests/core/jsonrpc/test_proxy.cc
View File

@ -1,6 +1,6 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "webfuse/core/jsonrpc/proxy.h" #include "webfuse/core/jsonrpc/proxy.h"
#include "webfuse/core/status.h" #include "webfuse/status.h"
#include "webfuse/core/timer/manager.h" #include "webfuse/core/timer/manager.h"
#include "webfuse/tests/core/jsonrpc/mock_timer.hpp" #include "webfuse/tests/core/jsonrpc/mock_timer.hpp"

2
test/webfuse/tests/core/jsonrpc/test_request.cc
View File

@ -1,6 +1,6 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "webfuse/core/jsonrpc/request.h" #include "webfuse/core/jsonrpc/request.h"
#include "webfuse/core/status.h" #include "webfuse/status.h"
namespace namespace
{ {

2
test/webfuse/tests/core/jsonrpc/test_response.cc
View File

@ -1,6 +1,6 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "webfuse/core/jsonrpc/response_intern.h" #include "webfuse/core/jsonrpc/response_intern.h"
#include "webfuse/core/status.h" #include "webfuse/status.h"
TEST(wf_json_response, init_result) TEST(wf_json_response, init_result)
{ {

2
test/webfuse/tests/core/jsonrpc/test_server.cc
View File

@ -1,7 +1,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "webfuse/core/jsonrpc/server.h" #include "webfuse/core/jsonrpc/server.h"
#include "webfuse/core/jsonrpc/request.h" #include "webfuse/core/jsonrpc/request.h"
#include "webfuse/core/status.h" #include "webfuse/status.h"
namespace namespace
{ {

4
test/webfuse/tests/integration/server.cc
View File

@ -6,8 +6,8 @@
#include <cstring> #include <cstring>
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "webfuse_adapter.h" #include "webfuse/webfuse.h"
#include "webfuse/adapter/impl/server.h" #include "webfuse/impl/server.h"
#define WF_PATH_MAX (100) #define WF_PATH_MAX (100)

2
test/webfuse/tests/integration/test_lowlevel.cc
View File

@ -1,4 +1,4 @@
#include "webfuse_adapter.h" #include "webfuse/webfuse.h"
#include "webfuse_provider.h" #include "webfuse_provider.h"
#include <libwebsockets.h> #include <libwebsockets.h>

2
test/webfuse/utils/adapter_client.hpp
View File

@ -1,7 +1,7 @@
#ifndef WF_UTILS_ADAPTER_CLIENT_HPP #ifndef WF_UTILS_ADAPTER_CLIENT_HPP
#define WF_UTILS_APAPTER_CLIENT_HPP #define WF_UTILS_APAPTER_CLIENT_HPP
#include "webfuse/adapter/client.h" #include "webfuse/client.h"
#include <string> #include <string>
namespace webfuse_test namespace webfuse_test