feedc0de/WifiLamp
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented reboot

Browse Source
This commit is contained in:
0xFEEDC0DE64
2018-04-26 22:46:29 +02:00
parent 7e599b5ba7
commit 300df2669e
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
relaisclient.cpp
View File

@@ -68,6 +68,12 @@ void RelaisClient::toggle()
m_status = QString(); m_status = QString();
} }
void RelaisClient::reboot()
{
m_socket->write(QByteArrayLiteral("r"));
m_status = QString();
}
void RelaisClient::requestStatus() void RelaisClient::requestStatus()
{ {
m_socket->write(QByteArrayLiteral("s")); m_socket->write(QByteArrayLiteral("s"));

1
relaisclient.h
View File

@@ -27,6 +27,7 @@ public Q_SLOTS:
void on(); void on();
void off(); void off();
void toggle(); void toggle();
void reboot();
void requestStatus(); void requestStatus();
private Q_SLOTS: private Q_SLOTS:

21
relaiswebserver.cpp
View File

@@ -22,11 +22,10 @@ void RelaisWebserver::handleRequest(HttpClientConnection *connection, const Http
HttpResponse response; HttpResponse response;
response.protocol = request.protocol; response.protocol = request.protocol;
response.statusCode = HttpResponse::StatusCode::BadRequest; response.statusCode = HttpResponse::StatusCode::BadRequest;
response.body = "Path does not start with /";
response.headers.insert(QStringLiteral("Server"), QStringLiteral("Hatschi Server 1.0")); response.headers.insert(QStringLiteral("Server"), QStringLiteral("Hatschi Server 1.0"));
response.headers.insert(QStringLiteral("Content-Type"), QStringLiteral("text/html")); response.headers.insert(QStringLiteral("Content-Type"), QStringLiteral("text/html"));
connection->sendResponse(response); connection->sendResponse(response, tr("Path does not start with /"));
return; return;
} }
@@ -84,6 +83,12 @@ void RelaisWebserver::handleRequest(HttpClientConnection *connection, const Http
redirectRoot(connection, request); redirectRoot(connection, request);
return; return;
} }
else if(parts.at(3) == "reboot")
{
client->reboot();
redirectRoot(connection, request);
return;
}
else else
{ {
handle404(connection, request); handle404(connection, request);
@@ -124,6 +129,8 @@ void RelaisWebserver::handleRoot(HttpClientConnection *connection, const HttpReq
if(client->status() != QStringLiteral("off")) if(client->status() != QStringLiteral("off"))
output.append("<a href=\"/devices/" % clientId(client).toHtmlEscaped() % "/off\">" % tr("off") % "</a> "); output.append("<a href=\"/devices/" % clientId(client).toHtmlEscaped() % "/off\">" % tr("off") % "</a> ");
output.append("<a href=\"/devices/" % clientId(client).toHtmlEscaped() % "/reboot\">" % tr("reboot") % "</a> ");
output.append("</td>"); output.append("</td>");
output.append("<td><a href=\"/devices/" % clientId(client).toHtmlEscaped() % "/delete\">" % tr("Delete") % "</a></td>"); output.append("<td><a href=\"/devices/" % clientId(client).toHtmlEscaped() % "/delete\">" % tr("Delete") % "</a></td>");
output.append("</tr>"); output.append("</tr>");
@@ -134,11 +141,10 @@ void RelaisWebserver::handleRoot(HttpClientConnection *connection, const HttpReq
HttpResponse response; HttpResponse response;
response.protocol = request.protocol; response.protocol = request.protocol;
response.statusCode = HttpResponse::StatusCode::OK; response.statusCode = HttpResponse::StatusCode::OK;
response.body = output.toUtf8();
response.headers.insert(QStringLiteral("Server"), QStringLiteral("Hatschi Server 1.0")); response.headers.insert(QStringLiteral("Server"), QStringLiteral("Hatschi Server 1.0"));
response.headers.insert(QStringLiteral("Content-Type"), QStringLiteral("text/html")); response.headers.insert(QStringLiteral("Content-Type"), QStringLiteral("text/html"));
connection->sendResponse(response); connection->sendResponse(response, output);
} }
void RelaisWebserver::redirectRoot(HttpClientConnection *connection, const HttpRequest &request) void RelaisWebserver::redirectRoot(HttpClientConnection *connection, const HttpRequest &request)
@@ -146,12 +152,12 @@ void RelaisWebserver::redirectRoot(HttpClientConnection *connection, const HttpR
HttpResponse response; HttpResponse response;
response.protocol = request.protocol; response.protocol = request.protocol;
response.statusCode = HttpResponse::StatusCode::Found; response.statusCode = HttpResponse::StatusCode::Found;
response.body = QByteArrayLiteral("<a href=\"/\">Follow this link</a>");
response.headers.insert(QStringLiteral("Server"), QStringLiteral("Hatschi Server 1.0")); response.headers.insert(QStringLiteral("Server"), QStringLiteral("Hatschi Server 1.0"));
response.headers.insert(QStringLiteral("Content-Type"), QStringLiteral("text/html")); response.headers.insert(QStringLiteral("Content-Type"), QStringLiteral("text/html"));
response.headers.insert(QStringLiteral("Location"), QStringLiteral("/")); response.headers.insert(QStringLiteral("Location"), QStringLiteral("/"));
connection->sendResponse(response); connection->sendResponse(response, "<a href=\"/\">" % tr("Follow this link") % "</a>");
} }
void RelaisWebserver::handle404(HttpClientConnection *connection, const HttpRequest &request) void RelaisWebserver::handle404(HttpClientConnection *connection, const HttpRequest &request)
@@ -159,11 +165,10 @@ void RelaisWebserver::handle404(HttpClientConnection *connection, const HttpRequ
HttpResponse response; HttpResponse response;
response.protocol = request.protocol; response.protocol = request.protocol;
response.statusCode = HttpResponse::StatusCode::NotFound; response.statusCode = HttpResponse::StatusCode::NotFound;
response.body = "Not Found";
response.headers.insert(QStringLiteral("Server"), QStringLiteral("Hatschi Server 1.0")); response.headers.insert(QStringLiteral("Server"), QStringLiteral("Hatschi Server 1.0"));
response.headers.insert(QStringLiteral("Content-Type"), QStringLiteral("text/html")); response.headers.insert(QStringLiteral("Content-Type"), QStringLiteral("text/html"));
connection->sendResponse(response); connection->sendResponse(response, tr("Not Found"));
} }
QString RelaisWebserver::clientId(RelaisClient *client) QString RelaisWebserver::clientId(RelaisClient *client)