add support for AVR

 this need some more testing but basics are done

Author: Links2004

README.md

@@ -3,6 +3,7 @@ WebSocket Server and Client for Arduino
 
 a WebSocket Server and Client for Arduino based on RFC6455.
 
+ 
 ##### Supported features of RFC6455 #####
  - text frame
  - binary frame
@@ -16,14 +17,18 @@ a WebSocket Server and Client for Arduino based on RFC6455.
 ##### Limitations #####
  - max input length is limited to the ram size and the ```WEBSOCKETS_MAX_DATA_SIZE``` define
  - max output length has no limit (the hardware is the limit)
- - Client send masked frames always with mask 0x00000000 (open todo)
+ - Client send masked frames always with mask 0x00000000
 
 ##### Supported Hardware #####
  - ESP8266 [Arduino for ESP8266](https://github.com/Links2004/Arduino)
- - ATmega328 with Ethernet Shield (planed)
- - ATmega328 with enc28j60 (planed)
- - ATmega2560 with Ethernet Shield (planed)
- - ATmega2560 with enc28j60 (planed)
+ - ATmega328 with Ethernet Shield (alpha)
+ - ATmega328 with enc28j60 (alpha)
+ - ATmega2560 with Ethernet Shield (alpha)
+ - ATmega2560 with enc28j60 (alpha)
+ 
+### wss / SSL ###
+ supported for:
+ - wss client on the ESP8266
 
 ### Issues ###
 Submit issues to: https://github.com/Links2004/arduinoWebSockets/issues

library.properties

@@ -1,5 +1,5 @@
 name=WebSockets
-version=1.2
+version=1.3
 author=Markus Sattler
 maintainer=Markus Sattler 
 sentence=WebSockets for Arduino (Server + Client)

src/WebSockets.cpp

@@ -38,6 +38,12 @@ extern "C" {
 
 #ifdef ESP8266
 #include <Hash.h>
+#else
+
+extern "C" {
+#include "libsha1/libsha1.h"
+}
+
 #endif
 
 /**
@@ -343,8 +349,13 @@ String WebSockets::acceptKey(String clientKey) {
 #ifdef ESP8266
  sha1(clientKey + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11", &sha1HashBin[0]);
 #else
-#error todo implement sha1 for AVR
+ clientKey =+ "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+ SHA1_CTX ctx;
+ SHA1Init(&ctx);
+ SHA1Update(&ctx, (const unsigned char*)clientKey.c_str(), clientKey.length());
+ SHA1Final(&sha1HashBin[0], &ctx);
 #endif
+
  String key = base64_encode(sha1HashBin, 20);
  key.trim();
 

src/WebSockets.h

@@ -27,7 +27,7 @@
 
 #include <Arduino.h>
 
-#define DEBUG_WEBSOCKETS(...) Serial1.printf( __VA_ARGS__ )
+//#define DEBUG_WEBSOCKETS(...) Serial1.printf( __VA_ARGS__ )
 
 #ifndef DEBUG_WEBSOCKETS
 #define DEBUG_WEBSOCKETS(...)
@@ -63,17 +63,20 @@
 
 #include <ESP8266WiFi.h>
 #define WEBSOCKETS_NETWORK_CLASS WiFiClient
+#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
 
 #elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_W5100)
 
 #include <Ethernet.h>
 #include <SPI.h>
 #define WEBSOCKETS_NETWORK_CLASS EthernetClient
+#define WEBSOCKETS_NETWORK_SERVER_CLASS EthernetServer
 
 #elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ENC28J60)
 
 #include <UIPEthernet.h>
 #define WEBSOCKETS_NETWORK_CLASS UIPClient
+#define WEBSOCKETS_NETWORK_SERVER_CLASS UIPServer
 
 #else
 #error "no network type selected!"

src/WebSocketsClient.h

@@ -26,17 +26,6 @@
 #define WEBSOCKETSCLIENT_H_
 
 #include <Arduino.h>
-
-#ifdef ESP8266
-#include <ESP8266WiFi.h>
-#else
-#include <UIPEthernet.h>
-#ifndef UIPETHERNET_H
-#include <Ethernet.h>
-#include <SPI.h>
-#endif
-#endif
-
 #include "WebSockets.h"
 
 class WebSocketsClient: private WebSockets {

src/WebSocketsServer.cpp

@@ -27,7 +27,7 @@
 
 WebSocketsServer::WebSocketsServer(uint16_t port) {
  _port = port;
- _server = new WiFiServer(port);
+ _server = new WEBSOCKETS_NETWORK_SERVER_CLASS(port);
 
  _cbEvent = NULL;
 
@@ -240,6 +240,7 @@ void WebSocketsServer::disconnect(uint8_t num) {
  }
 }
 
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
 /**
  * get an IP for a client
  * @param num uint8_t client id
@@ -255,6 +256,7 @@ IPAddress WebSocketsServer::remoteIP(uint8_t num) {
 
  return IPAddress();
 }
+#endif
 
 //#################################################################################
 //#################################################################################
@@ -363,18 +365,22 @@ bool WebSocketsServer::clientIsConnected(WSclient_t * client) {
  */
 void WebSocketsServer::handleNewClients(void) {
  WSclient_t * client;
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
  while(_server->hasClient()) {
+#endif
  bool ok = false;
  // search free list entry for client
  for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
  client = &_clients[i];
 
  // state is not connected or tcp connection is lost
  if(!clientIsConnected(client)) {
-
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
  // store new connection
  client->tcp = new WEBSOCKETS_NETWORK_CLASS(_server->available());
-
+#else
+ client->tcp = new WEBSOCKETS_NETWORK_CLASS(_server->available());
+#endif
  if(!client->tcp) {
  DEBUG_WEBSOCKETS("[WS-Client] creating Network class failed!");
  return;
@@ -387,9 +393,12 @@ void WebSocketsServer::handleNewClients(void) {
  // set Timeout for readBytesUntil and readStringUntil
  client->tcp->setTimeout(WEBSOCKETS_TCP_TIMEOUT);
  client->status = WSC_HEADER;
-
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
  IPAddress ip = client->tcp->remoteIP();
  DEBUG_WEBSOCKETS("[WS-Server][%d] new client from %d.%d.%d.%d\n", client->num, ip[0], ip[1], ip[2], ip[3]);
+#else
+ DEBUG_WEBSOCKETS("[WS-Server][%d] new client\n", client->num);
+#endif
  ok = true;
  break;
  }
@@ -398,15 +407,21 @@ void WebSocketsServer::handleNewClients(void) {
  if(!ok) {
  // no free space to handle client
  WEBSOCKETS_NETWORK_CLASS tcpClient = _server->available();
- IPAddress ip = tcpClient.remoteIP();
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+ IPAddress ip = client->tcp->remoteIP();
  DEBUG_WEBSOCKETS("[WS-Server] no free space new client from %d.%d.%d.%d\n", ip[0], ip[1], ip[2], ip[3]);
+#else
+ DEBUG_WEBSOCKETS("[WS-Server] no free space new client\n");
+#endif
  tcpClient.stop();
  }
 
 #ifdef ESP8266
  delay(0);
 #endif
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
  }
+#endif
 }
 
 /**

src/WebSocketsServer.h

@@ -68,20 +68,14 @@ class WebSocketsServer: private WebSockets {
  void disconnect(void);
  void disconnect(uint8_t num);
 
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
  IPAddress remoteIP(uint8_t num);
+#endif
 
 protected:
  uint16_t _port;
 
-#ifdef ESP8266
- WiFiServer * _server;
-#else
-#ifdef UIPETHERNET_H
- UIPServer * _server;
-#else
- EthernetServer * _server;
-#endif
-#endif
+ WEBSOCKETS_NETWORK_SERVER_CLASS * _server;
 
  WSclient_t _clients[WEBSOCKETS_SERVER_CLIENT_MAX];