Replace fnTcpClientRxBuffer with std::string (#1025)

Author: FozzTexx

Makefile

@@ -1,7 +1,7 @@
 SHELL=/bin/bash -o pipefail
 
 define builder
-  ./build.sh $1 | sed -e 's/\033[[][0-9][0-9]*m//g'
+  ./build.sh $1 2>&1 | sed -e 's/'$$'\033''[[][0-9][0-9]*m//g'
 endef
 
 .PHONY: upload uploadfs build all
@@ -18,8 +18,20 @@ build:
 all:
 	$(call builder, -a)
 
-pc:
-	$(call builder, -p APPLE)
+zip:
+	$(call builder, -z)
+
+coco-lwm:
+	$(call builder, -p COCO -g)
+
+rs232-lwm:
+	$(call builder, -p RS232 -g)
+
+apple-lwm:
+	$(call builder, -p APPLE -g)
+
+pico-de-coco:
+	make -C pico/coco/build
 
 clean:
 	$(call builder, -c)

lib/tcpip/fnTcpClient.cpp

@@ -37,162 +37,6 @@
 #define FNTCP_SELECT_TIMEOUT_US (1000000)
 #define FNTCP_FLUSH_BUFFER_SIZE (1024)
 
-class fnTcpClientRxBuffer
-{
-private:
-    size_t _size;
-    uint8_t *_buffer;
-    size_t _pos;
-    size_t _fill;
-    int _fd;
-    bool _failed;
-
-    size_t r_available()
-    {
-        if (_fd < 0)
-        {
-            return 0;
-        }
-#if defined(_WIN32)
-        unsigned long count;
-        int res = ioctlsocket(_fd, FIONREAD, &count);
-        if (res != 0)
-        {
-            _failed = true;
-            return 0;
-        }
-#else
-        int count;
-#ifdef ESP_PLATFORM
-        int res = lwip_ioctl(_fd, FIONREAD, &count);
-#else
-        int res = ioctl(_fd, FIONREAD, &count);
-#endif
-        if (res < 0)
-        {
-            _failed = true;
-            return 0;
-        }
-#endif
-        return count;
-    }
-
-    // Fill our buffer with data from the given socket descriptor
-    // Returns how much data was read
-    size_t fillBuffer()
-    {
-        // Allocate space for the buffer if we haven't already
-        if (!_buffer)
-        {
-            _buffer = (uint8_t *)malloc(_size);
-            if (!_buffer)
-            {
-                Debug_printf("Not enough memory to allocate buffer\r\n");
-                _failed = true;
-                return 0;
-            }
-        }
-
-        if (_fill && _pos == _fill)
-        {
-            _fill = 0;
-            _pos = 0;
-        }
-
-        if (!_buffer || _size <= _fill || !r_available())
-        {
-            return 0;
-        }
-
-        // Read the data
-        int res = recv(_fd, (char *)(_buffer + _fill), _size - _fill, MSG_DONTWAIT);
-        if (res < 0)
-        {
-            int err = compat_getsockerr();
-#if defined(_WIN32)
-            if (err != WSAEWOULDBLOCK)
-#else
-            if (err != EWOULDBLOCK)
-#endif
-            {
-                _failed = true;
-            }
-            return 0;
-        }
-        _fill += res;
-        return res;
-    }
-
-public:
-    fnTcpClientRxBuffer(int fd, size_t size = 1436)
-        : _size(size), _buffer(NULL), _pos(0), _fill(0), _fd(fd), _failed(false) {}
-
-    ~fnTcpClientRxBuffer() { free(_buffer); }
-
-    bool failed() { return _failed; }
-
-    // Read data and return how many bytes were read
-    int read(uint8_t *dst, size_t len)
-    {
-        // Fail if bad param or we're at the end of our buffer and couldn't get more data
-        if (!dst || !len || (_pos == _fill && !fillBuffer()))
-        {
-            return -1;
-        }
-
-        size_t a = _fill - _pos;
-        if (len <= a || ((len - a) <= (_size - _fill) && fillBuffer() >= (len - a)))
-        {
-            if (len == 1)
-            {
-                *dst = _buffer[_pos];
-            }
-            else
-            {
-                memcpy(dst, _buffer + _pos, len);
-            }
-            _pos += len;
-            return len;
-        }
-
-        size_t left = len;
-        size_t toRead = a;
-        uint8_t *buf = dst;
-        memcpy(buf, _buffer + _pos, toRead);
-        _pos += toRead;
-        left -= toRead;
-        buf += toRead;
-        while (left)
-        {
-            if (!fillBuffer())
-                return len - left;
-
-            a = _fill - _pos;
-            toRead = (a > left) ? left : a;
-            memcpy(buf, _buffer + _pos, toRead);
-            _pos += toRead;
-            left -= toRead;
-            buf += toRead;
-        }
-        return len;
-    }
-
-    // Return value at current buffer position
-    int peek()
-    {
-        // Return an error if we don't have any more data in our buffer and couldn't get more
-        if (_pos == _fill && !fillBuffer())
-            return -1;
-
-        return _buffer[_pos];
-    }
-
-    size_t available()
-    {
-        return _fill - _pos + r_available();
-    }
-};
-
 class fnTcpClientSocketHandle
 {
 private:
@@ -213,9 +57,10 @@ class fnTcpClientSocketHandle
 
 fnTcpClient::fnTcpClient(int fd)
 {
+    _fd = fd;
     _connected = true;
-    _clientSocketHandle.reset(new fnTcpClientSocketHandle(fd));
-    _rxBuffer.reset(new fnTcpClientRxBuffer(fd));
+    _clientSocketHandle.reset(new fnTcpClientSocketHandle(_fd));
+    _rxBuffer.clear();
 }
 
 fnTcpClient::~fnTcpClient()
@@ -226,7 +71,6 @@ fnTcpClient::~fnTcpClient()
 void fnTcpClient::stop()
 {
     _clientSocketHandle = nullptr;
-    _rxBuffer = nullptr;
     _connected = false;
 }
 
@@ -357,7 +201,7 @@ int fnTcpClient::connect(in_addr_t ip, uint16_t port, int32_t timeout)
 #endif
     // Create a socket handle and recieve buffer objects
     _clientSocketHandle.reset(new fnTcpClientSocketHandle(sockfd));
-    _rxBuffer.reset(new fnTcpClientRxBuffer(sockfd));
+    _rxBuffer.clear();
     _connected = true;
 
     return 1;
@@ -529,14 +373,15 @@ size_t fnTcpClient::write(uint8_t data)
 // Fill buffer with read data
 int fnTcpClient::read(uint8_t *buf, size_t size)
 {
-    int res = -1;
-    res = _rxBuffer->read(buf, size);
-    if (_rxBuffer->failed())
+    size_t rlen;
+
+    rlen = std::min(available(), size);
+    if (rlen)
     {
-        Debug_printf("fail on fd %d, errno: %d, \"%s\"\r\n", fd(), errno, strerror(errno));
-        stop();
+        memcpy(buf, _rxBuffer.data(), rlen);
+        _rxBuffer.erase(0, rlen);
     }
-    return res;
+    return rlen;
 }
 
 // Read one byte of data. Return read byte or negative value for error
@@ -571,28 +416,54 @@ int fnTcpClient::read_until(char terminator, char *buf, size_t size)
 // Peek at next byte available for reading
 int fnTcpClient::peek()
 {
-    int res = _rxBuffer->peek();
-    if (_rxBuffer->failed())
-    {
-        Debug_printf("fail on fd %d, errno: %d, \"%s\"\r\n", fd(), errno, strerror(errno));
-        stop();
-    }
-    return res;
+    if (_rxBuffer.size())
+        return _rxBuffer[0];
+    return -1;
 }
 
-// Return number of bytes available for reading
-int fnTcpClient::available()
+void fnTcpClient::updateFIFO()
 {
-    if (!_rxBuffer)
-        return 0;
+    // check if socket is still connected
+    if (!connected())
+    {
+        // connection was closed or it has an error
+        return;
+    }
+
+#if defined(_WIN32)
+    unsigned long count;
+    int res = ioctlsocket(_fd, FIONREAD, &count);
+    res = res != 0 ? -1 : count;
+#else
+    int count;
+    int res = ioctl(_fd, FIONREAD, &count);
+    res = res < 0 ? -1 : count;
+#endif
 
-    int res = _rxBuffer->available();
-    if (_rxBuffer->failed())
+    if (res > 0)
     {
-        Debug_printf("fail on fd %d, errno: %d, \"%s\"\r\n", fd(), errno, strerror(errno));
-        stop();
+        ssize_t result;
+
+        for (count = res; count; count -= result)
+        {
+            size_t old_len = _rxBuffer.size();
+            _rxBuffer.resize(old_len + count);
+            result = recv(_fd, &_rxBuffer[old_len], count, 0);
+            if (result < 0)
+                result = 0;
+            _rxBuffer.resize(old_len + result);
+        }
+
     }
-    return res;
+
+    return;
+}
+
+// Return number of bytes available for reading
+size_t fnTcpClient::available()
+{
+    updateFIFO();
+    return _rxBuffer.size();
 }
 
 // Send all pending data and clear receive buffer

lib/tcpip/fnTcpClient.h

@@ -4,16 +4,17 @@
 #define _FN_TCPCLIENT_H_
 
 #include <memory>
+#include <string>
 
 #include "compat_inet.h"
 
 class fnTcpClientSocketHandle;
-class fnTcpClientRxBuffer;
 
 class fnTcpClient
 {
 protected:
-    std::shared_ptr<fnTcpClientRxBuffer> _rxBuffer;
+    std::string _rxBuffer;
+    int _fd;
     std::shared_ptr<fnTcpClientSocketHandle> _clientSocketHandle;
     bool _connected = false;
 
@@ -36,7 +37,8 @@ class fnTcpClient
     int read(uint8_t *buf, size_t size);
     int read_until(char terminator, char *buf, size_t size);
 
-    int available();
+    void updateFIFO();
+    size_t available();
     int peek();
     void flush();
     uint8_t connected();