X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=cubemap.cpp;h=8dff03b58010e9f2c86a938ff177f64b7a001d24;hp=ed615a876574a8334757bd226529f58814e3ef70;hb=99646561978d4ed5be73f90441c5f64c4d64a0dc;hpb=6861e5c337ba300c61d8b64a3837bb43458caa3f

diff --git a/cubemap.cpp b/cubemap.cpp
index ed615a8..8dff03b 100644
--- a/cubemap.cpp
+++ b/cubemap.cpp
@@ -11,6 +11,7 @@
 #include <sys/epoll.h>
 #include <signal.h>
 #include <errno.h>
+#include <ctype.h>
 #include <vector>
 #include <string>
 #include <map>
@@ -23,7 +24,6 @@
 #define NUM_SERVERS 4
 #define STREAM_ID "stream"
 #define STREAM_URL "http://gruessi.zrh.sesse.net:4013/"
-#define PORT 9094
 
 using namespace std;
 
@@ -171,16 +171,121 @@ CubemapStateProto read_tempfile(int state_fd)
 	return state;
 }
 
+// Split a line on whitespace, e.g. "foo  bar baz" -> {"foo", "bar", "baz"}.
+vector<string> split_tokens(const string &line)
+{
+	vector<string> ret;
+	string current_token;
+
+	for (size_t i = 0; i < line.size(); ++i) {
+		if (isspace(line[i])) {
+			if (!current_token.empty()) {
+				ret.push_back(current_token);
+			}
+			current_token.clear();
+		} else {
+			current_token.push_back(line[i]);
+		}
+	}
+	if (!current_token.empty()) {
+		ret.push_back(current_token);
+	}
+	return ret;
+}
+
+struct ConfigLine {
+	string keyword;
+	vector<string> arguments;
+	map<string, string> parameters;
+};
+
+// Parse the configuration file.
+vector<ConfigLine> parse_config(const string &filename)
+{
+	vector<ConfigLine> ret;
+
+	FILE *fp = fopen(filename.c_str(), "r");
+	if (fp == NULL) {
+		perror(filename.c_str());
+		exit(1);
+	}
+
+	char buf[4096];
+	while (!feof(fp)) {
+		if (fgets(buf, sizeof(buf), fp) == NULL) {
+			break;
+		}
+
+		// Chop off the string at the first #, \r or \n.
+		buf[strcspn(buf, "#\r\n")] = 0;
+
+		// Remove all whitespace from the end of the string.
+		size_t len = strlen(buf);
+		while (len > 0 && isspace(buf[len - 1])) {
+			buf[--len] = 0;
+		}
+
+		// If the line is now all blank, ignore it.
+		if (len == 0) {
+			continue;
+		}
+
+		vector<string> tokens = split_tokens(buf);
+		assert(!tokens.empty());
+		
+		ConfigLine line;
+		line.keyword = tokens[0];
+
+		for (size_t i = 1; i < tokens.size(); ++i) {
+			// foo=bar is a parameter; anything else is an argument.
+			size_t equals_pos = tokens[i].find_first_of('=');
+			if (equals_pos == string::npos) {
+				line.arguments.push_back(tokens[i]);
+			} else {
+				string key = tokens[i].substr(0, equals_pos);
+				string value = tokens[i].substr(equals_pos + 1, string::npos);
+				line.parameters.insert(make_pair(key, value));
+			}
+		}
+
+		ret.push_back(line);
+	}
+
+	fclose(fp);
+	return ret;
+}
+
 int main(int argc, char **argv)
 {
 	fprintf(stderr, "\nCubemap starting.\n");
-		
+
+	string config_filename = (argc == 1) ? "cubemap.config" : argv[1];
+	vector<ConfigLine> config = parse_config(config_filename);
+
+	// Go through each (parsed) configuration line.
+	int port = -1;
+	for (unsigned i = 0; i < config.size(); ++i) {
+		if (config[i].keyword == "port") {
+			if (config[i].parameters.size() > 0 ||
+			    config[i].arguments.size() != 1) {
+				fprintf(stderr, "ERROR: 'port' takes one argument and no parameters\n");
+				exit(1);
+			}
+			port = atoi(config[i].arguments[0].c_str());
+		}
+	}
+	if (port <= 0 || port > 65535) {
+		fprintf(stderr, "ERROR: Missing or invalid 'port' statement in config file\n");
+		exit(1);
+	}
+
+	// Create the servers.
 	servers = new Server[NUM_SERVERS];
 
-	int server_sock;
-	if (argc == 3 && strcmp(argv[1], "-state") == 0) {
+	int server_sock = -1, old_port = -1;
+	if (argc == 4 && strcmp(argv[2], "-state") == 0) {
 		fprintf(stderr, "Deserializing state from previous process... ");
-		int state_fd = atoi(argv[2]);
+		int state_fd = atoi(argv[3]);
 		CubemapStateProto loaded_state = read_tempfile(state_fd);
 
 		// Deserialize the streams.
@@ -198,16 +303,27 @@ int main(int argc, char **argv)
 
 		// Deserialize the server socket.
 		server_sock = loaded_state.server_sock();
+		old_port = loaded_state.port();
 
 		fprintf(stderr, "done.\n");
-	} else {
-		// TODO: This should come from a config file.
-		server_sock = create_server_socket(PORT);
+	} else{
+		// TODO: This should come from the config file.
 		for (int i = 0; i < NUM_SERVERS; ++i) {
 			servers[i].add_stream(STREAM_ID);
 		}
 	}
 
+	// Open a new server socket if we do not already have one, or if we changed ports.
+	if (server_sock != -1 && port != old_port) {
+		fprintf(stderr, "NOTE: Port changed from %d to %d; opening new socket.\n", old_port, port);
+		close(server_sock);
+		server_sock = -1;
+	}
+	if (server_sock == -1) {
+		server_sock = create_server_socket(port);
+	}
+
+	// Start up all the servers!
 	for (int i = 0; i < NUM_SERVERS; ++i) {
 		servers[i].run();
 	}
@@ -215,6 +331,7 @@ int main(int argc, char **argv)
 	pthread_t acceptor_thread;
 	pthread_create(&acceptor_thread, NULL, acceptor_thread_run, reinterpret_cast<void *>(server_sock));
 
+	// TODO: This should come from the config file.
 	Input input(STREAM_ID, STREAM_URL);
 	input.run();
 
@@ -228,6 +345,7 @@ int main(int argc, char **argv)
 
 	CubemapStateProto state;
 	state.set_server_sock(server_sock);
+	state.set_port(port);
 	for (int i = 0; i < NUM_SERVERS; ++i) {
 		servers[i].stop();
 
@@ -250,7 +368,7 @@ int main(int argc, char **argv)
 	sprintf(buf, "%d", state_fd);
 
 	for ( ;; ) {
-		execlp(argv[0], argv[0], "-state", buf, NULL);
+		execlp(argv[0], argv[0], config_filename.c_str(), "-state", buf, NULL);
 		perror("execlp");
 		fprintf(stderr, "PANIC: re-exec of %s failed. Waiting 0.2 seconds and trying again...\n", argv[0]);
 		usleep(200000);