hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1220: Rename and reorganize HttpParser

Browse Source 
The HttpParser class was renamed to HttpRequest as it parses and processes
only HTTP requests. A second class that creates a HTTP response needs to
be created to handle the response generation.

Moved some of the HTTP constants and helper functions to a separate
http.hh header.
This commit is contained in:
Markus Mäkelä
2017-04-16 19:28:23 +03:00
committed by Markus Mäkelä
parent e34b65658e
commit 4eb121ce35
6 changed files with 282 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/core/adminclient.cc
View File

@ -12,7 +12,7 @@
*/
#include "maxscale/adminclient.hh"
#include "maxscale/httpparser.hh"
#include "maxscale/httprequest.hh"
#include <string>
#include <sstream>
@ -77,9 +77,14 @@ static bool read_request(int fd, string& output)
return true;
}
static bool write_response(int fd, string input)
static bool write_response(int fd, enum http_code code, const string& body)
{
return write(fd, input.c_str(), input.length()) != -1;
string payload = "HTTP/1.1 ";
payload += http_code_to_string(code);
payload += "\r\n\r\n";
payload += body;
return write(fd, payload.c_str(), payload.length()) != -1;
}
void AdminClient::process()
@ -89,15 +94,12 @@ void AdminClient::process()
if (read_request(m_fd, request))
{
SHttpParser parser(HttpParser::parse(request));
SHttpRequest parser(HttpRequest::parse(request));
string status = parser.get() ? "200 OK" : "400 Bad Request";
stringstream resp;
resp << "HTTP/1.1 " << status << "\r\n\r\n" << parser->get_body() << "\r\n";
enum http_code status = parser.get() ? HTTP_200_OK : HTTP_400_BAD_REQUEST;
atomic_write_int64(&m_last_activity, hkheartbeat);
write_response(m_fd, resp.str());
write_response(m_fd, HTTP_200_OK, parser->get_body());
}
else
{