Skip to content

Commit 7cbaf1d

Browse files
committed
Merge branch 'exp-jack-sha-header' into for-iotsa
# Conflicts: # src/HTTPConnection.hpp # src/WebsocketHandler.cpp
2 parents 9a3726d + c79117b commit 7cbaf1d

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/HTTPConnection.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <string>
88
#include <mbedtls/base64.h>
99
#include <mbedtls/sha1.h>
10+
#include <sha/sha_parallel_engine.h>
1011
#include <functional>
1112

1213
// Required for sockets

src/WebsocketHandler.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#include "WebsocketHandler.hpp"
2+
23
#ifndef TAG
3-
#define TAG "ARDUINO"
4+
static const char *TAG = "WebsocketHandler";
45
#endif
6+
57
namespace httpsserver {
68

79
/**
@@ -19,7 +21,7 @@ static void dumpFrame(WebsocketFrame frame) {
1921
case WebsocketHandler::OPCODE_TEXT: opcode = std::string("TEXT"); break;
2022
}
2123
ESP_LOGI(
22-
"",
24+
TAG,
2325
"Fin: %d, OpCode: %d (%s), Mask: %d, Len: %d",
2426
(int)frame.fin,
2527
(int)frame.opCode,

0 commit comments

Comments
 (0)