From e7f030a679d8e0abf73d4158fdbc6e6cf09dad9c Mon Sep 17 00:00:00 2001
From: EAD Fritz <ead.fritz@gmail.com>
Date: Thu, 8 Jan 2015 21:21:01 +0100
Subject: [PATCH] made SSL configuration part of the SYSCFG struct

---
 include/user_config.h | 4 +++-
 user/config.c         | 7 ++++++-
 user/config.h         | 1 +
 user/user_main.c      | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/include/user_config.h b/include/user_config.h
index 2906de9..f6b0975 100644
--- a/include/user_config.h
+++ b/include/user_config.h
@@ -22,5 +22,7 @@
 #define MQTT_RECONNECT_TIMEOUT 	5	/*second*/
 #define MQTT_CONNTECT_TIMER 	5 	/**/
 
-#define CLIENT_SSL_ENABLE
+#define MQTT_CLIENT_SSL_ENABLE
+//#undef MQTT_CLIENT_SSL_ENABLE
+
 #endif
diff --git a/user/config.c b/user/config.c
index 1e3ca97..4917cb4 100644
--- a/user/config.c
+++ b/user/config.c
@@ -34,6 +34,7 @@
 #include "osapi.h"
 #include "user_interface.h"
 
+#include "mqtt.h"
 #include "config.h"
 #include "user_config.h"
 #include "debug.h"
@@ -93,7 +94,11 @@ void CFG_Load()
 		sysCfg.mqtt_port = MQTT_PORT;
 		os_sprintf(sysCfg.mqtt_user, "%s", MQTT_USER);
 		os_sprintf(sysCfg.mqtt_pass, "%s", MQTT_PASS);
-
+#ifdef MQTT_CLIENT_SSL_ENABLE
+		sysCfg.security = SEC_SSL;
+#else
+		sysCfg.security = SEC_NONSSL;
+#endif
 		sysCfg.mqtt_keepalive = MQTT_KEEPALIVE;
 
 		INFO(" default configurations\r\n");
diff --git a/user/config.h b/user/config.h
index 249e9e1..9cab229 100644
--- a/user/config.h
+++ b/user/config.h
@@ -45,6 +45,7 @@ typedef struct{
 	uint8_t mqtt_user[32];
 	uint8_t mqtt_pass[32];
 	uint32_t mqtt_keepalive;
+	uint8_t security;
 } SYSCFG;
 
 typedef struct {
diff --git a/user/user_main.c b/user/user_main.c
index 42398e9..54dfee1 100644
--- a/user/user_main.c
+++ b/user/user_main.c
@@ -91,7 +91,7 @@ void user_init(void)
 
 	CFG_Load();
 
-	MQTT_InitConnection(&mqttClient, sysCfg.mqtt_host, sysCfg.mqtt_port, SEC_NONSSL);
+	MQTT_InitConnection(&mqttClient, sysCfg.mqtt_host, sysCfg.mqtt_port, sysCfg.security);
 	MQTT_InitClient(&mqttClient, sysCfg.device_id, sysCfg.mqtt_user, sysCfg.mqtt_pass, sysCfg.mqtt_keepalive);
 	MQTT_OnConnected(&mqttClient, mqttConnectedCb);
 	MQTT_OnDisconnected(&mqttClient, mqttDisconnectedCb);