diff options
| author | pillip8282 <pilseob.kang@samsung.com> | 2017-10-19 15:35:23 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-19 15:35:23 +0900 |
| commit | b668672489f43b73afbb55da206ad6d3a2699b59 (patch) | |
| tree | bfd31c696be4c181e152f2ba5c62916c75330aa1 | |
| parent | a153537ccb917f12ee1c2ebd6fc6c226b2e5003e (diff) | |
| parent | 7619c90cf3d24494d863b52cb2134328854c02b8 (diff) | |
| download | tinyara-b668672489f43b73afbb55da206ad6d3a2699b59.tar.gz tinyara-b668672489f43b73afbb55da206ad6d3a2699b59.tar.bz2 tinyara-b668672489f43b73afbb55da206ad6d3a2699b59.zip | |
Merge pull request #854 from an4967/fix_st_things_bug
framework/st_things: fix ssid format
| -rw-r--r-- | framework/src/st_things/things_stack/src/common/framework/things_data_manager.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/framework/src/st_things/things_stack/src/common/framework/things_data_manager.c b/framework/src/st_things/things_stack/src/common/framework/things_data_manager.c index 3daa1c23..7d5af410 100644 --- a/framework/src/st_things/things_stack/src/common/framework/things_data_manager.c +++ b/framework/src/st_things/things_stack/src/common/framework/things_data_manager.c @@ -661,17 +661,21 @@ wifi_manager_softap_config_s *dm_get_softap_wifi_config(void) st_device_s *device = (st_device_s *)hashmap_get(g_device_hmap, (unsigned long)(0)); int ssid_type = (is_artik == true ? 1 : 0); unsigned char mac_id[16] = { 0, }; + char ssid_device_name[17]; + + snprintf(ssid_device_name, sizeof(ssid_device_name), "%s", device->name); + THINGS_LOG_V(THINGS_INFO, TAG, "DeviceName : %s", ssid_device_name); wifi_manager_info_s st_wifi_info; wifi_manager_get_info(&st_wifi_info); snprintf(mac_id, sizeof(mac_id), "%02X%02X", st_wifi_info.mac_address[4], st_wifi_info.mac_address[5]); - snprintf(g_easysetup_softap_ssid, sizeof(g_easysetup_softap_ssid), "%s_%s%s%s%d%s", device->name, g_easysetup_tag, g_manufacturer_name, g_setup_id, 0, mac_id); + snprintf(g_easysetup_softap_ssid, sizeof(g_easysetup_softap_ssid), "%s_%s%s%s%d%s", ssid_device_name, g_easysetup_tag, g_manufacturer_name, g_setup_id, 0, mac_id); THINGS_LOG_V(THINGS_INFO, TAG, "SoftAP SSID : %s", g_easysetup_softap_ssid); - strncpy(ap_config.ssid, g_easysetup_softap_ssid, strlen(g_easysetup_softap_ssid) + 1); - strncpy(ap_config.passphrase, g_easysetup_softap_passphrase, strlen(g_easysetup_softap_passphrase) + 1); + snprintf(ap_config.ssid, sizeof(ap_config.ssid), "%s", g_easysetup_softap_ssid); + snprintf(ap_config.passphrase, sizeof(ap_config.passphrase), "%s", g_easysetup_softap_passphrase); ap_config.channel = g_easysetup_softap_channel; return &ap_config; |