From 8a8543b685b010c9f7653430e2790e15779657d7 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 7 Apr 2013 15:39:54 +0200 Subject: [PATCH] Take the port from the configuration file. --- cubemap.cpp | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/cubemap.cpp b/cubemap.cpp index 3f136aa..f682472 100644 --- a/cubemap.cpp +++ b/cubemap.cpp @@ -24,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; @@ -253,6 +252,7 @@ vector parse_config(const string &filename) } fclose(fp); + return ret; } int main(int argc, char **argv) @@ -262,6 +262,24 @@ int main(int argc, char **argv) string config_filename = (argc == 1) ? "cubemap.config" : argv[1]; vector 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; @@ -288,8 +306,9 @@ int main(int argc, char **argv) fprintf(stderr, "done.\n"); } else { - // TODO: This should come from a config file. - server_sock = create_server_socket(PORT); + server_sock = create_server_socket(port); + + // TODO: This should come from the config file. for (int i = 0; i < NUM_SERVERS; ++i) { servers[i].add_stream(STREAM_ID); } @@ -302,6 +321,7 @@ int main(int argc, char **argv) pthread_t acceptor_thread; pthread_create(&acceptor_thread, NULL, acceptor_thread_run, reinterpret_cast(server_sock)); + // TODO: This should come from the config file. Input input(STREAM_ID, STREAM_URL); input.run(); -- 2.39.2