X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=2fe4f15184a62699c6bcb8c89606ffa95f9559e8;hp=b05f661aa6641d5aed95953b98b1d103fee8702f;hb=061988af511f42da3cd584b4d983177504ddc177;hpb=513af50c3e3454aafc25e97a7d20c206006e4d4c

diff --git a/server.h b/server.h
index b05f661..2fe4f15 100644
--- a/server.h
+++ b/server.h
@@ -1,21 +1,25 @@
 #ifndef _SERVER_H
 #define _SERVER_H 1
 
-#include <pthread.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/epoll.h>
 #include <sys/types.h>
 #include <time.h>
 #include <map>
+#include <memory>
+#include <mutex>
 #include <queue>
 #include <string>
 #include <vector>
 
+#include "tlse.h"
+
 #include "client.h"
 #include "stream.h"
 #include "thread.h"
 
+class Acceptor;
 class ClientProto;
 struct Stream;
 
@@ -47,14 +51,14 @@ public:
 	// These will be deferred until the next time an iteration in do_work() happens,
 	// and the order between them are undefined.
 	// XXX: header should ideally be ordered with respect to data.
-	void add_client_deferred(int sock);
+	void add_client_deferred(int sock, Acceptor *acceptor);
 	void add_data_deferred(int stream_index, const char *data, size_t bytes, uint16_t metacube_flags);
 
 	// These should not be called while running, since that would violate
 	// threading assumptions (ie., that epoll is only called from one thread
 	// at the same time).
-	CubemapStateProto serialize();
-	void add_client_from_serialized(const ClientProto &client);
+	CubemapStateProto serialize(std::unordered_map<const std::string *, size_t> *short_response_pool);
+	void add_client_from_serialized(const ClientProto &client, const std::vector<std::shared_ptr<const std::string>> &short_responses);
 	int add_stream(const std::string &url, size_t bytes_received, size_t prebuffering_bytes, Stream::Encoding encoding, Stream::Encoding src_encoding);
 	int add_stream_from_serialized(const StreamProto &stream, int data_fd);
 	int lookup_stream_by_url(const std::string &url) const;
@@ -63,30 +67,31 @@ public:
 	void set_encoding(int stream_index, Stream::Encoding encoding);
 	void set_src_encoding(int stream_index, Stream::Encoding encoding);
 	void add_gen204(const std::string &url, const std::string &allow_origin);
+	void create_tls_context_for_acceptor(const Acceptor *acceptor);
 
 private:
 	// Mutex protecting queued_add_clients.
-	// Note that if you want to hold both this and <mutex> below,
-	// you will need to take <mutex> before this one.
-	mutable pthread_mutex_t queued_clients_mutex;
+	// Note that if you want to hold both this and <mu> below,
+	// you will need to take <mu> before this one.
+	mutable std::mutex queued_clients_mutex;
 
 	// Deferred commands that should be run from the do_work() thread as soon as possible.
 	// We defer these for two reasons:
 	//
 	//  - We only want to fiddle with epoll from one thread at any given time,
 	//    and doing add_client() from the acceptor thread would violate that.
-	//  - We don't want the input thread(s) hanging on <mutex> when doing
-	//    add_data(), since they want to do add_data() rather often, and <mutex>
+	//  - We don't want the input thread(s) hanging on <mu> when doing
+	//    add_data(), since they want to do add_data() rather often, and <mu>
 	//    can be taken a lot of the time.
 	//	
 	// Protected by <queued_clients_mutex>.
-	std::vector<int> queued_add_clients;
+	std::vector<std::pair<int, Acceptor *>> queued_add_clients;
 
 	// All variables below this line are protected by the mutex.
-	mutable pthread_mutex_t mutex;
+	mutable std::mutex mu;
 
 	// All streams.
-	std::vector<Stream *> streams;
+	std::vector<std::unique_ptr<Stream>> streams;
 
 	// Map from URL to index into <streams>.
 	std::map<std::string, int> stream_url_map;
@@ -108,12 +113,15 @@ private:
 	// This means that when reading it, we need to check if the client it
 	// describes is still exists (ie., that the fd still exists, and that
 	// the timespec matches).
-	std::queue<std::pair<timespec, int> > clients_ordered_by_connect_time;
+	std::queue<std::pair<timespec, int>> clients_ordered_by_connect_time;
 
 	// Used for epoll implementation (obviously).
 	int epoll_fd;
 	epoll_event events[EPOLL_MAX_EVENTS];
 
+	// For each TLS-enabled acceptor, our private server context for its key pair.
+	std::map<const Acceptor *, TLSContext *> tls_server_contexts;
+
 	// The actual worker thread.
 	virtual void do_work();
 
@@ -132,9 +140,33 @@ private:
 	// but it's cheaper than taking it in and out all the time.
 	void process_client(Client *client);
 
+	// If the TLS library wants to write anything to this client,
+	// output it. Returns true if the processing should go to sleep
+	// (an error, or lack of outgoing buffer space).
+	bool send_pending_tls_data(Client *client);
+
+	// Reads regular data fro ma socket. Returns -1 if the processing
+	// should go to sleep (an error, or no data available yet), otherwise
+	// the number of bytes read.
+	int read_nontls_data(Client *client, char *buf, size_t max_size);
+
+	// Reads (decrypted) data from a TLS socket. Returns -1 if the processing
+	// should go to sleep (an error, or no data available yet), otherwise
+	// the number of bytes read. The buffer will be used as scratch space
+	// for TLS data, so it can be overwritten by more bytes than what is returned.
+	int read_tls_data(Client *client, char *buf, size_t max_size);
+
 	// Close a given client socket, and clean up after it.
 	void close_client(Client *client);
 
+	// Listen for a different set of epoll events.
+	void change_epoll_events(Client *client, uint32_t events);
+
+	// If we're supposed to listen for more requests (persistent HTTP connections),
+	// puts the client back into READING_REQUEST, changes its epoll flags and returns
+	// true.
+	bool more_requests(Client *client);
+
 	// Parse the HTTP request. Returns a HTTP status code (200/204/400/404).
 	int parse_request(Client *client);
 
@@ -152,7 +184,7 @@ private:
 	void process_queued_data();
 	void skip_lost_data(Client *client);
 
-	void add_client(int sock);
+	void add_client(int sock, Acceptor *acceptor);
 };
 
 #endif  // !defined(_SERVER_H)