WIP mdns

Author: d-a-v

cores/esp8266/spiffs_api.h

@@ -221,8 +221,8 @@ class SPIFFSImpl : public FSImpl
 
         if (!_workBuf) {
             DEBUGV("SPIFFSImpl: allocating %d+%d+%d=%d bytes\r\n",
-                   workBufSize, fdsBufSize, cacheBufSize,
-                   workBufSize + fdsBufSize + cacheBufSize);
+                   (int)workBufSize, (int)fdsBufSize, (int)cacheBufSize,
+                   (int)(workBufSize + fdsBufSize + cacheBufSize));
             _workBuf.reset(new uint8_t[workBufSize]);
             _fdsBuf.reset(new uint8_t[fdsBufSize]);
             _cacheBuf.reset(new uint8_t[cacheBufSize]);

libraries/ESP8266WiFi/src/WiFiUdp.cpp

@@ -286,15 +286,15 @@ uint16_t WiFiUDP::localPort()
 void WiFiUDP::stopAll()
 {
     for (WiFiUDP* it = _s_first; it; it = it->_next) {
-        DEBUGV("%s %08x %08x\n", __func__, (uint32_t) it, (uint32_t) _s_first);
+        DEBUGV("%s %p %p\n", __func__, it, _s_first);
         it->stop();
     }
 }
 
 void WiFiUDP::stopAllExcept(WiFiUDP * exC) {
     for (WiFiUDP* it = _s_first; it; it = it->_next) {
         if (it->_ctx != exC->_ctx) {
-            DEBUGV("%s %08x %08x\n", __func__, (uint32_t) it, (uint32_t) _s_first);
+            DEBUGV("%s %p %p\n", __func__, it, _s_first);
             it->stop();
         }
     }

tests/host/Makefile

@@ -80,7 +80,10 @@ PREINCLUDES := \
 	-include common/mock.h \
 	-include common/c_types.h \
 
-CXXFLAGS += -std=c++11 -Wall -Werror -coverage -O0 -fno-common -g
+DEBUG += -DDEBUG_ESP_PORT=Serial
+DEBUG += -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_MDNS
+
+CXXFLAGS += $(DEBUG) -std=c++11 -Wall -Werror -coverage -O0 -fno-common -g
 CFLAGS += -std=c99 -Wall -Werror -coverage -O0 -fno-common -g
 LDFLAGS += -coverage -O0 -g
 VALGRINDFLAGS += --leak-check=full --track-origins=yes --error-limit=no --show-leak-kinds=all --error-exitcode=999
@@ -172,9 +175,9 @@ MOCK_ARDUINO_LIBS := \
 			Parsing.cpp \
 			detail/mimetable.cpp \
 		) \
+		ESP8266mDNS/ESP8266mDNS.cpp \
 	)
 
-#		ESP8266mDNS/ESP8266mDNS.cpp \
 
 
 MOCK_ARDUINO_LIBS += \

tests/host/common/ArduinoMain.cpp

@@ -1,15 +1,51 @@
 
 #include <Arduino.h>
 
+#include <functional>
+#include "lwip/opt.h"
+#include "lwip/udp.h"
+#include "lwip/inet.h"
+#include "lwip/igmp.h"
+#include "lwip/mem.h"
+#include <include/UdpContext.h>
+#include <poll.h>
+
 #include <unistd.h> // usleep
+#include <map>
+
+std::map<int,UdpContext*> udps;
+
+void register_udp (int sock, UdpContext* udp)
+{
+	if (udp)
+		udps[sock] = udp;
+	else
+		udps.erase(sock);
+}
+
 
 int main (void)
 {
 	setup();
 	while (true)
 	{
 		usleep(10000); // not 100% cpu
+		
 		loop();
+		
+		// check incoming udp
+		for (auto& udp: udps)
+		{
+			pollfd p;
+			p.fd = udp.first;
+			p.events = POLLIN;
+			if (poll(&p, 1, 0) && p.revents == POLLIN)
+			{
+				fprintf(stderr, MOCK "UDP poll(%d) -> cb\n", (int)p.fd);
+				udp.second->mock_cb();
+			}
+		}
+		
 	}
 	return 0;
 }

tests/host/common/MockTools.cpp

@@ -1,5 +1,6 @@
 
 #include <arpa/inet.h>
+#include <stdarg.h>
 
 extern "C"
 {
@@ -12,4 +13,13 @@ uint16_t lwip_ntohs (uint16_t netshort)  { return ntohs(netshort);  }
 char* ets_strcpy (char* d, const char* s) { return strcpy(d, s); }
 size_t ets_strlen (const char* s) { return strlen(s); }
 
+int ets_printf (const char* fmt, ...)
+{
+        va_list ap;
+        va_start(ap, fmt);
+	int len = vprintf(fmt, ap);
+	va_end(ap);
+	return len;
+}
+
 };

tests/host/common/MockUDPSocket.cpp

@@ -26,7 +26,7 @@ bool mockUDPListen (int sock, uint32_t dstaddr, uint16_t port, uint32_t mcast)
 
 	// Filling server information 
 	servaddr.sin_family = AF_INET;
-	servaddr.sin_addr.s_addr = htonl(dstaddr);
+	servaddr.sin_addr.s_addr = dstaddr;
 	servaddr.sin_port = htons(port);
 
 	// Bind the socket with the server address 
@@ -42,8 +42,8 @@ bool mockUDPListen (int sock, uint32_t dstaddr, uint16_t port, uint32_t mcast)
 	{
 		// https://web.cs.wpi.edu/~claypool/courses/4514-B99/samples/multicast.c
 		struct ip_mreq mreq;
-		mreq.imr_multiaddr.s_addr = htonl(mcast);
-		mreq.imr_interface.s_addr = htonl(INADDR_ANY);         
+		mreq.imr_multiaddr.s_addr = mcast;
+		mreq.imr_interface.s_addr = 0;//htonl(INADDR_ANY);         
 		if (setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0)
 		{
 			fprintf(stderr, MOCK "can't join multicast group addr %08x\n", (int)mcast);

tests/host/common/MockWiFiServer.cpp

@@ -7,6 +7,8 @@
 
 #include <include/ClientContext.h>
 
+extern "C" const ip_addr_t ip_addr_any = IPADDR4_INIT(IPADDR_ANY);
+
 #define int2pcb(x) ((tcp_pcb*)(long)(x))
 #define pcb2int(x) ((int)(long)(x))
 

tests/host/common/include/UdpContext.h

@@ -62,19 +62,25 @@ class UdpContext
 
     bool listen(ip_addr_t addr, uint16_t port)
     {
-        return mockUDPListen(_sock, addr.addr, port, staticMCastAddr);
+        bool ret = mockUDPListen(_sock, addr.addr, port, staticMCastAddr);
+        register_udp(_sock, this);
+        return ret;
     }
 
     void disconnect()
     {
         if (_sock >= 0)
+        {
             close(_sock);
+            register_udp(_sock, nullptr);
+        }
         _sock = -1;
     }
 
     void setMulticastInterface(const ip_addr_t& addr)
     {
-        fprintf(stderr, MOCK "TODO: UdpContext::setMulticastInterface\n");
+    	// not needed on posix, multicast is associated with
+    	// socket and its address (0.0.0.0) = all interfaces
     }
 
     void setMulticastTTL(int ttl)
@@ -165,8 +171,8 @@ class UdpContext
 
     void flush()
     {
-	fprintf(stderr, MOCK "UdpContext::flush() does not follow arduino's flush concept\n");
-	exit(EXIT_FAILURE);
+	//fprintf(stderr, MOCK "UdpContext::flush() does not follow arduino's flush concept\n");
+	//exit(EXIT_FAILURE);
 	// would be:
         _inbufsize = 0;
     }
@@ -192,6 +198,11 @@ class UdpContext
     	_outbufsize = 0;
     	return ret > 0;
     }
+    
+    void mock_cb (void)
+    {
+    	if (_on_rx) _on_rx();
+    }
 
 public:
 

tests/host/common/mock.h

@@ -33,6 +33,18 @@ typedef uint32_t uint32;
 //
 
 #ifdef __cplusplus
+extern "C" {
+#endif
+int ets_printf (const char* fmt, ...) __attribute__ ((format (printf, 1, 2)));
+#define os_printf_plus ets_printf
+#ifdef __cplusplus
+}
+#endif
+
+//
+
+#ifdef __cplusplus
+
 #ifndef CCBUFSIZE
 #define CCBUFSIZE 8192
 #endif
@@ -53,4 +65,8 @@ size_t mockUDPFillInBuf (int sock, char* ccinbuf, size_t& ccinbufsize, uint8_t&
 size_t mockUDPPeekBytes (int sock, char* dst, size_t usersize, int timeout_ms, char* ccinbuf, size_t& ccinbufsize);
 size_t mockUDPRead (int sock, char* dst, size_t size, int timeout_ms, char* ccinbuf, size_t& ccinbufsize);
 size_t mockUDPWrite (int sock, const uint8_t* data, size_t size, int timeout_ms, uint32_t ipv4, uint16_t port);
+
+class UdpContext;
+void register_udp (int sock, UdpContext* udp);
+
 #endif // __cplusplus

tests/host/common/user_interface.cpp

@@ -79,10 +79,15 @@ bool wifi_get_ip_info (uint8 if_index, struct ip_info *info)
 		fprintf(stderr, "we are not AP");
 
 	//XXXTODO (give ip address of default route's interface?)
+#if 1
+	info->ip.addr = lwip_htonl(0xc0a80108);
+	info->netmask.addr = lwip_htonl(0xffffff00);
+	info->gw.addr = lwip_htonl(0xc0a801fe);
+#else
 	info->ip.addr = lwip_htonl(0x7f000001);
 	info->netmask.addr = lwip_htonl(0xff000000);
 	info->gw.addr = lwip_htonl(0x7f000001);
-
+#endif
 	return true;
 }