Merge branch 'dev'

Homegear · May 9, 2017 · 6532bb7 · 6532bb7
2 parents 8a6e662 + 10e77aa
commit 6532bb7
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/src/BidCoSPeer.cpp b/src/BidCoSPeer.cpp
@@ -861,13 +861,13 @@ void BidCoSPeer::removePeer(int32_t channel, int32_t address, int32_t remoteChan
 {
 	try
 	{
-		BaseLib::DisposableLockGuard peersGuard(_peersMutex);
+		std::unique_lock<std::mutex> peersGuard(_peersMutex);
 		for(std::vector<std::shared_ptr<BaseLib::Systems::BasicPeer>>::iterator i = _peers[channel].begin(); i != _peers[channel].end(); ++i)
 		{
 			if((*i)->address == address && (*i)->channel == remoteChannel)
 			{
 				_peers[channel].erase(i);
-				peersGuard.dispose();
+				peersGuard.unlock();
 				if(linksCentral[channel].find(address) != linksCentral[channel].end() && linksCentral[channel][address].find(remoteChannel) != linksCentral[channel][address].end()) linksCentral[channel][address].erase(linksCentral[channel][address].find(remoteChannel));
 				BaseLib::Database::DataRow data;
 				data.push_back(std::shared_ptr<BaseLib::Database::DataColumn>(new BaseLib::Database::DataColumn(_peerID)));

diff --git a/src/PhysicalInterfaces/Cunx.cpp b/src/PhysicalInterfaces/Cunx.cpp
@@ -40,8 +40,6 @@ Cunx::Cunx(std::shared_ptr<BaseLib::Systems::PhysicalInterfaceSettings> settings
 	_out.init(GD::bl);
 	_out.setPrefix(GD::out.getPrefix() + "CUNX \"" + settings->id + "\": ");
 
-	signal(SIGPIPE, SIG_IGN);
-
 	_socket = std::unique_ptr<BaseLib::TcpSocket>(new BaseLib::TcpSocket(_bl));
 
 	if(settings->listenThreadPriority == -1)

diff --git a/src/PhysicalInterfaces/HM-CFG-LAN.cpp b/src/PhysicalInterfaces/HM-CFG-LAN.cpp
@@ -38,8 +38,6 @@ HM_CFG_LAN::HM_CFG_LAN(std::shared_ptr<BaseLib::Systems::PhysicalInterfaceSettin
 	_out.init(GD::bl);
 	_out.setPrefix(GD::out.getPrefix() + "LAN-Konfigurationsadapter \"" + settings->id + "\": ");
 
-	signal(SIGPIPE, SIG_IGN);
-
 	_socket = std::unique_ptr<BaseLib::TcpSocket>(new BaseLib::TcpSocket(_bl));
 
 	if(!settings)

diff --git a/src/PhysicalInterfaces/HM-LGW.cpp b/src/PhysicalInterfaces/HM-LGW.cpp
@@ -37,8 +37,6 @@ HM_LGW::HM_LGW(std::shared_ptr<BaseLib::Systems::PhysicalInterfaceSettings> sett
 	_out.init(GD::bl);
 	_out.setPrefix(_out.getPrefix() + "HM-LGW \"" + settings->id + "\": ");
 
-	signal(SIGPIPE, SIG_IGN);
-
 	_initCompleteKeepAlive = false;
 	_socket = std::unique_ptr<BaseLib::TcpSocket>(new BaseLib::TcpSocket(_bl));
 	_socketKeepAlive = std::unique_ptr<BaseLib::TcpSocket>(new BaseLib::TcpSocket(_bl));