Merge remote-tracking branch 'origin/master' into

refactor_webserver_server_class

# Conflicts:
#	main/mainworker.cpp
#	webserver/cWebem.cpp

Author: gaudryc

CMakeLists.txt

@@ -290,8 +290,6 @@ hardware/SBFSpot.cpp
 hardware/serial/serial.cpp
 hardware/serial/impl/unix.cpp
 hardware/SolarEdgeAPI.cpp
-hardware/SolarEdgeBase.cpp
-hardware/SolarEdgeTCP.cpp
 hardware/SolarMaxTCP.cpp
 hardware/TCPProxy/tcpproxy_server.cpp
 hardware/TE923.cpp
@@ -567,10 +565,26 @@ else()
   message(STATUS "Not found telldus-core (telldus-core.h), not adding tellstick support")
 endif (TELLDUSCORE_INCLUDE)
 
+# Under FreeBSD sys/sysinfo?h exist using a separate pkg
+IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+  find_path(SYSINFO_INCLUDE NAMES sys/sysinfo.h)
+  if (SYSINFO_INCLUDE)
+     message(STATUS "Found sys/sysinfo.h at : ${SYSINFO_INCLUDE}")
+     find_library(SYSINFO_LIBRARIES NAMES libsysinfo.so)
+     if(SYSINFO_LIBRARIES)
+       message(STATUS "Found libsysinfo.so at : ${SYSINFO_LIBRARIES}")
+     else(SYSINFO_LIBRARIES)
+       message(FATAL_ERROR "Cannot find libsysinfo, please install it with 'pkg install libsysinfo'")
+     endif(SYSINFO_LIBRARIES)
+  else()
+     message(FATAL_ERROR "Cannot find sysinfo.h, please install it with 'pkg install libsysinfo'")
+  endif()
+ENDIF()
+
 IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   target_link_libraries(domoticz ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} pthread ${LUA_LIBRARIES} ${MQTT_LIBRARIES} ${SQLite_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES})
 else()
-  target_link_libraries(domoticz -lrt ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} pthread ${LUA_LIBRARIES} ${MQTT_LIBRARIES} ${SQLite_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES})
+  target_link_libraries(domoticz -lrt ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} pthread ${LUA_LIBRARIES} ${MQTT_LIBRARIES} ${SQLite_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES} ${SYSINFO_LIBRARIES})
 ENDIF()
 
 ADD_PRECOMPILED_HEADER(domoticz "main/stdafx.h")

History.txt

@@ -81,6 +81,7 @@ Version 2.4xxx
 - Fixed: Fix missing Selector switch levels in MQTT device info response by returning all device options (#459)
 - Fixed: Fix dead code in the AsyncSerial::close method causing the method not to stop or close the background resources.
 - Fixed: Fix a security issue (DOS) in webserver to prevent a remote_endpoint exception to be thrown to the WebServer class causing the webserver to be down (no possible stop and no possible connection). Now, the webserver can be scanned using the nmap tool (for the SSL configuration purpose).
+- Fixed: Under FreeBSD Hardware Monitor works, but it needs the libsysinfo package to work.
 - Updated: OpenZWave, configuration files
 
 Version 2.3530 (November 1th 2015)

hardware/1Wire.cpp

@@ -139,7 +139,7 @@ void C1Wire::Do_Work()
 
 bool C1Wire::WriteToHardware(const char *pdata, const unsigned char length)
 {
-	tRBUF *pSen=(tRBUF*)pdata;
+	const tRBUF *pSen= reinterpret_cast<const tRBUF*>(pdata);
 
 	if (!m_system)
 		return false;//no 1-wire support

hardware/1Wire/1WireByKernel.h

@@ -45,7 +45,7 @@ class C1WireByKernel : public I_1WireSystem
    class DeviceState
    {
    public:
-      DeviceState(_t1WireDevice device) : m_Device(device) {}
+	   explicit DeviceState(_t1WireDevice device) : m_Device(device) {}
       _t1WireDevice GetDevice() const {return m_Device;}
       union
       {
@@ -64,7 +64,7 @@ class C1WireByKernel : public I_1WireSystem
    class Locker:boost::lock_guard<boost::mutex>
    {
    public:
-      Locker(const boost::mutex& mutex):boost::lock_guard<boost::mutex>(*(const_cast<boost::mutex*>(&mutex))){}
+	   explicit Locker(const boost::mutex& mutex):boost::lock_guard<boost::mutex>(*(const_cast<boost::mutex*>(&mutex))){}
       virtual ~Locker(){}
    };
    typedef std::map<std::string,DeviceState*> DeviceCollection;
@@ -80,15 +80,15 @@ class C1WireByKernel : public I_1WireSystem
    private:
       std::list<DeviceState>& m_List;
    public:
-      IsPendingChanges(std::list<DeviceState>& list):m_List(list){}
+	   explicit  IsPendingChanges(std::list<DeviceState>& list):m_List(list){}
       bool operator()() const {return !m_List.empty();}
    };
 };
 
 class OneWireReadErrorException : public std::exception
 {
 public:
-   OneWireReadErrorException(const std::string& deviceFileName) : m_Message("1-Wire system : error reading value from ") {m_Message.append(deviceFileName);}
+	explicit OneWireReadErrorException(const std::string& deviceFileName) : m_Message("1-Wire system : error reading value from ") {m_Message.append(deviceFileName);}
    virtual ~OneWireReadErrorException() throw() {}
    virtual const char* what() const throw() {return m_Message.c_str();}
 protected:
@@ -98,7 +98,7 @@ class OneWireReadErrorException : public std::exception
 class OneWireWriteErrorException : public std::exception
 {
 public:
-   OneWireWriteErrorException(const std::string& deviceFileName) : m_Message("1-Wire system : error writing value from ") {m_Message.append(deviceFileName);}
+	explicit  OneWireWriteErrorException(const std::string& deviceFileName) : m_Message("1-Wire system : error writing value from ") {m_Message.append(deviceFileName);}
    virtual ~OneWireWriteErrorException() throw() {}
    virtual const char* what() const throw() {return m_Message.c_str();}
 protected:

hardware/1Wire/1WireForWindows.h

@@ -42,7 +42,7 @@ class C1WireForWindows : public I_1WireSystem
 class C1WireForWindowsReadException : public std::exception
 {
 public:
-   C1WireForWindowsReadException(const std::string& message) : m_Message("1-Wire system : error reading value, ") {m_Message.append(message);}
+   explicit C1WireForWindowsReadException(const std::string& message) : m_Message("1-Wire system : error reading value, ") {m_Message.append(message);}
    virtual ~C1WireForWindowsReadException() throw() {}
    virtual const char* what() const throw() {return m_Message.c_str();}
 protected:

hardware/AnnaThermostat.cpp

@@ -55,7 +55,6 @@ m_UserName(CURLEncode::URLEncode(Username)),
 m_Password(CURLEncode::URLEncode(Password))
 {
 	m_HwdID=ID;
-	m_ThermostatID = "";
 	Init();
 	GetMeterDetails();
 }
@@ -139,7 +138,7 @@ bool CAnnaThermostat::WriteToHardware(const char *pdata, const unsigned char len
 	if (m_Password.size() == 0)
 		return false;
 
-	tRBUF *pCmd = (tRBUF *)pdata;
+	const tRBUF *pCmd = reinterpret_cast<const tRBUF *>(pdata);
 	if (pCmd->LIGHTING2.packettype != pTypeLighting2)
 		return false; //later add RGB support, if someone can provide access
 

hardware/BMP085.cpp

@@ -78,11 +78,11 @@ and does not require smbus or wire libs
 
 const unsigned char BMPx8x_OverSampling = 3;
 
-CBMP085::CBMP085(const int ID)
+CBMP085::CBMP085(const int ID) :
+m_ActI2CBus("/dev/i2c-1")
 {
 	m_stoprequested=false;
 	m_HwdID=ID;
-	m_ActI2CBus = "/dev/i2c-1";
 	if (!i2c_test(m_ActI2CBus.c_str()))
 	{
 		m_ActI2CBus = "/dev/i2c-0";

hardware/Comm5TCP.cpp

@@ -41,6 +41,9 @@ m_szIPAddress(IPAddress)
 	m_usIPPort=usIPPort;
 	lastKnownSensorState = 0;
 	initSensorData = true;
+	reqState = Idle;
+	notificationEnabled = false;
+	m_bReceiverStarted = false;
 }
 
 bool Comm5TCP::StartHardware()
@@ -185,10 +188,10 @@ void Comm5TCP::enableNotifications()
 
 bool Comm5TCP::WriteToHardware(const char *pdata, const unsigned char length)
 {
-	tRBUF *pSen = (tRBUF*)pdata;
+	const tRBUF *pSen = reinterpret_cast<const tRBUF*>(pdata);
 
 	unsigned char packettype = pSen->ICMND.packettype;
-	unsigned char subtype = pSen->ICMND.subtype;
+	//unsigned char subtype = pSen->ICMND.subtype;
 
 	if (!mIsConnected)
 		return false;

hardware/DavisLoggerSerial.cpp

@@ -24,12 +24,15 @@
 
 #define round(a) ( int ) ( a + .5 )
 
-CDavisLoggerSerial::CDavisLoggerSerial(const int ID, const std::string& devname, unsigned int baud_rate)
+CDavisLoggerSerial::CDavisLoggerSerial(const int ID, const std::string& devname, unsigned int baud_rate) :
+m_szSerialPort(devname)
 {
 	m_HwdID=ID;
-	m_szSerialPort=devname;
 	m_iBaudRate=baud_rate;
 	m_stoprequested=false;
+	m_retrycntr = RETRY_DELAY;
+	m_statecounter = 0;
+	m_state = DSTATE_WAKEUP;
 }
 
 CDavisLoggerSerial::~CDavisLoggerSerial(void)
@@ -218,7 +221,7 @@ bool CDavisLoggerSerial::HandleLoopData(const unsigned char *data, size_t len)
 		(data[97]!=0x0d)
 		)
 		return false;
-	bool bIsRevA = (data[4]=='P');
+	//bool bIsRevA = (data[4]=='P');
 #else
 //	FILE *fOut=fopen("davisrob.bin","wb+");
 //	fwrite(data,1,len,fOut);

hardware/DomoticzHardware.cpp

@@ -516,7 +516,6 @@ void CDomoticzHardwareBase::SendSwitchIfNotExists(const int NodeID, const int Ch
 
 void CDomoticzHardwareBase::SendSwitch(const int NodeID, const int ChildID, const int BatteryLevel, const bool bOn, const double Level, const std::string &defaultname)
 {
-	bool bDeviceExits = true;
 	double rlevel = (15.0 / 100)*Level;
 	int level = int(rlevel);
 
@@ -531,11 +530,7 @@ void CDomoticzHardwareBase::SendSwitch(const int NodeID, const int ChildID, cons
 	std::vector<std::vector<std::string> > result;
 	result = m_sql.safe_query("SELECT Name,nValue,sValue FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Unit == %d) AND (Type==%d) AND (Subtype==%d)",
 		m_HwdID, szIdx, ChildID, int(pTypeLighting2), int(sTypeAC));
-	if (result.size() < 1)
-	{
-		bDeviceExits = false;
-	}
-	else
+	if (!result.empty())
 	{
 		//check if we have a change, if not do not update it
 		int nvalue = atoi(result[0][1].c_str());