3.0 migration

Change-Id: I1aad5245c9b5e93d482a1a6b94c46d026e56ace4
Signed-off-by: Sangkoo Kim <sangkoo.kim@samsung.com>

diff --git a/framework/transaction-manager/MsgCmdHandlerTransport.cpp b/framework/transaction-manager/MsgCmdHandlerTransport.cpp
index e08ebac..7211e48 100755 (executable)
--- a/framework/transaction-manager/MsgCmdHandlerTransport.cpp
+++ b/framework/transaction-manager/MsgCmdHandlerTransport.cpp
@@ -394,19 +394,18 @@ int MsgSentStatusHandler(const MSG_CMD_S *pCmd, char **ppEvent)
        MSG_DEBUG("REQID %d, listenerFD %d, handleAddr %x, msgId %d", pStatus->reqId, prxInfo->listenerFd, prxInfo->handleAddr, prxInfo->sentMsgId);
 
        // if APP send and quit(not exist at this time), don't send the data up.
-       if (prxInfo->handleAddr == 0)
-       {
-               // just making data which will be passed to plugin. it indicates "handling evt success"
-               MsgTransactionManager::instance()->delProxyInfo(pStatus->reqId);
-
-               return MsgMakeEvent(NULL, 0, MSG_EVENT_PLG_SENT_STATUS_CNF, MSG_SUCCESS, (void**)ppEvent);
-       }
+//     if (prxInfo->handleAddr == 0)
+//     {
+//             // just making data which will be passed to plugin. it indicates "handling evt success"
+//             MsgTransactionManager::instance()->delProxyInfo(pStatus->reqId);
+//
+//             return MsgMakeEvent(NULL, 0, MSG_EVENT_PLG_SENT_STATUS_CNF, MSG_SUCCESS, (void**)ppEvent);
+//     }
 
        unsigned int ret[3] = {0}; //3// reqid, status, object
 
        ret[0] = pStatus->reqId;
        ret[1] = pStatus->status;
-       ret[2] = (unsigned int)prxInfo->handleAddr;
 
        // Make Event Data for APP
        int eventSize = MsgMakeEvent(ret, sizeof(ret), MSG_EVENT_PLG_SENT_STATUS_CNF, MSG_SUCCESS, (void**)ppEvent);

diff --git a/proxy/MsgHandleTransport.cpp b/proxy/MsgHandleTransport.cpp
index a23ee76..9ddbac1 100755 (executable)
--- a/proxy/MsgHandleTransport.cpp
+++ b/proxy/MsgHandleTransport.cpp
@@ -118,8 +118,6 @@ msg_error_t MsgHandle::submitReq(MSG_REQUEST_S* pReq)
 
        chInfo.listenerFd = MsgProxyListener::instance()->getRemoteFd();
 
-       chInfo.handleAddr = (void *)this;
-
        /* Allocate Memory to Command Data */
        char* encodedData = NULL;
        AutoPtr<char> buf(&encodedData);

diff --git a/proxy/MsgProxyListener.cpp b/proxy/MsgProxyListener.cpp
index d744675..0e5f181 100755 (executable)
--- a/proxy/MsgProxyListener.cpp
+++ b/proxy/MsgProxyListener.cpp
@@ -210,7 +210,7 @@ bool MsgProxyListener::regSentStatusEventCB(MsgHandle* pMsgHandle, msg_sent_stat
 
        for (; it != sentStatusCBList.end(); it++)
        {
-               if ((MsgHandle*)it->hAddr == pMsgHandle && it->pfSentStatusCB == pfSentStatus) {
+               if (it->hAddr == pMsgHandle && it->pfSentStatusCB == pfSentStatus) {
                        MSG_DEBUG("msg_sent_status_cb() callback : [%p] is already registered!!!", pfSentStatus);
                        return false;
                }
@@ -232,7 +232,7 @@ bool MsgProxyListener::regMessageIncomingEventCB(MsgHandle* pMsgHandle, msg_sms_
 
        for (; it != newMessageCBList.end(); it++)
        {
-               if ((MsgHandle*)it->hAddr == pMsgHandle && it->port == port && it->pfIncomingCB == pfNewMessage) {
+               if (it->hAddr == pMsgHandle && it->port == port && it->pfIncomingCB == pfNewMessage) {
                        MSG_DEBUG("msg_sms_incoming_cb() callback : Port Number [%d] is already registered!!!", port);
                        return false;
                }
@@ -254,7 +254,7 @@ bool MsgProxyListener::regMMSConfMessageIncomingEventCB(MsgHandle* pMsgHandle, m
 
        for (; it != newMMSConfMessageCBList.end(); it++)
        {
-               if ((MsgHandle*)it->hAddr == pMsgHandle && it->pfMMSConfIncomingCB == pfNewMMSConfMessage) {
+               if (it->hAddr == pMsgHandle && it->pfMMSConfIncomingCB == pfNewMMSConfMessage) {
 
                        if(pAppId == NULL) {
                                MSG_DEBUG("msg_mms_conf_msg_incoming_cb() callback is already registered!!!");
@@ -285,7 +285,7 @@ bool MsgProxyListener::regPushMessageIncomingEventCB(MsgHandle* pMsgHandle, msg_
 
        for (; it != newPushMessageCBList.end(); it++)
        {
-               if ((MsgHandle*)it->hAddr == pMsgHandle && it->pfPushIncomingCB == pfNewPushMessage) {
+               if (it->hAddr == pMsgHandle && it->pfPushIncomingCB == pfNewPushMessage) {
 
                        if(pAppId == NULL) {
                                MSG_DEBUG("msg_push_msg_incoming_cb() callback is already registered!!!");
@@ -315,7 +315,7 @@ bool MsgProxyListener::regCBMessageIncomingEventCB(MsgHandle* pMsgHandle, msg_cb
 
        for (; it != newCBMessageCBList.end(); it++)
        {
-               if ((MsgHandle*)it->hAddr == pMsgHandle && it->pfCBIncomingCB == pfNewCBMessage) {
+               if (it->hAddr == pMsgHandle && it->pfCBIncomingCB == pfNewCBMessage) {
                        MSG_DEBUG("msg_CB_incoming_cb() callback : [%p] is already registered!!!", pfNewCBMessage);
                         it->bsave = bSave;
                         it->userParam = pUserParam;
@@ -339,7 +339,7 @@ bool MsgProxyListener::regReportMsgIncomingCB(MsgHandle* pMsgHandle, msg_report_
 
        for (; it != reportMessageCBList.end(); it++)
        {
-               if ((MsgHandle*)it->hAddr == pMsgHandle && it->pfReportMsgIncomingCB == pfReportMessage) {
+               if (it->hAddr == pMsgHandle && it->pfReportMsgIncomingCB == pfReportMessage) {
                        MSG_DEBUG("msg_report_msg_incoming_cb() callback : [%p] is already registered!!!", pfReportMessage);
                         it->userParam = pUserParam;
                        return false;
@@ -362,7 +362,7 @@ bool MsgProxyListener::regSyncMLMessageIncomingEventCB(MsgHandle* pMsgHandle, ms
 
        for (; it != newSyncMLMessageCBList.end(); it++)
        {
-               if ((MsgHandle*)it->hAddr == pMsgHandle && it->pfSyncMLIncomingCB == pfNewSyncMLMessage) {
+               if (it->hAddr == pMsgHandle && it->pfSyncMLIncomingCB == pfNewSyncMLMessage) {
                        MSG_DEBUG("msg_syncml_msg_incoming_cb() callback : [%p] is already registered!!!", pfNewSyncMLMessage);
                        return false;
                }
@@ -384,7 +384,7 @@ bool MsgProxyListener::regLBSMessageIncomingEventCB(MsgHandle* pMsgHandle, msg_l
 
        for (; it != newLBSMessageCBList.end(); it++)
        {
-               if ((MsgHandle*)it->hAddr == pMsgHandle && it->pfLBSMsgIncoming == pfNewLBSMsgIncoming) {
+               if (it->hAddr == pMsgHandle && it->pfLBSMsgIncoming == pfNewLBSMsgIncoming) {
                        MSG_DEBUG("msg_lbs_msg_incoming_cb() callback : [%p] is already registered!!!", pfNewLBSMsgIncoming);
                        return false;
                }
@@ -406,7 +406,7 @@ bool MsgProxyListener::regSyncMLMessageOperationEventCB(MsgHandle* pMsgHandle, m
 
        for (; it != operationSyncMLMessageCBList.end(); it++)
        {
-               if ((MsgHandle*)it->hAddr == pMsgHandle && it->pfSyncMLOperationCB == pfSyncMLMessageOperation) {
+               if (it->hAddr == pMsgHandle && it->pfSyncMLOperationCB == pfSyncMLMessageOperation) {
                        MSG_DEBUG("msg_syncml_msg_incoming_cb() callback : [%p] is already registered!!!", pfSyncMLMessageOperation);
                        return false;
                }
@@ -428,7 +428,7 @@ bool MsgProxyListener::regStorageChangeEventCB(MsgHandle* pMsgHandle, msg_storag
 
        for (; it != storageChangeCBList.end(); it++)
        {
-               if ((MsgHandle*)it->hAddr == pMsgHandle && it->pfStorageChangeCB == pfStorageChangeOperation) {
+               if (it->hAddr == pMsgHandle && it->pfStorageChangeCB == pfStorageChangeOperation) {
                        MSG_DEBUG("msg_storage_change_cb() callback : [%p] is already registered!!!", pfStorageChangeOperation);
                        return false;
                }
@@ -453,7 +453,7 @@ void MsgProxyListener::clearListOfClosedHandle(MsgHandle* pMsgHandle)
 
        for (; it != sentStatusCBList.end(); )
        {
-               if ((MsgHandle*)it->hAddr == pMsgHandle)
+               if (it->hAddr == pMsgHandle)
                {
                        sentStatusCBList.erase(it++);
 
@@ -626,7 +626,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != sentStatusCBList.end() ; it++)
                {
-                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
+                       MsgHandle* pHandle = it->hAddr;
 
                        msg_sent_status_cb pfunc = it->pfSentStatusCB;
 
@@ -668,7 +668,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != matchList.end(); it++ )
                {
-                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
+                       MsgHandle* pHandle = it->hAddr;
 
                        MSG_MESSAGE_HIDDEN_S msgHidden = {0,};
 
@@ -785,7 +785,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != matchList.end() ; it++)
                {
-                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
+                       MsgHandle* pHandle = it->hAddr;
 
                        MSG_MESSAGE_HIDDEN_S msgHidden = {0,};
 
@@ -870,7 +870,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != newSyncMLMessageCBList.end() ; it++)
                {
-                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
+                       MsgHandle* pHandle = it->hAddr;
 
                        msg_syncml_msg_incoming_cb pfunc = it->pfSyncMLIncomingCB;
 
@@ -891,7 +891,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != newLBSMessageCBList.end() ; it++)
                {
-                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
+                       MsgHandle* pHandle = it->hAddr;
 
                        msg_lbs_msg_incoming_cb pfunc = it->pfLBSMsgIncoming;
 
@@ -919,7 +919,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != operationSyncMLMessageCBList.end() ; it++)
                {
-                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
+                       MsgHandle* pHandle = it->hAddr;
 
                        msg_syncml_msg_operation_cb pfunc = it->pfSyncMLOperationCB;
 
@@ -953,7 +953,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != storageChangeCBList.end() ; it++)
                {
-                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
+                       MsgHandle* pHandle = it->hAddr;
 
                        msg_storage_change_cb pfunc = it->pfStorageChangeCB;
 
@@ -975,7 +975,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != newCBMessageCBList.end() ; it++)
                {
-                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
+                       MsgHandle* pHandle = it->hAddr;
                        msg_struct_s msg = {0,};
 
                        msg.type = MSG_STRUCT_CB_MSG;
@@ -1001,7 +1001,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != newPushMessageCBList.end() ; it++)
                {
-                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
+                       MsgHandle* pHandle = it->hAddr;
 
                        msg_push_msg_incoming_cb pfunc = it->pfPushIncomingCB;
 
@@ -1036,7 +1036,7 @@ void MsgProxyListener::handleEvent(const MSG_EVENT_S* pMsgEvent)
 
                for( ; it != reportMessageCBList.end() ; it++)
                {
-                       MsgHandle* pHandle = (MsgHandle*)it->hAddr;
+                       MsgHandle* pHandle = it->hAddr;
 
                        msg_report_msg_incoming_cb pfunc = it->pfReportMsgIncomingCB;