From: VBS Date: Wed, 29 Mar 2017 10:03:13 +0000 (+0900) Subject: Sync with 3.0 : Ver. 0.1.156 to 0.1.159 X-Git-Tag: accepted/tizen/unified/20170411.164458~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F04%2F121904%2F2;p=platform%2Fcore%2Fconnectivity%2Fnfc-manager.git Sync with 3.0 : Ver. 0.1.156 to 0.1.159 Signed-off-by: Jihoon Jung Change-Id: I63591fa3c4a98dae9d482f3e706d16ac48c2db7e --- diff --git a/packaging/nfc-manager.spec b/packaging/nfc-manager.spec index 1c69d5b..2694ad9 100755 --- a/packaging/nfc-manager.spec +++ b/packaging/nfc-manager.spec @@ -1,6 +1,6 @@ Name: nfc-manager Summary: NFC framework manager -Version: 0.1.156 +Version: 0.1.159 Release: 0 Group: Network & Connectivity/NFC License: Flora-1.1 @@ -99,10 +99,6 @@ cp -af %{SOURCE2} %{buildroot}/usr/lib/systemd/system/ mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants ln -s ../%{name}.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/%{name}.service -install -D -m 0644 LICENSE.Flora %{buildroot}/%{_datadir}/license/nfc-common-lib -install -D -m 0644 LICENSE.Flora %{buildroot}/%{_datadir}/license/%{name} -#install -D -m 0644 LICENSE.Flora %{buildroot}/%{_datadir}/license/nfc-client-test - %post /sbin/ldconfig @@ -145,21 +141,21 @@ systemctl daemon-reload %files %manifest %{name}.manifest +%license LICENSE.Flora %defattr(-,root,root,-) %{_bindir}/nfc-manager-daemon /usr/lib/systemd/system/%{name}.service /usr/lib/systemd/system/%{name}.socket /usr/lib/systemd/system/multi-user.target.wants/%{name}.service %{_datadir}/dbus-1/system-services/org.tizen.NetNfcService.service -%{_datadir}/license/%{name} %files -n nfc-common-lib %manifest nfc-common-lib.manifest +%license LICENSE.Flora %defattr(-,root,root,-) %{_libdir}/libnfc-common-lib.so %{_libdir}/libnfc-common-lib.so.* -%{_datadir}/license/nfc-common-lib %{_datadir}/nfc-manager-daemon/sounds/Operation_sdk.wav diff --git a/src/commonlib/include/net_nfc_typedef_internal.h b/src/commonlib/include/net_nfc_typedef_internal.h index ff5504e..b35f9af 100755 --- a/src/commonlib/include/net_nfc_typedef_internal.h +++ b/src/commonlib/include/net_nfc_typedef_internal.h @@ -337,11 +337,24 @@ typedef struct _net_nfc_stack_information_s typedef enum _net_nfc_discovery_mode_e { - NET_NFC_DISCOVERY_MODE_CONFIG = 0x00U, - NET_NFC_DISCOVERY_MODE_START, - NET_NFC_DISCOVERY_MODE_STOP, - NET_NFC_DISCOVERY_MODE_RESUME, -} net_nfc_discovery_mode_e; + NET_NFC_DISCOVERY_MODE_STOP = 0x00, + NET_NFC_DISCOVERY_MODE_CONFIG_POLLING = 0x01, + NET_NFC_DISCOVERY_MODE_CONFIG_LISTENING = 0x02, + NET_NFC_DISCOVERY_MODE_CONFIG_P2P = 0x04, + NET_NFC_DISCOVERY_MODE_CONFIG_ALL = NET_NFC_DISCOVERY_MODE_CONFIG_POLLING | + NET_NFC_DISCOVERY_MODE_CONFIG_LISTENING | + NET_NFC_DISCOVERY_MODE_CONFIG_P2P, + NET_NFC_DISCOVERY_MODE_CONFIG_DEFAULT = NET_NFC_DISCOVERY_MODE_CONFIG_POLLING | + NET_NFC_DISCOVERY_MODE_CONFIG_LISTENING, + NET_NFC_DISCOVERY_MODE_CONFIG = NET_NFC_DISCOVERY_MODE_CONFIG_DEFAULT, + NET_NFC_DISCOVERY_MODE_START_LISTENING = NET_NFC_DISCOVERY_MODE_CONFIG_LISTENING, + NET_NFC_DISCOVERY_MODE_START_POLLING = NET_NFC_DISCOVERY_MODE_CONFIG_POLLING, + NET_NFC_DISCOVERY_MODE_START_ALL = NET_NFC_DISCOVERY_MODE_CONFIG_ALL, + NET_NFC_DISCOVERY_MODE_START_DEFAULT = NET_NFC_DISCOVERY_MODE_CONFIG_DEFAULT, + NET_NFC_DISCOVERY_MODE_START = NET_NFC_DISCOVERY_MODE_START_DEFAULT, + NET_NFC_DISCOVERY_MODE_RESUME = NET_NFC_DISCOVERY_MODE_START + } net_nfc_discovery_mode_e; + typedef enum _net_nfc_secure_element_policy_e { diff --git a/src/manager/net_nfc_server_handover_bt.c b/src/manager/net_nfc_server_handover_bt.c index 23ce7a4..f508b57 100755 --- a/src/manager/net_nfc_server_handover_bt.c +++ b/src/manager/net_nfc_server_handover_bt.c @@ -624,7 +624,7 @@ static int _bt_prepare_pairing(net_nfc_handover_bt_process_context_t *context) bt_device_info_s *device_info; NET_NFC_REVERSE_ORDER_6_BYTES(temp.buffer); - sprintf(context->remote_address, "%02X:%02X:%02X:%02X:%02X:%02X", + snprintf(context->remote_address, 18, "%02X:%02X:%02X:%02X:%02X:%02X", temp.buffer[0], temp.buffer[1], temp.buffer[2], @@ -1039,7 +1039,7 @@ static int _bt_do_pairing(net_nfc_handover_bt_process_context_t *context) bt_device_info_s *device_info; NET_NFC_REVERSE_ORDER_6_BYTES(temp.buffer); - sprintf(context->remote_address, "%02X:%02X:%02X:%02X:%02X:%02X", + snprintf(context->remote_address, 18, "%02X:%02X:%02X:%02X:%02X:%02X", temp.buffer[0], temp.buffer[1], temp.buffer[2], diff --git a/src/manager/net_nfc_server_handover_wfd.c b/src/manager/net_nfc_server_handover_wfd.c index 1fdb8c9..08adc0b 100755 --- a/src/manager/net_nfc_server_handover_wfd.c +++ b/src/manager/net_nfc_server_handover_wfd.c @@ -63,12 +63,12 @@ static void set_mac_address(char *data, uint8_t *origin_data) for (i = 0; i < 6; i++) { - len += sprintf(data + len, "%02x", origin_data[i]); + len += snprintf(data + len, 3, "%02x", origin_data[i]); //DEBUG_SERVER_MSG("check temp [%s]", data); if (i != 5) - len += sprintf(data + len, ":"); + len += snprintf(data + len, 2, ":"); } SECURE_MSG("check mac_address [%s]", data); diff --git a/src/manager/net_nfc_server_tag.c b/src/manager/net_nfc_server_tag.c index 62c4781..37e89dd 100755 --- a/src/manager/net_nfc_server_tag.c +++ b/src/manager/net_nfc_server_tag.c @@ -466,23 +466,7 @@ static void tag_get_current_tag_info_thread_func(gpointer user_data) static bool _is_supported_tags(net_nfc_current_target_info_s *target) { - bool result; - - switch (target->devType) { - case NET_NFC_ISO14443_3A_PICC : - case NET_NFC_MIFARE_MINI_PICC : - case NET_NFC_MIFARE_1K_PICC : - case NET_NFC_MIFARE_4K_PICC : - case NET_NFC_ISO14443_BPRIME_PICC : - result = false; - break; - - default : - result = true; - break; - } - - return result; + return true; } static void _start_check_presence(net_nfc_current_target_info_s *target)