Change cache dir to /run/ for DA model

Change-Id: Ideda7b9aca1c92ebbfeb96c26474245d01792dc0
Signed-off-by: Wootak Jung <wootak.jung@samsung.com>

diff --git a/profile.h b/profile.h
index f0b5df90881bc5e012f3e1830d87eb81bbc1697a..f5a9a69c35fe4e0769b35a0475d6a14dbcd9de01 100755 (executable)
--- a/profile.h
+++ b/profile.h
@@ -274,6 +274,7 @@ static inline tizen_certifcation_mode_t _get_tizen_certification_mode(void)
 #define TIZEN_FEATURE_BLUEZ_DA ((_get_tizen_model()) == TIZEN_MODEL_FHUB || (_get_tizen_model()) == TIZEN_MODEL_DA)
 #define TIZEN_FEATURE_BLUEZ_STACK_CERTIFICATION (((_get_tizen_certification_mode()) & TIZEN_CERTI_MODE_STACK) != 0)
 #define TIZEN_FEATURE_BLUEZ_PROFILE_CERTIFICATION (((_get_tizen_certification_mode()) & TIZEN_CERTI_MODE_PROFILE) != 0)
+#define TIZEN_FEATURE_BLUEZ_DA_CACHE_DIR "/run/network/bluetooth"
 
 #endif /* __TIZEN_PROFILE_H__ */
 

diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
index ea3deb8b65eb5364db2723c797c84722b0e866e9..14c784de0090a492baf3c95ea416854a2d54c84a 100644 (file)
--- a/profiles/audio/a2dp.c
+++ b/profiles/audio/a2dp.c
@@ -879,6 +879,13 @@ static void store_remote_seps(struct a2dp_channel *chan)
 
        ba2str(device_get_address(device), dst_addr);
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       if (TIZEN_FEATURE_BLUEZ_DA)
+               snprintf(filename, PATH_MAX, TIZEN_FEATURE_BLUEZ_DA_CACHE_DIR "/%s/cache/%s",
+                               btd_adapter_get_storage_dir(device_get_adapter(device)),
+                               dst_addr);
+       else
+#endif
        snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s",
                        btd_adapter_get_storage_dir(device_get_adapter(device)),
                        dst_addr);
@@ -1052,6 +1059,13 @@ static void store_last_used(struct a2dp_channel *chan, uint8_t lseid,
 
        ba2str(device_get_address(chan->device), dst_addr);
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       if (TIZEN_FEATURE_BLUEZ_DA)
+               snprintf(filename, PATH_MAX, TIZEN_FEATURE_BLUEZ_DA_CACHE_DIR "/%s/cache/%s",
+                               btd_adapter_get_storage_dir(device_get_adapter(chan->device)),
+                               dst_addr);
+       else
+#endif
        snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s",
                btd_adapter_get_storage_dir(device_get_adapter(chan->device)),
                dst_addr);
@@ -2342,6 +2356,13 @@ static void load_remote_seps(struct a2dp_channel *chan)
 
        ba2str(device_get_address(device), dst_addr);
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       if (TIZEN_FEATURE_BLUEZ_DA)
+               snprintf(filename, PATH_MAX, TIZEN_FEATURE_BLUEZ_DA_CACHE_DIR "/%s/cache/%s",
+                               btd_adapter_get_storage_dir(device_get_adapter(device)),
+                               dst_addr);
+       else
+#endif
        snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s",
                        btd_adapter_get_storage_dir(device_get_adapter(device)),
                        dst_addr);

diff --git a/profiles/input/device.c b/profiles/input/device.c
index 96e97be03d68b4bd47b1794562497c3dda4f1cdc..daf94ad3278a32b94603989646eac7e120706fa2 100644 (file)
--- a/profiles/input/device.c
+++ b/profiles/input/device.c
@@ -1051,6 +1051,12 @@ static int hidp_add_connection(struct input_device *idev)
        ba2str(&idev->src, src_addr);
        ba2str(&idev->dst, dst_addr);
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       if (TIZEN_FEATURE_BLUEZ_DA)
+               snprintf(filename, PATH_MAX, TIZEN_FEATURE_BLUEZ_DA_CACHE_DIR "/%s/cache/%s", src_addr,
+                               dst_addr);
+       else
+#endif
        snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s", src_addr,
                                                                dst_addr);
        sprintf(handle, "0x%8.8X", idev->handle);

diff --git a/src/adapter.c b/src/adapter.c
index db1cf5c7aca2f1ab0bbd004bc55b64e0da6ad2cd..60e9818ffe9d8e76a71792deeeed51b6173f6a3a 100644 (file)
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -10725,6 +10725,11 @@ static void convert_names_entry(char *key, char *value, void *user_data)
        if (bachk(str) != 0)
                return;
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       if (TIZEN_FEATURE_BLUEZ_DA)
+               snprintf(filename, PATH_MAX, TIZEN_FEATURE_BLUEZ_DA_CACHE_DIR "/%s/cache/%s", address, str);
+       else
+#endif
        snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s", address, str);
        create_file(filename, 0600);
 
@@ -11065,6 +11070,11 @@ static void store_sdp_record(char *local, char *peer, int handle, char *value)
        char *data;
        gsize length = 0;
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       if (TIZEN_FEATURE_BLUEZ_DA)
+               snprintf(filename, PATH_MAX, TIZEN_FEATURE_BLUEZ_DA_CACHE_DIR "/%s/cache/%s", local, peer);
+       else
+#endif
        snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s", local, peer);
 
        key_file = g_key_file_new();

diff --git a/src/device.c b/src/device.c
index 1b627524edfad445884416afffad7881ca2e176b..8952f71fad96d8aee9767b0dda8fef5931e775f2 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -806,6 +806,12 @@ void device_store_cached_name(struct btd_device *dev, const char *name)
                ba2str(dev->rpa, d_addr);
 #endif
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       if (TIZEN_FEATURE_BLUEZ_DA)
+               snprintf(filename, PATH_MAX, TIZEN_FEATURE_BLUEZ_DA_CACHE_DIR "/%s/cache/%s",
+                               btd_adapter_get_storage_dir(dev->adapter), d_addr);
+       else
+#endif
        snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s",
                        btd_adapter_get_storage_dir(dev->adapter), d_addr);
        create_file(filename, 0600);
@@ -855,6 +861,12 @@ static void device_store_cached_name_resolve(struct btd_device *dev)
        }
 
        ba2str(&dev->bdaddr, d_addr);
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       if (TIZEN_FEATURE_BLUEZ_DA)
+               snprintf(filename, PATH_MAX, TIZEN_FEATURE_BLUEZ_DA_CACHE_DIR "/%s/cache/%s",
+                               btd_adapter_get_storage_dir(dev->adapter), d_addr);
+       else
+#endif
        snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s",
                        btd_adapter_get_storage_dir(dev->adapter), d_addr);
        create_file(filename, 0600);
@@ -3342,9 +3354,16 @@ static void store_gatt_db(struct btd_device *device)
 
        ba2str(&device->bdaddr, dst_addr);
 
-       snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s",
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       if (TIZEN_FEATURE_BLUEZ_DA)
+               snprintf(filename, PATH_MAX, TIZEN_FEATURE_BLUEZ_DA_CACHE_DIR "/%s/cache/%s",
                                btd_adapter_get_storage_dir(device->adapter),
                                dst_addr);
+       else
+#endif
+       snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s",
+                       btd_adapter_get_storage_dir(device->adapter),
+                       dst_addr);
        create_file(filename, 0600);
 
        key_file = g_key_file_new();
@@ -5855,6 +5874,11 @@ static char *load_cached_name(struct btd_device *device, const char *local,
        if (device_address_is_private(device))
                return NULL;
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       if (TIZEN_FEATURE_BLUEZ_DA)
+               snprintf(filename, PATH_MAX, TIZEN_FEATURE_BLUEZ_DA_CACHE_DIR "/%s/cache/%s", local, peer);
+       else
+#endif
        snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s", local, peer);
 
        key_file = g_key_file_new();
@@ -5885,6 +5909,11 @@ static void load_cached_name_resolve(struct btd_device *device,
        if (device_address_is_private(device))
                return;
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       if (TIZEN_FEATURE_BLUEZ_DA)
+               snprintf(filename, PATH_MAX, TIZEN_FEATURE_BLUEZ_DA_CACHE_DIR "/%s/cache/%s", local, peer);
+       else
+#endif
        snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s", local, peer);
 
        key_file = g_key_file_new();
@@ -6611,6 +6640,11 @@ static void load_gatt_db(struct btd_device *device, const char *local,
 
        DBG("Restoring %s gatt database from file", peer);
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       if (TIZEN_FEATURE_BLUEZ_DA)
+               snprintf(filename, PATH_MAX, TIZEN_FEATURE_BLUEZ_DA_CACHE_DIR "/%s/cache/%s", local, peer);
+       else
+#endif
        snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s", local, peer);
 
        key_file = g_key_file_new();
@@ -7441,6 +7475,13 @@ static void device_remove_stored(struct btd_device *device)
                                device_addr);
        delete_folder_tree(filename);
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       if (TIZEN_FEATURE_BLUEZ_DA)
+               snprintf(filename, PATH_MAX, TIZEN_FEATURE_BLUEZ_DA_CACHE_DIR "/%s/cache/%s",
+                               btd_adapter_get_storage_dir(device->adapter),
+                               device_addr);
+       else
+#endif
        snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s",
                                btd_adapter_get_storage_dir(device->adapter),
                                device_addr);
@@ -8124,6 +8165,12 @@ static void update_bredr_services(struct browse_req *req, sdp_list_t *recs)
        ba2str(btd_adapter_get_address(device->adapter), srcaddr);
        ba2str(&device->bdaddr, dstaddr);
 
+#if TIZEN_FEATURE_BLUEZ_MODIFY
+       if (TIZEN_FEATURE_BLUEZ_DA)
+               snprintf(sdp_file, PATH_MAX, TIZEN_FEATURE_BLUEZ_DA_CACHE_DIR "/%s/cache/%s", srcaddr,
+                               dstaddr);
+       else
+#endif
        snprintf(sdp_file, PATH_MAX, STORAGEDIR "/%s/cache/%s", srcaddr,
                                                                dstaddr);
        create_file(sdp_file, 0600);
@@ -10449,6 +10496,11 @@ static sdp_list_t *read_device_records(struct btd_device *device)
                ba2str(device->rpa, peer);
 #endif
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       if (TIZEN_FEATURE_BLUEZ_DA)
+               snprintf(filename, PATH_MAX, TIZEN_FEATURE_BLUEZ_DA_CACHE_DIR "/%s/cache/%s", local, peer);
+       else
+#endif
        snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s", local, peer);
 
        key_file = g_key_file_new();