Merge branch 'dev'

Homegear · Jul 7, 2016 · 4a76f42 · 4a76f42
2 parents 3035261 + c7a4664
commit 4a76f42
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/InsteonPeer.cpp b/src/InsteonPeer.cpp
@@ -635,7 +635,7 @@ void InsteonPeer::getValuesFromPacket(std::shared_ptr<InsteonPacket> packet, std
 						if(frame->channel == -2)
 						{
 							startChannel = 0;
-							endChannel = (_rpcDevice->functions.end()--)->first;
+							endChannel = _rpcDevice->functions.rbegin()->first;
 						}
 						else endChannel = startChannel;
 						for(int32_t l = startChannel; l <= endChannel; l++)

diff --git a/src/PhysicalInterfaces/Insteon_Hub_X10.cpp b/src/PhysicalInterfaces/Insteon_Hub_X10.cpp
@@ -39,7 +39,7 @@ InsteonHubX10::InsteonHubX10(std::shared_ptr<BaseLib::Systems::PhysicalInterface
 	_out.setPrefix(GD::out.getPrefix() + "Insteon Hub X10 \"" + settings->id + "\": ");
 
 	signal(SIGPIPE, SIG_IGN);
-	_socket = std::unique_ptr<BaseLib::SocketOperations>(new BaseLib::SocketOperations(_bl));
+	_socket = std::unique_ptr<BaseLib::TcpSocket>(new BaseLib::TcpSocket(_bl));
 
 	_lengthLookup[0x50] = 11;
 	_lengthLookup[0x51] = 25;
@@ -667,7 +667,7 @@ void InsteonHubX10::startListening()
 	try
 	{
 		stopListening();
-		_socket = std::unique_ptr<BaseLib::SocketOperations>(new BaseLib::SocketOperations(GD::bl, _settings->host, _settings->port));
+		_socket = std::unique_ptr<BaseLib::TcpSocket>(new BaseLib::TcpSocket(GD::bl, _settings->host, _settings->port));
 		_socket->setReadTimeout(1000000);
 		_out.printDebug("Connecting to Insteon Hub X10 with Hostname " + _settings->host + " on port " + _settings->port + "...");
 		_stopped = false;

diff --git a/src/PhysicalInterfaces/Insteon_Hub_X10.h b/src/PhysicalInterfaces/Insteon_Hub_X10.h
@@ -94,7 +94,7 @@ class InsteonHubX10  : public IInsteonInterface
         int64_t _lastAction = 0;
         std::string _hostname;
         std::string _port;
-        std::unique_ptr<BaseLib::SocketOperations> _socket;
+        std::unique_ptr<BaseLib::TcpSocket> _socket;
         std::mutex _requestMutex;
         std::shared_ptr<Request> _request;
         std::mutex _sendMutex;