From 54012fa91f77cddcc424a7c9a3213e3ee70b941e Mon Sep 17 00:00:00 2001
From: Hadley Rich <hads@sodium.nice.net.nz>
Date: Sun, 15 Apr 2012 20:35:04 +1200
Subject: [PATCH] Use example Sec-Websocket-Key headers from hixie76/hybi00
 document[1]. This seems to work (with gevent-websocket server at least)
 updating support from Hixie75 to Hixie76.

Note that auth values are hard-coded, using the values from the draft.

Hybi support is a much more complicated change.

[1]http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76
---
 WebSocketClient.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/WebSocketClient.cpp b/WebSocketClient.cpp
index 335329b..a20346c 100644
--- a/WebSocketClient.cpp
+++ b/WebSocketClient.cpp
@@ -33,6 +33,8 @@ prog_char clientHandshakeLine2[] PROGMEM = "Upgrade: WebSocket";
 prog_char clientHandshakeLine3[] PROGMEM = "Connection: Upgrade";
 prog_char clientHandshakeLine4[] PROGMEM = "Host: {0}";
 prog_char clientHandshakeLine5[] PROGMEM = "Origin: ArduinoWebSocketClient";
+prog_char clientHandshakeLine6[] PROGMEM = "Sec-WebSocket-Key1: 18x 6]8vM;54 *(5:  {   U1]8  z [  8";
+prog_char clientHandshakeLine7[] PROGMEM = "Sec-WebSocket-Key2: 1_ tx7X d  <  nw  334J702) 7]o}` 0";
 prog_char serverHandshake[] PROGMEM = "HTTP/1.1 101";
 
 PROGMEM const char *WebSocketClientStringTable[] =
@@ -43,11 +45,13 @@ PROGMEM const char *WebSocketClientStringTable[] =
     clientHandshakeLine3,
     clientHandshakeLine4,
     clientHandshakeLine5,
+    clientHandshakeLine6,
+    clientHandshakeLine7,
     serverHandshake
 };
 
 String WebSocketClient::getStringTableItem(int index) {
-    char buffer[35];
+    char buffer[60];
     strcpy_P(buffer, (char*)pgm_read_word(&(WebSocketClientStringTable[index])));
     return String(buffer);
 }
@@ -99,12 +103,15 @@ void WebSocketClient::setDataArrivedDelegate(DataArrivedDelegate dataArrivedDele
 
 
 void WebSocketClient::sendHandshake(char hostname[], char path[]) {
+    
     String stringVar = getStringTableItem(0);
     String line1 = getStringTableItem(1);
     String line2 = getStringTableItem(2);
     String line3 = getStringTableItem(3);
     String line4 = getStringTableItem(4);
     String line5 = getStringTableItem(5);
+    String line6 = getStringTableItem(6);
+    String line7 = getStringTableItem(7);
     
     line1.replace(stringVar, path);
     line4.replace(stringVar, hostname);
@@ -114,7 +121,10 @@ void WebSocketClient::sendHandshake(char hostname[], char path[]) {
     _client.println(line3);
     _client.println(line4);
     _client.println(line5);
+    _client.println(line6);
+    _client.println(line7);
     _client.println();
+    _client.print("Tm[K T2u");
 }
 
 bool WebSocketClient::readHandshake() {
@@ -133,7 +143,7 @@ bool WebSocketClient::readHandshake() {
         handshake += line + '\n';
     }
     
-    String response = getStringTableItem(6);
+    String response = getStringTableItem(8);
     result = handshake.indexOf(response) != -1;
     
     if(!result) {