platform/core/convergence/d2d-conv-manager.git
7 years agomsf_client - service list managing method is changed. 78/78578/3
milk.lee [Wed, 6 Jul 2016 06:51:35 +0000 (15:51 +0900)]
msf_client - service list managing method is changed.
msf_client - mdns adding service bug fixed.

Change-Id: I8982395a886cf2e7ebac6a0f42f3093c69d4ff1a
Signed-off-by: milk.lee <milk.lee@samsung.com>
7 years agofixed json_parse() in Channel.cpp 06/78906/3
Sang gun Lee [Thu, 7 Jul 2016 09:46:54 +0000 (18:46 +0900)]
fixed json_parse() in Channel.cpp
deleted dependent json key order

Change-Id: Ib79464ff9e6ff650a6ab98a6ba1cf6acda92f9ea
Signed-off-by: Sang gun Lee <sanggun7.lee@samsung.com>
7 years agofixed bug on payload string copy 91/79991/1
kmook [Thu, 14 Jul 2016 02:41:04 +0000 (11:41 +0900)]
fixed bug on payload string copy

Change-Id: I1bf2097295527b198adaa53d215bcddf521bb5ca
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agoMerge "fixed bug in listener callback" into tizen
Park [Wed, 13 Jul 2016 09:57:40 +0000 (02:57 -0700)]
Merge "fixed bug in listener callback" into tizen

7 years agoMerge "d2d-conv-manager: modify dbus policy #2" into tizen
Park [Wed, 13 Jul 2016 09:57:28 +0000 (02:57 -0700)]
Merge "d2d-conv-manager: modify dbus policy #2" into tizen

7 years agofixed bug in listener callback 90/79890/1
kmook [Wed, 13 Jul 2016 09:52:35 +0000 (18:52 +0900)]
fixed bug in listener callback

Change-Id: Idfb50cd2b7cf6f87605970ed8a71a04c93d94189
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agod2d-conv-manager: modify dbus policy #2 83/79883/1
Hongkuk, Son [Wed, 13 Jul 2016 09:26:01 +0000 (18:26 +0900)]
d2d-conv-manager: modify dbus policy #2

Modify dbus policy when context="default" to check privilege.

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Id7cf5a93bdf59a81b482407c04122fa6f2d6a640

7 years ago- changed app_comm_service_info class to remove build warnings from last commit 69/79669/1
kmook [Tue, 12 Jul 2016 08:35:22 +0000 (17:35 +0900)]
- changed app_comm_service_info class to remove build warnings from last commit
- added exceptions for MSF socket close
- removed cpp lint warning

Change-Id: Ice88f5dfbf9730f7abc1ce0132d1d5ecffeced15
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agochanged app comm service stop logic 08/79608/1
kmook [Tue, 12 Jul 2016 04:32:14 +0000 (13:32 +0900)]
changed app comm service stop logic

Change-Id: I600e15ae68f802195ec25b574220b74b927a2c9a
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agod2d-conv-manager: privilege check 91/79591/1 accepted/tizen/common/20160712.150730 submit/tizen/20160712.030109
Hongkuk, Son [Tue, 12 Jul 2016 02:55:19 +0000 (11:55 +0900)]
d2d-conv-manager: privilege check

In platform-permission CTC, d2d privilege check testcase is added.
So now, d2d-conv-manager needs to check privilege.

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: I02df6e642d7c91738a81b97e3f4e1e8fd1ec30ef

7 years agoMerge "d2d-conv-manager: modify dbus policy" into tizen accepted/tizen/common/20160706.142743 accepted/tizen/mobile/20160706.132222 accepted/tizen/tv/20160706.132238 accepted/tizen/wearable/20160706.132342 submit/tizen/20160706.103701
Park [Wed, 6 Jul 2016 10:33:02 +0000 (03:33 -0700)]
Merge "d2d-conv-manager: modify dbus policy" into tizen

7 years agod2d-conv-manager: modify dbus policy 40/78640/1
Hongkuk, Son [Wed, 6 Jul 2016 09:14:21 +0000 (18:14 +0900)]
d2d-conv-manager: modify dbus policy

Container ITC fails when using conv_discovery_start() and polling that cb.
When container session("tct"), dbus method return fail occurs.
Now modify d2d-conv-manager.conf file to fix dbus policy.
But this is very rough, so it needs to check dbus policy more in detail.

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: I04b9affafc194779d6e055954c642a3a69fbf977

7 years agofixed msf_tizen_client libwebsocket protocol. 96/78396/1
Sang gun Lee [Tue, 5 Jul 2016 09:52:44 +0000 (18:52 +0900)]
fixed msf_tizen_client libwebsocket protocol.
lws-mirror-protocol is libwebsocket example protocol.
deleted protocol and client websocket use no protocol.

Change-Id: Ife237479ecf4649ef55fb694c757b00d2ee2b2d6
Signed-off-by: Sang gun Lee <sanggun7.lee@samsung.com>
7 years agochanged discovery provider name. ble -> wifi_direct 53/77153/1
kmook [Wed, 29 Jun 2016 01:55:28 +0000 (10:55 +0900)]
changed discovery provider name. ble -> wifi_direct

Change-Id: I0828f23766ed768083d677c266204b1e91be326d
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agoenabled feature check routine 53/76953/2
kmook [Tue, 28 Jun 2016 06:21:39 +0000 (15:21 +0900)]
enabled feature check routine

Change-Id: I9cd759d008011ac13ed61aba45d36f9a71568893
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agoMerge "Revert "d2d-conv-manager: added tizenid.service dependency"" into tizen accepted/tizen/common/20160628.141506 accepted/tizen/mobile/20160628.065954 accepted/tizen/tv/20160628.065859 accepted/tizen/wearable/20160628.065917 submit/tizen/20160628.051425
Park [Tue, 28 Jun 2016 05:07:43 +0000 (22:07 -0700)]
Merge "Revert "d2d-conv-manager: added tizenid.service dependency"" into tizen

7 years agoRevert "d2d-conv-manager: added tizenid.service dependency" 24/76924/1
Hongkuk Son [Tue, 28 Jun 2016 04:43:03 +0000 (21:43 -0700)]
Revert "d2d-conv-manager: added tizenid.service dependency"

This reverts commit d550eab70348459bc641b6335c069bd599b1bafe.

Change-Id: Ifba7c4fbea3ffd69e4c41845e8c9f71c68ddbf1c

7 years agoMerge "removed msf_tizen_client/LICENSE" into tizen
Park [Tue, 28 Jun 2016 04:07:50 +0000 (21:07 -0700)]
Merge "removed msf_tizen_client/LICENSE" into tizen

7 years agoadded error handling for iotcon init 13/76913/1
kmook [Tue, 28 Jun 2016 01:49:06 +0000 (10:49 +0900)]
added error handling for iotcon init

- d2d daemon now does not exit even discovery/service providers fail to initiate

Change-Id: Iaf79842897ab495a0a15b295ec8a5c9ea3198a3c
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agod2d-conv-manager: added tizenid.service dependency 16/76716/1 accepted/tizen/common/20160627.192032 accepted/tizen/mobile/20160627.091344 accepted/tizen/tv/20160627.091402 accepted/tizen/wearable/20160627.091418 submit/tizen/20160627.050355
Hongkuk, Son [Mon, 27 Jun 2016 04:45:00 +0000 (13:45 +0900)]
d2d-conv-manager: added tizenid.service dependency

In a mobile emulator, when first booting after emulator creation,
d2d daemon does not works and dlog shows iotcon fails to get tizenid.
So, now d2d adds tizenid.service dependency and d2d will uses iotcon API.

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Ia505e0792248b954e4d397891bc2b7153c45351c

7 years agoapplied smack labeling for dat file 27/76527/1 accepted/tizen/common/20160624.134317 accepted/tizen/mobile/20160624.103232 accepted/tizen/tv/20160624.103236 accepted/tizen/wearable/20160624.103257 submit/tizen/20160624.072535
kmook [Fri, 24 Jun 2016 07:21:04 +0000 (16:21 +0900)]
applied smack labeling for dat file

Change-Id: Ic5b46d277e0eac64bd77678759af5e1acf694083
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agomodified post file to access user directory 96/76496/1 submit/tizen/20160624.061417
kmook [Fri, 24 Jun 2016 06:11:27 +0000 (15:11 +0900)]
modified post file to access user directory

Change-Id: I2748d3163d7c2604ea9d794093a0a3521bbff0a2
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agoremoved wifi-direct init code 58/76458/1
kmook [Fri, 24 Jun 2016 04:35:10 +0000 (13:35 +0900)]
removed wifi-direct init code

Change-Id: I012fa896808ebdc5a010897bd2df7d2d65ea3570
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agoremoved msf_tizen_client/LICENSE 55/76455/1
Sang gun Lee [Fri, 24 Jun 2016 04:30:47 +0000 (13:30 +0900)]
removed msf_tizen_client/LICENSE

Change-Id: Ifc3b4f90f74201604b482c7308e594d92a4d3791
Signed-off-by: Sang gun Lee <sanggun7.lee@samsung.com>
7 years agoadded post script on user add 44/76444/1 accepted/tizen/mobile/20160624.064829 accepted/tizen/tv/20160624.064749 accepted/tizen/wearable/20160624.064912 submit/tizen/20160624.042109
kmook [Fri, 24 Jun 2016 03:35:48 +0000 (12:35 +0900)]
added post script on user add

Change-Id: I76bc28871a805ad051ade2542f6e878fa34120c9
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agoapplied c++ coding rules 10/76110/2
kmook [Thu, 23 Jun 2016 01:32:26 +0000 (10:32 +0900)]
applied c++ coding rules
fixed build warnings

Change-Id: Ifb9e6e03355fb4bd5797bc4b8d419e7e29cd1a4d
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agoMerge "applied workaround for new iotivity security policy" into tizen accepted/tizen/common/20160623.154128 accepted/tizen/mobile/20160623.123217 accepted/tizen/tv/20160623.123228 accepted/tizen/wearable/20160623.123248 submit/tizen/20160622.235853
Park [Thu, 23 Jun 2016 00:02:58 +0000 (17:02 -0700)]
Merge "applied workaround for new iotivity security policy" into tizen

7 years agoapplied workaround for new iotivity security policy 57/75957/1
kmook [Wed, 22 Jun 2016 08:23:27 +0000 (17:23 +0900)]
applied workaround for new iotivity security policy

Change-Id: Ie1a38146b2a87d8c68db47667e1f89caa1a368c2
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agosvace fix 71/75771/1 accepted/tizen/common/20160622.145952 submit/tizen/20160622.065657
KwangJin Noh [Tue, 21 Jun 2016 09:35:09 +0000 (18:35 +0900)]
svace fix

Change-Id: I34b8dc9301ce44f25ce7d5ffac046e737de53df2
Signed-off-by: KwangJin Noh <kj.noh@samsung.com>
7 years agofixed unremoved timer bug in discovery start request 58/75458/1 accepted/tizen/common/20160620.163812 accepted/tizen/mobile/20160621.083706 accepted/tizen/tv/20160621.083736 accepted/tizen/wearable/20160621.083742 submit/tizen/20160620.073416
kmook [Mon, 20 Jun 2016 03:52:48 +0000 (12:52 +0900)]
fixed unremoved timer bug in discovery start request

Change-Id: Ied884abe205ddc2fa4558018fb18b4f67b9807ac
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agoremove boost in msf client 79/75279/1
KwangJin Noh [Fri, 17 Jun 2016 08:11:26 +0000 (17:11 +0900)]
remove boost in msf client

Change-Id: I740068bbb3dcf2a26917724e0287345f7ff2954d
Signed-off-by: KwangJin Noh <kj.noh@samsung.com>
7 years agoMerge "modified return type of iotcon_found_resource callback" into tizen accepted/tizen/common/20160617.121753 accepted/tizen/mobile/20160617.084326 accepted/tizen/tv/20160617.084143 accepted/tizen/wearable/20160617.084334 submit/tizen/20160617.045901
Park [Fri, 17 Jun 2016 05:49:37 +0000 (22:49 -0700)]
Merge "modified return type of iotcon_found_resource callback" into tizen

7 years agomodified return type of iotcon_found_resource callback 18/75218/2
Hongkuk Son [Fri, 17 Jun 2016 05:47:44 +0000 (22:47 -0700)]
modified return type of iotcon_found_resource callback

This reverts commit 7e263b0874930be232d61ff4d18527b96edc1839.

Change-Id: Ic144b8697853ce7457e4acddaefae5bddbb97757

7 years agoMerge "Revert "modified return type of iotcon_found_resource callback"" into tizen accepted/tizen/mobile/20160617.084212 accepted/tizen/tv/20160617.083018 accepted/tizen/wearable/20160617.084218 submit/tizen/20160617.030442
Younho Park [Fri, 17 Jun 2016 02:50:12 +0000 (19:50 -0700)]
Merge "Revert "modified return type of iotcon_found_resource callback"" into tizen

7 years agoRevert "modified return type of iotcon_found_resource callback" 74/75174/1
Park [Fri, 17 Jun 2016 02:48:59 +0000 (19:48 -0700)]
Revert "modified return type of iotcon_found_resource callback"

This reverts commit 64025cd10db5468972583d8934b19b73b459f560.

Change-Id: Ib1490a84a7c367b3e0517650380b3e29a6704a93

7 years agoadded service dependency to fix crash in booting sequence 57/75157/1
kmook [Fri, 17 Jun 2016 02:01:54 +0000 (11:01 +0900)]
added service dependency to fix crash in booting sequence

Change-Id: Ibe7d372f0fdb96fa6bb4848afe042144e3efca37
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agomodified return type of iotcon_found_resource callback 48/75148/1
kmook [Fri, 17 Jun 2016 01:04:09 +0000 (10:04 +0900)]
modified return type of iotcon_found_resource callback

Change-Id: I75b6bbd417f96d89c2c4d9864d6cde95319ceefc
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agoadded error handling for app_control_import_from_bundle 78/74978/2
kmook [Thu, 16 Jun 2016 07:54:13 +0000 (16:54 +0900)]
added error handling for app_control_import_from_bundle

Change-Id: I32b6db0eccfbf7d82cb6afdb676b97635eaf61d3
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agod2d-conv-manager: replace multi-spaces with tab in msf_tizen_client 95/74995/2 accepted/tizen/common/20160617.121239 accepted/tizen/mobile/20160617.082832 accepted/tizen/tv/20160617.082758 accepted/tizen/wearable/20160617.082810 submit/tizen/20160616.084450
Hongkuk, Son [Thu, 16 Jun 2016 08:29:28 +0000 (17:29 +0900)]
d2d-conv-manager: replace multi-spaces with tab in msf_tizen_client

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: If5f08073bed1ed3fe2143ab9660166f475c0ff9a

7 years agoMerge "d2d-conv-manager: fix for line-coverage" into tizen
Park [Thu, 16 Jun 2016 07:52:23 +0000 (00:52 -0700)]
Merge "d2d-conv-manager: fix for line-coverage" into tizen

7 years agofixed lws_write issue. 76/74976/1
kmook [Thu, 16 Jun 2016 07:47:26 +0000 (16:47 +0900)]
fixed lws_write issue.

fixed MSFD Map itr remove issue.

Change-Id: I1be117c037049533425942ba835b2a9ee1fd1c0b
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agod2d-conv-manager: fix for line-coverage 67/74967/1
Hongkuk, Son [Thu, 16 Jun 2016 07:25:20 +0000 (16:25 +0900)]
d2d-conv-manager: fix for line-coverage

- add //LCOV_EXCL_START, //LCOV_EXCL_STOP, //LCOV_EXCL_LINE

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Ib3cf7fcbeecf0a11576e7279418225498b5e55ae

7 years agofixed msf-api-test bug
Sang gun Lee [Wed, 15 Jun 2016 08:51:19 +0000 (17:51 +0900)]
fixed msf-api-test bug
fixed msf-api socket close bug

Change-Id: I6fb5e0d3424b95828b6ee27f14d8e8a17c4fc313
Signed-off-by: Sang gun Lee <sanggun7.lee@samsung.com>
7 years agosvace
KwangJin Noh [Wed, 15 Jun 2016 01:22:13 +0000 (10:22 +0900)]
svace

- msf-api-client svace.
- msf-api libwebsocket poll() issue fixed.
- msf-api-client test svace issue fixed.

Change-Id: I60176660c117ec94b2ee6d917ef0a9de787d1142
Signed-off-by: KwangJin Noh <kj.noh@samsung.com>
7 years agomerged devel branch to SPIN 31/74231/1
kmook [Thu, 9 Jun 2016 09:18:25 +0000 (18:18 +0900)]
merged devel branch to SPIN

- applied discovery lost callback
- modified app communication service start to get onStart callback
- msf : seperated application connect() and start() functions

Change-Id: Ic3cf4ec9eb228b004360dc466d4dbf8f50e164b4
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agoMerge "[ACR-666] Add new enum values for discovery result and new service" into tizen
Younho Park [Mon, 13 Jun 2016 09:18:02 +0000 (02:18 -0700)]
Merge "[ACR-666] Add new enum values for discovery result and new service" into tizen

7 years agoGet UUID from Node server to set device ID 51/73751/2 accepted/tizen/common/20160610.182148 accepted/tizen/mobile/20160610.011608 accepted/tizen/tv/20160610.011507 accepted/tizen/tv/20160610.012026 accepted/tizen/wearable/20160610.011534 submit/tizen/20160609.103247 submit/tizen/20160609.234207
Jihoon Park [Thu, 9 Jun 2016 10:15:48 +0000 (19:15 +0900)]
Get UUID from Node server to set device ID

In order to use UUID for device ID, read UUID from
Node server and set it as device ID.

Change-Id: I9e240ea9ac0fa9a1baf387b9d48a0a35cc9b170a
Signed-off-by: Jihoon Park <jpark0@samsung.com>
7 years agod2d-conv-manager: apply ASLR for executable d2d-conv-managerd 90/73690/1
Hongkuk, Son [Thu, 9 Jun 2016 07:29:18 +0000 (16:29 +0900)]
d2d-conv-manager: apply ASLR for executable d2d-conv-managerd

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: I197ad725b7545976e902a4e5ae36bdeaeb3e2b8d

7 years ago[ACR-666] Add new enum values for discovery result and new service 53/73653/1
Jihoon Park [Thu, 9 Jun 2016 05:25:24 +0000 (14:25 +0900)]
[ACR-666] Add new enum values for discovery result and new service

 - Adding a new enum value to notify that the discovered device has been
   lost while discovery process is on-going.
 - Adding a new enum value for a new service, "Remote Interaction"

Change-Id: I70d4496b00efa90a143b5f9098d3c80f7c6d3fc7
Signed-off-by: Jihoon Park <jpark0@samsung.com>
7 years agoRevert "temporarily removed code using iotcon APIs" 94/73594/1 accepted/tizen/mobile/20160609.034248 accepted/tizen/tv/20160609.034202 accepted/tizen/wearable/20160609.034236 submit/tizen/20160609.000822
JiHoon Park [Thu, 9 Jun 2016 00:25:55 +0000 (09:25 +0900)]
Revert "temporarily removed code using iotcon APIs"

This reverts commit 6c2b6cfa419ca92346225a03b410fecf7e7401f8.

Change-Id: I56642fc5469d5664b865c9c16e15528d666b9e99

7 years agotemporarily removed code using iotcon APIs 94/73494/1 accepted/tizen/mobile/20160609.034142 accepted/tizen/tv/20160609.034022 accepted/tizen/wearable/20160609.034130 submit/tizen/20160608.100741
kmook [Wed, 8 Jun 2016 08:42:36 +0000 (17:42 +0900)]
temporarily removed code using iotcon APIs

Change-Id: I55eefd838801a8280d5a9f925659c9a5cb6c4aba
Signed-off-by: kmook <kmook.choi@samsung.com>
7 years agoAdded msf-client to d2d-conv-manager 43/73443/2
kmook [Wed, 8 Jun 2016 05:39:51 +0000 (14:39 +0900)]
Added msf-client to d2d-conv-manager

Change-Id: Ie0363771fe734a6b7c25f48328705d81ae1e225e
Signed-off-by: kmook <kmook.choi@samsung.com>
8 years agoapplied iotcon API renaming 64/72964/1 accepted/tizen/mobile/20160606.214933 accepted/tizen/tv/20160606.214954 accepted/tizen/wearable/20160606.215017 submit/tizen/20160603.085358
kmook [Fri, 3 Jun 2016 08:28:51 +0000 (17:28 +0900)]
applied iotcon API renaming

Change-Id: Ibc65b16df69c21119bae48edfbde57780218448b
Signed-off-by: kmook <kmook.choi@samsung.com>
8 years agod2d-conv-manager: ExcludeArch aarch64 x86_64 50/72950/1
Hongkuk, Son [Fri, 3 Jun 2016 08:03:01 +0000 (17:03 +0900)]
d2d-conv-manager: ExcludeArch aarch64 x86_64

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: I5bb3a10e720a684b76fedb7108b2aebefbbf4219

8 years agod2d-conv-manager: sync with SPIN 59/72659/2 submit/tizen/20160603.035302 submit/tizen/20160603.071703
Hongkuk, Son [Thu, 2 Jun 2016 04:47:11 +0000 (13:47 +0900)]
d2d-conv-manager: sync with SPIN

removed dbus activation service flie
added validation check for providing service
bug fix. request object for callback is sometimes overwritten
added internal APIs for web device API
modified code for creating local service
modified code for publishing message
bug fix for server application
removed SVACE warning
removed build warnings
integrated dev branch. applied code review feedbacks and code clean-ups
applied code-review feedbacks

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: I7f540efcee5f919e88c0feac69594ceca987f9ef

8 years agoUploading Device-to-Device Convergence framework source code 01/70101/2
Jihoon Park [Wed, 18 May 2016 06:16:00 +0000 (15:16 +0900)]
Uploading Device-to-Device Convergence framework source code

Device-to-device(D2D) Convergence framework provides feature to
discover near-by devices and to connect and execute the service
remotely, which the near-by device provides.

Change-Id: Iefc1f8cf70cc32c1de025209bc9a1cb6b1db3312
Signed-off-by: Jihoon Park <jpark0@samsung.com>
8 years agoInitial empty repository master
Jinkun Jang [Tue, 8 Mar 2016 01:46:37 +0000 (17:46 -0800)]
Initial empty repository