Separate the metadata

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

diff --git a/src/FIo_MessagePortStub.cpp b/src/FIo_MessagePortStub.cpp
index 0c06d06..d244a9d 100644 (file)
--- a/src/FIo_MessagePortStub.cpp
+++ b/src/FIo_MessagePortStub.cpp
@@ -36,13 +36,6 @@ using namespace Tizen::Base::Runtime;
 using namespace Tizen::Io;
 using namespace Tizen::App;
 
-static void 
-ConvertBundleToMap(const char *pKey, const int type, const bundle_keyval_t *pVal, void *pData)
-{
-       SysLog(NID_IO, "CB key = %s", pKey);
-
-}
-
 _MessagePortStub::_MessagePortStub(void)
        : __pIpcServer(null)
        , __pService(null)
@@ -52,7 +45,11 @@ _MessagePortStub::_MessagePortStub(void)
 
 _MessagePortStub::~_MessagePortStub(void)
 {
-       delete __pIpcServer;
+       if (__pIpcServer != null)
+       {
+               __pIpcServer->Stop();
+               delete __pIpcServer;
+       }
 }
 
 result
@@ -110,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.");