diff options
| author | Sung-jae Park <nicesj.park@samsung.com> | 2013-06-13 10:12:10 +0900 |
|---|---|---|
| committer | Sung-jae Park <nicesj.park@samsung.com> | 2013-06-13 10:24:57 +0900 |
| commit | a5959a0e1b3a78ccbc82e3854af6f320b6bd1673 (patch) | |
| tree | eb5819f7de31763d154400aecbd103b799960774 | |
| parent | 7ab43c03b6ed9a31bb0fa38cb6bb7fd2a64c3254 (diff) | |
| download | livebox-viewer-a5959a0e1b3a78ccbc82e3854af6f320b6bd1673.tar.gz livebox-viewer-a5959a0e1b3a78ccbc82e3854af6f320b6bd1673.tar.bz2 livebox-viewer-a5959a0e1b3a78ccbc82e3854af6f320b6bd1673.zip | |
Apply secure log and update the terminate sequence.
[model] Tizen
[binary_type] AP
[customer] Tizen Developer
[issue#] N/A
[problem] Before close the socket, disconnected callback should be deleted first.
[cause] com-core is changed. even though the user close the socket, if there is any registered callback for disconnecting event, it will be invoked.
[solution] Delete disconnection callback first before close the socket.
[team] HomeTF
[request]
[horizontal_expansion]
Change-Id: Iac32ef696ae32812ab40562764a255205842cd6c
| -rw-r--r-- | include/debug.h | 16 | ||||
| -rw-r--r-- | live.viewer/include/debug.h | 16 | ||||
| -rw-r--r-- | packaging/liblivebox-viewer.spec | 2 | ||||
| -rw-r--r-- | src/client.c | 2 |
4 files changed, 30 insertions, 6 deletions
diff --git a/include/debug.h b/include/debug.h index cc2e49b..5021bfa 100644 --- a/include/debug.h +++ b/include/debug.h @@ -14,9 +14,21 @@ * limitations under the License. */ +#if !defined(SECURE_LOGD) +#define SECURE_LOGD LOGD +#endif + +#if !defined(SECURE_LOGE) +#define SECURE_LOGE LOGE +#endif + +#if !defined(SECURE_LOGW) +#define SECURE_LOGW LOGW +#endif + #if !defined(FLOG) -#define DbgPrint(format, arg...) LOGD("[[32m%s/%s[0m:%d] " format, util_basename(__FILE__), __func__, __LINE__, ##arg) -#define ErrPrint(format, arg...) LOGE("[[32m%s/%s[0m:%d] " format, util_basename(__FILE__), __func__, __LINE__, ##arg) +#define DbgPrint(format, arg...) SECURE_LOGD("[[32m%s/%s[0m:%d] " format, util_basename(__FILE__), __func__, __LINE__, ##arg) +#define ErrPrint(format, arg...) SECURE_LOGE("[[32m%s/%s[0m:%d] " format, util_basename(__FILE__), __func__, __LINE__, ##arg) #else extern FILE *__file_log_fp; #define DbgPrint(format, arg...) do { fprintf(__file_log_fp, "[LOG] [[32m%s/%s[0m:%d] " format, util_basename(__FILE__), __func__, __LINE__, ##arg); fflush(__file_log_fp); } while (0) diff --git a/live.viewer/include/debug.h b/live.viewer/include/debug.h index cc2e49b..5021bfa 100644 --- a/live.viewer/include/debug.h +++ b/live.viewer/include/debug.h @@ -14,9 +14,21 @@ * limitations under the License. */ +#if !defined(SECURE_LOGD) +#define SECURE_LOGD LOGD +#endif + +#if !defined(SECURE_LOGE) +#define SECURE_LOGE LOGE +#endif + +#if !defined(SECURE_LOGW) +#define SECURE_LOGW LOGW +#endif + #if !defined(FLOG) -#define DbgPrint(format, arg...) LOGD("[[32m%s/%s[0m:%d] " format, util_basename(__FILE__), __func__, __LINE__, ##arg) -#define ErrPrint(format, arg...) LOGE("[[32m%s/%s[0m:%d] " format, util_basename(__FILE__), __func__, __LINE__, ##arg) +#define DbgPrint(format, arg...) SECURE_LOGD("[[32m%s/%s[0m:%d] " format, util_basename(__FILE__), __func__, __LINE__, ##arg) +#define ErrPrint(format, arg...) SECURE_LOGE("[[32m%s/%s[0m:%d] " format, util_basename(__FILE__), __func__, __LINE__, ##arg) #else extern FILE *__file_log_fp; #define DbgPrint(format, arg...) do { fprintf(__file_log_fp, "[LOG] [[32m%s/%s[0m:%d] " format, util_basename(__FILE__), __func__, __LINE__, ##arg); fflush(__file_log_fp); } while (0) diff --git a/packaging/liblivebox-viewer.spec b/packaging/liblivebox-viewer.spec index ec08f6e..32ea4ff 100644 --- a/packaging/liblivebox-viewer.spec +++ b/packaging/liblivebox-viewer.spec @@ -1,6 +1,6 @@ Name: liblivebox-viewer Summary: Library for developing the application. -Version: 0.13.4 +Version: 0.13.5 Release: 1 Group: HomeTF/Livebox License: Flora License diff --git a/src/client.c b/src/client.c index b0ad235..102e07b 100644 --- a/src/client.c +++ b/src/client.c @@ -1385,9 +1385,9 @@ int client_fini(void) ret = vconf_ignore_key_changed(VCONFKEY_MASTER_STARTED, master_started_cb); if (ret < 0) DbgPrint("Ignore vconf key: %d\n", ret); - com_core_packet_client_fini(s_info.fd); com_core_del_event_callback(CONNECTOR_DISCONNECTED, disconnected_cb, NULL); com_core_del_event_callback(CONNECTOR_CONNECTED, connected_cb, NULL); + com_core_packet_client_fini(s_info.fd); s_info.fd = -1; return LB_STATUS_SUCCESS; } |