Changed: RFLink controller initialisation detection (reported by gkro…

…one)

Removed: Duplicate lines from the manufacturer_specific.xml

Config/manufacturer_specific.xml

@@ -648,10 +648,10 @@
 	<Manufacturer id="0109" name="Vision">
 		<Product type="1001" id="0101" name="ZU1401 Z-Wave USB Stick"/>
 		<Product type="1001" id="0105" name="ZU1401 Z-Wave USB Stick"/>
-		<Product type="2001" id="0101" name="ZD2102 Door/Window Sensor"/>
-		<Product type="2001" id="0102" name="ZD2102 Door/Window Sensor"/>
-		<Product type="2001" id="0104" name="ZD2102 Door/Window Sensor"/>
-		<Product type="2001" id="0105" name="ZD2102 Door/Window Sensor"/>
+		<Product type="2001" id="0101" name="ZD2102 US Door/Window Sensor" config="vision/zd2102.xml"/>
+		<Product type="2001" id="0102" name="ZD2102 AU Door/Window Sensor" config="vision/zd2102.xml"/>
+		<Product type="2001" id="0104" name="ZD2102 JP Door/Window Sensor" config="vision/zd2102.xml"/>
+		<Product type="2001" id="0105" name="ZD2102 EU Door/Window Sensor" config="vision/zd2102.xml"/>		
 		<Product type="2002" id="0201" name="ZP3102 US PIR Motion Sensor" config="vision/zp3102.xml"/>
 		<Product type="2002" id="0202" name="ZP3102 AU PIR Motion Sensor" config="vision/zp3102.xml"/>
 		<Product type="2002" id="0203" name="ZP3102 EU PIR Motion Sensor" config="vision/zp3102.xml"/>
@@ -673,10 +673,6 @@
 		<Product type="2014" id="1401" name="ZL7101 Plug-in Dimmer Module"/>
 		<Product type="2017" id="1717" name="ZL7432 In-Wall Switch, Dual Relay"/>
 		<Product type="3001" id="0104" name="ZM1602 Main Operated Siren"/>
-		<Product type="2001" id="0101" name="ZD2102 US Door/Window Sensor" config="vision/zd2102.xml"/>
-		<Product type="2001" id="0102" name="ZD2102 AU Door/Window Sensor" config="vision/zd2102.xml"/>
-		<Product type="2001" id="0104" name="ZD2102 JP Door/Window Sensor" config="vision/zd2102.xml"/>
-		<Product type="2001" id="0105" name="ZD2102 EU Door/Window Sensor" config="vision/zd2102.xml"/>		
 	</Manufacturer>
 	<Manufacturer id="0115" name="Z-Wave.Me">
 		<Product type="0001" id="0001" name="Z-Wave USB Stick"/>

History.txt

@@ -102,6 +102,8 @@ Version 2.0.xxxx (xxxx 2015)
 - Fixed: HTTP Notification (Script) stop url encoding subject/message
 - Implemented: KMTronic USB-> RS485 relay hardware
 - Implemented: Extra check in short-log cleanup
+- Changed: RFLink controller initialisation detection (reported by gkroone)
+
 
 Version 2.0.2284 (February 22th 2015)
 - Fixed: Firefox, RGBW/Setpoint popup

hardware/RFLink.cpp

@@ -450,11 +450,11 @@ bool CRFLink::ParseLine(const std::string &sLine)
 #endif
 
 	std::string Sensor_ID = results[1];
-	std::string Name_ID = results[2];
-	if (results.size() == 3)
+	if (results.size() >2)
 	{
 		//Status reply
-		if (Name_ID.find("Nodo RadioFrequencyLink")!=std::string::npos)
+		std::string Name_ID = results[2];
+		if (Name_ID.find("Nodo RadioFrequencyLink") != std::string::npos)
 		{
 			_log.Log(LOG_STATUS, "RFLink: Controller Initialized!...");
 			//Enable DEBUG

main/WebServer.cpp

@@ -3221,7 +3221,7 @@ namespace http {
 		void CWebServer::Cmd_GetConfig(Json::Value &root)
 		{
 			root["status"] = "OK";
-			root["title"] = "GetActiveTabs";
+			root["title"] = "GetConfig";
 
 			bool bHaveUser = (m_pWebEm->m_actualuser != "");
 			int urights = 3;

server_cert.pem

@@ -1,30 +1,57 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQCxI/lar5EOkR/wO+8yxO1lwT0ouAHDSkPt9EDz2uajWqqO3UyL
-Z6xvhp++lxB+9Iwiv8FLzTJ32BJAXqfLLKs44Xb5YjuF2aWZap2dmjg2/iLrQzhk
-4ezfWT00bA5hQ903TFSo8Cn4SO3O8QrGPioVi5ZfgNlGAxCLJOLPbqBg8wIDAQAB
-AoGACFt+JD0sRtep/heVzXtlB+v6CrXDv4b9dXiUp+yn/QUGDv954QnfJNPhLYjL
-CnJXOjx5zi28N9NF6SuOFxPgcBZlKMXcLxgFJLXlsKYZsFRu7XUA6QsH4O67c7by
-CEUbsy029E+oM45623WQzFkXsqezhLSH7C50/LzmFRZHWIECQQDpgaAc94/38sTv
-cmZDs2BxOfwDNl2Kr+6ozBlfifWhkc40RQ9Huy0HeXFIUMz7xFn0I7KxlNgTSDmN
-OE4NhTmDAkEAwjRXXVy4RAnefvG2MjofO9U9FRcN+B0mdHeG0G33IXgYis2R0xy6
-JMYBjorJvpXGPTATI6pff79xj3v55d9P0QJAWpW+133yi+3SGFH4+iqML2CfM1/T
-ygmWPEVxUm7iq1s083IXC2zBezTRjYxK+SCjBOMUX2+uo0xRh0dggD4+oQJAOH6z
-f5RuglSApls4jmn8FhLVXyJCzQ/l1PHEhTPINbNTKGXe6xQrTnFPmKDlSY0Wi0xF
-9RUmDOqrZXtCWk3ZUQJAKqD/lm30dRfpldhBZhSTJbMASvJ4LdDWZYmqmo6uAEZI
-8zeYNlq8Wzx4hXDnz5qrI7pRfTBEEOy2se6QXKH8Ig==
------END RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAqy/uNP+xnpBUaXEErnXybGU7DZkOWxp0cVCSvr+ttJUgX9Qj
+xI/16kKupLrW1bYaDeb4sPpJOF/HULQ5nPXktyw2oGkOFITcwqvngFia7spqY0oO
+4Zi+nm6V56XpaYBsPLT6WMlx7FgfhXsNKqM6AF7E/JFnQfrD+bpK+GCMz2PINbIY
+dkmD1IbB/HLu1dZzZI/FErkkmPtJm5+1AcjMm5xyKayPpKVoh65eP3AKOJPlmbmf
+wrS1xQpPZaAdOVDW+6FrgFAehpVOehuJVav6st7rnvVienKMT4CDI+h/8V5483gR
+GhxKyKlQSKXk/f/JzlqSsJQqGbvQYLORluQM1QIDAQABAoIBAHI0dcyx0QOh8k6t
+8ZuaYHLkTjNSKvuoeIqoYF4VboONAZ4s3vfhuwPgHLcVVwIYjOU9dChNsc+ERmqW
+8eC/QyjYvFDkBVq3ELhnCvjbI/Gu5K7811S2HGWCDUwPqdqSrKMLcgEN040DdXQN
+lckeQDHDB9QgBS1FaL0QBbgSYZ5xMV1USkyUlQjzosA9TXQPv4u1t7JrfqD15l1p
+BqEfJiz7juIoN5MrQm9GY0IaVgmf/pEdHtJn9qmB3T8uBLisH0iLWvyozKeHczSb
+XAevcnlx9BGeq9J3o5dbgVrhCKxFD7mbmrtyuGlhTyDlx6T4KzOsUrFeaf3LjnJj
+/Pw3iwECgYEA3vxQ7ekgPiNXQiUfGQNmWoAJUHnt1Gygku3dNRKsRZal7S0RRn8O
+gFP7PFGoZpv/+7YpL3t1R9DM0aYWMyX0aeroe7eR646eG3qAt9pOi05BwRqc8MUD
+ONSKh0QfnfQ7Jvfe8Q+3B9mfJtUoQ7yGH5BaACWt0bCoVYBybRjCw2ECgYEAxIhV
+ME7MZlHk/PeK1y8kRmb7m/pbnRuMAaQIMxQAFkt1+cmXAFXgyjtmfDN4c/Bjen5a
+fUeSMSgyKbJnbY4vnFwKJpOpQ9dgBqapTN4lFX/HiXeNrsWELpA+boEpq+QdUBfw
+7WkcsXeYgo3Sbt+Z6hCFopBrq+Rvgp3pq30JsfUCgYEAqXqWvCyLIA9WW+TA/Q7z
+dWeJLMxvchvZ87KshZEatI1qsZimX7FkQS8TbeYWm16IMjVimj84hYvykImup9N6
+MCKl7po4YxPzoaj7OkHHnuOs4Gssy2bCKyiH3YVujmw5pUWSAiBSmbnS1/3863bX
+bhgV/7SjpxOg7dOBpN/D8CECgYADm4kMyPWBj1FHv3eB+bCNxkgqFc9ms+G/CfbI
+kT5rKllxC11FOU5WB/8amotEfY4l6nnYwN6THmzFTSwO28RN93aMPLunriVqGdcT
+vSQrH9xWzqYAJkoF3Mn4l1BfgmFzXe0jPoGzVEGta9MIC/y0SjdZw5LmZdwSJrnq
+VvI9nQKBgQCZOPZHYudKm3Qi/q3QkxnrHCgQYsKYWUCtIibseJDoE9iM7ka5U1p0
+PdamM6GYSL2T9roikYJ59j5KaqKuJF30Z+/5x/5DBD4IYwwjyl9TzJ0sJvM3OjVH
+Odmdb+TBFzhlXdG/t/QJkBvx12lfGKeNS9HglDya+hJ6bOOwHv7aXg==
+-----END RSA PRIVATE KEY----- 
 -----BEGIN CERTIFICATE-----
-MIICRTCCAa4CCQDnULDopuAIJzANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJB
-VTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UECgwIZG9tb3RpY3oxETAPBgNV
-BAMMCGRvbW90aWN6MR0wGwYJKoZIhvcNAQkBFg55b3VyQGVtYWlsLmNvbTAeFw0x
-NTAxMjAwODI2MjFaFw0yNTAxMTcwODI2MjFaMGcxCzAJBgNVBAYTAkFVMRMwEQYD
-VQQIDApTb21lLVN0YXRlMREwDwYDVQQKDAhkb21vdGljejERMA8GA1UEAwwIZG9t
-b3RpY3oxHTAbBgkqhkiG9w0BCQEWDnlvdXJAZW1haWwuY29tMIGfMA0GCSqGSIb3
-DQEBAQUAA4GNADCBiQKBgQCxI/lar5EOkR/wO+8yxO1lwT0ouAHDSkPt9EDz2uaj
-WqqO3UyLZ6xvhp++lxB+9Iwiv8FLzTJ32BJAXqfLLKs44Xb5YjuF2aWZap2dmjg2
-/iLrQzhk4ezfWT00bA5hQ903TFSo8Cn4SO3O8QrGPioVi5ZfgNlGAxCLJOLPbqBg
-8wIDAQABMA0GCSqGSIb3DQEBCwUAA4GBAJGFPnVdErCPYNeLe0IJm/iiOxrLB9qt
-+wtihHubyq7gHxnuVupztmUPME4KYQVisZ4BVChHM4EbarXaoei2AEFLQJpj/mBN
-MzpCHLCOjo+wHELC4OLh9HY9dzBfZC+VNULDFBvF1gffstwLWs8Fb2FQeq3BVTnK
-DecyEjg+yegZ
+MIIDmjCCAoICCQCY2Jha7lCbUTANBgkqhkiG9w0BAQsFADCBjjELMAkGA1UEBhMC
+TkwxEDAOBgNVBAgMB015U3RhdGUxETAPBgNVBAoMCERvbW90aWN6MREwDwYDVQQH
+DAhEb21vdGljejEXMBUGA1UEAwwOKi5kb21vdGljei5jb20xDzANBgNVBAsMBlVu
+aXQ1MTEdMBsGCSqGSIb3DQEJARYOeW91ckBlbWFpbC5jb20wHhcNMTUwNTIzMDY0
+OTAyWhcNMjUwNTIwMDY0OTAyWjCBjjELMAkGA1UEBhMCTkwxEDAOBgNVBAgMB015
+U3RhdGUxETAPBgNVBAoMCERvbW90aWN6MREwDwYDVQQHDAhEb21vdGljejEXMBUG
+A1UEAwwOKi5kb21vdGljei5jb20xDzANBgNVBAsMBlVuaXQ1MTEdMBsGCSqGSIb3
+DQEJARYOeW91ckBlbWFpbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCrL+40/7GekFRpcQSudfJsZTsNmQ5bGnRxUJK+v620lSBf1CPEj/XqQq6k
+utbVthoN5viw+kk4X8dQtDmc9eS3LDagaQ4UhNzCq+eAWJruympjSg7hmL6ebpXn
+pelpgGw8tPpYyXHsWB+Few0qozoAXsT8kWdB+sP5ukr4YIzPY8g1shh2SYPUhsH8
+cu7V1nNkj8USuSSY+0mbn7UByMybnHIprI+kpWiHrl4/cAo4k+WZuZ/CtLXFCk9l
+oB05UNb7oWuAUB6GlU56G4lVq/qy3uue9WJ6coxPgIMj6H/xXnjzeBEaHErIqVBI
+peT9/8nOWpKwlCoZu9Bgs5GW5AzVAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJSg
+f/g28YLhsxefDoBJ4b8tr+956WkiRpb/7RMyCuJbNuu4CYaPOtm4HfySQN989Jry
+EQyzfoqz8cSit88PVnMeQ2PUNtWE/bHzX+AaCTwZ6Pc46eo7nUedChFg4Srr5cqm
+AtzNVS2/dz3m/Cce6iJogrvTl45fRO3Oi7U/Y1GWc8Fl980Jku+TARhvS3PM/cp8
+ek0mW+Dl45MBO0GE5NzsyRcw3SxRICnQfV+r8VignT7tATrYsAXUoFbJ2lTShCYg
+89YiKp3K/dhSsygdx67d7+pzeoUHtIgfQG+JGa0Tu9T3QrRwNVICBqgPRi/u1WVy
+Tv+I9/FcpxWtlvQySP8=
 -----END CERTIFICATE-----
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEAqRpAeUSD+sitKNc5EVkZVH6WBYxkYwtP4jRZOxGBROaLjt1ueltR
+6CXdr3HRjvIn2UFZPx4m0oLs4YxcFi8rxyYdPTa03mI3q/osDnCA6ggZPOGhAMlf
+5PmwHf4m7lBioR/JEV6ou4QX+nzz27EqGg9bRE1F16tXwg864WnIwZyayPtsV1zJ
+PwS64fx15JFvBEh2vEXOuMeHT1t+qyhR8kU4EF7Ue495Ju0bE7oqa6bBlhpYUPT6
+BX1FyDgqEUMxQEAEU1njB2GxVH8dHElhpetEM9VCo3K99imh5lOATQKLxjAv8Yje
+e0Q2/jxxHkX4pqXKg3v+PhD0InRUZRVFywIBAg==
+-----END DH PARAMETERS-----

webserver/connection.cpp

@@ -112,6 +112,10 @@ void connection::handle_handshake(const boost::system::error_code& error)
 			// handshake completed, start reading
 			read_more_secure();
 		}
+		else
+		{
+			connection_manager_.stop(shared_from_this());
+		}
   }
 }
 

webserver/server.cpp

@@ -5,6 +5,7 @@
 #include "stdafx.h"
 #include <boost/bind.hpp>
 #include "server.hpp"
+#include <fstream>
 
 namespace http {
 namespace server {
@@ -19,10 +20,21 @@ server::server(const std::string& address, const std::string& port,
 #endif
     request_handler_( user_request_handler),
 	timeout_(20), // default read timeout in seconds
-    new_connection_(new connection(io_service_,
-          connection_manager_, request_handler_, timeout_))
+	secure_(false)
 {
-  secure_ = (certificatefile != "");
+#ifdef NS_ENABLE_SSL
+	secure_ = (certificatefile != "");
+#endif
+  if (!secure_)
+  {
+	  new_connection_.reset(new connection(io_service_, connection_manager_, request_handler_, timeout_));
+  }
+  else
+  {
+#ifdef NS_ENABLE_SSL
+	  new_connection_.reset(new connection(io_service_, connection_manager_, request_handler_, timeout_,context_));
+#endif
+  }
   // Open the acceptor with the option to reuse the address (i.e. SO_REUSEADDR).
   boost::asio::ip::tcp::resolver resolver(io_service_);
   boost::asio::ip::tcp::resolver::query query(address, port);
@@ -39,8 +51,13 @@ server::server(const std::string& address, const std::string& port,
 		| boost::asio::ssl::context::single_dh_use);
 	context_.use_certificate_chain_file(certificatefile);
 	context_.use_private_key_file(certificatefile, boost::asio::ssl::context::pem);
-	// we won't use a separate diffie hellman file (commented out)
-	// context_.use_tmp_dh_file("dh512.pem");
+
+	//Check if certificate contains DH parameters
+	std::ifstream ifs(certificatefile);
+	std::string content((std::istreambuf_iterator<char>(ifs)),
+		(std::istreambuf_iterator<char>()));
+	if (content.find("BEGIN DH PARAMETERS")!=std::string::npos)
+		context_.use_tmp_dh_file(certificatefile);
 #endif
   }
   // bind to our port

www/html5.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# ref 893
+# ref 894
 
 CACHE:
 # CSS

www/index.html

@@ -150,8 +150,6 @@
 			//data.HaveUpdate=true;
 			if (data.HaveUpdate == true) {
 				window.my_config.hasupdatesupport = true;
-				$("#mUpdate").show();
-				$("#mCheckUpdate").hide();
 				if (showdialog) {
 					bootbox.confirm($.t("Update Available !... Update Now?"), function(result) {
 						if (result==true) {
@@ -168,14 +166,9 @@
 			{
 				if (data.IsSupported==false) {
 					window.my_config.hasupdatesupport = false;
-					$("#dUpdate").hide();
-					$("#mUpdate").hide();
-					$("#mCheckUpdate").hide();
 				}
 				else {
 					window.my_config.hasupdatesupport = true;
-					$("#mUpdate").hide();
-					$("#mCheckUpdate").show();
 				}
 				if (showdialog) {
 					bootbox.alert($.t("No Update Available !..."));
@@ -184,8 +177,6 @@
 			}
 		 },
 		 error: function(){
-				$("#mUpdate").hide();
-				$("#mCheckUpdate").show();
 				if (showdialog) {
 					bootbox.alert($.t("Error communicating to server!"));
 				}
@@ -806,7 +797,6 @@ <h1 id="theader" data-i18n="Usage this Year">Usage this Year</h1>
 									<li ng-class="{'current_page_item':getClass('/Devices')}" id="mDevices"><a id="cDevices" href="#Devices"><img src="images/devices.png"> <span data-i18n="Devices">Devices</span></a></li>
 									<li ng-class="{'current_page_item':getClass('/Setup')}" id="mSetup"><a id="cSetup" href="#Setup"><img src="images/setup.png"> <span data-i18n="Settings">Settings</span></a></li>
                                     <li id="dUpdate" class="divider"></li>
-                                    <li ng-class="{'current_page_item':getClass('/Update')}" id="mUpdate"><a id="cUpdate" href="#Update"><img src="images/utility.png"> <span data-i18n="Update Domoticz">Update Domoticz</span></a></li>
                                     <li id="mCheckUpdate"><a id="cCheckUpdate" class="lcursor" onclick="javascript:CheckForUpdate(true)"><img src="images/utility.png"> <span data-i18n="Check for Update">Check for Update</span></a></li>
                                     <li class="dropdown-submenu">
 										<a id="cMoreOptions" tabindex="-1" data-i18n="More options">More options</a>