mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-13 03:22:34 -04:00
improving safe upnp shutdown
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1771 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
b99b99f0d5
commit
3ab1b5bb3f
2 changed files with 9 additions and 30 deletions
|
@ -697,32 +697,6 @@ bool CUPnPService::Execute(
|
|||
static_cast<Upnp_FunPtr>(&CUPnPControlPoint::Callback),
|
||||
NULL);
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
|
@ -887,7 +861,7 @@ m_WanService(NULL)
|
|||
#ifdef UPNP_DEBUG
|
||||
std::cerr << "CUPnPControlPoint Constructor UpnpInit finished" << std::endl;
|
||||
#endif
|
||||
if (ret != UPNP_E_SUCCESS) {
|
||||
if (ret != UPNP_E_SUCCESS && ret !=UPNP_E_INIT) {
|
||||
std::cerr << "error(UpnpInit): Error code : ";
|
||||
goto error;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue