janis/aes67-daemon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed handling of IGMP join and leave for the multicast RTP sessions.

Browse Source 
The IGMP handling was broken in case the RTP multicast address of a stream was updated.
This commit is contained in:
Andrea Bondavalli 2020-03-30 18:58:07 +02:00
parent 3947b77d7c
commit bf8a4c56da
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
daemon/session_manager.cpp
View File

@ -499,11 +499,12 @@ std::error_code SessionManager::add_source(const StreamSource& source) {
auto const it = sources_.find(source.id); auto const it = sources_.find(source.id);
if (it != sources_.end()) { if (it != sources_.end()) {
BOOST_LOG_TRIVIAL(info) << "session_manager:: source id " BOOST_LOG_TRIVIAL(info) << "session_manager:: source id "
<< std::to_string(source.id) << " is in use, updating"; << std::to_string(source.id) << " is in use, updating";
const auto& info = (*it).second;
// remove previous stream if enabled // remove previous stream if enabled
if (info.enabled) { if ((*it).second.enabled) {
(void)driver_->remove_rtp_stream(info.handle); (void)driver_->remove_rtp_stream((*it).second.handle);
igmp_.leave(config_->get_ip_addr_str(),
ip::address_v4((*it).second.stream.m_ui32DestIP).to_string());
} }
} }
@ -514,17 +515,11 @@ std::error_code SessionManager::add_source(const StreamSource& source) {
if (it != sources_.end()) { if (it != sources_.end()) {
/* update operation failed */ /* update operation failed */
sources_.erase(source.id); sources_.erase(source.id);
igmp_.leave(config_->get_ip_addr_str(),
ip::address_v4(info.stream.m_ui32DestIP).to_string());
} }
return ret; return ret;
} }
igmp_.join(config_->get_ip_addr_str(),
if (it == sources_.end()) { ip::address_v4(info.stream.m_ui32DestIP).to_string());
/* if add join multicast */
igmp_.join(config_->get_ip_addr_str(),
ip::address_v4(info.stream.m_ui32DestIP).to_string());
}
} }
// update source map // update source map
@ -743,10 +738,11 @@ std::error_code SessionManager::add_sink(const StreamSink& sink) {
auto const it = sinks_.find(sink.id); auto const it = sinks_.find(sink.id);
if (it != sinks_.end()) { if (it != sinks_.end()) {
BOOST_LOG_TRIVIAL(info) << "session_manager:: sink id " BOOST_LOG_TRIVIAL(info) << "session_manager:: sink id "
<< std::to_string(sink.id) << " is in use, updating"; << std::to_string(sink.id) << " is in use, updating";
// remove previous stream // remove previous stream
const auto& info = (*it).second; (void)driver_->remove_rtp_stream((*it).second.handle);
(void)driver_->remove_rtp_stream(info.handle); igmp_.leave(config_->get_ip_addr_str(),
ip::address_v4((*it).second.stream.m_ui32DestIP).to_string());
} }
auto ret = driver_->add_rtp_stream(info.stream, info.handle); auto ret = driver_->add_rtp_stream(info.stream, info.handle);
@ -754,17 +750,12 @@ std::error_code SessionManager::add_sink(const StreamSink& sink) {
if (it != sinks_.end()) { if (it != sinks_.end()) {
/* update operation failed */ /* update operation failed */
sinks_.erase(sink.id); sinks_.erase(sink.id);
igmp_.leave(config_->get_ip_addr_str(),
ip::address_v4(info.stream.m_ui32DestIP).to_string());
} }
return ret; return ret;
} }
if (it == sinks_.end()) { igmp_.join(config_->get_ip_addr_str(),
/* if add join multicast */ ip::address_v4(info.stream.m_ui32DestIP).to_string());
igmp_.join(config_->get_ip_addr_str(),
ip::address_v4(info.stream.m_ui32DestIP).to_string());
}
// update sinks map // update sinks map
sinks_[sink.id] = info; sinks_[sink.id] = info;