Move ports around to allow master/server to coexist (#962).

diff --git a/ChangeLog b/ChangeLog
index b1ffde15b9955a514a271f8ce5a94fda524fcd55..b1fcbb37ecbb2a3b06c3da8b3561835172543998 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-04-27  Carl Hetherington  <cth@carlh.net>
+
+       * Stop master and server instances fighting over ports, allowing them to coexist (#962).
+

 2017-04-26  Carl Hetherington  <cth@carlh.net>
 
        * Make a copy of the configuration, if it fails to load, before making new defaults.
 2017-04-26  Carl Hetherington  <cth@carlh.net>
 
        * Make a copy of the configuration, if it fails to load, before making new defaults.

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index ba8057be06a97fa0f0ff751ca25e0b2a20f76884..916563b856468a421708e31ad7cfc624cd5df40d 100644 (file)
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -156,7 +156,7 @@ DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout)
 {
        boost::asio::io_service io_service;
        boost::asio::ip::tcp::resolver resolver (io_service);
 {
        boost::asio::io_service io_service;
        boost::asio::ip::tcp::resolver resolver (io_service);

-       boost::asio::ip::tcp::resolver::query query (serv.host_name(), raw_convert<string> (Config::instance()->server_port_base ()));
+       boost::asio::ip::tcp::resolver::query query (serv.host_name(), raw_convert<string> (ENCODE_FRAME_PORT));

        boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query);
 
        shared_ptr<Socket> socket (new Socket (timeout));
        boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query);
 
        shared_ptr<Socket> socket (new Socket (timeout));

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index 442ce3d6f4b41377c69874bf45a1ec44e2f90a43..4f27ee42132ac244c45f22020a4bba6db6902d82 100644 (file)
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -67,7 +67,7 @@ using dcp::Data;
 using dcp::raw_convert;
 
 EncodeServer::EncodeServer (shared_ptr<Log> log, bool verbose, int num_threads)
 using dcp::raw_convert;
 
 EncodeServer::EncodeServer (shared_ptr<Log> log, bool verbose, int num_threads)

-       : Server (Config::instance()->server_port_base())
+       : Server (ENCODE_FRAME_PORT)

        , _log (log)
        , _verbose (verbose)
        , _num_threads (num_threads)
        , _log (log)
        , _verbose (verbose)
        , _num_threads (num_threads)


@@ -237,7 +237,7 @@ EncodeServer::broadcast_thread ()
 try
 {
        boost::asio::ip::address address = boost::asio::ip::address_v4::any ();
 try
 {
        boost::asio::ip::address address = boost::asio::ip::address_v4::any ();

-       boost::asio::ip::udp::endpoint listen_endpoint (address, Config::instance()->server_port_base() + 1);
+       boost::asio::ip::udp::endpoint listen_endpoint (address, HELLO_PORT);

 
        _broadcast.socket = new boost::asio::ip::udp::socket (_broadcast.io_service);
        _broadcast.socket->open (listen_endpoint.protocol ());
 
        _broadcast.socket = new boost::asio::ip::udp::socket (_broadcast.io_service);
        _broadcast.socket->open (listen_endpoint.protocol ());


@@ -274,7 +274,7 @@ EncodeServer::broadcast_received ()
                }
                shared_ptr<Socket> socket (new Socket);
                try {
                }
                shared_ptr<Socket> socket (new Socket);
                try {

-                       socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), Config::instance()->server_port_base() + 1));
+                       socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), SERVER_PRESENCE_PORT));

                        socket->write (xml.length() + 1);
                        socket->write ((uint8_t *) xml.c_str(), xml.length() + 1);
                } catch (...) {
                        socket->write (xml.length() + 1);
                        socket->write ((uint8_t *) xml.c_str(), xml.length() + 1);
                } catch (...) {

diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc
index e964bb8b34a76746424c5712fa84edde152b3662..2796df8f55e85417b37478e1d8dcf860245d3c68 100644 (file)
--- 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 {
                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 (...) {
 
                                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);
                        }
                        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 (...) {
                                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 {
        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.")));
        }
        } catch (...) {
                boost::throw_exception (NetworkError (_("Could not listen for remote encode servers.  Perhaps another instance of DCP-o-matic is running.")));
        }

diff --git a/src/lib/types.h b/src/lib/types.h
index 041db1786ea6c2653eba64c97161898b530a76c7..0702c873405c07a823bb13ccbe03150052bf6fe4 100644 (file)
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -70,6 +70,15 @@ namespace xmlpp {
 */
 #define VIDEO_FRAME_RATE_EPSILON (1e-4)
 
 */
 #define VIDEO_FRAME_RATE_EPSILON (1e-4)
 

+/** Port on which EncodeServer listens for frame encoding requests */
+#define ENCODE_FRAME_PORT (Config::instance()->server_port_base())
+/** Port on which EncodeServer listens for DCPOMATIC_HELLO from masters */
+#define HELLO_PORT (Config::instance()->server_port_base()+1)
+/** Port on which EncodeServerFinder listens for replies to DCPOMATIC_HELLO from servers */
+#define SERVER_PRESENCE_PORT (Config::instance()->server_port_base()+2)
+/** Port on which batch converter listens for job requests */
+#define BATCH_JOB_PORT (Config::instance()->server_port_base()+3)
+

 typedef std::vector<boost::shared_ptr<Content> > ContentList;
 typedef std::vector<boost::shared_ptr<FFmpegContent> > FFmpegContentList;
 
 typedef std::vector<boost::shared_ptr<Content> > ContentList;
 typedef std::vector<boost::shared_ptr<FFmpegContent> > FFmpegContentList;
 

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index f94c2ac547209a2118927779d1355723d2d8eb72..e9a1f652cea81ef535369e8cb82604b855316a06 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -559,7 +559,7 @@ private:
                        try {
                                boost::asio::io_service io_service;
                                boost::asio::ip::tcp::resolver resolver (io_service);
                        try {
                                boost::asio::io_service io_service;
                                boost::asio::ip::tcp::resolver resolver (io_service);

-                               boost::asio::ip::tcp::resolver::query query ("127.0.0.1", raw_convert<string> (Config::instance()->server_port_base() + 2));
+                               boost::asio::ip::tcp::resolver::query query ("127.0.0.1", raw_convert<string> (BATCH_JOB_PORT));

                                boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query);
                                Socket socket (5);
                                socket.connect (*endpoint_iterator);
                                boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query);
                                Socket socket (5);
                                socket.connect (*endpoint_iterator);

diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index 3088743547b0ed1f7f3e3b6b0b2df574dea94ed1..9b6fdfd8da3239761057e8c6bd035b1e3b04e3b5 100644 (file)
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -252,7 +252,7 @@ class JobServer : public Server
 {
 public:
        JobServer (DOMFrame* frame)
 {
 public:
        JobServer (DOMFrame* frame)

-               : Server (Config::instance()->server_port_base() + 2)
+               : Server (BATCH_JOB_PORT)

                , _frame (frame)
        {}
 
                , _frame (frame)
        {}