X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=907be07e93e85c501d7a3f6ee3d8d6ee91e709d0;hp=03ef0d7aaa5ef587cd2547be0b07b38abe0f7183;hb=32d84e70aa1f1c9cd8334aceac0a617b4a7b4b40;hpb=7c4707af4ea7af05e34bc0414d18d9fd54e4f23e

diff --git a/main.cpp b/main.cpp
index 03ef0d7..907be07 100644
--- a/main.cpp
+++ b/main.cpp
@@ -19,6 +19,7 @@
 #include <set>
 
 #include "acceptor.h"
+#include "config.h"
 #include "markpool.h"
 #include "metacube.h"
 #include "parse.h"
@@ -215,7 +216,7 @@ vector<Acceptor *> create_acceptors(
 			acceptor = deserialized_acceptor_it->second;
 			deserialized_acceptors->erase(deserialized_acceptor_it);
 		} else {
-			int server_sock = create_server_socket(port);
+			int server_sock = create_server_socket(port, TCP_SOCKET);
 			acceptor = new Acceptor(server_sock, port);
 		}
 		acceptor->run();
@@ -262,6 +263,7 @@ vector<Input *> create_inputs(const vector<ConfigLine> &config,
 			if (input->get_url() != src) {
 				fprintf(stderr, "INFO: Stream '%s' has changed URL from '%s' to '%s', restarting input.\n",
 					stream_id.c_str(), input->get_url().c_str(), src.c_str());
+				input->close_socket();
 				delete input;
 				input = NULL;
 			}
@@ -269,6 +271,11 @@ vector<Input *> create_inputs(const vector<ConfigLine> &config,
 		}
 		if (input == NULL) {
 			input = create_input(stream_id, src);
+			if (input == NULL) {
+				fprintf(stderr, "ERROR: did not understand URL '%s', clients will not get any data.\n",
+				        src.c_str());
+				continue;
+			}
 		}
 		input->run();
 		inputs.push_back(input);