X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=httpd.h;h=509ae0146a344f101d34d199b36bcab3380c06a6;hb=d3e48df512d9476d3849227067792a3537bb094e;hp=94de03199827f5282e4e195ee23e0150bc4fbb4f;hpb=ae6eccf4792e276970fa4fb985dc4588947b767b;p=nageru

diff --git a/httpd.h b/httpd.h
index 94de031..509ae01 100644
--- a/httpd.h
+++ b/httpd.h
@@ -3,30 +3,49 @@
 
 // A class dealing with stream output to HTTP.
 
-#include <microhttpd.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>
+#include <atomic>
 #include <condition_variable>
 #include <deque>
-#include <memory>
+#include <functional>
 #include <mutex>
 #include <set>
 #include <string>
+#include <unordered_map>
+#include <utility>
 
 struct MHD_Connection;
+struct MHD_Daemon;
 
 class HTTPD {
 public:
+	// Returns a pair of content and content-type.
+	using EndpointCallback = std::function<std::pair<std::string, std::string>()>;
+
 	HTTPD();
+	~HTTPD();
 
 	// Should be called before start().
 	void set_header(const std::string &data) {
 		header = data;
 	}
 
+	// Should be called before start() (due to threading issues).
+	enum CORSPolicy {
+		NO_CORS_POLICY,
+		ALLOW_ALL_ORIGINS
+	};
+	void add_endpoint(const std::string &url, const EndpointCallback &callback, CORSPolicy cors_policy) {
+		endpoints[url] = Endpoint{ callback, cors_policy };
+	}
+
 	void start(int port);
 	void add_data(const char *buf, size_t size, bool keyframe);
+	int64_t get_num_connected_clients() const {
+		return metric_num_connected_clients.load();
+	}
 
 private:
 	static int answer_to_connection_thunk(void *cls, MHD_Connection *connection,
@@ -41,10 +60,6 @@ private:
 
 	static void free_stream(void *cls);
 
-	static void request_completed_thunk(void *cls, struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe);
-
-	void request_completed(struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe);
-
 
 	class Stream {
 	public:
@@ -52,7 +67,7 @@ private:
 			FRAMING_RAW,
 			FRAMING_METACUBE
 		};
-		Stream(Framing framing) : framing(framing) {}
+		Stream(HTTPD *parent, Framing framing) : parent(parent), framing(framing) {}
 
 		static ssize_t reader_callback_thunk(void *cls, uint64_t pos, char *buf, size_t max);
 		ssize_t reader_callback(uint64_t pos, char *buf, size_t max);
@@ -63,20 +78,33 @@ private:
 			DATA_TYPE_OTHER
 		};
 		void add_data(const char *buf, size_t size, DataType data_type);
+		void stop();
+		HTTPD *get_parent() const { return parent; }
 
 	private:
+		HTTPD *parent;
 		Framing framing;
 
 		std::mutex buffer_mutex;
+		bool should_quit = false;  // Under <buffer_mutex>.
 		std::condition_variable has_buffered_data;
-		std::deque<std::string> buffered_data;  // Protected by <mutex>.
+		std::deque<std::string> buffered_data;  // Protected by <buffer_mutex>.
 		size_t used_of_buffered_data = 0;  // How many bytes of the first element of <buffered_data> that is already used. Protected by <mutex>.
 		size_t seen_keyframe = false;
 	};
 
+	MHD_Daemon *mhd = nullptr;
 	std::mutex streams_mutex;
 	std::set<Stream *> streams;  // Not owned.
+	struct Endpoint {
+		EndpointCallback callback;
+		CORSPolicy cors_policy;
+	};
+	std::unordered_map<std::string, Endpoint> endpoints;
 	std::string header;
+
+	// Metrics.
+	std::atomic<int64_t> metric_num_connected_clients{0};
 };
 
 #endif  // !defined(_HTTPD_H)