From d213fed8d20588e00fad7f4ec111ba4610b1735d Mon Sep 17 00:00:00 2001 From: Sung-jae Park Date: Sun, 29 Jul 2012 00:48:25 +0900 Subject: [PATCH] SEL Verification - bug fixed S1-6489 S1-6520 S1-6337 S1-6494 S1-5750 P120725-0076 Change-Id: If67b70d855bca2573b715e96239c1603adf25fe4 --- CMakeLists.txt | 1 + debian/changelog | 7 +++++++ include/conf.h | 2 -- packaging/liblivebox-viewer.spec | 2 +- src/client.c | 9 +++++++-- src/master_rpc.c | 3 ++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5f7279..730cc52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,7 @@ ADD_DEFINITIONS("-DLIVE_IMAGE_FOLDER=\"/opt/share/live_magazine/\"") ADD_DEFINITIONS("-DNDEBUG") #ADD_DEFINITIONS("-DFLOG") ADD_DEFINITIONS("-DMASTER_PKGNAME=\"com.samsung.data-provider-master\"") +ADD_DEFINITIONS("-DSOCKET_FILE=\"/opt/share/live_magazine/.live.socket\"") ADD_LIBRARY(${PROJECT_NAME} SHARED src/dlist.c src/livebox.c diff --git a/debian/changelog b/debian/changelog index 8ddfd88..edb8ccf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livebox-viewer (0.3.9) unstable; urgency=low + + * Git: slp/pkgs/l/livebox-viewer + * Tag: livebox-viewer_0.3.9 + + -- Sung-jae Park Sun, 29 Jul 2012 08:44:21 +0900 + livebox-viewer (0.3.8) unstable; urgency=low * Git: slp/pkgs/l/livebox-viewer diff --git a/include/conf.h b/include/conf.h index fd8db06..313a111 100644 --- a/include/conf.h +++ b/include/conf.h @@ -3,5 +3,3 @@ * milli seconds */ #define RECONNECT_PERIOD 1000 - -#define LIVE_SOCKET "/tmp/.live.socket" diff --git a/packaging/liblivebox-viewer.spec b/packaging/liblivebox-viewer.spec index 3a3a880..742c754 100644 --- a/packaging/liblivebox-viewer.spec +++ b/packaging/liblivebox-viewer.spec @@ -1,6 +1,6 @@ Name: liblivebox-viewer Summary: Library for the development of a livebox viewer -Version: 0.3.8 +Version: 0.3.9 Release: 1 Group: main/app License: Samsung Proprietary License diff --git a/src/client.c b/src/client.c index 26b5e75..7d592a6 100644 --- a/src/client.c +++ b/src/client.c @@ -508,7 +508,7 @@ static inline void make_connection(void) DbgPrint("Let's making connection!\n"); - s_info.fd = com_core_packet_client_init(LIVE_SOCKET, 0, s_table); + s_info.fd = com_core_packet_client_init(SOCKET_FILE, 0, s_table); if (s_info.fd < 0) { s_info.reconnector = g_timeout_add(RECONNECT_PERIOD, connector_cb, NULL); /*!< After 10 secs later, try to connect again */ if (s_info.reconnector == 0) @@ -542,6 +542,11 @@ static int connected_cb(int handle, void *data) static int disconnected_cb(int handle, void *data) { + if (s_info.fd != handle) { + /*!< This handle is not my favor */ + return 0; + } + s_info.fd = -1; /*!< Disconnected */ if (s_info.reconnector > 0) { @@ -577,7 +582,7 @@ int client_fd(void) const char *client_addr(void) { - return LIVE_SOCKET; + return SOCKET_FILE; } int client_fini(void) diff --git a/src/master_rpc.c b/src/master_rpc.c index e2de5b4..a88b176 100644 --- a/src/master_rpc.c +++ b/src/master_rpc.c @@ -95,6 +95,7 @@ static gboolean cmd_consumer(gpointer user_data) */ DbgPrint("Send packet to master [%s]\n", packet_command(command->packet)); if (com_core_packet_async_send(client_fd(), command->packet, 0u, done_cb, command) < 0) { + DbgPrint("Failed to send a packet to master\n"); if (command->ret_cb) command->ret_cb(command->handler, NULL, command->data); destroy_command(command); @@ -192,7 +193,7 @@ int master_rpc_sync_request(struct packet *packet) struct packet *result; int ret; - result = com_core_packet_oneshot_send(client_addr(), packet); + result = com_core_packet_oneshot_send(client_addr(), packet, 0.0f); if (result) { packet_get(result, "i", &ret); packet_unref(result); -- 2.7.4