Skip to content

Commit d009eff

Browse files
mathieucarboumathieucarbou
authored
Merge pull request #471 from ESP32Async/RequestedConnectionType
Removing dead code for RequestedConnectionType
2 parents f443b9a + edd16e7 commit d009eff

3 files changed

Lines changed: 25 additions & 46 deletions

File tree

‎src/ESPAsyncWebServer.h‎

Lines changed: 19 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -361,9 +361,7 @@ class AsyncWebHeader {
361361
AsyncWebHeader(constchar *name, constchar *value) : _name(name), _value(value) {}
362362
AsyncWebHeader(const String &name, const String &value) : _name(name), _value(value) {}
363363

364-
#ifndef ESP8266
365364
[[deprecated("Use AsyncWebHeader::parse(data) instead")]]
366-
#endif
367365
AsyncWebHeader(const String &data)
368366
: AsyncWebHeader(parse(data)){};
369367

@@ -395,12 +393,9 @@ class AsyncWebHeader {
395393
* */
396394

397395
typedefenum {
398-
RCT_NOT_USED = -1,
399-
RCT_DEFAULT = 0,
400-
RCT_HTTP,
401-
RCT_WS,
402-
RCT_EVENT,
403-
RCT_MAX
396+
RCT_HTTP = 1,
397+
RCT_WS = 2,
398+
RCT_EVENT = 3
404399
} RequestedConnectionType;
405400

406401
// this enum is similar to Arduino WebServer's AsyncAuthType and PsychicHttp
@@ -578,17 +573,28 @@ class AsyncWebServerRequest {
578573
RequestedConnectionType requestedConnType() const {
579574
return _reqconntype;
580575
}
581-
boolisExpectedRequestedConnType(RequestedConnectionType erct1, RequestedConnectionType erct2 = RCT_NOT_USED, RequestedConnectionType erct3 = RCT_NOT_USED)
582-
const;
576+
[[deprecated("Use isExpectedRequestedConnType(RequestedConnectionType) instead")]]
577+
boolisExpectedRequestedConnType(RequestedConnectionType erct1, RequestedConnectionType erct2, RequestedConnectionType erct3) const {
578+
returnisExpectedRequestedConnType(erct1) || isExpectedRequestedConnType(erct2) || isExpectedRequestedConnType(erct3);
579+
}
580+
[[deprecated("Use isExpectedRequestedConnType(RequestedConnectionType) instead")]]
581+
boolisExpectedRequestedConnType(RequestedConnectionType erct1, RequestedConnectionType erct2) const {
582+
returnisExpectedRequestedConnType(erct1) || isExpectedRequestedConnType(erct2);
583+
}
584+
boolisExpectedRequestedConnType(RequestedConnectionType type) const {
585+
return _reqconntype == type;
586+
}
587+
583588
boolisWebSocketUpgrade() const {
584589
return _method == AsyncWebRequestMethod::HTTP_GET && isExpectedRequestedConnType(RCT_WS);
585590
}
586591
boolisSSE() const {
587592
return _method == AsyncWebRequestMethod::HTTP_GET && isExpectedRequestedConnType(RCT_EVENT);
588593
}
589594
boolisHTTP() const {
590-
returnisExpectedRequestedConnType(RCT_DEFAULT, RCT_HTTP);
595+
returnisExpectedRequestedConnType(RCT_HTTP);
591596
}
597+
592598
voidonDisconnect(ArDisconnectHandler fn);
593599

594600
// hash is the string representation of:
@@ -619,16 +625,10 @@ class AsyncWebServerRequest {
619625
_handler = handler;
620626
}
621627

622-
#ifndef ESP8266
623628
[[deprecated("All headers are now collected. Use removeHeader(name) or AsyncHeaderFreeMiddleware if you really need to free some headers.")]]
624-
#endif
625-
voidaddInterestingHeader(__asyncws_unused constchar *name) {
626-
}
627-
#ifndef ESP8266
629+
voidaddInterestingHeader(__asyncws_unused constchar *name) {}
628630
[[deprecated("All headers are now collected. Use removeHeader(name) or AsyncHeaderFreeMiddleware if you really need to free some headers.")]]
629-
#endif
630-
voidaddInterestingHeader(__asyncws_unused const String &name) {
631-
}
631+
voidaddInterestingHeader(__asyncws_unused const String &name) {}
632632

633633
/**
634634
* @brief issue HTTP redirect response with Location header
@@ -700,9 +700,7 @@ class AsyncWebServerRequest {
700700
send(beginChunkedResponse(contentType, callback, templateCallback));
701701
}
702702

703-
#ifndef ESP8266
704703
[[deprecated("Replaced by send(int code, const String& contentType, const uint8_t* content, size_t len, AwsTemplateProcessor callback = nullptr)")]]
705-
#endif
706704
voidsend_P(int code, const String &contentType, constuint8_t *content, size_t len, AwsTemplateProcessor callback = nullptr) {
707705
send(code, contentType, content, len, callback);
708706
}
@@ -767,16 +765,12 @@ class AsyncWebServerRequest {
767765
returnbeginResponseStream(contentType.c_str(), bufferSize);
768766
}
769767

770-
#ifndef ESP8266
771768
[[deprecated("Replaced by beginResponse(int code, const String& contentType, const uint8_t* content, size_t len, AwsTemplateProcessor callback = nullptr)")]]
772-
#endif
773769
AsyncWebServerResponse *beginResponse_P(int code, const String &contentType, constuint8_t *content, size_t len, AwsTemplateProcessor callback = nullptr) {
774770
returnbeginResponse(code, contentType.c_str(), content, len, callback);
775771
}
776-
#ifndef ESP8266
777772
[[deprecated("Replaced by beginResponse(int code, const String& contentType, const char* content = asyncsrv::empty, AwsTemplateProcessor callback = nullptr)"
778773
)]]
779-
#endif
780774
AsyncWebServerResponse *beginResponse_P(int code, const String &contentType, PGM_P content, AwsTemplateProcessor callback = nullptr);
781775

782776
/**
@@ -1436,9 +1430,7 @@ class AsyncCorsMiddleware : public AsyncMiddleware {
14361430
_maxAge = seconds;
14371431
}
14381432

1439-
#ifndef ESP8266
14401433
[[deprecated("Use instead: addCORSHeaders(AsyncWebServerRequest *request, AsyncWebServerResponse *response)")]]
1441-
#endif
14421434
voidaddCORSHeaders(AsyncWebServerResponse *response) {
14431435
addCORSHeaders(nullptr, response);
14441436
}
@@ -1632,9 +1624,7 @@ class AsyncWebServerResponse {
16321624
return _headers;
16331625
}
16341626

1635-
#ifndef ESP8266
16361627
[[deprecated("Use instead: _assembleHead(String& buffer, uint8_t version)")]]
1637-
#endif
16381628
String _assembleHead(uint8_t version) {
16391629
String buffer;
16401630
_assembleHead(buffer, version);
@@ -1678,9 +1668,7 @@ class AsyncCallbackJsonWebHandler;
16781668
typedef std::function<void(AsyncWebServerRequest *request, JsonVariant &json)> ArJsonRequestHandlerFunction;
16791669

16801670
#if ASYNC_MSG_PACK_SUPPORT == 1
1681-
#ifndef ESP8266
16821671
[[deprecated("Replaced by AsyncCallbackJsonWebHandler")]]
1683-
#endif
16841672
typedef AsyncCallbackJsonWebHandler AsyncCallbackMessagePackWebHandler;
16851673
#endif// ASYNC_MSG_PACK_SUPPORT
16861674

‎src/WebRequest.cpp‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ bool AsyncWebServerRequest::_parseReqHeader() {
663663
// connection is still a plain HTTP connection so a previously detected
664664
// SSE request (or any other classified type) cannot be clobbered by
665665
// header ordering.
666-
if (_method == AsyncWebRequestMethod::HTTP_GET && (_reqconntype == RCT_DEFAULT || _reqconntype == RCT_HTTP)) {
666+
if (_method == AsyncWebRequestMethod::HTTP_GET && _reqconntype == RCT_HTTP) {
667667
_reqconntype = RCT_WS;
668668
}
669669
} elseif (name.equalsIgnoreCase(T_ACCEPT)) {
@@ -678,7 +678,7 @@ bool AsyncWebServerRequest::_parseReqHeader() {
678678
// Accept: text/event-stream. Only classify when the connection is still
679679
// a plain HTTP connection so a previously detected WebSocket upgrade
680680
// cannot be clobbered by header ordering.
681-
if (substr != NULL && _method == AsyncWebRequestMethod::HTTP_GET && (_reqconntype == RCT_DEFAULT || _reqconntype == RCT_HTTP)) {
681+
if (substr != NULL && _method == AsyncWebRequestMethod::HTTP_GET && _reqconntype == RCT_HTTP) {
682682
// WebEvent request can be uniquely identified by header: [Accept: text/event-stream]
683683
_reqconntype = RCT_EVENT;
684684
}
@@ -1469,20 +1469,13 @@ String AsyncWebServerRequest::urlDecode(const String &text) const {
14691469

14701470
constchar *AsyncWebServerRequest::requestedConnTypeToString() const {
14711471
switch (_reqconntype) {
1472-
caseRCT_NOT_USED: returnT_RCT_NOT_USED;
1473-
caseRCT_DEFAULT: returnT_RCT_DEFAULT;
1474-
caseRCT_HTTP: returnT_RCT_HTTP;
1475-
caseRCT_WS: returnT_RCT_WS;
1476-
caseRCT_EVENT: returnT_RCT_EVENT;
1477-
default: returnT_ERROR;
1472+
caseRCT_HTTP: returnT_RCT_HTTP;
1473+
caseRCT_WS: returnT_RCT_WS;
1474+
caseRCT_EVENT: returnT_RCT_EVENT;
1475+
default: returnT_ERROR;
14781476
}
14791477
}
14801478

1481-
boolAsyncWebServerRequest::isExpectedRequestedConnType(RequestedConnectionType erct1, RequestedConnectionType erct2, RequestedConnectionType erct3) const {
1482-
return ((erct1 != RCT_NOT_USED) && (erct1 == _reqconntype)) || ((erct2 != RCT_NOT_USED) && (erct2 == _reqconntype))
1483-
|| ((erct3 != RCT_NOT_USED) && (erct3 == _reqconntype));
1484-
}
1485-
14861479
AsyncClient *AsyncWebServerRequest::clientRelease() {
14871480
AsyncClient *c = _client;
14881481
_client = nullptr;

‎src/literals.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,6 @@ static constexpr const char T_LINK[] = "LINK";
139139
staticconstexprconstcharT_UNLINK[] = "UNLINK";
140140

141141
// Req content types
142-
staticconstexprconstcharT_RCT_NOT_USED[] = "RCT_NOT_USED";
143-
staticconstexprconstcharT_RCT_DEFAULT[] = "RCT_DEFAULT";
144142
staticconstexprconstcharT_RCT_HTTP[] = "RCT_HTTP";
145143
staticconstexprconstcharT_RCT_WS[] = "RCT_WS";
146144
staticconstexprconstcharT_RCT_EVENT[] = "RCT_EVENT";

0 commit comments

Comments
 (0)