summaryrefslogtreecommitdiff
path: root/src/lib/encode_server_finder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-04-27 15:07:21 +0100
committerCarl Hetherington <cth@carlh.net>2017-04-27 15:07:21 +0100
commitf80e2f7b370c3a6dfa8a78c9665a8eaf43a05f03 (patch)
treea71e6e42c93fec31b12226a404bc87a50cf51422 /src/lib/encode_server_finder.cc
parent89a4ad5f9d430e29758e5cca82a66ff3b6f11ea7 (diff)
Move ports around to allow master/server to coexist (#962).
Diffstat (limited to 'src/lib/encode_server_finder.cc')
-rw-r--r--src/lib/encode_server_finder.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc
index e964bb8b3..2796df8f5 100644
--- a/src/lib/encode_server_finder.cc
+++ b/src/lib/encode_server_finder.cc
@@ -118,7 +118,7 @@ try
if (Config::instance()->use_any_servers ()) {
/* Broadcast to look for servers */
try {
- boost::asio::ip::udp::endpoint end_point (boost::asio::ip::address_v4::broadcast(), Config::instance()->server_port_base() + 1);
+ boost::asio::ip::udp::endpoint end_point (boost::asio::ip::address_v4::broadcast(), HELLO_PORT);
socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point);
} catch (...) {
@@ -134,7 +134,7 @@ try
}
try {
boost::asio::ip::udp::resolver resolver (io_service);
- boost::asio::ip::udp::resolver::query query (*i, raw_convert<string> (Config::instance()->server_port_base() + 1));
+ boost::asio::ip::udp::resolver::query query (*i, raw_convert<string> (HELLO_PORT));
boost::asio::ip::udp::endpoint end_point (*resolver.resolve (query));
socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point);
} catch (...) {
@@ -157,7 +157,7 @@ try {
using namespace boost::asio::ip;
try {
- _listen_acceptor.reset (new tcp::acceptor (_listen_io_service, tcp::endpoint (tcp::v4(), Config::instance()->server_port_base() + 1)));
+ _listen_acceptor.reset (new tcp::acceptor (_listen_io_service, tcp::endpoint (tcp::v4(), SERVER_PRESENCE_PORT)));
} catch (...) {
boost::throw_exception (NetworkError (_("Could not listen for remote encode servers. Perhaps another instance of DCP-o-matic is running.")));
}