diff options
| author | Sangkoo Kim <sangkoo.kim@samsung.com> | 2017-05-29 20:01:12 +0900 |
|---|---|---|
| committer | Sangkoo Kim <sangkoo.kim@samsung.com> | 2017-05-29 20:01:19 +0900 |
| commit | a70dd92da8a0b038cd4be60d79722bc5f775a7bf (patch) | |
| tree | 55dd1757cecfa8433be68847a83fb6f243025eb1 | |
| parent | aa0feabd2001cc2c3408a4df8cf14154b2ae1745 (diff) | |
| download | ua-client-accepted/tizen_4.0_unified.tar.gz ua-client-accepted/tizen_4.0_unified.tar.bz2 ua-client-accepted/tizen_4.0_unified.zip | |
clean up code for auth and server informationtizen_4.0.m2_releasetizen_4.0.IoT.p2_releasetizen_4.0.IoT.p1_releasesubmit/tizen_4.0_unified/20170814.115522submit/tizen_4.0/20170828.110004submit/tizen_4.0/20170828.100004submit/tizen_4.0/20170814.115522submit/tizen_4.0/20170811.094300submit/tizen/20170530.235130accepted/tizen/unified/20170531.082801accepted/tizen/4.0/unified/20170829.020416accepted/tizen/4.0/unified/20170816.015015accepted/tizen/4.0/unified/20170816.011921tizen_4.0accepted/tizen_4.0_unified
Change-Id: I0881874cb00d687eb45610a0bdc8249cbdf69969
Signed-off-by: Sangkoo Kim <sangkoo.kim@samsung.com>
| -rwxr-xr-x | res/device_info.ini | 12 | ||||
| -rwxr-xr-x | src/ua_client.cpp | 20 |
2 files changed, 8 insertions, 24 deletions
diff --git a/res/device_info.ini b/res/device_info.ini index fafd304..92a1ae0 100755 --- a/res/device_info.ini +++ b/res/device_info.ini @@ -1,9 +1,7 @@ [device_info] -manufacturer=samsung -model_name=tm1 -firmware_ver=1.0 +manufacturer= +model_name= +firmware_ver= firmware_update_state=0 -uuid= -access_token= -content_server=http://13.124.95.191:8000 -ocf_server=13.124.29.169:5683 +content_server= +ocf_server= diff --git a/src/ua_client.cpp b/src/ua_client.cpp index 0f81bf3..02bbaf7 100755 --- a/src/ua_client.cpp +++ b/src/ua_client.cpp @@ -35,16 +35,11 @@ #include "ua_client.h" -#define _WIFI_AUTO_CONNECT_ // WIFI Auto connection :: FOR TEST - #define OC_SECURITY_DB_DAT_FILE_NAME "oic_svr_db.dat" #define OC_RSRVD_PROTOCOL_INDEPENDENT_ID "piid" #define OC_CONTROLEE_DATA_FILE_PATH "/opt/usr/data/ua_client/" #define OC_CONTROLEE_DB_DAT_FILE_NAME ".firmware_controlee.dat" -//#define UA_OCF_SERVER_URL "13.124.29.169:5683" -//#define UA_CONTENTS_SERVER_URL "http://13.124.95.191:8000" - #define UPDATE_FILE "/opt/usr/data/fota/tota_init" using namespace OC; @@ -703,8 +698,8 @@ void handleSignupCB(const HeaderOptions &, g_accesstoken = rep.getValueToString("accesstoken"); g_uid = rep.getValueToString("uid"); - _set_device_info("uuid", g_uid.c_str()); - _set_device_info("access_token", g_accesstoken.c_str()); +// _set_device_info("uuid", g_uid.c_str()); +// _set_device_info("access_token", g_accesstoken.c_str()); } g_callbackLock.notify_all(); @@ -1237,7 +1232,7 @@ void *_start_ua_client(void *data) } #endif - // For TDC + ua_account_info_s *account_info = (ua_account_info_s *)calloc(1, sizeof(ua_account_info_s)); if (account_info) { @@ -1261,20 +1256,11 @@ void *_start_ua_client(void *data) accountMgr->signIn(g_uid, g_accesstoken, &handleSigninCB); g_callbackLock.wait(lock); } else { -#if 1 // FOR TDC - UA_LOG("Sign-up..."); - accountMgr->signUp(account_info->account, account_info->auth_code, &handleSignupCB); - g_callbackLock.wait(lock); - UA_LOG("Sign-In..."); - accountMgr->signIn(g_uid, g_accesstoken, &handleSigninCB); - g_callbackLock.wait(lock); -#else UA_LOG("Sign-In..."); string uuid(device->uuid); string access_token(device->access_token); accountMgr->signIn(uuid, access_token, &handleSigninCB); g_callbackLock.wait(lock); -#endif } } catch (exception& e){ |