From b94dc9f61246ebfe59f81c3d0fc476e7a70689e2 Mon Sep 17 00:00:00 2001
From: Falk Werner <falk.werner@gmx.net>
Date: Sun, 24 May 2020 21:43:14 +0200
Subject: [PATCH 01/10] added option to prevent installation

---
 meson.build       | 16 ++++++++++++++--
 meson_options.txt |  1 +
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 meson_options.txt

diff --git a/meson.build b/meson.build
index f2b8c01..0bc537b 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,7 @@
 project('webfuse', 'c', 'cpp', version: '0.3.0', license: 'LGPL-3.0+')
 
+without_install = get_option('without_install')
+
 libwebsockets_dep = dependency('libwebsockets', version: '>=4.0.1') 
 jansson_dep = dependency('jansson', version: '>=2.11', fallback: ['jansson', 'jansson_dep'])
 libfuse_dep = dependency('fuse3', version: '>=3.8.0', fallback: ['fuse3', 'libfuse_dep'])
@@ -41,7 +43,9 @@ webfuse_core_dep = declare_dependency(
     link_with: webfuse_core,
 	dependencies: [jansson_dep, libwebsockets_dep])
 
+if not without_install
 install_subdir('include/webfuse/core', install_dir: 'include/webfuse')
+endif
 
 # Webfuse provider
 
@@ -75,13 +79,15 @@ webfuse_provider = shared_library('webfuse_provider',
     c_args: ['-fvisibility=hidden', '-DWFP_API=WFP_EXPORT'],
     include_directories: private_inc_dir,
     dependencies: [webfuse_provider_static_dep],
-	install: true)
+	install: not without_install)
 
 webfuse_provider_dep = declare_dependency(
 	include_directories: inc_dir,
 	link_with: [webfuse_provider],
 	dependencies: [libwebsockets_dep, jansson_dep])
 
+if not without_install
+
 install_headers('include/webfuse_provider.h', subdir: 'webfuse')
 install_subdir('include/webfuse/provider', install_dir: 'include/webfuse')
 
@@ -93,6 +99,8 @@ pkg_config.generate(
     filebase: 'webfuse_provider',
     description: 'Provider library for websockets filesystem')
 
+endif
+
 #  Webfuse adapter
 
 webfuse_adapter_static = static_library('webfuse_adapter',
@@ -130,13 +138,15 @@ webfuse_adapter = shared_library('webfuse_adapter',
     c_args: ['-fvisibility=hidden', '-DWF_API=WF_EXPORT'],
     include_directories: private_inc_dir,
     dependencies: [webfuse_adapter_static_dep, libfuse_dep],
-	install: true)
+	install: not without_install)
 
 webfuse_adapter_dep = declare_dependency(
 	include_directories: inc_dir,
 	link_with: [webfuse_adapter],
 	dependencies: [libfuse_dep, libwebsockets_dep, jansson_dep])
 
+if not without_install
+
 install_headers('include/webfuse_adapter.h', subdir: 'webfuse')
 install_subdir('include/webfuse/adapter', install_dir: 'include/webfuse')
 
@@ -148,6 +158,8 @@ pkg_config.generate(
     filebase: 'webfuse_adapter',
     description: 'Websockets filesystem server library')
 
+endif
+
 # Unit Tests
 
 fscheck = executable('fs_check',
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 0000000..e1a77c3
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1 @@
+option('without_install', type: 'boolean', value: false, description: 'skip installation shared libraries, headers and pkg-config files')

From 273e56bd636ae9243db8b8b6b536058cc7a1d784 Mon Sep 17 00:00:00 2001
From: Falk Werner <falk.werner@gmx.net>
Date: Mon, 25 May 2020 19:55:09 +0200
Subject: [PATCH 02/10] added build options for meson

---
 doc/build.md      | 27 ++++++++++++++++++++++-----
 meson.build       | 31 +++++++++++++++++++------------
 meson_options.txt |  4 +++-
 3 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/doc/build.md b/doc/build.md
index 3aa6bec..a100114 100644
--- a/doc/build.md
+++ b/doc/build.md
@@ -22,18 +22,35 @@ in order to reduce build dependencies.
 -   **WITHOUT_ADAPTER**: omit adapter library  
     `cmake -DWITHOUT_ADAPTER=ON`
 
--   **WIHTOU_PROVIDER**: omit provider library
+-   **WIHTOUT_PROVIDER**: omit provider library
     `cmake -DWITHOUT_PROVIDER=ON`
 
 ## Build using Meson (experimental)
 
 _Note: Meson build support is experimental. Do not rely on it._
 
-  meson .build
-  cd .build
-  ninja build
+    meson .build
+    cd .build
+    ninja build
+
+### Meson Build options
+
+Build options can be specified during meson setup or later via meson configure.
+
+    meson -D<option>=<value> .build
+
+The following options are available:
+
+-   **without_tests**: _(boolean)_ diable tests  
+    `meson -Dwithout_tests=true .build`
+
+-   **without_adapter**: _(boolean)_ omit adapter library  
+    `meson -Dwithout_adapter=true .build`
+
+-   **without_provider**: _(boolean)_ omit provider library
+    `meson -Dwithout_provider=true .build`
 
-_Note: Build options are not supported yet._
+_Note that unit tests are only available, when both libraries are built._
 
 ## Create API documentation
 
diff --git a/meson.build b/meson.build
index 0bc537b..7aa30f3 100644
--- a/meson.build
+++ b/meson.build
@@ -1,12 +1,12 @@
 project('webfuse', 'c', 'cpp', version: '0.3.0', license: 'LGPL-3.0+')
 
-without_install = get_option('without_install')
+without_adapter = get_option('without_adapter')
+without_provider = get_option('without_provider')
+without_tests = get_option('without_tests') or without_adapter or without_provider
+
 
 libwebsockets_dep = dependency('libwebsockets', version: '>=4.0.1') 
 jansson_dep = dependency('jansson', version: '>=2.11', fallback: ['jansson', 'jansson_dep'])
-libfuse_dep = dependency('fuse3', version: '>=3.8.0', fallback: ['fuse3', 'libfuse_dep'])
-gtest_dep = dependency('gtest', version: '>=1.10.0', fallback: ['gtest', 'gtest_dep']) 
-gmock_main_dep = dependency('gmock_main', version: '>=1.10.0', fallback: ['gtest', 'gmock_main_main_dep'])
 
 pkg_config = import('pkgconfig')
 
@@ -43,12 +43,12 @@ webfuse_core_dep = declare_dependency(
     link_with: webfuse_core,
 	dependencies: [jansson_dep, libwebsockets_dep])
 
-if not without_install
 install_subdir('include/webfuse/core', install_dir: 'include/webfuse')
-endif
 
 # Webfuse provider
 
+if not without_provider
+
 webfuse_provider_static = static_library('webfuse_provider',
 	'lib/webfuse/provider/api.c',
 	'lib/webfuse/provider/impl/url.c',
@@ -79,15 +79,13 @@ webfuse_provider = shared_library('webfuse_provider',
     c_args: ['-fvisibility=hidden', '-DWFP_API=WFP_EXPORT'],
     include_directories: private_inc_dir,
     dependencies: [webfuse_provider_static_dep],
-	install: not without_install)
+	install: true)
 
 webfuse_provider_dep = declare_dependency(
 	include_directories: inc_dir,
 	link_with: [webfuse_provider],
 	dependencies: [libwebsockets_dep, jansson_dep])
 
-if not without_install
-
 install_headers('include/webfuse_provider.h', subdir: 'webfuse')
 install_subdir('include/webfuse/provider', install_dir: 'include/webfuse')
 
@@ -103,6 +101,10 @@ endif
 
 #  Webfuse adapter
 
+if not without_adapter
+
+libfuse_dep = dependency('fuse3', version: '>=3.8.0', fallback: ['fuse3', 'libfuse_dep'])
+
 webfuse_adapter_static = static_library('webfuse_adapter',
 	'lib/webfuse/adapter/api.c',
 	'lib/webfuse/adapter/impl/filesystem.c',
@@ -138,15 +140,13 @@ webfuse_adapter = shared_library('webfuse_adapter',
     c_args: ['-fvisibility=hidden', '-DWF_API=WF_EXPORT'],
     include_directories: private_inc_dir,
     dependencies: [webfuse_adapter_static_dep, libfuse_dep],
-	install: not without_install)
+	install: true)
 
 webfuse_adapter_dep = declare_dependency(
 	include_directories: inc_dir,
 	link_with: [webfuse_adapter],
 	dependencies: [libfuse_dep, libwebsockets_dep, jansson_dep])
 
-if not without_install
-
 install_headers('include/webfuse_adapter.h', subdir: 'webfuse')
 install_subdir('include/webfuse/adapter', install_dir: 'include/webfuse')
 
@@ -162,6 +162,11 @@ endif
 
 # Unit Tests
 
+if not without_tests
+
+gtest_dep = dependency('gtest', version: '>=1.10.0', fallback: ['gtest', 'gtest_dep']) 
+gmock_main_dep = dependency('gmock_main', version: '>=1.10.0', fallback: ['gtest', 'gmock_main_main_dep'])
+
 fscheck = executable('fs_check',
 	'test/webfuse/tests/integration/fs_check.c')
 
@@ -270,3 +275,5 @@ alltests = executable('alltests',
 	])
 
 test('alltests', alltests)
+
+endif
\ No newline at end of file
diff --git a/meson_options.txt b/meson_options.txt
index e1a77c3..81622ad 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1 +1,3 @@
-option('without_install', type: 'boolean', value: false, description: 'skip installation shared libraries, headers and pkg-config files')
+option('without_tests', type: 'boolean', value: false, description: 'disable unit tests')
+option('without_adapter', type: 'boolean', value: false, description: 'disable adapter library')
+option('without_provider', type: 'boolean', value: false, description: 'disable provider library')
\ No newline at end of file

From 67ccadee4e664ce1f1499d2985a07441958e133c Mon Sep 17 00:00:00 2001
From: Falk Werner <falk.werner@gmx.net>
Date: Thu, 4 Jun 2020 17:55:33 +0200
Subject: [PATCH 03/10] added wrap file of libwebsockets

---
 meson.build                    | 7 ++++++-
 subprojects/libwebsockets.wrap | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 subprojects/libwebsockets.wrap

diff --git a/meson.build b/meson.build
index 7aa30f3..11a1487 100644
--- a/meson.build
+++ b/meson.build
@@ -4,8 +4,13 @@ without_adapter = get_option('without_adapter')
 without_provider = get_option('without_provider')
 without_tests = get_option('without_tests') or without_adapter or without_provider
 
+libwebsockets_dep = dependency('libwebsockets', version: '>=4.0.13', required: false)
+if not libwebsockets_dep.found()
+	cmake = import('cmake')
+	libwebsockets = cmake.subproject('libwebsockets')
+	libwebsockets_dep = libwebsockets.dependency('websockets_shared')
+endif
 
-libwebsockets_dep = dependency('libwebsockets', version: '>=4.0.1') 
 jansson_dep = dependency('jansson', version: '>=2.11', fallback: ['jansson', 'jansson_dep'])
 
 pkg_config = import('pkgconfig')
diff --git a/subprojects/libwebsockets.wrap b/subprojects/libwebsockets.wrap
new file mode 100644
index 0000000..da72f53
--- /dev/null
+++ b/subprojects/libwebsockets.wrap
@@ -0,0 +1,6 @@
+[wrap-file]
+directory = libwebsockets-4.0.13
+
+source_url = https://github.com/warmcat/libwebsockets/archive/v4.0.13.zip
+source_filename = v4.0.13.zip
+source_hash = 0914ea3fdec496daf6b6a5c00f7ba1b52eb8cc3d55b66685df92920b232fd7a5

From 9af1eb9e7362695ae4cc386c4af945f8acad67a1 Mon Sep 17 00:00:00 2001
From: Falk Werner <falk.werner@gmx.net>
Date: Fri, 5 Jun 2020 13:49:24 +0200
Subject: [PATCH 04/10] added changelog

---
 changelog.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 changelog.md

diff --git a/changelog.md b/changelog.md
new file mode 100644
index 0000000..ca852f4
--- /dev/null
+++ b/changelog.md
@@ -0,0 +1,31 @@
+# webfuse changelog
+
+## 0.3.0 _(Fri Jun 05 2020)_
+
+### Breaking Changes
+
+*   Remove argument `timeout_ms` in  `wf_server_service` and `wfp_client_service`
+*   Remove `wfp_client_ontimer`
+
+### New Features
+
+*   Add meson build support
+*   Add `wf_server_interrupt` and `wfp_client_interrupt`
+
+## 0.2.0 _(Sun Mar 01 2020)_
+
+### New Features
+
+*   Add authentication support of provider
+*   Add API documentation (doxygen)
+*   Add `mountpoint_factory`
+*   Add option to build adapter and provider libraries separately
+
+### Fixes
+
+*   Fix crash of example when using option `-h`
+*   Fix error in `static_filesystem` providen when adding multiple files to same directory
+
+## 0.1.0 _(Sat Apr 27 2019)_
+
+*   initial version

From b94530c0345cb118f741f48bdf85b11619817b9c Mon Sep 17 00:00:00 2001
From: Falk Werner <falk.werner@gmx.net>
Date: Fri, 5 Jun 2020 15:29:24 +0200
Subject: [PATCH 05/10] increased version

---
 CMakeLists.txt | 2 +-
 Doxyfile       | 2 +-
 VERSION        | 2 +-
 changelog.md   | 2 ++
 meson.build    | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e3f18c..aef7498 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required (VERSION 3.10)
-project(webfuse VERSION 0.3.0 DESCRIPTION "Websocket filesystem based on libfuse")
+project(webfuse VERSION 0.4.0 DESCRIPTION "Websocket filesystem based on libfuse")
 
 option(WITHOUT_TESTS    "disable unit tests"   OFF)
 option(WITHOUT_ADAPTER  "disable adapter library" OFF)
diff --git a/Doxyfile b/Doxyfile
index 4f4ccdf..adf69af 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "webfuse"
-PROJECT_NUMBER         = 0.3.0
+PROJECT_NUMBER         = 0.4.0
 PROJECT_BRIEF          = "Websocket filesystem based on libfuse"
 PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = "doc/api"
diff --git a/VERSION b/VERSION
index 0d91a54..1d0ba9e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.3.0
+0.4.0
diff --git a/changelog.md b/changelog.md
index ca852f4..9b4b3de 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,7 @@
 # webfuse changelog
 
+## 0.4.0 _(unknown)_
+
 ## 0.3.0 _(Fri Jun 05 2020)_
 
 ### Breaking Changes
diff --git a/meson.build b/meson.build
index 11a1487..cea37e2 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('webfuse', 'c', 'cpp', version: '0.3.0', license: 'LGPL-3.0+')
+project('webfuse', 'c', 'cpp', version: '0.4.0', license: 'LGPL-3.0+')
 
 without_adapter = get_option('without_adapter')
 without_provider = get_option('without_provider')

From 0dc93a6f31adefdd7502fa587859553297b05692 Mon Sep 17 00:00:00 2001
From: Falk Werner <falk.werner@gmx.net>
Date: Fri, 5 Jun 2020 23:06:48 +0200
Subject: [PATCH 06/10] fix: fixed dependency of jansson and gmock_main

---
 meson.build | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index cea37e2..5b3ffbe 100644
--- a/meson.build
+++ b/meson.build
@@ -76,7 +76,8 @@ webfuse_provider_static = static_library('webfuse_provider',
 
 webfuse_provider_static_dep = declare_dependency(
     include_directories: inc_dir,
-    link_with: webfuse_provider_static)
+    link_with: webfuse_provider_static,
+	dependencies: [webfuse_core_dep])
 
 webfuse_provider = shared_library('webfuse_provider',
     'lib/webfuse/provider/api.c',
@@ -137,7 +138,7 @@ webfuse_adapter_static = static_library('webfuse_adapter',
 webfuse_adapter_static_dep = declare_dependency(
 	include_directories: inc_dir,
 	link_with: [webfuse_adapter_static],
-	dependencies: [libfuse_dep])
+	dependencies: [webfuse_core_dep, libfuse_dep])
 
 webfuse_adapter = shared_library('webfuse_adapter',
     'lib/webfuse/adapter/api.c',
@@ -170,7 +171,7 @@ endif
 if not without_tests
 
 gtest_dep = dependency('gtest', version: '>=1.10.0', fallback: ['gtest', 'gtest_dep']) 
-gmock_main_dep = dependency('gmock_main', version: '>=1.10.0', fallback: ['gtest', 'gmock_main_main_dep'])
+gmock_main_dep = dependency('gmock_main', version: '>=1.10.0', fallback: ['gtest', 'gmock_main_dep'])
 
 fscheck = executable('fs_check',
 	'test/webfuse/tests/integration/fs_check.c')

From 82dedba6a145ee0e33eb70cc0d3a0c40556f2517 Mon Sep 17 00:00:00 2001
From: Falk Werner <falk.werner@gmx.net>
Date: Fri, 5 Jun 2020 23:44:00 +0200
Subject: [PATCH 07/10] added fix

---
 changelog.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/changelog.md b/changelog.md
index 9b4b3de..f7af51b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,10 @@
 
 ## 0.4.0 _(unknown)_
 
+### Fixes
+
+*   Fix meson build failure when gtest or jansson are not installed
+
 ## 0.3.0 _(Fri Jun 05 2020)_
 
 ### Breaking Changes

From 38ef0ddd9a3517b255dcb54db8d2e1ed28f1d1ee Mon Sep 17 00:00:00 2001
From: Falk Werner <falk.werner@gmx.net>
Date: Sat, 6 Jun 2020 00:00:08 +0200
Subject: [PATCH 08/10] fix: crash if libfuse is not available at runtime

---
 changelog.md                       | 1 +
 lib/webfuse/adapter/impl/session.c | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index f7af51b..cc9a9dd 100644
--- a/changelog.md
+++ b/changelog.md
@@ -5,6 +5,7 @@
 ### Fixes
 
 *   Fix meson build failure when gtest or jansson are not installed
+*   Fix crash if libfuse is not available at runtime
 
 ## 0.3.0 _(Fri Jun 05 2020)_
 
diff --git a/lib/webfuse/adapter/impl/session.c b/lib/webfuse/adapter/impl/session.c
index 6bacd10..159f43a 100644
--- a/lib/webfuse/adapter/impl/session.c
+++ b/lib/webfuse/adapter/impl/session.c
@@ -109,8 +109,11 @@ bool wf_impl_session_add_filesystem(
     if (result)
     {
         struct wf_impl_filesystem * filesystem = wf_impl_filesystem_create(session, name, mountpoint);
-        wf_slist_append(&session->filesystems, &filesystem->item);
         result = (NULL != filesystem);
+        if (result)
+        {
+            wf_slist_append(&session->filesystems, &filesystem->item);
+        }
     }
     
     // cleanup on error

From 11e45789baeb593512e56727ef9bd61d0820bf4a Mon Sep 17 00:00:00 2001
From: Falk Werner <falk.werner@gmx.net>
Date: Sat, 6 Jun 2020 08:08:37 +0200
Subject: [PATCH 09/10] fix: requires section of pc files

---
 meson.build | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 5b3ffbe..e08f828 100644
--- a/meson.build
+++ b/meson.build
@@ -96,7 +96,8 @@ install_headers('include/webfuse_provider.h', subdir: 'webfuse')
 install_subdir('include/webfuse/provider', install_dir: 'include/webfuse')
 
 pkg_config.generate(
-    libraries: [webfuse_provider, jansson_dep, libwebsockets_dep],
+    libraries: [webfuse_provider],
+	requires: ['libwebsockets', 'jansson'],
     subdirs: '.',
     version: meson.project_version(),
     name: 'libwebfuse_provider',
@@ -157,7 +158,8 @@ install_headers('include/webfuse_adapter.h', subdir: 'webfuse')
 install_subdir('include/webfuse/adapter', install_dir: 'include/webfuse')
 
 pkg_config.generate(
-    libraries: [webfuse_adapter, jansson_dep, libwebsockets_dep, libfuse_dep],
+    libraries: [webfuse_adapter],
+	requires: ['fuse3', 'libwebsockets', 'jansson'],
     subdirs: '.',
     version: meson.project_version(),
     name: 'libwebfuse_adapter',

From 11565d22ade0208354791a4f232ea00ce16c07c5 Mon Sep 17 00:00:00 2001
From: Falk Werner <falk.werner@gmx.net>
Date: Sat, 6 Jun 2020 10:59:06 +0200
Subject: [PATCH 10/10] fix: prevent deadlock if libfuse is not available at
 runtime

---
 test/webfuse/tests/integration/provider.cc | 58 ++++++++++++++++++++--
 test/webfuse/utils/static_filesystem.c     | 17 +++++++
 test/webfuse/utils/static_filesystem.h     |  9 ++++
 3 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/test/webfuse/tests/integration/provider.cc b/test/webfuse/tests/integration/provider.cc
index e813b4d..a4b4473 100644
--- a/test/webfuse/tests/integration/provider.cc
+++ b/test/webfuse/tests/integration/provider.cc
@@ -9,6 +9,39 @@
 
 using namespace std::chrono_literals;
 
+namespace
+{
+    enum class ConnectionState
+    {
+        disconnected,
+        connected,
+        connecting
+    };
+}
+
+extern "C"
+{
+
+void
+webfuse_test_provider_onconnected(
+    void * user_data)
+{
+    auto * fs = reinterpret_cast<wfp_static_filesystem*>(user_data);
+    auto * connection_state = reinterpret_cast<ConnectionState*>(wfp_static_filesystem_get_user_data(fs));
+    *connection_state = ConnectionState::connected;
+}
+
+void
+webfuse_test_provider_ondisconnected(
+    void * user_data)
+{
+    auto * fs = reinterpret_cast<wfp_static_filesystem*>(user_data);
+    auto * connection_state = reinterpret_cast<ConnectionState*>(wfp_static_filesystem_get_user_data(fs));
+    *connection_state = ConnectionState::disconnected;
+}
+
+}
+
 namespace webfuse_test
 {
 
@@ -18,23 +51,40 @@ public:
     explicit Private(char const * url)
     : is_shutdown_requested(false)
     {
+        ConnectionState connection_state = ConnectionState::connecting;
+
         config = wfp_client_config_create();
         wfp_client_config_set_certpath(config, "client-cert.pem");
         wfp_client_config_set_keypath(config, "client-key.pem");
         wfp_client_config_set_ca_filepath(config, "server-cert.pem");
+        wfp_client_config_set_onconnected(config, &webfuse_test_provider_onconnected);
+        wfp_client_config_set_ondisconnected(config, &webfuse_test_provider_ondisconnected);
 
         fs = wfp_static_filesystem_create(config);
+        wfp_static_filesystem_set_user_data(fs, reinterpret_cast<void*>(&connection_state));
         wfp_static_filesystem_add_text(fs, "hello.txt", 0444, "Hello, World");
 
         client = wfp_client_create(config);
         wfp_client_connect(client, url);
-        while (!wfp_impl_client_is_connected(client))
+        while (ConnectionState::connecting == connection_state)
         {
             wfp_client_service(client);
         }
-       
-        thread = std::thread(Run, this);
-        std::this_thread::sleep_for(200ms);
+
+        if (ConnectionState::connected == connection_state)
+        {
+            thread = std::thread(Run, this);
+            std::this_thread::sleep_for(200ms);
+        }
+        else
+        {
+            wfp_client_dispose(client);
+
+            wfp_static_filesystem_dispose(fs);
+            wfp_client_config_dispose(config);
+
+            throw std::runtime_error("unable to connect");
+        }
     }
 
     ~Private()
diff --git a/test/webfuse/utils/static_filesystem.c b/test/webfuse/utils/static_filesystem.c
index 855564b..0f64733 100644
--- a/test/webfuse/utils/static_filesystem.c
+++ b/test/webfuse/utils/static_filesystem.c
@@ -38,6 +38,7 @@ struct wfp_static_filesystem
     struct wfp_static_filesystem_entry * entries;
     size_t size;
     size_t capacity;
+    void * user_data;
 };
 
 static struct wfp_static_filesystem_entry *
@@ -335,6 +336,7 @@ wfp_static_filesystem_create(
     filesystem->entries = malloc(sizeof(struct wfp_static_filesystem_entry) * WFP_STATIC_FILESYSTEM_DEFAULT_CAPACITY);
     filesystem->size = 0;
     filesystem->capacity = WFP_STATIC_FILESYSTEM_DEFAULT_CAPACITY;
+    filesystem->user_data = NULL;
 
     wfp_static_filesystem_add_dir(filesystem, 0, "<root>");
 
@@ -402,3 +404,18 @@ wfp_static_filesystem_add_text(
     size_t length = strlen(content);
     wfp_static_filesystem_add(filesystem, path, mode, content, length);
 }
+
+void
+wfp_static_filesystem_set_user_data(
+    struct wfp_static_filesystem * filesystem,
+    void * user_data)
+{
+    filesystem->user_data = user_data;
+}
+
+void *
+wfp_static_filesystem_get_user_data(
+    struct wfp_static_filesystem * filesystem)
+{
+    return filesystem->user_data;
+}
diff --git a/test/webfuse/utils/static_filesystem.h b/test/webfuse/utils/static_filesystem.h
index bf23b88..d4d574a 100644
--- a/test/webfuse/utils/static_filesystem.h
+++ b/test/webfuse/utils/static_filesystem.h
@@ -56,6 +56,15 @@ wfp_static_filesystem_add_text(
     int mode,
     char const * content);
 
+extern void
+wfp_static_filesystem_set_user_data(
+    struct wfp_static_filesystem * filesystem,
+    void * user_data);
+
+extern void *
+wfp_static_filesystem_get_user_data(
+    struct wfp_static_filesystem * filesystem);
+
 #ifdef __cplusplus
 }
 #endif