Revert "[FIX] Working w/o netlink"

This reverts commit f00d555b1a09da91926c4cf32cb498a2a12b5e4c.

Change-Id: I32b6f6868712456fa6b1138df1cbbcdf9b26ee76
Signed-off-by: Alexander Aksenov <a.aksenov@samsung.com>

diff --git a/daemon/daemon.c b/daemon/daemon.c
index 0e11fd4..e3fe0db 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -956,17 +956,15 @@ static bool initialize_events(void)
                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;
-               }
+       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 2ca9a3a..8e5ffbf 100644 (file)
--- 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 never happend
+               return -1;      // should be never happend
 
        manager.kernel_socket = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR);
        if (manager.kernel_socket < 0) {
-               LOGW("Kernel socket creation failed: %s\n", strerror(errno));
+               LOGE("Kernel socket creation failed\n");
                return -1;
        }
 
@@ -346,7 +346,8 @@ static int initializeManager(FILE *portfile)
                return -1;
        }
 
-       makeKernelSocket();
+       if (makeKernelSocket() != 0)
+               return -1;
 
        int port = makeHostServerSocket();
        if (port < 0) {