From aca89457ae8be0fc0bd077f07fa3f3f16dedc6ed Mon Sep 17 00:00:00 2001 From: Marcelo Roberto Jimenez Date: Mon, 15 Mar 2010 03:30:11 +0000 Subject: [PATCH] SF Patch Tracker [ 2962606 ] Autorenewal errors: invalid SID, too-short renewal interval Submitted By: Nick Leverton (leveret) Auto-renewals send an invalid SID due to a missing UpnpString_get_String call. They also send a renewal interval of 0 instead of copying it from the original subscription. git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/trunk@492 119443c7-1b9e-41f8-b6fc-b9c35fce742c --- ChangeLog | 10 ++++++++++ upnp/src/gena/gena_ctrlpt.c | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1d6f4da..edd1f38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,8 +2,18 @@ Version 1.8.0 ******************************************************************************* +2010-03-15 Marcelo Jimenez + * SF Patch Tracker [ 2962606 ] Autorenewal errors: invalid SID, + too-short renewal interval + Submitted By: Nick Leverton (leveret) + + Auto-renewals send an invalid SID due to a missing UpnpString_get_String + call. They also send a renewal interval of 0 instead of copying it from + the original subscription. + 2010-03-15 Marcelo Jimenez * SF Patch Tracker [ 2964685 ] patch for avoiding inet_ntoa (1.8.0) + Submitted By: Nick Leverton (leveret) Seems like SF's tracker won't let me add a patch to someone else's issue ?! This refers to https://sourceforge.net/support/tracker.php?aid=2724578 diff --git a/upnp/src/gena/gena_ctrlpt.c b/upnp/src/gena/gena_ctrlpt.c index 88c2cd6..00b4af0 100644 --- a/upnp/src/gena/gena_ctrlpt.c +++ b/upnp/src/gena/gena_ctrlpt.c @@ -81,6 +81,7 @@ static void GenaAutoRenewSubscription( eventType = UPNP_EVENT_SUBSCRIPTION_EXPIRED; } else { UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, "GENA AUTO RENEW"); + timeout = UpnpEventSubscribe_get_TimeOut(sub_struct); errCode = genaRenewSubscription( event->handle, UpnpEventSubscribe_get_SID(sub_struct), @@ -303,7 +304,7 @@ static int gena_subscribe( &request, 1, 1, "q" "ssc" "sscc", HTTPMETHOD_SUBSCRIBE, &dest_url, - "SID: ", renewal_sid, + "SID: ", UpnpString_get_String(renewal_sid), "TIMEOUT: Second-", timeout_str ); } else { // subscribe