Skip to content

Always handle subscription expiration #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
schenkmi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Always handle subscription expiration #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions Source/Core/PltDeviceHost.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,8 +679,11 @@ PLT_DeviceHost::ProcessHttpSubscriberRequest(NPT_HttpRequest& reque
goto cleanup;
}

// default lease
NPT_Int32 timeout = (NPT_Int32)*PLT_Constants::GetInstance().GetDefaultSubscribeLease().AsPointer();
NPT_Int32 timeout;
if (PLT_UPnPMessageHelper::GetTimeOut(request, timeout) != NPT_SUCCESS) {
// default lease
timeout = (NPT_Int32)*PLT_Constants::GetInstance().GetDefaultSubscribeLease().AsPointer();
}

// subscription renewed
// send the info to the service
Expand All @@ -702,8 +705,11 @@ PLT_DeviceHost::ProcessHttpSubscriberRequest(NPT_HttpRequest& reque
return NPT_SUCCESS;
}

// default lease time
NPT_Int32 timeout = (NPT_Int32)*PLT_Constants::GetInstance().GetDefaultSubscribeLease().AsPointer();
NPT_Int32 timeout;
if (PLT_UPnPMessageHelper::GetTimeOut(request, timeout) != NPT_SUCCESS) {
// default lease
timeout = (NPT_Int32)*PLT_Constants::GetInstance().GetDefaultSubscribeLease().AsPointer();
}

// send the info to the service
service->ProcessNewSubscription(m_TaskManager,
Expand Down
17 changes: 17 additions & 0 deletions Source/Core/PltService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,6 +791,23 @@ PLT_Service::NotifyChanged()
{
NPT_AutoLock lock(m_Lock);

// remove timed out subscriptions
{
NPT_List<PLT_EventSubscriberReference>::Iterator sub_iter = m_Subscribers.GetFirstItem();
NPT_TimeStamp now;
NPT_System::GetCurrentTimeStamp(now);
while (sub_iter) {
PLT_EventSubscriberReference sub = *sub_iter;
NPT_TimeStamp expiration;
expiration = sub->GetExpirationTime();
if (expiration < now ) {
m_Subscribers.Erase(sub_iter++);
} else {
++sub_iter;
}
}
}

// no eventing for now
if (m_EventingPaused) return NPT_SUCCESS;

Expand Down