Listen for server replies on different ports on main and batch, and get servers to...

[dcpomatic.git] / src / lib / encode_server.cc

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index 442ce3d6f4b41377c69874bf45a1ec44e2f90a43..332c7ab46d34c858a5ee60e78415b6fe7abd293d 100644 (file)
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -34,6 +34,7 @@
 #include "compose.hpp"
 #include "log.h"
 #include "encoded_log_entry.h"
+#include "version.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
@@ -67,7 +68,7 @@ using dcp::Data;
 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)
@@ -94,6 +95,9 @@ EncodeServer::~EncodeServer ()
                delete i;
        }
 
+       if (_broadcast.socket) {
+               _broadcast.socket->close ();
+       }
        _broadcast.io_service.stop ();
        if (_broadcast.thread) {
                /* Ideally this would be a DCPOMATIC_ASSERT(_broadcast.thread->joinable()) but we
@@ -102,6 +106,7 @@ EncodeServer::~EncodeServer ()
                if (_broadcast.thread->joinable ()) {
                        _broadcast.thread->join ();
                }
+               delete _broadcast.thread;
        }
 }
 
@@ -218,7 +223,7 @@ EncodeServer::worker_thread ()
 void
 EncodeServer::run ()
 {
-       LOG_GENERAL ("Server starting with %1 threads", _num_threads);
+       LOG_GENERAL ("Server %1 (%2) starting with %3 threads", dcpomatic_version, dcpomatic_git_commit, _num_threads);
        if (_verbose) {
                cout << "DCP-o-matic server starting with " << _num_threads << " threads.\n";
        }
@@ -237,7 +242,7 @@ EncodeServer::broadcast_thread ()
 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 ());
@@ -272,9 +277,19 @@ EncodeServer::broadcast_received ()
                if (_verbose) {
                        cout << "Offering services to master " << _broadcast.send_endpoint.address().to_string () << "\n";
                }
-               shared_ptr<Socket> socket (new Socket);
+
+               try {
+                       shared_ptr<Socket> socket (new Socket);
+                       socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), MAIN_SERVER_PRESENCE_PORT));
+                       socket->write (xml.length() + 1);
+                       socket->write ((uint8_t *) xml.c_str(), xml.length() + 1);
+               } catch (...) {
+
+               }
+
                try {
-                       socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), Config::instance()->server_port_base() + 1));
+                       shared_ptr<Socket> socket (new Socket);
+                       socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), BATCH_SERVER_PRESENCE_PORT));
                        socket->write (xml.length() + 1);
                        socket->write ((uint8_t *) xml.c_str(), xml.length() + 1);
                } catch (...) {