upgrade ws client/server

Author: janbar

noson/src/filepicreader.cpp

@@ -21,7 +21,7 @@
 #include "filepicreader.h"
 #include "private/debug.h"
 #include "private/tokenizer.h"
-#include "private/urlencoder.h"
+#include "private/uriencoder.h"
 #include "private/byteorder.h"
 #include "private/base64.h"
 

noson/src/filestreamer.cpp

@@ -20,7 +20,8 @@
 #include "imageservice.h"
 #include "data/datareader.h"
 #include "private/debug.h"
-#include "private/urlencoder.h"
+#include "private/builtin.h"
+#include "private/uriencoder.h"
 #include "private/tokenizer.h"
 #include "private/wsstatic.h"
 #include "private/wsrequestbroker.h"

noson/src/imageservice.cpp

@@ -20,7 +20,7 @@
 #include "private/debug.h"
 #include "data/datareader.h"
 #include "filepicreader.h"
-#include "private/urlencoder.h"
+#include "private/uriencoder.h"
 #include "private/wsstatic.h"
 #include "private/wsrequestbroker.h"
 #include "private/wsrequestreply.h"

noson/src/private/builtin.c

@@ -249,6 +249,18 @@ void char_to_hex(char c, BUILTIN_BUFFER *str)
   p[2] = '\0';
 }
 
+void char_to_uhex(char c, BUILTIN_BUFFER *str)
+{
+  static const char g[16] = {
+    '0', '1', '2', '3', '4', '5', '6', '7',
+    '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
+  };
+  char * p = str->data;
+  p[0] = g[(0xf & (c >> 4))];
+  p[1] = g[(0xf & (c))];
+  p[2] = '\0';
+}
+
 unsigned uint_to_strdec(unsigned u, char *str, unsigned len, int pad)
 {
   static const char g[10] = {

noson/src/private/builtin.h

@@ -70,6 +70,9 @@ extern int hex_to_num(const char *str, int *num);
 #define char_to_hex __charhex
 extern void char_to_hex(char c, BUILTIN_BUFFER *str);
 
+#define char_to_uhex __charuhex
+extern void char_to_uhex(char c, BUILTIN_BUFFER *str);
+
 #define int64_to_string __int64str
 static CC_INLINE void int64_to_string(int64_t num, BUILTIN_BUFFER *str)
 {

noson/src/private/pathencoder.h

@@ -347,6 +347,36 @@ size_t SecureSocket::ReceiveData(void* buf, size_t n)
   return 0;
 }
 
+size_t SecureSocket::BlockingRead(void* buf, size_t n)
+{
+  if (m_connected && n > 0)
+  {
+    m_ssl_error = SSL_ERROR_NONE;
+    for (;;)
+    {
+      int r = SSL_read(static_cast<SSL*>(m_ssl), buf, (int) n);
+      if (r >= 0)
+        return (size_t) r;
+      int err = SSL_get_error(static_cast<SSL*>(m_ssl), r);
+      if (err == SSL_ERROR_WANT_READ)
+      {
+        DBG(DBG_DEBUG, "%s: SSL retry\n", __FUNCTION__);
+        continue;
+      }
+      if (err == SSL_ERROR_WANT_WRITE)
+      {
+        DBG(DBG_DEBUG, "%s: SSL wants write\n", __FUNCTION__);
+        m_ssl_error = ERR_get_error();
+        break;
+      }
+      m_ssl_error = ERR_get_error();
+      DBG(DBG_ERROR, "%s: SSL read failed: %s\n", __FUNCTION__, GetSSLError());
+      break;
+    }
+  }
+  return 0;
+}
+
 bool SecureSocket::SendData(const char* buf, size_t size)
 {
   if (m_connected && size > 0)
@@ -484,6 +514,13 @@ size_t SecureSocket::ReceiveData(void* buf, size_t n)
   return 0;
 }
 
+size_t SecureSocket::BlockingRead(void* buf, size_t n)
+{
+  (void)buf;
+  (void)n;
+  return 0;
+}
+
 bool SecureSocket::SendData(const char* buf, size_t size)
 {
   (void)buf;

noson/src/private/securesocket.cpp

@@ -111,6 +111,7 @@ namespace NSROOT
     bool Connect(const char *server, unsigned port, int rcvbuf);
     bool SendData(const char* buf, size_t size);
     size_t ReceiveData(void* buf, size_t n);
+    size_t BlockingRead(void* buf, size_t n);
     void Disconnect();
 
     bool IsCertificateValid(std::string& info);

noson/src/private/securesocket.h

@@ -414,6 +414,31 @@ size_t TcpSocket::ReceiveData(void *buf, size_t n)
   return 0;
 }
 
+size_t TcpSocket::BlockingRead(void *buf, size_t n)
+{
+  if (IsValid() && n > 0)
+  {
+    // Check for data remaining in buffer
+    if (m_buffer)
+    {
+      if (m_bufptr < m_buffer + m_rcvlen)
+      {
+        size_t rcvlen = m_rcvlen - (m_bufptr - m_buffer);
+        if (rcvlen > n)
+          rcvlen = n;
+        memcpy(buf, m_bufptr, rcvlen);
+        m_bufptr += rcvlen;
+        return rcvlen;
+      }
+    }
+
+    int r = 0;
+    if ((r = recv(m_socket, buf, n, 0)) > 0)
+      return r;
+  }
+  return 0;
+}
+
 void TcpSocket::Disconnect()
 {
   if (IsValid())

noson/src/private/socket.cpp

@@ -107,6 +107,14 @@ namespace NSROOT
      */
     virtual size_t ReceiveData(void* buf, size_t n);
 
+    /**
+     * Read data or block.
+     * @param buf the pointer to write data
+     * @param n read at most n bytes
+     * @return the number of received byte
+     */
+    virtual size_t BlockingRead(void* buf, size_t n);
+
     /**
      * Gracefully disconnect the socket.
      */