X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=httpd.cpp;h=fe2c929969de53db70e179a5f5200db201732631;hb=d3e48df512d9476d3849227067792a3537bb094e;hp=e76cc80634ca9b2b03cd253d69b0641674693d19;hpb=93f17d73eab9e3263c4058a1900a03ce213137a4;p=nageru

diff --git a/httpd.cpp b/httpd.cpp
index e76cc80..fe2c929 100644
--- a/httpd.cpp
+++ b/httpd.cpp
@@ -22,6 +22,7 @@ using namespace std;
 
 HTTPD::HTTPD()
 {
+	global_metrics.add("num_connected_clients", &metric_num_connected_clients, Metrics::TYPE_GAUGE);
 }
 
 HTTPD::~HTTPD()
@@ -87,6 +88,18 @@ int HTTPD::answer_to_connection(MHD_Connection *connection,
 		MHD_destroy_response(response);  // Only decreases the refcount; actual free is after the request is done.
 		return ret;
 	}
+	if (endpoints.count(url)) {
+		pair<string, string> contents_and_type = endpoints[url].callback();
+		MHD_Response *response = MHD_create_response_from_buffer(
+			contents_and_type.first.size(), &contents_and_type.first[0], MHD_RESPMEM_MUST_COPY);
+		MHD_add_response_header(response, "Content-type", contents_and_type.second.c_str());
+		if (endpoints[url].cors_policy == ALLOW_ALL_ORIGINS) {
+			MHD_add_response_header(response, "Access-Control-Allow-Origin", "*");
+		}
+		int ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
+		MHD_destroy_response(response);  // Only decreases the refcount; actual free is after the request is done.
+		return ret;
+	}
 
 	HTTPD::Stream *stream = new HTTPD::Stream(this, framing);
 	stream->add_data(header.data(), header.size(), Stream::DATA_TYPE_HEADER);
@@ -94,6 +107,7 @@ int HTTPD::answer_to_connection(MHD_Connection *connection,
 		unique_lock<mutex> lock(streams_mutex);
 		streams.insert(stream);
 	}
+	++metric_num_connected_clients;
 	*con_cls = stream;
 
 	// Does not strictly have to be equal to MUX_BUFFER_SIZE.
@@ -119,6 +133,7 @@ void HTTPD::free_stream(void *cls)
 		delete stream;
 		httpd->streams.erase(stream);
 	}
+	--httpd->metric_num_connected_clients;
 }
 
 ssize_t HTTPD::Stream::reader_callback_thunk(void *cls, uint64_t pos, char *buf, size_t max)