From f00d555b1a09da91926c4cf32cb498a2a12b5e4c Mon Sep 17 00:00:00 2001 From: Alexander Aksenov Date: Thu, 6 Mar 2014 19:35:23 +0400 Subject: [PATCH] [FIX] Working w/o netlink Change-Id: I40278c470d68fc4fd30267cb21a63af81a5c36df Signed-off-by: Alexander Aksenov --- daemon/daemon.c | 20 +++++++++++--------- daemon/main.c | 7 +++---- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/daemon/daemon.c b/daemon/daemon.c index be0979e..7da1871 100644 --- a/daemon/daemon.c +++ b/daemon/daemon.c @@ -953,15 +953,17 @@ static bool initialize_events(void) return false; } - kernel_connect_handler = - ecore_main_fd_handler_add(manager.kernel_socket, - ECORE_FD_READ, - kernel_connect_cb, - NULL, - NULL, NULL); - if (!kernel_connect_handler) { - LOGE("Kernel socket add error\n"); - return false; + if (manager.kernel_socket != -1) { + kernel_connect_handler = + ecore_main_fd_handler_add(manager.kernel_socket, + ECORE_FD_READ, + kernel_connect_cb, + NULL, + NULL, NULL); + if (!kernel_connect_handler) { + LOGE("Kernel socket add error\n"); + return false; + } } return true; diff --git a/daemon/main.c b/daemon/main.c index 8e5ffbf..2ca9a3a 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -250,11 +250,11 @@ static int makeKernelSocket(void) int ret; if (manager.kernel_socket != -1) - return -1; // should be never happend + return -1; // should never happend manager.kernel_socket = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR); if (manager.kernel_socket < 0) { - LOGE("Kernel socket creation failed\n"); + LOGW("Kernel socket creation failed: %s\n", strerror(errno)); return -1; } @@ -346,8 +346,7 @@ static int initializeManager(FILE *portfile) return -1; } - if (makeKernelSocket() != 0) - return -1; + makeKernelSocket(); int port = makeHostServerSocket(); if (port < 0) { -- 2.7.4