Identify UDPInput error messages by the stream, too.

[cubemap] / parse.h

diff --git a/parse.h b/parse.h
index 83c5d2a8998dff2832b879b78db04c4467608696..de260640f56ebc4a0cbe0f6b06a39ead8d6bcbc0 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -1,17 +1,11 @@
 #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>
-
-struct ConfigLine {
-       std::string keyword;
-       std::vector<std::string> arguments;
-       std::map<std::string, std::string> parameters;
-};
+#include <vector>
 
 // Split a line on whitespace, e.g. "foo  bar baz" -> {"foo", "bar", "baz"}.
 std::vector<std::string> split_tokens(const std::string &line);
@@ -19,10 +13,19 @@ 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);
-
-// Note: Limits are inclusive.
-int fetch_config_int(const std::vector<ConfigLine> &config, const std::string &keyword, int min_limit, int max_limit);
+// Add the new data to an existing string, looking for \r\n\r\n
+// (typical of HTTP requests and/or responses). Will return one
+// of the given statuses.
+//
+// Note that if you give too much data in new_data_size, you could
+// get an RP_OUT_OF_SPACE even if you expected RP_EXTRA_DATA.
+// Be careful about how large reads you give in.
+enum RequestParseStatus {
+       RP_OUT_OF_SPACE,       // If larger than 16 kB.
+       RP_NOT_FINISHED_YET,   // Did not get \r\n\r\n yet. 
+       RP_EXTRA_DATA,         // Got \r\n\r\n, but there was extra data behind it.
+       RP_FINISHED,           // Ended exactly in \r\n\r\n.
+};
+RequestParseStatus wait_for_double_newline(std::string *existing_data, const char *new_data, size_t new_data_size);
 
 #endif  // !defined(_PARSE_H)