ble disc: Do not set service_data

Change-Id: I53ee0fc993a628c12a2028079641b3a588ec0271
Signed-off-by: Cheoleun Moon <chleun.moon@samsung.com>

diff --git a/plugins/ble/ble-plugin.cpp b/plugins/ble/ble-plugin.cpp
index 33f057b..4388042 100755 (executable)
--- a/plugins/ble/ble-plugin.cpp
+++ b/plugins/ble/ble-plugin.cpp
@@ -207,17 +207,6 @@ static int __configure_advertiser(bt_advertiser_h adv,
                                BT_ADAPTER_LE_PACKET_ADVERTISING, VINE_UUID);
        RET_VAL_IF(ret != BT_ERROR_NONE, ret,
                "bt_adapter_le_add_advertising_service_uuid() fails %d", ret);
-       // TODO: Determine which data should be set for service_data
-       // It should be set mandatorily?
-       // Or we don't have to set service_data if manufacturer data is set
-       char service_data[3] = {0x01, 0x02, 0x03};
-       // TODO: ALso set for BT_ADAPTER_LE_PACKET_ADVERTISING?
-       ret = bt_adapter_le_add_advertising_service_data(adv,
-                               BT_ADAPTER_LE_PACKET_SCAN_RESPONSE,
-                               VINE_UUID, service_data, sizeof(service_data));
-       RET_VAL_IF(ret != BT_ERROR_NONE, ret,
-               "bt_adapter_le_add_advertising_service_data() fails %s(%d)",
-               __convert_ble_erro_to_str(ret), ret);
 
        // TODO: Also set for BT_ADAPTER_LE_PACKET_ADVERTISING?
        ret = bt_adapter_le_set_advertising_device_name(adv,
@@ -355,6 +344,7 @@ static void __le_scan_result_cb(int result, bt_adapter_le_device_scan_result_inf
                char service_name[VINE_MAX_BLE_SERVICE_NAME_LEN + 1] = {0, };
                int service_name_len = manufacturer_len - 1 - service_type_len;
                strncpy(service_name, manufacturer_data + service_type_len + 1, VINE_MAX_BLE_SERVICE_NAME_LEN);
+               service_name[service_name_len] = 0;
                char mac[VINE_MAC_LEN + 1] = {0, };
                strncpy(mac, info->remote_address, VINE_MAC_LEN);
 

diff --git a/src/vine-disc.cpp b/src/vine-disc.cpp
index 9626153..b6ddf24 100755 (executable)
--- a/src/vine-disc.cpp
+++ b/src/vine-disc.cpp
@@ -265,6 +265,7 @@ static void __ble_discovered_cb(void *plugin_handle, bool available,
        strncpy(discovered_event->service_type, service_type, VINE_MAX_SERVICE_TYPE_LEN);
        strncpy(discovered_event->service_name, service_name, VINE_MAX_SERVICE_NAME_LEN);
        strncpy(discovered_event->mac, mac, VINE_MAC_LEN);
+       discovered_event->port = -1;
 
        VINE_LOGD("Create a discovered_event[%p]", discovered_event);