X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=parse.h;h=70b3b5ac20869850ada68d71518cd10ee08dbcb7;hp=3cfa09119458efbdd2d182bd09381e1111f8191c;hb=4c0ab81c4f1b5d0e76c5775a01819d3334cc9399;hpb=019b96a9cc6fa2902690e98a2aa033517efef3ed

diff --git a/parse.h b/parse.h
index 3cfa091..70b3b5a 100644
--- a/parse.h
+++ b/parse.h
@@ -1,17 +1,46 @@
 #ifndef _PARSE_H
 #define _PARSE_H
 
-// Various routines that deal with parsing; both configuration files and HTTP requests.
+// Various routines that deal with parsing; both HTTP requests and more generic text.
 
-#include <map>
-#include <vector>
+#include <stddef.h>
+#include <string>
+#include <algorithm>
 #include <string>
+#include <unordered_map>
+#include <vector>
 
-struct ConfigLine {
-	std::string keyword;
-	std::vector<std::string> arguments;
-	std::map<std::string, std::string> parameters;
+// Locale-unaware tolower(); matches RFC 2616 no matter what the locale is set to.
+static inline char ascii_tolower(const char ch)
+{
+	if (ch >= 'A' && ch <= 'Z') {
+		return ch + 'a' - 'A';
+	} else {
+		return ch;
+	}
+}
+
+// Case-insensitive header comparison and hashing.
+struct HTTPEqual {
+	bool operator() (const std::string &a, const std::string &b) const
+	{
+		return a.size() == b.size() &&
+			std::equal(
+				begin(a), end(a), begin(b),
+				[](char a, char b) {
+					return ascii_tolower(a) == ascii_tolower(b);
+				});
+	}
+};
+struct HTTPHash {
+	size_t operator() (const std::string &s) const
+	{
+		std::string s_low = s;
+		for (char &ch : s_low) { ch = ascii_tolower(ch); }
+		return std::hash<std::string>() (s_low);
+	}
 };
+using HTTPHeaderMultimap = std::unordered_multimap<std::string, std::string, HTTPHash, HTTPEqual>;
 
 // Split a line on whitespace, e.g. "foo  bar baz" -> {"foo", "bar", "baz"}.
 std::vector<std::string> split_tokens(const std::string &line);
@@ -19,21 +48,9 @@ std::vector<std::string> split_tokens(const std::string &line);
 // Split a string on \n or \r\n, e.g. "foo\nbar\r\n\nbaz\r\n\r\n" -> {"foo", "bar", "baz"}.
 std::vector<std::string> split_lines(const std::string &str);
 
-// Parse the configuration file.
-std::vector<ConfigLine> parse_config(const std::string &filename);
-
-enum ParameterType {
-	PARAMETER_OPTIONAL,
-	PARAMATER_MANDATORY,
-};
-
-std::string fetch_config_string(const std::vector<ConfigLine> &config, const std::string &keyword,
-                                ParameterType parameter_type, const std::string &default_value = "");
-
-// Note: Limits are inclusive.
-int fetch_config_int(const std::vector<ConfigLine> &config, const std::string &keyword,
-                     int min_limit, int max_limit,
-                     ParameterType parameter_type, int default_value = -1);
+// Extract HTTP headers from a request or response. Ignores the first line,
+// where the verb or the return code is.
+HTTPHeaderMultimap extract_headers(const std::vector<std::string> &lines, const std::string &log_context);
 
 // Add the new data to an existing string, looking for \r\n\r\n
 // (typical of HTTP requests and/or responses). Will return one