Merge branch 'master' of https://github.com/MonaSolutions/librtmfp

Author: thomasjammet

include/RTMFP.h

@@ -32,7 +32,7 @@ along with Librtmfp.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "Mona/Logs.h"
 
-#define RTMFP_LIB_VERSION	0x0102000B	// (1.2.11)
+#define RTMFP_LIB_VERSION	0x0102000C	// (1.2.12)
 
 #define RTMFP_DEFAULT_KEY	(UInt8*)"Adobe Systems 02"
 #define RTMFP_KEY_SIZE		0x10

sources/NetGroup.cpp

@@ -130,6 +130,14 @@ NetGroup::NetGroup(const string& groupId, const string& groupTxt, const string&
 			itGroupMedia = _mapGroupMedias.emplace_hint(itGroupMedia, piecewise_construct, forward_as_tuple(streamKey), forward_as_tuple(_conn.poolBuffers(), stream, streamKey, pParameters));
 			itGroupMedia->second.subscribe(onGroupPacket);
 			DEBUG("Creation of GroupMedia ", itGroupMedia->second.id," for the stream ", stream, " :\n", Util::FormatHex(BIN streamKey.data(), streamKey.size(), LOG_BUFFER))
+
+			// Send the group media infos to each other peers
+			for (auto itPeer : _mapPeers) {
+				if (itPeer.first == peerId)
+					continue;
+				auto pPeerMedia = itPeer.second->getPeerMedia(itGroupMedia->first);
+				itGroupMedia->second.sendGroupMedia(pPeerMedia);
+			}
 		}
 
 		// And finally try to add the peer and send the GroupMedia subscription

sources/RTMFPHandshaker.cpp

@@ -476,7 +476,7 @@ void RTMFPHandshaker::handleRedirection(BinaryReader& reader) {
 		DEBUG("Server has sent to us the peer addresses of responders") // (we are the initiator)
 
 		// Reset the host address if it changes
-		if (hostAddress != pHandshake->hostAddress) {
+		if (hostAddress && hostAddress != pHandshake->hostAddress) {
 			pHandshake->pSession->setAddresses(hostAddress, pHandshake->listAddresses);
 			pHandshake->hostAddress = hostAddress;
 		}