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

MXS-1220: Clean up resource, request and response headers

Browse Source 
Cleaned up various parts of the resource, request and response class
headers.

Moved `using` declarations into .cc files.

Made the Resource class non-copyable as it isn't really meant to be
copied.
This commit is contained in:
Markus Mäkelä
2017-04-19 18:58:40 +03:00
committed by Markus Mäkelä
parent 80104d6dad
commit ebc9e4bd3b
7 changed files with 67 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/maxscale/http.hh
View File

@ -18,14 +18,12 @@
#include <maxscale/debug.h>
using std::string;
/**
* @brief Return the current HTTP-date
*
* @return The RFC 1123 compliant date
*/
static inline string http_get_date()
static inline std::string http_get_date()
{
time_t now = time(NULL);
struct tm tm;
@ -34,5 +32,5 @@ static inline string http_get_date()
gmtime_r(&now, &tm);
strftime(buf, sizeof(buf), "%a, %d %b %y %T GMT", &tm);
return string(buf);
return std::string(buf);
}

47
server/core/maxscale/httprequest.hh
View File

@ -26,23 +26,12 @@
#include "http.hh"
using std::shared_ptr;
using std::string;
using std::map;
using std::deque;
using mxs::Closer;
class HttpRequest;
/** Typedef for managed pointer */
typedef std::shared_ptr<HttpRequest> SHttpRequest;
static int value_iterator(void *cls,
enum MHD_ValueKind kind,
const char *key,
const char *value)
{
std::pair<string, string>* cmp = (std::pair<string, string>*)cls;
std::pair<std::string, std::string>* cmp = (std::pair<std::string, std::string>*)cls;
if (cmp->first == key)
{
@ -55,6 +44,8 @@ static int value_iterator(void *cls,
class HttpRequest
{
HttpRequest(const HttpRequest&);
HttpRequest& operator = (const HttpRequest);
public:
/**
* @brief Parse a request
@ -63,7 +54,7 @@ public:
*
* @return Parsed statement or NULL if request is not valid
*/
HttpRequest(struct MHD_Connection *connection, string url, string method, json_t* data);
HttpRequest(struct MHD_Connection *connection, std::string url, std::string method, json_t* data);
~HttpRequest();
@ -72,7 +63,7 @@ public:
*
* @return One of the HTTP verb values
*/
const string& get_verb() const
const std::string& get_verb() const
{
return m_verb;
}
@ -84,9 +75,9 @@ public:
*
* @return Header value or empty string if the header was not found
*/
string get_header(const string header) const
std::string get_header(const std::string& header) const
{
std::pair<string, string> p;
std::pair<std::string, std::string> p;
p.first = header;
MHD_get_connection_values(m_connection, MHD_HEADER_KIND,
@ -102,9 +93,9 @@ public:
*
* @return Option value or empty string if the option was not found
*/
string get_option(const string option) const
std::string get_option(const std::string& option) const
{
std::pair<string, string> p;
std::pair<std::string, std::string> p;
p.first = option;
MHD_get_connection_values(m_connection, MHD_GET_ARGUMENT_KIND,
@ -118,7 +109,7 @@ public:
*
* @return Request body or empty string if no body is defined
*/
const string& get_json_str() const
const std::string& get_json_str() const
{
return m_json_string;
}
@ -138,7 +129,7 @@ public:
*
* @return The complete request URI
*/
const string& get_uri() const
const std::string& get_uri() const
{
return m_resource;
}
@ -150,7 +141,7 @@ public:
*
* @return The request URI part or empty string if no part was found
*/
const string uri_part(uint32_t idx) const
const std::string uri_part(uint32_t idx) const
{
return m_resource_parts.size() > idx ? m_resource_parts[idx] : "";
}
@ -171,12 +162,12 @@ public:
}
private:
map<string, string> m_options; /**< Request options */
Closer<json_t*> m_json; /**< Request body */
string m_json_string; /**< String version of @c m_json */
string m_resource; /**< Requested resource */
deque<string> m_resource_parts; /**< @c m_resource split into parts */
string m_verb; /**< Request method */
string m_hostname; /**< The value of the Host header */
std::map<std::string, std::string> m_options; /**< Request options */
mxs::Closer<json_t*> m_json; /**< Request body */
std::string m_json_string; /**< String version of @c m_json */
std::string m_resource; /**< Requested resource */
std::deque<std::string> m_resource_parts; /**< @c m_resource split into parts */
std::string m_verb; /**< Request method */
std::string m_hostname; /**< The value of the Host header */
struct MHD_Connection* m_connection;
};

8
server/core/maxscale/httpresponse.hh
View File

@ -23,14 +23,6 @@
#include "http.hh"
using std::map;
using std::string;
using std::shared_ptr;
class HttpResponse;
typedef shared_ptr<HttpResponse> SHttpResponse;
class HttpResponse
{
public:

11
server/core/maxscale/resource.hh
View File

@ -18,7 +18,6 @@
#include <string>
#include <deque>
#include <tr1/memory>
#include <maxscale/server.h>
@ -30,14 +29,12 @@
#include "filter.h"
#include "session.h"
using std::string;
using std::shared_ptr;
using std::deque;
typedef HttpResponse (*ResourceCallback)(HttpRequest& request);
class Resource
{
Resource(const Resource&);
Resource& operator = (const Resource&);
public:
Resource(ResourceCallback cb, int components, ...);
@ -63,10 +60,10 @@ public:
private:
bool matching_variable_path(const string& path, const string& target);
bool matching_variable_path(const std::string& path, const std::string& target);
ResourceCallback m_cb; /**< Resource handler callback */
deque<string> m_path; /**< Path components */
std::deque<std::string> m_path; /**< Path components */
};
/**