Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

action are passed async

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1762 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-10-30 00:39:06 +00:00
parent 3c7f714650
commit fcaae207ef
1 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
libretroshare/src/upnp/UPnPBase.cpp
View File

@ -577,14 +577,14 @@ bool CUPnPService::Execute(
const std::string &ActionName,
const std::vector<CUPnPArgumentValue> &ArgValue) const
{
std::ostringstream msg;
std::cerr << "CUPnPService::Execute called.";
if (m_SCPD.get() == NULL) {
std::cerr << "Service without SCPD Document, cannot execute action '" << ActionName <<
"' for service '" << GetServiceType() << "'.";
std::cerr << std::endl;
return false;
}
std::ostringstream msgAction("Sending action ");
std::cerr << "Sending action ";
// Check for correct action name
ActionList::const_iterator itAction =
m_SCPD->GetActionList().find(ActionName);
@ -594,7 +594,7 @@ bool CUPnPService::Execute(
std::cerr << std::endl;
return false;
}
msgAction << ActionName << "(";
std::cerr << ActionName << "(";
bool firstTime = true;
// Check for correct Argument/Value pairs
const CUPnPAction &action = *(itAction->second);
@ -676,6 +676,7 @@ bool CUPnPService::Execute(
}
}
} else {
std::cerr << "UpnpMakeAction" << std::endl;
ActionDoc = UpnpMakeAction(
action.GetName().c_str(),
GetServiceType().c_str(),
@ -686,7 +687,7 @@ bool CUPnPService::Execute(
return false;
}
}
#if 0
// Send the action asynchronously
UpnpSendActionAsync(
m_UPnPControlPoint.GetUPnPClientHandle(),
@ -696,32 +697,32 @@ bool CUPnPService::Execute(
static_cast<Upnp_FunPtr>(&CUPnPControlPoint::Callback),
NULL);
return true;
#endif
// Send the action synchronously
IXML_Document *RespDoc = NULL;
int ret = UpnpSendAction(
m_UPnPControlPoint.GetUPnPClientHandle(),
GetAbsControlURL().c_str(),
GetServiceType().c_str(),
NULL, ActionDoc, &RespDoc);
if (ret != UPNP_E_SUCCESS) {
m_upnpLib.processUPnPErrorMessage(
"UpnpSendAction", ret, NULL, RespDoc);
ixmlDocument_free(ActionDoc);
ixmlDocument_free(RespDoc);
return false;
}
ixmlDocument_free(ActionDoc);
// Check the response document
m_upnpLib.ProcessActionResponse(
RespDoc, action.GetName());
// Free the response document
ixmlDocument_free(RespDoc);
return true;
// std::cerr << "Calling UpnpSendAction." << std::endl;
// // Send the action synchronously
// IXML_Document *RespDoc = NULL;
// int ret = UpnpSendAction(
// m_UPnPControlPoint.GetUPnPClientHandle(),
// GetAbsControlURL().c_str(),
// GetServiceType().c_str(),
// NULL, ActionDoc, &RespDoc);
// if (ret != UPNP_E_SUCCESS) {
// m_upnpLib.processUPnPErrorMessage(
// "UpnpSendAction", ret, NULL, RespDoc);
// ixmlDocument_free(ActionDoc);
// ixmlDocument_free(RespDoc);
// return false;
// }
// ixmlDocument_free(ActionDoc);
//
// // Check the response document
// m_upnpLib.ProcessActionResponse(
// RespDoc, action.GetName());
//
// // Free the response document
// ixmlDocument_free(RespDoc);
//
// return true;
}