add ESP31B support and fix header size

Me No Dev · Me No Dev · commit 512e3f6c0959 · 2016-01-30T02:24:29.000+02:00
diff --git a/src/WebSockets.cpp b/src/WebSockets.cpp
@@ -341,7 +341,7 @@ void WebSockets::handleWebsocketCb(WSclient_t * client) {
     buffer++;
 
     if(header->payloadLen == 126) {
-        headerLen += 4;
+        headerLen += 2;
         if(!handleWebsocketWaitFor(client, headerLen)) {
             return;
         }
diff --git a/src/WebSockets.h b/src/WebSockets.h
@@ -53,9 +53,9 @@
 #define WEBSOCKETS_MAX_HEADER_SIZE  (14)
 
 // select Network type based
-#ifdef ESP8266
-#define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP8266
-//#define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP8266_ASYNC
+#if defined(ESP8266) || defined(ESP31B)
+//#define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP8266
+#define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP8266_ASYNC
 #else
 #define WEBSOCKETS_NETWORK_TYPE NETWORK_W5100
 #endif
@@ -66,23 +66,31 @@
 //   No SSL/WSS support for client in Async mode
 //   TLS lib need a sync interface!
 
-#ifndef ESP8266
+#if !defined(ESP8266) && !defined(ESP31B)
 #error "network type ESP8266 ASYNC only possible on the ESP mcu!"
 #endif
 
+#ifdef ESP8266
 #include <ESP8266WiFi.h>
+#else
+#include <ESP31BWiFi.h>
+#endif
 #include <ESPAsyncTCP.h>
 #include <ESPAsyncTCPbuffer.h>
 #define WEBSOCKETS_NETWORK_CLASS AsyncTCPbuffer
 #define WEBSOCKETS_NETWORK_SERVER_CLASS AsyncServer
 
 #elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
 
-#ifndef ESP8266
+#if !defined(ESP8266) && !defined(ESP31B)
 #error "network type ESP8266 only possible on the ESP mcu!"
 #endif
 
+#ifdef ESP8266
 #include <ESP8266WiFi.h>
+#else
+#include <ESP31BWiFi.h>
+#endif
 #define WEBSOCKETS_NETWORK_CLASS WiFiClient
 #define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
 

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ void WebSockets::handleWebsocketCb(WSclient_t * client) {`
`341`	`341`	`buffer++;`
`342`	`342`
`343`	`343`	`if(header->payloadLen == 126) {`
`344`		`- headerLen += 4;`
	`344`	`+ headerLen += 2;`
`345`	`345`	`if(!handleWebsocketWaitFor(client, headerLen)) {`
`346`	`346`	`return;`
`347`	`347`	`}`