remove circular dependency

esp8266 · devyte · Sep 25, 2018 · Aug 22, 2018 · Aug 22, 2018 · Aug 22, 2018
commit 888bdb8c3b10b534e77495d3ea89396b04f8717c
diff --git a/libraries/ESP8266WiFi/src/WiFiClient.cpp b/libraries/ESP8266WiFi/src/WiFiClient.cpp
@@ -42,30 +42,33 @@ extern "C"
 #include "c_types.h"
 
 uint16_t WiFiClient::_localPort = 0;
-bool WiFiClient::_defaultNoDelay = true;
-bool WiFiClient::_defaultSync = false;
 
-static bool _defaultNoDelay = false; // false == Nagle enabled by default
-static bool _defaultSync = false;
+static bool defaultNoDelay = false; // false == Nagle enabled by default
+static bool defaultSync = false;
+
+bool getDefaultPrivateGlobalSyncValue ()
+{
+    return defaultSync;
+}
 
 void WiFiClient::setDefaultNoDelay (bool noDelay)
 {
-    _defaultNoDelay = noDelay;
+    defaultNoDelay = noDelay;
 }
 
 void WiFiClient::setDefaultSync (bool sync)
 {
-    _defaultSync = sync;
+    defaultSync = sync;
 }
 
 bool WiFiClient::getDefaultNoDelay ()
 {
-    return _defaultNoDelay;
+    return defaultNoDelay;
 }
 
 bool WiFiClient::getDefaultSync ()
 {
-    return _defaultSync;
+    return defaultSync;
 }
 
 template<>
@@ -86,8 +89,8 @@ WiFiClient::WiFiClient(ClientContext* client)
     _client->ref();
     WiFiClient::_add(this);
 
-    setSync(_defaultSync);
-    setNoDelay(_defaultNoDelay);
+    setSync(defaultSync);
+    setNoDelay(defaultNoDelay);
 }
 
 WiFiClient::~WiFiClient()
@@ -174,8 +177,8 @@ int WiFiClient::connect(IPAddress ip, uint16_t port)
         return 0;
     }
 
-    setSync(_defaultSync);
-    setNoDelay(_defaultNoDelay);
+    setSync(defaultSync);
+    setNoDelay(defaultNoDelay);
 
     return 1;
 }

diff --git a/libraries/ESP8266WiFi/src/WiFiClient.h b/libraries/ESP8266WiFi/src/WiFiClient.h
@@ -128,9 +128,6 @@ class WiFiClient : public Client, public SList<WiFiClient> {
 
   ClientContext* _client;
   static uint16_t _localPort;
-
-  static bool _defaultNoDelay;
-  static bool _defaultSync;
 };
 
 #endif
diff --git a/libraries/ESP8266WiFi/src/include/ClientContext.h b/libraries/ESP8266WiFi/src/include/ClientContext.h
@@ -31,11 +31,14 @@ extern "C" void esp_schedule();
 
 #include "DataSource.h"
 
+bool getDefaultPrivateGlobalSyncValue ();
+
 class ClientContext
 {
 public:
     ClientContext(tcp_pcb* pcb, discard_cb_t discard_cb, void* discard_cb_arg) :
-        _pcb(pcb), _rx_buf(0), _rx_buf_offset(0), _discard_cb(discard_cb), _discard_cb_arg(discard_cb_arg), _refcnt(0), _next(0), _sync(WiFiClient::getDefaultSync())
+        _pcb(pcb), _rx_buf(0), _rx_buf_offset(0), _discard_cb(discard_cb), _discard_cb_arg(discard_cb_arg), _refcnt(0), _next(0),
+        _sync(::getDefaultPrivateGlobalSyncValue())
     {
         tcp_setprio(pcb, TCP_PRIO_MIN);
         tcp_arg(pcb, this);
@@ -473,7 +476,7 @@ class ClientContext
                 // (with sync, we wait for acknowledgment before returning to user)
                 flags |= TCP_WRITE_FLAG_COPY;
             err_t err = tcp_write(_pcb, buf, next_chunk_size, flags);
-            DEBUGV(":wrc %d %d %d\r\n", next_chunk_size, will_send, (int)err);
+            DEBUGV(":wrc %d %d %d\r\n", next_chunk_size, _datasource->available(), (int)err);
             if (err == ERR_OK) {
                 _datasource->release_buffer(buf, next_chunk_size);
                 _written += next_chunk_size;