pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-11 16:07:13 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Return OPTIONS when requested for toradio

Browse Source
This commit is contained in:
Jm Casler 2020-10-16 17:41:08 -07:00
parent b9df2c00fa
commit ba549d8fcd
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/meshwifi/meshhttp.cpp
View File

@ -207,6 +207,7 @@ void initWebServer()
// For every resource available on the server, we need to create a ResourceNode // For every resource available on the server, we need to create a ResourceNode
// The ResourceNode links URL and HTTP method to a handler function // The ResourceNode links URL and HTTP method to a handler function
ResourceNode *nodeAPIv1ToRadioOptions = new ResourceNode("/api/v1/toradio", "OPTIONS", &handleAPIv1ToRadio);
ResourceNode *nodeAPIv1ToRadio = new ResourceNode("/api/v1/toradio", "PUT", &handleAPIv1ToRadio); ResourceNode *nodeAPIv1ToRadio = new ResourceNode("/api/v1/toradio", "PUT", &handleAPIv1ToRadio);
ResourceNode *nodeAPIv1FromRadio = new ResourceNode("/api/v1/fromradio", "GET", &handleAPIv1FromRadio); ResourceNode *nodeAPIv1FromRadio = new ResourceNode("/api/v1/fromradio", "GET", &handleAPIv1FromRadio);
ResourceNode *nodeCSS = new ResourceNode("/css/style.css", "GET", &handleStyleCSS); ResourceNode *nodeCSS = new ResourceNode("/css/style.css", "GET", &handleStyleCSS);
@ -217,6 +218,7 @@ void initWebServer()
ResourceNode *node404 = new ResourceNode("", "GET", &handle404); ResourceNode *node404 = new ResourceNode("", "GET", &handle404);
// Secure nodes // Secure nodes
secureServer->registerNode(nodeAPIv1ToRadioOptions);
secureServer->registerNode(nodeAPIv1ToRadio); secureServer->registerNode(nodeAPIv1ToRadio);
secureServer->registerNode(nodeAPIv1FromRadio); secureServer->registerNode(nodeAPIv1FromRadio);
secureServer->registerNode(nodeCSS); secureServer->registerNode(nodeCSS);
@ -229,6 +231,7 @@ void initWebServer()
secureServer->addMiddleware(&middlewareSpeedUp240); secureServer->addMiddleware(&middlewareSpeedUp240);
// Insecure nodes // Insecure nodes
insecureServer->registerNode(nodeAPIv1ToRadioOptions);
insecureServer->registerNode(nodeAPIv1ToRadio); insecureServer->registerNode(nodeAPIv1ToRadio);
insecureServer->registerNode(nodeAPIv1FromRadio); insecureServer->registerNode(nodeAPIv1FromRadio);
insecureServer->registerNode(nodeCSS); insecureServer->registerNode(nodeCSS);
@ -378,7 +381,14 @@ void handleAPIv1ToRadio(HTTPRequest *req, HTTPResponse *res)
// Status code is 200 OK by default. // Status code is 200 OK by default.
res->setHeader("Content-Type", "application/x-protobuf"); res->setHeader("Content-Type", "application/x-protobuf");
res->setHeader("Access-Control-Allow-Origin", "*"); res->setHeader("Access-Control-Allow-Origin", "*");
res->setHeader("Access-Control-Allow-Methods", "PUT, GET"); res->setHeader("Access-Control-Allow-Methods", "PUT, OPTIONS");
if (req->getMethod() == "OPTIONS") {
res->setStatusCode(204);
res->print("");
return;
}
byte buffer[MAX_TO_FROM_RADIO_SIZE]; byte buffer[MAX_TO_FROM_RADIO_SIZE];
size_t s = req->readBytes(buffer, MAX_TO_FROM_RADIO_SIZE); size_t s = req->readBytes(buffer, MAX_TO_FROM_RADIO_SIZE);