Change file path of domain socket

[platform/framework/native/channel-service.git] / src / IpcServer.cpp

diff --git a/src/IpcServer.cpp b/src/IpcServer.cpp
index f6b2712..3c449f5 100644 (file)
--- a/src/IpcServer.cpp
+++ b/src/IpcServer.cpp
@@ -36,9 +36,9 @@
 
 #include <sys/smack.h>
 
-#include <ipc/ipc_message.h>
+#include <aul/aul.h>
 
-#include <app_manager.h>
+#include <ipc/ipc_message.h>
 
 #include <FBaseRtMutex.h>
 #include <FBaseSysLog.h>
@@ -172,7 +172,7 @@ IpcServer::Construct(const String& name, const IIpcServerEventListener& listener
        pName = _StringConverter::CopyToCharArrayN(name);
        SysTryReturnResult(NID_IO, pName != null, E_OUT_OF_MEMORY, "Not enough memory");
 
-       socketName.append("/tmp/");
+       socketName.append("/var/run/osp/");
        socketName.append(pName);
 
        delete[] pName;
@@ -231,7 +231,7 @@ IpcServer::Construct(const String& name, const IIpcServerEventListener& listener
        SysTryCatch(NID_IO, ret == 0, r = E_SYSTEM, E_SYSTEM, "[E_SYSTEM] Failed to change permission of a socket(%d, %s): %s", serverSocket,
                           socketName.c_str(), strerror(errno));
 
-       ret = listen(serverSocket, 15);
+       ret = listen(serverSocket, 128);
        SysTryCatch(NID_IO, ret == 0, r = E_SYSTEM, E_SYSTEM, "[E_SYSTEM] Failed to listen a socket(%d, %s): %s", serverSocket,
                           socketName.c_str(), strerror(errno));
 
@@ -289,7 +289,6 @@ CATCH:
 
 struct HelloMessage
 {
-       int pid;
        int reverse;  // if the connection is for reverse message
 };
 
@@ -303,12 +302,17 @@ IpcServer::OnConnectionRequest(GIOChannel* source, GIOCondition condition, gpoin
        _ChannelInfo* pChannelInfo = null;
        GSource* pGSource = null;
        GIOChannel* pChannel = null;
+       ssize_t readBytes = 0;
+       int ret = 0;
 
        int server = -1;
        int client = -1;
        struct sockaddr_un clientAddress;
        socklen_t clientLen = sizeof(clientAddress);
 
+       struct ucred cr;
+       socklen_t ucredLen = sizeof(cr);
+
        SysAssertf(pIpcServer != null, "Not yet constructed. Construct() should be called before use.\n");
        SysAssertf(pIpcServer->__pListener != null, "Listener is null.\n");
 
@@ -317,7 +321,9 @@ IpcServer::OnConnectionRequest(GIOChannel* source, GIOCondition condition, gpoin
        client = accept(server, (struct sockaddr*) &clientAddress, &clientLen);
        SysTryCatch(NID_IO, client != -1, , E_SYSTEM, "[E_SYSTEM] Accept failed.");
 
-       read(client, &helloMessage, sizeof(helloMessage));
+       readBytes = read(client, &helloMessage, sizeof(helloMessage));
+       SysTryCatch(NID_IO, readBytes >= 0, , E_SYSTEM, "[E_SYSTEM] Failed to receive hello message (%d, %s).",
+                       errno, strerror(errno));
 
        pChannel = g_io_channel_unix_new(client);
        SysTryCatch(NID_IO, pChannel != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Not enough memory.");
@@ -326,29 +332,32 @@ IpcServer::OnConnectionRequest(GIOChannel* source, GIOCondition condition, gpoin
        g_io_channel_set_flags(pChannel, G_IO_FLAG_NONBLOCK, &pGError);
 
        g_io_channel_set_close_on_unref(pChannel, TRUE);
+
+       ret = getsockopt(client, SOL_SOCKET, SO_PEERCRED, &cr, &ucredLen);
+       SysTryCatch(NID_IO, ret >= 0, , E_SYSTEM, "[E_SYSTEM] Failed to get peercred information: %s", strerror(errno));
+
        client = -1;
 
-       pClientInfo = pIpcServer->__clients[helloMessage.pid];
+       pClientInfo = pIpcServer->__clients[cr.pid];
        if (pClientInfo == null) // first connection request from this client
        {
                pClientInfo = new (std::nothrow) _ClientInfo;
                SysTryCatch(NID_IO, pClientInfo != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Not enough memory.");
 
                pClientInfo->pIpcServer = pIpcServer;
-               pClientInfo->clientId = helloMessage.pid;
+               pClientInfo->clientId = cr.pid;
 
-               char* pAppId = NULL;
-               int ret = app_manager_get_app_id(helloMessage.pid, &pAppId);
-               SysTryCatch(NID_IO, ret >= 0, delete pClientInfo, E_SYSTEM, "[E_SYSTEM] Failed to get_app_id: %d", ret);
+               char buffer[256] = {0, };
+               ret = aul_app_get_appid_bypid(cr.pid, buffer, sizeof(buffer));
+               SysTryCatch(NID_IO, ret == AUL_R_OK, delete pClientInfo, E_SYSTEM, "[E_SYSTEM] Failed to get the application ID of pid: %d", ret);
 
-               pClientInfo->appId = pAppId;
-               free(pAppId);
+               pClientInfo->appId = buffer;
 
                pClientInfo->pReverseChannel = null;
 
-               pIpcServer->__clients[helloMessage.pid] = pClientInfo;
+               pIpcServer->__clients[cr.pid] = pClientInfo;
                pIpcServer->__pCurrentClientInfo = pClientInfo;
-               pIpcServer->__pListener->OnIpcClientConnected(*pIpcServer, helloMessage.pid);
+               pIpcServer->__pListener->OnIpcClientConnected(*pIpcServer, cr.pid);
                pIpcServer->__pCurrentClientInfo = null;
        }
 
@@ -694,6 +703,8 @@ IpcServer::Send(IPC::Message* msg)
                // empty statement;
        }
 
+       delete msg;
+
        return true;
 }
 
@@ -706,6 +717,7 @@ IpcServer::SendResponse(int client, IPC::Message* pMessage)
        char* pData = null;
        GError* pGError = null;
        _ClientInfo* pClientInfo = null;
+       int ret = 0;
 
        SysTryReturn(NID_IO, client >= 0 && pMessage != null, false, E_INVALID_ARG,
                                "[E_INVALID_ARG] pMessage(0x%x) is null or clinet(%d) < 0", pMessage,
@@ -723,8 +735,12 @@ IpcServer::SendResponse(int client, IPC::Message* pMessage)
        while (remain > 0)
        {
                pGError = NULL;
-               g_io_channel_write_chars(pClientInfo->pReverseChannel, (char*) pData, remain, &written, &pGError);
-               SysTryCatch(NID_IO, pGError == null, , E_SYSTEM, "[E_SYSTEM] Error occurred during writing message to socket.");
+               ret = g_io_channel_write_chars(pClientInfo->pReverseChannel, (char*) pData, remain, &written, &pGError);
+               if (ret != G_IO_STATUS_NORMAL)
+               {
+                       SysLog(NID_IO, "Failed to send a response: %d", ret);
+                       SysTryCatch(NID_IO, ret != G_IO_STATUS_ERROR, , E_SYSTEM, "[E_SYSTEM] Error occurred during writing message to socket.");
+               }
 
                remain -= written;
                pData += written;
@@ -750,6 +766,7 @@ IpcServer::SendResponse(int client, const IPC::Message& message)
        char* pData = null;
        GError* pGError = null;
        _ClientInfo* pClientInfo = null;
+       int ret = 0;
 
        SysTryReturn(NID_IO, client >= 0, false, E_INVALID_ARG, "[E_INVALID_ARG] clinet(%d) < 0", client);
        SysTryCatch(NID_IO, !message.is_sync(), r = E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] Can't send sync. messagee.");
@@ -765,8 +782,12 @@ IpcServer::SendResponse(int client, const IPC::Message& message)
        while (remain > 0)
        {
                pGError = NULL;
-               g_io_channel_write_chars(pClientInfo->pReverseChannel, (char*) pData, remain, &written, &pGError);
-               SysTryCatch(NID_IO, pGError == null, , E_SYSTEM, "[E_SYSTEM] Error occurred during writing message to socket.");
+               ret = g_io_channel_write_chars(pClientInfo->pReverseChannel, (char*) pData, remain, &written, &pGError);
+               if (ret != G_IO_STATUS_NORMAL)
+               {
+                       SysLog(NID_IO, "Failed to send a response: %d", ret);
+                       SysTryCatch(NID_IO, ret != G_IO_STATUS_ERROR, , E_SYSTEM, "[E_SYSTEM] Error occurred during writing message to socket.");
+               }
 
                remain -= written;
                pData += written;