From 1ac89aeb6ca8642b7cc0f6b43899e4c8d9e08489 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 5 Oct 2014 23:18:39 +0100 Subject: Bump ffmpeg version. --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index f676d6b99..a650dbf20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-05 Carl Hetherington + + * Bump ffmpeg version. + 2014-09-28 Carl Hetherington * Version 1.73.8 released. -- cgit v1.2.3 From 4e99fbf516b8a5d5c350950aee6d9068a4acf3b7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 Oct 2014 15:17:59 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index f676d6b99..ee41a8697 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-06 Carl Hetherington + + * Version 1.73.9 released. + 2014-09-28 Carl Hetherington * Version 1.73.8 released. diff --git a/debian/changelog b/debian/changelog index fe31a1bf8..30e9a1839 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.73.8-1) UNRELEASED; urgency=low +dcpomatic (1.73.9-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -184,8 +184,9 @@ dcpomatic (1.73.8-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sun, 28 Sep 2014 23:54:07 +0100 + -- Carl Hetherington Mon, 06 Oct 2014 15:17:59 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 3da81ce4b..778c9ffa3 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.8devel' +VERSION = '1.73.9' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From c803f81818284dba426cbaf7663fc728f3b36530 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 Oct 2014 20:50:41 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index ee41a8697..da38791d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-06 Carl Hetherington + + * Version 1.74.0 released. + 2014-10-06 Carl Hetherington * Version 1.73.9 released. diff --git a/debian/changelog b/debian/changelog index 30e9a1839..29e5d1a2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.73.9-1) UNRELEASED; urgency=low +dcpomatic (1.74.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -185,8 +185,9 @@ dcpomatic (1.73.9-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Mon, 06 Oct 2014 15:17:59 +0100 + -- Carl Hetherington Mon, 06 Oct 2014 20:50:41 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 1b8077a00..7c31d9d3c 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.9devel' +VERSION = '1.74.0' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 57fd7451d6565ac2b56f9881abd5f425a3a91a5e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 8 Oct 2014 10:06:10 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index c044e5450..d4e344e81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-08 Carl Hetherington + + * Version 1.74.1 released. + 2014-10-05 Carl Hetherington * Bump ffmpeg version. diff --git a/debian/changelog b/debian/changelog index 29e5d1a2f..b31e37e68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.74.0-1) UNRELEASED; urgency=low +dcpomatic (1.74.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -186,8 +186,9 @@ dcpomatic (1.74.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Mon, 06 Oct 2014 20:50:41 +0100 + -- Carl Hetherington Wed, 08 Oct 2014 10:06:10 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 4ce99ca71..688639e37 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.74.0devel' +VERSION = '1.74.1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 1c7805bddbe58dd829c59c559c6c62fe4c9a9302 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 8 Oct 2014 10:37:21 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index d4e344e81..6c40e1de2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-08 Carl Hetherington + + * Version 1.74.2 released. + 2014-10-08 Carl Hetherington * Version 1.74.1 released. diff --git a/debian/changelog b/debian/changelog index b31e37e68..e0ce39fd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.74.1-1) UNRELEASED; urgency=low +dcpomatic (1.74.2-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -187,8 +187,9 @@ dcpomatic (1.74.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Wed, 08 Oct 2014 10:06:10 +0100 + -- Carl Hetherington Wed, 08 Oct 2014 10:37:21 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index ded3409ca..52d6047b0 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.74.1devel' +VERSION = '1.74.2' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From e89aee2c29f02d8a2044c97fc5cdd4be6eb34ef0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 8 Oct 2014 16:55:52 +0100 Subject: Use accept() properly when reading replies to server request broadcasts. Without this, some replies were being lost. --- ChangeLog | 5 +++++ src/lib/server.cc | 3 +++ src/lib/server_finder.cc | 28 ++++++++++++++++++---------- 3 files changed, 26 insertions(+), 10 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 6c40e1de2..047628602 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-10-08 c.hetherington + + * Make server finding more reliable when + there are more than a few servers. + 2014-10-08 Carl Hetherington * Version 1.74.2 released. diff --git a/src/lib/server.cc b/src/lib/server.cc index 9591be188..9428ba611 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -247,6 +247,9 @@ Server::broadcast_received () root->add_child("Threads")->add_child_text (raw_convert (_worker_threads.size ())); string xml = doc.write_to_string ("UTF-8"); + if (_verbose) { + cout << "Offering services to master " << _broadcast.send_endpoint.address().to_string () << "\n"; + } shared_ptr socket (new Socket); try { socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), Config::instance()->server_port_base() + 1)); diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc index 744a65f59..58ad61bf9 100644 --- a/src/lib/server_finder.cc +++ b/src/lib/server_finder.cc @@ -102,24 +102,32 @@ void ServerFinder::listen_thread () try { + using namespace boost::asio::ip; + + boost::asio::io_service io_service; + tcp::acceptor acceptor (io_service, tcp::endpoint (tcp::v4(), Config::instance()->server_port_base() + 1)); + while (true) { - shared_ptr sock (new Socket (60)); + tcp::socket socket (io_service); + acceptor.accept (socket); - try { - sock->accept (Config::instance()->server_port_base() + 1); - } catch (std::exception& e) { - continue; - } + /* XXX: does this deadline work with synchronous reads? */ + + boost::asio::deadline_timer deadline (io_service); + deadline.expires_from_now (boost::posix_time::seconds (10)); + + uint32_t length = 0; + boost::asio::read (socket, boost::asio::buffer (&length, sizeof (uint32_t))); + length = ntohl (length); - uint32_t length = sock->read_uint32 (); scoped_array buffer (new char[length]); - sock->read (reinterpret_cast (buffer.get()), length); + boost::asio::read (socket, boost::asio::buffer (reinterpret_cast (buffer.get ()), length)); string s (buffer.get()); shared_ptr xml (new cxml::Document ("ServerAvailable")); xml->read_string (s); - - string const ip = sock->socket().remote_endpoint().address().to_string (); + + string const ip = socket.remote_endpoint().address().to_string (); if (!server_found (ip)) { ServerDescription sd (ip, xml->number_child ("Threads")); _servers.push_back (sd); -- cgit v1.2.3