+sync, get/set default nodelay, sync

libraries/ESP8266WiFi/src/WiFiClient.cpp

@@ -42,6 +42,8 @@ extern "C"
 #include "c_types.h"
 
 uint16_t WiFiClient::_localPort = 0;
+bool WiFiClient::_defaultNoDelay = false;
+bool WiFiClient::_defaultSync = false;
 
 template<>
 WiFiClient* SList<WiFiClient>::_s_first = 0;
@@ -60,6 +62,9 @@ WiFiClient::WiFiClient(ClientContext* client)
     _timeout = 5000;
     _client->ref();
     WiFiClient::_add(this);
+
+    setSync(_defaultSync);
+    setNoDelay(_defaultNoDelay);
 }
 
 WiFiClient::~WiFiClient()
@@ -91,7 +96,6 @@ WiFiClient& WiFiClient::operator=(const WiFiClient& other)
     return *this;
 }
 
-
 int WiFiClient::connect(const char* host, uint16_t port)
 {
     IPAddress remote_addr;
@@ -147,6 +151,9 @@ int WiFiClient::connect(IPAddress ip, uint16_t port)
         return 0;
     }
 
+    setSync(_defaultSync);
+    setNoDelay(_defaultNoDelay);
+
     return 1;
 }
 
@@ -156,12 +163,26 @@ void WiFiClient::setNoDelay(bool nodelay) {
     _client->setNoDelay(nodelay);
 }
 
-bool WiFiClient::getNoDelay() {
+bool WiFiClient::getNoDelay() const {
     if (!_client)
         return false;
     return _client->getNoDelay();
 }
 
+void WiFiClient::setSync(bool sync)
+{
+    if(!_client)
+        return;
+    _client->setSync(sync);
+}
+
+bool WiFiClient::getSync() const
+{
+    if(!_client)
+        return false;
+    return _client->getSync();
+}
+
 size_t WiFiClient::availableForWrite ()
 {
     return _client? _client->availableForWrite(): 0;

libraries/ESP8266WiFi/src/WiFiClient.h

@@ -76,8 +76,11 @@ class WiFiClient : public Client, public SList<WiFiClient> {
   uint16_t  remotePort();
   IPAddress localIP();
   uint16_t  localPort();
-  bool getNoDelay();
+  bool getNoDelay() const;
   void setNoDelay(bool nodelay);
+  bool getSync() const;
+  void setSync(bool sync);
+
   static void setLocalPortStart(uint16_t port) { _localPort = port; }
 
   size_t availableForWrite();
@@ -96,6 +99,11 @@ class WiFiClient : public Client, public SList<WiFiClient> {
   uint8_t  getKeepAliveCount () const;
   void     disableKeepAlive () { keepAlive(0, 0, 0); }
 
+  static void setDefaultNoDelay (bool noDelay) { _defaultNoDelay = noDelay; }
+  static void setDefaultSync    (bool sync)    { _defaultSync = sync; }
+  static bool getDefaultNoDelay ()             { return _defaultNoDelay; }
+  static bool getDefaultSync    ()             { return _defaultSync; }
+
 protected:
 
   static int8_t _s_connected(void* arg, void* tpcb, int8_t err);
@@ -106,6 +114,9 @@ class WiFiClient : public Client, public SList<WiFiClient> {
 
   ClientContext* _client;
   static uint16_t _localPort;
+
+  static bool _defaultNoDelay;
+  static bool _defaultSync;
 };
 
 #endif

libraries/ESP8266WiFi/src/WiFiServer.cpp

@@ -88,11 +88,16 @@ void WiFiServer::begin(uint16_t port) {
 }
 
 void WiFiServer::setNoDelay(bool nodelay) {
-    _noDelay = nodelay;
+    _noDelay = nodelay? _ndTrue: _ndFalse;
 }
 
 bool WiFiServer::getNoDelay() {
-    return _noDelay;
+    switch (_noDelay)
+    {
+    case _ndFalse: return false;
+    case _ndTrue: return true;
+    default: return WiFiClient::getDefaultNoDelay();
+    }
 }
 
 bool WiFiServer::hasClient() {
@@ -106,7 +111,7 @@ WiFiClient WiFiServer::available(byte* status) {
     if (_unclaimed) {
         WiFiClient result(_unclaimed);
         _unclaimed = _unclaimed->next();
-        result.setNoDelay(_noDelay);
+        result.setNoDelay(getNoDelay());
         DEBUGV("WS:av\r\n");
         return result;
     }

libraries/ESP8266WiFi/src/WiFiServer.h

@@ -43,7 +43,7 @@ class WiFiServer : public Server {
 
   ClientContext* _unclaimed;
   ClientContext* _discarded;
-  bool _noDelay = false;
+  enum { _ndDefault, _ndFalse, _ndTrue } _noDelay = _ndDefault;
 
 public:
   WiFiServer(IPAddress addr, uint16_t port);

libraries/ESP8266WiFi/src/include/ClientContext.h

@@ -35,7 +35,7 @@ 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)
+        _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())
     {
         tcp_setprio(pcb, TCP_PRIO_MIN);
         tcp_arg(pcb, this);
@@ -44,7 +44,7 @@ class ClientContext
         tcp_err(pcb, &_s_error);
         tcp_poll(pcb, &_s_poll, 1);
 
-        // not enabled by default for 2.4.0
+        // keep-alive not enabled by default
         //keepAlive();
     }
 
@@ -159,7 +159,7 @@ class ClientContext
         }
     }
 
-    bool getNoDelay()
+    bool getNoDelay() const
     {
         if(!_pcb) {
             return false;
@@ -172,12 +172,12 @@ class ClientContext
         _timeout_ms = timeout_ms;
     }
 
-    int getTimeout()
+    int getTimeout() const
     {
         return _timeout_ms;
     }
 
-    uint32_t getRemoteAddress()
+    uint32_t getRemoteAddress() const
     {
         if(!_pcb) {
             return 0;
@@ -186,7 +186,7 @@ class ClientContext
         return _pcb->remote_ip.addr;
     }
 
-    uint16_t getRemotePort()
+    uint16_t getRemotePort() const
     {
         if(!_pcb) {
             return 0;
@@ -195,7 +195,7 @@ class ClientContext
         return _pcb->remote_port;
     }
 
-    uint32_t getLocalAddress()
+    uint32_t getLocalAddress() const
     {
         if(!_pcb) {
             return 0;
@@ -204,7 +204,7 @@ class ClientContext
         return _pcb->local_ip.addr;
     }
 
-    uint16_t getLocalPort()
+    uint16_t getLocalPort() const
     {
         if(!_pcb) {
             return 0;
@@ -257,7 +257,7 @@ class ClientContext
         return size_read;
     }
 
-    char peek()
+    char peek() const
     {
         if(!_rx_buf) {
             return 0;
@@ -266,7 +266,7 @@ class ClientContext
         return reinterpret_cast<char*>(_rx_buf->payload)[_rx_buf_offset];
     }
 
-    size_t peekBytes(char *dst, size_t size)
+    size_t peekBytes(char *dst, size_t size) const
     {
         if(!_rx_buf) {
             return 0;
@@ -307,7 +307,7 @@ class ClientContext
         int tries = 1+ WAIT_TRIES_MS;
 
         while (state() == ESTABLISHED && tcp_sndbuf(_pcb) != TCP_SND_BUF && --tries) {
-            _write_some();
+            //_write_some();
             delay(1); // esp_ schedule+yield
         }
     }
@@ -321,7 +321,6 @@ class ClientContext
         return _pcb->state;
     }
 
-
     size_t write(const uint8_t* data, size_t size)
     {
         if (!_pcb) {
@@ -379,6 +378,16 @@ class ClientContext
         return isKeepAliveEnabled()? _pcb->keep_cnt: 0;
     }
 
+    bool getSync () const
+    {
+        return _sync;
+    }
+
+    void setSync (bool sync)
+    {
+        _sync = sync;
+    }
+
 protected:
 
     bool _is_timeout()
@@ -418,6 +427,10 @@ class ClientContext
             esp_yield();
         } while(true);
         _send_waiting = 0;
+
+        if (_sync)
+            wait_until_sent();
+
         return _written;
     }
 
@@ -442,11 +455,9 @@ class ClientContext
             //   PUSH is for peer, telling to give to user app as soon as received
             //   PUSH may be set when sender has finished sending a meaningful data block
             //   Nagle is for delaying local stack, to send less and bigger packets
-            uint8_t flags = TCP_WRITE_FLAG_COPY;
-           if (!tcp_nagle_disabled(_pcb))
-                // nagle enabled, delayed, buffering, bigger packets
-                // (When should we use PUSH?)
-                flags |= TCP_WRITE_FLAG_MORE;
+            uint8_t flags = TCP_WRITE_FLAG_MORE; // do not tcp-PuSH (XXX always?)
+            if (!_sync)
+                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);
             if (err == ERR_OK) {
@@ -460,10 +471,12 @@ class ClientContext
             }
         }
 
-        if (has_written && tcp_nagle_disabled(_pcb))
+        if (has_written && (_sync || tcp_nagle_disabled(_pcb)))
+        {
             // handle nagle manually because of TCP_WRITE_FLAG_MORE
             // lwIP's tcp_output: "Find out what we can send and send it"
             tcp_output(_pcb);
+        }
 
         return has_written;
     }
@@ -472,7 +485,7 @@ class ClientContext
     {
         // lwIP needs feeding
         _write_some();
-        
+
         if (_send_waiting == 1) {
             _send_waiting--;
         }
@@ -596,14 +609,15 @@ class ClientContext
 
     DataSource* _datasource = nullptr;
     size_t _written = 0;
-    //size_t _write_chunk_size = 256;
     uint32_t _timeout_ms = 5000;
     uint32_t _op_start_time = 0;
     uint8_t _send_waiting = 0;
     uint8_t _connect_pending = 0;
 
     int8_t _refcnt;
     ClientContext* _next;
+
+    bool _sync;
 };
 
 #endif//CLIENTCONTEXT_H