X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FIpcServer.cpp;h=aacdd490926b28a53927d750e0871ed69348627d;hb=9d0565b3a8378067c26b9d492c52d4b3b7d71ece;hp=0debbd9eb9d8a8d99853a54b18b7ba5efc0dc2e6;hpb=ad6bb9a14ff8eda6abfeed02dd5b02ac4bbee8a5;p=platform%2Fframework%2Fnative%2Fchannel-service.git diff --git a/src/IpcServer.cpp b/src/IpcServer.cpp index 0debbd9..aacdd49 100644 --- a/src/IpcServer.cpp +++ b/src/IpcServer.cpp @@ -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)); @@ -290,7 +290,7 @@ CATCH: struct HelloMessage { int pid; - bool reverse; // true if the connection is for reverse message + int reverse; // if the connection is for reverse message }; gboolean @@ -352,7 +352,7 @@ IpcServer::OnConnectionRequest(GIOChannel* source, GIOCondition condition, gpoin pIpcServer->__pCurrentClientInfo = null; } - if (helloMessage.reverse) + if (helloMessage.reverse != 0) { pClientInfo->pReverseChannel = pChannel; } @@ -694,6 +694,8 @@ IpcServer::Send(IPC::Message* msg) // empty statement; } + delete msg; + return true; } @@ -706,6 +708,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 +726,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 +757,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 +773,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;