[mythtv-firehose] mythtv branch master updated by jyavenard. v0.28-pre-1466-g4aec40d

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user jyavenard.
       via  4aec40dcad6ac1f24b08609a1eef75a1720d5cc1 (commit)
       via  7e92707d60a9623e59a4e63d72107fa7df6ef708 (commit)
       via  5594a6f32e73b0519b556b63983786a01a0f2228 (commit)
      from  23813a5913924239eeeb7b418dd4673395294483 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4aec40dcad6ac1f24b08609a1eef75a1720d5cc1
Author:    Jean-Yves Avenard <jyavenard at mythtv.org> at Mon, 2 Jun 2014 01:51:17 +1000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Mon, 2 Jun 2014 01:51:17 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=4aec40dcad6ac1f24b08609a1eef75a1720d5cc1

Merge branch 'master' of code.mythtv.org:mythtv



commit 7e92707d60a9623e59a4e63d72107fa7df6ef708
Author:    Jean-Yves Avenard <jyavenard at mythtv.org> at Mon, 2 Jun 2014 01:50:59 +1000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Mon, 2 Jun 2014 01:50:59 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=7e92707d60a9623e59a4e63d72107fa7df6ef708

Fix connection to Master Backend where the master IP address is a link-local address
Similar problems as fixed in 5594a6f32e73b0519b556b63983786a01a0f2228, if MasterServerIP contains a scope Id, it will prevent frontend and slave backend to connect.

Also, the master backend detects that it is the master by comparing its IP address with the value stored in the MasterServerIP setting. The comparison is made using strings.
So if MasterServerIP is set to something like 192.168.000.001 it will fail (as we would be comparing with 192.168.0.1). IPv6 can also contains upper or lower case characters.

Add convenience methods GetMasterServerIP, GetMasterServerPort and GetMasterServerStatusPort ; which will ensure the value read is always correct.

Ref #10921



commit 5594a6f32e73b0519b556b63983786a01a0f2228
Author:    Jean-Yves Avenard <jyavenard at mythtv.org> at Mon, 2 Jun 2014 01:35:46 +1000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Mon, 2 Jun 2014 01:35:46 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=5594a6f32e73b0519b556b63983786a01a0f2228

Make Frontend/Backend connection works when BE is set to use IPv6 link-local address
BackendServerIP6 has created by mythtv-setup will contain the scope Id. That scope id is only valid on the machine mythtv-setup was run on.
We must remove that scope id before attempting to use it, as otherwise the connection would fail.

IPv6 link-local addresses do cause a problem has all network interfaces have one. We attempt to determine the scope id by trying to connect to the backend using each active interfaces. Once the scope Id is found, we cache it for later use.

This fixes #10921



-----------------------------------------------------------------------

Summary of changes:
 mythplugins/mytharchive/mytharchivehelper/main.cpp |    4 +-
 mythtv/libs/libmyth/programinfo.cpp                |    6 +-
 mythtv/libs/libmythbase/mythcorecontext.cpp        |  129 +++++++++++++++-----
 mythtv/libs/libmythbase/mythcorecontext.h          |    9 ++
 mythtv/libs/libmythbase/mythsocket.cpp             |   68 ++++++++++-
 .../requesthandler/outboundhandler.cpp             |    4 +-
 mythtv/libs/libmythtv/HLS/httplivestream.cpp       |    4 +-
 mythtv/programs/mythbackend/httpstatus.cpp         |    2 +-
 mythtv/programs/mythbackend/main_helpers.cpp       |    4 +-
 mythtv/programs/mythbackend/mainserver.cpp         |    4 +-
 mythtv/programs/mythfrontend/mediarenderer.cpp     |    2 +-
 mythtv/programs/mythfrontend/themechooser.cpp      |    4 +-
 mythtv/programs/mythfrontend/upnpscanner.cpp       |    4 +-
 13 files changed, 190 insertions(+), 54 deletions(-)

--