Merge pull request scikit-learn#48 from hyeonseok-han/feature/IoTGateway

IoT Gateway Code Update
원격지 서버의 주소가 하드코딩 되어 있는 것이 바람직 한지 고민을 해 봐야 할 듯 합니다. 보안상 바람직 하지는 않다고 생각되네요.;;

IoTGateWay/bsp/stm32/stm32f105RC/application/config/appconfig.h

@@ -50,7 +50,7 @@
 #define DEFAULT_IP							"0.0.0.0"
 #define DEFAULT_MAC							"00:00:00:00:00:00"
 #define DEFAULT_DEVICE						"TS0000" //Default Device Info
-#define DEFAULT_DOMAIN						"iot.espressif.cn"
+#define DEFAULT_DOMAIN						"onsite-monitor.xip.kr"
 
 #endif /* __APPCONFIG_H__ */
 

IoTGateWay/bsp/stm32/stm32f105RC/application/config/configuration.c

@@ -141,7 +141,7 @@ void SetApPassword(rt_uint8_t *pData, rt_size_t dataSize)
 
 	if(0 != rt_strncmp((char *)pCfg->networkdCofig.apPassword, (char *)pData, dataSize))
 	{
-		rt_memset(pCfg->networkdCofig.apPassword,0,AP_MAX_LENGTH);
+		rt_memset(pCfg->networkdCofig.apPassword,0,AP_MAX_PASSWORD_LENGTH);
 		rt_memcpy(pCfg->networkdCofig.apPassword,pData,dataSize);
 		rt_kprintf("Set Ap Password: %s\r\n", pCfg->networkdCofig.apPassword);
 		FlashWrite((rt_uint8_t *)pCfg, sizeof(Config));
@@ -159,7 +159,7 @@ void SetApSSID(rt_uint8_t *pData, rt_size_t dataSize)
 
 	if(0 != rt_strncmp((char *)pCfg->networkdCofig.apSSID, (char *)pData, dataSize))
 	{
-		rt_memset(pCfg->networkdCofig.apSSID,0,AP_MAX_LENGTH);
+		rt_memset(pCfg->networkdCofig.apSSID,0,AP_MAX_SSID_LENGTH);
 		rt_memcpy(pCfg->networkdCofig.apSSID,pData,dataSize);
 		rt_kprintf("Set Ap SSID: %s\r\n", pCfg->networkdCofig.apSSID);
 		FlashWrite((rt_uint8_t *)pCfg, sizeof(Config));
@@ -216,7 +216,7 @@ void SetDeviceInfo(rt_uint8_t *pData, rt_size_t dataSize)
 
 	if(0 != rt_strncmp((char *)pCfg->device, (char *)pData, dataSize))
 	{
-		rt_memset(pCfg->device,0,dataSize);
+		rt_memset(pCfg->device,0,sizeof(pCfg->device));
 		rt_memcpy(pCfg->device,pData,dataSize);
 		rt_kprintf("Set Device Info: %s\r\n", pCfg->device);
 		FlashWrite((rt_uint8_t *)pCfg, sizeof(Config));
@@ -271,7 +271,7 @@ void SetDomainInfo(rt_uint8_t *pData, rt_size_t dataSize)
 
 	if(0 != rt_strncmp((char *)pCfg->networkdCofig.domainInfo, (char *)pData, dataSize))
 	{
-		rt_memset(pCfg->networkdCofig.domainInfo,0,dataSize);
+		rt_memset(pCfg->networkdCofig.domainInfo,0,MAX_DOMAIN_LENGTH);
 		rt_memcpy(pCfg->networkdCofig.domainInfo,pData,dataSize);
 		rt_kprintf("Set Domain Info: %s\r\n", pCfg->networkdCofig.domainInfo);
 		FlashWrite((rt_uint8_t *)pCfg, sizeof(Config));
@@ -308,13 +308,14 @@ rt_bool_t LoadConfig(void)
 	if(RT_FALSE == retVal || WATERMARK_VALUE != pCfg->waterMark)
 	{
 		rt_kprintf("Set Factory Reset...\r\n");
+		rt_memset(pCfg,0,sizeof(Config));
 		pCfg->networkdCofig.destPort = 0;
 		pCfg->networkdCofig.dhcpMode = 1;
 		pCfg->networkdCofig.domainOn = DISABLE;
 		pCfg->waterMark = WATERMARK_VALUE;
 		pCfg->manufacture = DISABLE;
-		rt_memcpy(pCfg->networkdCofig.apSSID,DEFAULT_IP,rt_strlen(DEFAULT_SSID));
-		rt_memcpy(pCfg->networkdCofig.apPassword,DEFAULT_IP,rt_strlen(DEFAULT_PASSWORD));
+		rt_memcpy(pCfg->networkdCofig.apSSID,DEFAULT_SSID,rt_strlen(DEFAULT_SSID));
+		rt_memcpy(pCfg->networkdCofig.apPassword,DEFAULT_PASSWORD,rt_strlen(DEFAULT_PASSWORD));
 		rt_memcpy(pCfg->networkdCofig.destIp,DEFAULT_IP,rt_strlen(DEFAULT_IP));
 		rt_memcpy(pCfg->networkdCofig.dnsServer,DEFAULT_IP,rt_strlen(DEFAULT_IP));
 		rt_memcpy(pCfg->networkdCofig.gatewayIp,DEFAULT_IP,rt_strlen(DEFAULT_IP));

IoTGateWay/bsp/stm32/stm32f105RC/application/config/configuration.h

@@ -8,15 +8,16 @@
 #ifndef __CONFIGURATION_H__
 #define __CONFIGURATION_H__
 
-#define AP_MAX_LENGTH	32
+#define AP_MAX_SSID_LENGTH	32
+#define AP_MAX_PASSWORD_LENGTH	64
 #define IP_MAX_LENGTH	16
 #define MAC_LENGTH		18
 #define MAX_DOMAIN_LENGTH	64
 
 #pragma pack(push, 1)
 typedef struct _NetworkdCofig{
-	rt_uint8_t apSSID[AP_MAX_LENGTH];
-	rt_uint8_t apPassword[AP_MAX_LENGTH];
+	rt_uint8_t apSSID[AP_MAX_SSID_LENGTH];
+	rt_uint8_t apPassword[AP_MAX_PASSWORD_LENGTH];
 
 	rt_uint8_t destIp[IP_MAX_LENGTH];
 	rt_uint16_t destPort;

IoTGateWay/bsp/stm32/stm32f105RC/application/network/wifi/wifi.c

@@ -78,12 +78,12 @@ typedef struct _WifiInfo
 	rt_uint8_t dhcp;
 
 	//Wi-Fi Info
-	rt_uint8_t ssid[64];
-	rt_uint8_t password[64];
+	rt_uint8_t ssid[AP_MAX_SSID_LENGTH<<1];
+	rt_uint8_t password[AP_MAX_PASSWORD_LENGTH<<1];
 
 	//TCP Info
 	rt_uint8_t domainConfig;
-	rt_uint8_t remoteIp[16];
+	rt_uint8_t remoteIp[IP_MAX_LENGTH];
 	rt_uint16_t remotePort;
 	rt_uint8_t domain[WIFI_MAX_LEN];
 
@@ -151,7 +151,7 @@ rt_uint8_t *MakeWifiFormat(rt_uint8_t *pData)
 			{
 				end = pos++;
 			}
-			else
+			else if(0x80 > *pos)
 			{
 				rt_uint8_t buf[64];
 				end = pos;
@@ -591,12 +591,12 @@ void InitWifInformation(void)
 	wifiInfo.mode = 1; //Station
 	wifiInfo.dhcp = GetDhcpMode();
 
-	rt_uint8_t ssid[64];
-	rt_uint8_t password[64];
-	rt_memcpy(ssid,GetApSSID(),WIFI_MAX_LEN);
-	rt_memcpy(wifiInfo.ssid,MakeWifiFormat(ssid),WIFI_MAX_LEN);
-	rt_memcpy(password,GetApPassword(),WIFI_MAX_LEN);
-	rt_memcpy(wifiInfo.password,MakeWifiFormat(password),WIFI_MAX_LEN);
+	rt_uint8_t ssid[AP_MAX_SSID_LENGTH];
+	rt_uint8_t password[AP_MAX_PASSWORD_LENGTH];
+	rt_memcpy(ssid,GetApSSID(),AP_MAX_SSID_LENGTH);
+	rt_memcpy(wifiInfo.ssid,MakeWifiFormat(ssid),AP_MAX_SSID_LENGTH);
+	rt_memcpy(password,GetApPassword(),AP_MAX_PASSWORD_LENGTH);
+	rt_memcpy(wifiInfo.password,MakeWifiFormat(password),AP_MAX_PASSWORD_LENGTH);
 
 	rt_memcpy(wifiInfo.remoteIp,GetTcpIp(),sizeof(wifiInfo.remoteIp));
 	rt_memcpy(wifiInfo.domain,GetDomainInfo(),sizeof(wifiInfo.domain));