diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-02-04 23:38:08 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-02-04 23:38:08 +0000 |
| commit | 918124fb0b2fdf05bf98aee2c74c85387f1d8638 (patch) | |
| tree | 209154022d91c7381c2ed1b2b00f01ebe14997e6 /src/lib/encode_server_finder.cc | |
| parent | 9a5f1ef94b9916f5cd5996255007200bf61af7bf (diff) | |
Listen for server replies on different ports on main and batch, and get servers to send replies to both (#1190).
Diffstat (limited to 'src/lib/encode_server_finder.cc')
| -rw-r--r-- | src/lib/encode_server_finder.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc index 2796df8f5..267fbb62a 100644 --- a/src/lib/encode_server_finder.cc +++ b/src/lib/encode_server_finder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -157,7 +157,9 @@ try { using namespace boost::asio::ip; try { - _listen_acceptor.reset (new tcp::acceptor (_listen_io_service, tcp::endpoint (tcp::v4(), SERVER_PRESENCE_PORT))); + _listen_acceptor.reset ( + new tcp::acceptor (_listen_io_service, tcp::endpoint (tcp::v4(), is_batch_converter ? BATCH_SERVER_PRESENCE_PORT : MAIN_SERVER_PRESENCE_PORT)) + ); } catch (...) { boost::throw_exception (NetworkError (_("Could not listen for remote encode servers. Perhaps another instance of DCP-o-matic is running."))); } |