Merge branch 'main' of https://github.com/pschatzmann/Arduino-Emulator

Author: pschatzmann

ArduinoCore-Linux/cores/arduino/Ethernet.h

@@ -26,6 +26,7 @@
 #include "ArduinoLogger.h"
 #include "RingBufferExt.h"
 #include "SocketImpl.h"
+#include "SignalHandler.h"
 #include "api/Client.h"
 #include "api/Common.h"
 #include "api/IPAddress.h"
@@ -81,14 +82,16 @@ class EthernetClient : public Client {
     active_clients().push_back(this);
   }
   EthernetClient(SocketImpl* sock, int bufferSize = 256, long timeout = 2000) {
-    setTimeout(timeout);
-    this->bufferSize = bufferSize;
-    readBuffer = RingBufferExt(bufferSize);
-    writeBuffer = RingBufferExt(bufferSize);
-    p_sock = sock;
-    is_connected = p_sock->connected();
-    registerCleanup();
-    active_clients().push_back(this);
+    if (sock) {
+      setTimeout(timeout);
+      this->bufferSize = bufferSize;
+      readBuffer = RingBufferExt(bufferSize);
+      writeBuffer = RingBufferExt(bufferSize);
+      p_sock = sock;
+      is_connected = p_sock->connected();
+      registerCleanup();
+      active_clients().push_back(this);
+    }
   }
   EthernetClient(int socket) {
     setTimeout(2000);

ArduinoCore-Linux/cores/arduino/EthernetServer.h

@@ -172,15 +172,15 @@ class EthernetServer : public Server {
     // non blocking check if we have any request to accept
     if (!is_blocking) {
       if (poll_rc <= 0 || !(pfd.revents & POLLIN)) {
-        EthernetClient result;
+        EthernetClient result(nullptr);
         return result;
       }
     }
 
     // accept client connection (blocking call)
     if ((client_fd = ::accept(server_fd, (struct sockaddr*)&client_addr,
                               &client_addr_len)) < 0) {
-      EthernetClient result;
+      EthernetClient result(nullptr);
       Logger.error("accept failed");
       return result;
     }

ArduinoCore-Linux/cores/arduino/SignalHandler.h

@@ -25,6 +25,8 @@
 #include <map>
 #include <algorithm>
 
+#undef INADDR_NONE
+
 // Generic signal handler utility
 class SignalHandler {
  public:

CMakeLists.txt

@@ -9,6 +9,7 @@ option(USE_HTTPS "Https Support" OFF)
 option(USE_RPI "Raspberry Pi Support" OFF)
 option(USE_REMOTE "Remote API Support" OFF)
 option(BUILD_SHARED_LIBS "Build with shared libraries" ON)
+option(BUILD_EXAMPLES "Build with examples" OFF)
 
 # Https support: Build with wolfssl 
 if(USE_HTTPS)
@@ -94,4 +95,6 @@ if(USE_FTDI)
 endif(USE_FTDI)
 
 # build examples
-add_subdirectory("examples")
+if(BUILD_EXAMPLES)
+    add_subdirectory("examples")
+endif(BUILD_EXAMPLES)