Update macros

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

diff --git a/src/FIo_MessagePortStub.cpp b/src/FIo_MessagePortStub.cpp
index 4da0287..582bb0c 100644 (file)
--- a/src/FIo_MessagePortStub.cpp
+++ b/src/FIo_MessagePortStub.cpp
@@ -107,23 +107,24 @@ _MessagePortStub::OnCheckRemotePort(const BundleBuffer& buffer, int* pResult)
 }
 
 bool
-_MessagePortStub::OnSendMessage(const BundleBuffer& buffer, int* pResult)
+_MessagePortStub::OnSendMessage(const BundleBuffer& metadata, const BundleBuffer& buffer, int* pResult)
 {
        SysAssertf(__pService != null, "MessagePort service has not been initialized.\n");
 
-       *pResult = __pService->SendMessage(buffer);
+       *pResult = __pService->SendMessage(metadata, buffer);
 
+       bundle_free(metadata.b);
        bundle_free(buffer.b);
 
        return true;
 }
 
 result
-_MessagePortStub::SendMessage(int clientId, const BundleBuffer& buffer)
+_MessagePortStub::SendMessage(int clientId, const BundleBuffer& metadata, const BundleBuffer& buffer)
 {
        SysAssertf(__pService != null, "MessagePort service has not been initialized.\n");
 
-       result r = __pIpcServer->SendResponse(clientId, new MessagePort_sendMessageAsync(buffer));
+       result r = __pIpcServer->SendResponse(clientId, new MessagePort_sendMessageAsync(metadata, buffer));
 
        SysTryReturnResult(NID_IO, r == E_SUCCESS, r, "Failed to send a response message.");
 
@@ -134,10 +135,10 @@ void
 _MessagePortStub::OnIpcRequestReceived(IpcServer& server, const IPC::Message& message)
 {
        IPC_BEGIN_MESSAGE_MAP(_MessagePortStub, message)
-       IPC_MESSAGE_HANDLER_EX(MessagePort_registerPort, &server, OnRegisterMessagePort)
-       IPC_MESSAGE_HANDLER_EX(MessagePort_checkRemotePort, &server, OnCheckRemotePort)
-       IPC_MESSAGE_HANDLER_EX(MessagePort_sendMessage, &server, OnSendMessage)
-       IPC_END_MESSAGE_MAP_EX()
+               IPC_MESSAGE_HANDLER_EX(MessagePort_registerPort, &server, OnRegisterMessagePort)
+               IPC_MESSAGE_HANDLER_EX(MessagePort_checkRemotePort, &server, OnCheckRemotePort)
+               IPC_MESSAGE_HANDLER_EX(MessagePort_sendMessage, &server, OnSendMessage)
+       IPC_END_MESSAGE_MAP()
 }
 
 void
@@ -161,8 +162,10 @@ _MessagePortStub::OnIpcClientConnected(const IpcServer& server, int clientId)
 void
 _MessagePortStub::OnIpcClientDisconnected(const IpcServer& server, int clientId)
 {
-       SysAssertf(__pService != null, "Channel service has not been initialized.\n");
-       SysLog(NID_IO, "Unregister - clientId =  %d", clientId);
+       SysAssertf(__pService != null, "MessagePort service has not been initialized.");
+       SysLog(NID_IO, "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
+       SysLog(NID_IO, "Unregister - client =  %d", clientId);
+       SysLog(NID_IO, "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
 
        __pService->UnregisterMessagePort(clientId);
 }