mirror of
https://github.com/Links2004/arduinoWebSockets.git
synced 2025-07-01 09:51:00 +02:00
Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
187a4ac823 | |||
d2d06b59a4 | |||
b60599dcd7 |
@ -1,5 +1,5 @@
|
||||
name=WebSockets
|
||||
version=1.0
|
||||
version=1.1
|
||||
author=Markus Sattler
|
||||
maintainer=Markus Sattler
|
||||
sentence=WebSockets for Arduino (Server + Client)
|
||||
|
@ -272,33 +272,22 @@ void WebSocketsClient::sendHeader(WSclient_t * client) {
|
||||
|
||||
unsigned long start = micros();
|
||||
|
||||
//todo use tcp.write only once
|
||||
|
||||
client->tcp.write("GET ");
|
||||
client->tcp.write(client->cUrl.c_str(), client->cUrl.length());
|
||||
client->tcp.write(" HTTP/1.1\r\n"
|
||||
"Host: ");
|
||||
|
||||
client->tcp.write(_host.c_str(), _host.length());
|
||||
client->tcp.write("\r\n"
|
||||
"Upgrade: websocket\r\n"
|
||||
"Connection: Upgrade\r\n"
|
||||
"User-Agent: arduino-WebSocket-Client\r\n"
|
||||
"Sec-WebSocket-Version: 13\r\n"
|
||||
"Sec-WebSocket-Protocol: arduino\r\n" // todo add api to set Protocol of Server
|
||||
"Sec-WebSocket-Key: ");
|
||||
|
||||
client->tcp.write(client->cKey.c_str(), client->cKey.length());
|
||||
client->tcp.write("\r\n");
|
||||
String handshake = "GET " + client->cUrl + " HTTP/1.1\r\n"
|
||||
"Host: " + _host + "\r\n"
|
||||
"Upgrade: websocket\r\n"
|
||||
"Connection: Upgrade\r\n"
|
||||
"User-Agent: arduino-WebSocket-Client\r\n"
|
||||
"Sec-WebSocket-Version: 13\r\n"
|
||||
"Sec-WebSocket-Protocol: arduino\r\n"
|
||||
"Sec-WebSocket-Key: " + client->cKey + "\r\n";
|
||||
|
||||
if(client->cExtensions.length() > 0) {
|
||||
client->tcp.write("Sec-WebSocket-Extensions: ");
|
||||
client->tcp.write(client->cExtensions.c_str(), client->cExtensions.length());
|
||||
client->tcp.write("\r\n");
|
||||
handshake += "Sec-WebSocket-Extensions: " + client->cExtensions + "\r\n";
|
||||
}
|
||||
|
||||
// Header end wait for Server response
|
||||
client->tcp.write("\r\n");
|
||||
handshake += "\r\n";
|
||||
|
||||
client->tcp.write(handshake.c_str(), handshake.length());
|
||||
|
||||
DEBUG_WEBSOCKETS("[WS-Client][sendHeader] sending header... Done (%uus).\n", (micros() - start));
|
||||
|
||||
|
Reference in New Issue
Block a user