WIP: Support support using the RSMB code as an ESP-IDF component

CMakeLists.txt

@@ -0,0 +1,7 @@
+file(GLOB srcs rsmb/src/*.c)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D _BOOL=1")
+
+idf_component_register(SRCS "${srcs}"
+                       INCLUDE_DIRS "rsmb/src"
+			)

rsmb/src/Broker.c

@@ -159,6 +159,17 @@ void HUPHandler(int sig)
 
 
 #if !defined(WIN32)
+#ifdef ESP_PLATFORM
+void linux_segv(int signo, siginfo_t* info, void* context)
+{
+	const char *signal_codes[3] = {"", "SEGV_MAPERR", "SEGV_ACCERR"};
+	static char symptoms[1024];
+
+	sprintf(symptoms, "SEGV information\n"
+			"info.si_signo = %d\n"
+			"info.si_code  = %d (%s)\n",
+			info->si_signo, info->si_code, signal_codes[info->si_code]);
+#else
 void linux_segv(int signo, siginfo_t* info, void* context)
 {
 	const char *signal_codes[3] = {"", "SEGV_MAPERR", "SEGV_ACCERR"};
@@ -170,6 +181,7 @@ void linux_segv(int signo, siginfo_t* info, void* context)
 			"info.si_code  = %d (%s)\n"
 			"info.si_addr  = %p\n",
 			info->si_signo, info->si_errno, info->si_code, signal_codes[info->si_code], info->si_addr);
+#endif
 #else
 /**
  * Normal segv handling function
@@ -187,6 +199,7 @@ void segv(int sig)
 	exit(-1);
 }
 
+#ifndef ESP_PLATFORM
 
 int set_sigsegv()
 {
@@ -196,7 +209,6 @@ int set_sigsegv()
 #else
 	struct sigaction action;
 	void linux_segv(int signo, siginfo_t* info, void* context);
-
 	action.sa_flags = SA_SIGINFO; /* indicates the sa_sigaction field is to be used */
 	action.sa_sigaction = linux_segv;
 	sigemptyset(&action.sa_mask);
@@ -205,7 +217,7 @@ int set_sigsegv()
 #endif
 }
 
-
+#endif
 
 void getopts(int argc, char** argv)
 {
@@ -320,12 +332,14 @@ int Broker_startup()
 	int rc;
 
 	FUNC_ENTRY;
+	#if !defined(ESP_PLATFORM)
 	signal(SIGINT, finish);
 	signal(SIGTERM, finish);
 	signal(SIGHUP, HUPHandler);
 	#if !defined(_DEBUG)
 		set_sigsegv();
 	#endif
+	#endif
 
 	BrokerState.clients = TreeInitialize(clientSocketCompare);
 	TreeAddIndex(BrokerState.clients, clientIDCompare);

rsmb/src/Broker.h

@@ -26,7 +26,9 @@
 #define true 1
 #define false 0
 
+#ifndef assert
 #define assert(x) if (!x) printf("Assertion error %s\n", # x);
+#endif
 
 #ifdef __GNUC__
   #define ATTR_UNUSED __attribute__((unused))

rsmb/src/Log.c

@@ -34,7 +34,11 @@
 #include <stdlib.h>
 
 #if !defined(WIN32)
+#ifdef ESP_PLATFORM
+#include <esp_log.h>
+#else
 #include <syslog.h>
+#endif
 #define GETTIMEOFDAY 1
 #else
 #define snprintf _snprintf
@@ -399,8 +403,13 @@ void Log(int log_level, int msgno, char* format, ...)
 #if !defined(WIN32)
 		if (trace_settings.isdaemon)
 		{
+#ifdef ESP_PLATFORM
+			static char priorities[] = { 5, 5, 5, 5, 4, 4, 3, 3, 2, 2, 1, 0};
+			esp_log_write(priorities[log_level], "mqtt", "%s", &msg_buf[22]);
+#else
 			static char priorities[] = { 7, 7, 7, 7, 6, 6, 5, 5, 4, 3, 1, 0};
 			syslog(priorities[log_level], "%s", &msg_buf[22]);
+#endif
 		}
 		else
 		{

rsmb/src/MQTTPacket.h

@@ -27,7 +27,10 @@ include "LinkedList"
 include "Clients"
 BE*/
 
+#ifndef _BOOL
+#define _BOOL
 typedef unsigned int bool;
+#endif
 
 #define PRIVATE_PROTOCOL_VERSION 131  /**< protocol version used for noLocal subscriptions */
 #define BAD_MQTT_PACKET -4				/**< completion code for an ill-formed packet */

rsmb/src/Messages.c

@@ -204,7 +204,11 @@ int Messages_findMyLocation(char* buf, int bufsize)
 	rc = GetModuleFileName(NULL, wbuf, bufsize);
 	wcstombs(buf, wbuf, bufsize);
 #else /* Linux */
+#ifdef ESP_PLATFORM
+    rc = sprintf(buf, "/sdcard/dummy.exe");
+#else
 	rc = (int)readlink("/proc/self/exe", buf, bufsize);
+#endif
 #endif
 	if (rc > 0 && rc < bufsize)
 	{
@@ -244,13 +248,15 @@ int Messages_initialize(BrokerStates* bstate)
 	{
 		char fullfn[256];
 		sprintf(fullfn, "..%cmessages%c%s", sep, sep, fn);
+
 		if ((rfile = fopen(fullfn, "r")) == NULL)
 		{
 			if (Messages_findMyLocation(fullfn, sizeof(fullfn)) == 0)
 			{
 				int dirlength = strlen(fullfn);
-				
+
 				snprintf(&fullfn[dirlength], sizeof(fullfn) - dirlength, "%c%s", sep, fn);
+
 				rfile = fopen(fullfn, "r");
 				if (rfile == NULL)
 				{

rsmb/src/Socket.c

@@ -141,7 +141,9 @@ void Socket_outInitialize()
 	WSAStartup(winsockVer, &wsd);
 #else
 	FUNC_ENTRY;
+	#if !defined(ESP_PLATFORM)
 	signal(SIGPIPE, SIG_IGN);
+	#endif
 #endif
 	SocketBuffer_initialize();
 
@@ -323,11 +325,15 @@ int Socket_joinMulticastGroup(int sock, int ipv6, char* mcast)
 			struct ifreq ifreq;
 
 			strncpy(ifreq.ifr_name, mcast_interface, IFNAMSIZ);
+#ifdef ESP_PLATFORM
+#warning Socket_joinMulticastGroup() broken on ESP-IDF
+#else
 			if (ioctl(sock, SIOCGIFADDR, &ifreq) >= 0)
 				memcpy(&mreq.imr_interface,
 						&((struct sockaddr_in *) &ifreq.ifr_addr)->sin_addr,
 						sizeof(struct in_addr));
 			else
+#endif
 				Socket_error("ioctl SIOCGIFADDR", sock);
 #endif
 		}
@@ -1276,6 +1282,10 @@ int Socket_noPendingWrites(int socket)
 }
 #endif
 
+#ifdef ESP_PLATFORM
+#include <lwip/sockets.h>
+#define 	writev(s, iov, iovcnt)   lwip_writev(s,iov,iovcnt)
+#endif
 
 /**
  *  Attempts to write a series of iovec buffers to a socket in *one* system call so that
@@ -1301,6 +1311,7 @@ int Socket_writev(int socket, iobuf* iovecs, int count, unsigned long* bytes)
 	}
 #else
 	*bytes = 0L;
+
 	rc = writev(socket, iovecs, count);
 	if (rc == SOCKET_ERROR)
 	{
@@ -1346,11 +1357,18 @@ int Socket_putdatas(int socket, char* buf0, int buf0len, int count, char** buffe
 
 	iovecs[0].iov_base = buf0;
 	iovecs[0].iov_len = buf0len;
-	for (i = 0; i < count; i++)
+
+	int targetbufs = 0;
+	for (i = 0; i < count;i++)
 	{
-		iovecs[i+1].iov_base = buffers[i];
-		iovecs[i+1].iov_len = buflens[i];
+		if(buflens[i] > 0)
+		{
+			iovecs[targetbufs+1].iov_base = buffers[i];
+			iovecs[targetbufs+1].iov_len = buflens[i];
+			targetbufs++;
+		}
 	}
+	count = targetbufs;
 
 	if ((rc = Socket_writev(socket, iovecs, count+1, &bytes)) != SOCKET_ERROR)
 	{
@@ -1721,6 +1739,10 @@ int Socket_continueWrites(fd_set* pwset)
 }
 #endif
 
+#ifdef ESP_PLATFORM
+#include "esp_netif.h"
+#endif
+
 /**
  *  Get the hostname of the computer we are running on
  *  @return the hostname
@@ -1731,7 +1753,14 @@ char* Socket_gethostname()
 	#define HOST_NAME_MAX 256 /* 255 is a POSIX limit/256 a Windows max for this call */
 #endif
 	static char buf[HOST_NAME_MAX+1] = "";
+
+#ifdef ESP_PLATFORM
+	const char *pHostName = buf;
+	tcpip_adapter_get_hostname(TCPIP_ADAPTER_IF_STA, &pHostName);
+	snprintf(buf, HOST_NAME_MAX+1, "%s", pHostName);
+#else
 	gethostname(buf, HOST_NAME_MAX+1);
+#endif
 	return buf;
 }
 

rsmb/src/tools/be/bersmb.cpp

@@ -141,7 +141,7 @@ class MemList
 	   MemEntry* entry = head;
 	   while (entry != NULL)
 	   {
-		   printf("f0x%lX = m[0x%lX]s[%d]\n", entry->fileaddr, entry->memoryaddr, entry->size);
+		   printf("f0x%lX = m[0x%llX]s[%d]\n", entry->fileaddr, entry->memoryaddr, entry->size);
 		   entry = entry->next;
 	   }
 	   printf("------------\n");