moved wf_url to core

lib/webfuse/adapter/impl/client.c

@@ -85,14 +85,14 @@ void
 wf_impl_client_service(
     struct wf_client * client)
 {
-    (void) client;
+    lws_service(client->context, 0);
 }
 
 void
 wf_impl_client_interrupt(
     struct wf_client * client)
 {
-    (void) client;
+    lws_cancel_service(client->context);
 }
 
 void

lib/webfuse/adapter/impl/client_protocol.c

@@ -53,3 +53,18 @@ wf_impl_client_protocol_init_lws(
     lws_protocol->per_session_data_size = 0;
     lws_protocol->user = protocol;
 }
+
+void
+wf_impl_client_protocol_connect(
+    struct wf_client_protocol * protocol,
+    char const * url)
+{
+
+}
+
+void
+wf_impl_client_protocol_disconnect(
+    struct wf_client_protocol * protocol)
+{
+
+}

lib/webfuse/adapter/impl/client_protocol.h

@@ -43,6 +43,15 @@ wf_impl_client_protocol_init_lws(
     struct wf_client_protocol * protocol,
     struct lws_protocols * lws_protocol);
 
+extern void
+wf_impl_client_protocol_connect(
+    struct wf_client_protocol * protocol,
+    char const * url);
+
+extern void
+wf_impl_client_protocol_disconnect(
+    struct wf_client_protocol * protocol);
+
 #ifdef __cplusplus
 }
 #endif

lib/webfuse/adapter/impl/client_tlsconfig.c

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

lib/webfuse/core/url.c

@@ -1,9 +1,9 @@
-#include "webfuse/provider/impl/url.h"
+#include "webfuse/core/url.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-struct wfp_impl_url_protocol
+struct wf_url_protocol
 {
     char const * name;
     size_t name_length;
@@ -11,11 +11,11 @@ struct wfp_impl_url_protocol
     bool use_tls;
 };
 
-static bool wfp_impl_url_readprotocol(
-    struct wfp_impl_url * url,
+static bool wf_url_readprotocol(
+    struct wf_url * url,
     char const * * data)
 {
-    static struct wfp_impl_url_protocol const known_protocols[] =
+    static struct wf_url_protocol const known_protocols[] =
     {
         {"ws://", 5, 80, false},
         {"wss://", 6, 443, true}
@@ -25,7 +25,7 @@ static bool wfp_impl_url_readprotocol(
     bool found = false;
     for(size_t i = 0; (!found) && (i < count); i++)
     {
-        struct wfp_impl_url_protocol const * protocol = &known_protocols[i];
+        struct wf_url_protocol const * protocol = &known_protocols[i];
         if (0 == strncmp(*data, protocol->name, protocol->name_length))
         {
             url->port = protocol->default_port;
@@ -38,8 +38,8 @@ static bool wfp_impl_url_readprotocol(
     return found;
 }
 
-static bool wfp_impl_url_readhost(
-    struct wfp_impl_url * url,
+static bool wf_url_readhost(
+    struct wf_url * url,
     char const * * data)
 {
     char * end = strpbrk(*data, ":/");
@@ -55,8 +55,8 @@ static bool wfp_impl_url_readhost(
     return result;
 }
 
-static bool wfp_impl_url_readport(
-    struct wfp_impl_url * url,
+static bool wf_url_readport(
+    struct wf_url * url,
     char const * * data)
 {
     bool result;
@@ -81,8 +81,8 @@ static bool wfp_impl_url_readport(
     return result;
 }
 
-static bool wfp_impl_url_readpath(
-    struct wfp_impl_url * url,
+static bool wf_url_readpath(
+    struct wf_url * url,
     char const * * data)
 {
     bool const result = ('/' == **data);
@@ -93,33 +93,33 @@ static bool wfp_impl_url_readpath(
 }
 
 
-bool wfp_impl_url_init(
-    struct wfp_impl_url * url,
+bool wf_url_init(
+    struct wf_url * url,
     char const * value)
 {
-    memset(url, 0, sizeof(struct wfp_impl_url));
+    memset(url, 0, sizeof(struct wf_url));
     char const * data = value;
 
     bool const result = 
-        wfp_impl_url_readprotocol(url, &data) &&
-        wfp_impl_url_readhost(url, &data) &&
-        wfp_impl_url_readport(url, &data) &&
-        wfp_impl_url_readpath(url, &data)
+        wf_url_readprotocol(url, &data) &&
+        wf_url_readhost(url, &data) &&
+        wf_url_readport(url, &data) &&
+        wf_url_readpath(url, &data)
         ;
 
     if (!result)
     {
-        wfp_impl_url_cleanup(url);
+        wf_url_cleanup(url);
     }
 
     return result;
 }
 
-void wfp_impl_url_cleanup(
-    struct wfp_impl_url * url)
+void wf_url_cleanup(
+    struct wf_url * url)
 {    
     free(url->host);
     free(url->path);
-    memset(url, 0, sizeof(struct wfp_impl_url));
+    memset(url, 0, sizeof(struct wf_url));
 }
 

lib/webfuse/core/url.h

@@ -1,5 +1,5 @@
-#ifndef WF_PROVIDER_IMPL_URL_H
-#define WF_PROVIDER_IMPL_URL_H
+#ifndef WF_URL_H
+#define WF_URL_H
 
 #ifndef __cplusplus
 #include <stdbool.h>
@@ -9,7 +9,7 @@
 extern "C"
 {
 #endif
-struct wfp_impl_url
+struct wf_url
 {
     char * host;
     int port;
@@ -17,12 +17,12 @@ struct wfp_impl_url
     bool use_tls;
 };
 
-extern bool wfp_impl_url_init(
-    struct wfp_impl_url * url,
+extern bool wf_url_init(
+    struct wf_url * url,
     char const * value);
 
-extern void wfp_impl_url_cleanup(
-    struct wfp_impl_url * url);
+extern void wf_url_cleanup(
+    struct wf_url * url);
 
 
 #ifdef __cplusplus

lib/webfuse/provider/impl/client_protocol.c

@@ -13,7 +13,7 @@
 #include "webfuse/core/message.h"
 #include "webfuse/core/message_queue.h"
 #include "webfuse/core/container_of.h"
-#include "webfuse/provider/impl/url.h"
+#include "webfuse/core/url.h"
 #include "webfuse/core/protocol_names.h"
 
 #include "webfuse/core/timer/manager.h"
@@ -297,8 +297,8 @@ void wfp_impl_client_protocol_connect(
     struct lws_context * context,
     char const * url)
 {
-    struct wfp_impl_url url_data;
-    bool const success = wfp_impl_url_init(&url_data, url);
+    struct wf_url url_data;
+    bool const success = wf_url_init(&url_data, url);
     if (success)
     {
         struct lws_client_connect_info info;
@@ -316,7 +316,7 @@ void wfp_impl_client_protocol_connect(
 
         lws_client_connect_via_info(&info);
 
-        wfp_impl_url_cleanup(&url_data);
+        wf_url_cleanup(&url_data);
     }
     else
     {