From bda942b22a1cac424eb07f524679debb6ddde669 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Nov 2010 10:51:22 +0100 Subject: [PATCH] Returning the SID in Upnp_Event_Subscribe. Currently, Upnp_Event_Subscribe always contains an empty chain in the Sid parameter. This patch now saves the client Subscription ID in this parameter so Control Points can see and use the same SID in the Upnp_Event_Subscribe and in the Upnp_Event structures. --- ChangeLog | 9 +++++++++ upnp/src/api/upnpapi.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0b15813..b242d3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,15 @@ Version 1.6.10 ******************************************************************************* +2010-11-23 Fabrice Fontaine + + Returning the Sid in Upnp_Event_Subscribe. + + Currently, Upnp_Event_Subscribe always contains an empty chain in the + Sid parameter. This patch now saves the client Subscription ID in this + parameter so Control Points can see and use the same SID in the + Upnp_Event_Subscribe and in the Upnp_Event structures. + 2010-11-22 Marcelo Roberto Jimenez Two fixes from Juergen Lock : diff --git a/upnp/src/api/upnpapi.c b/upnp/src/api/upnpapi.c index 22bf99d..7a8b435 100644 --- a/upnp/src/api/upnpapi.c +++ b/upnp/src/api/upnpapi.c @@ -3322,7 +3322,6 @@ void UpnpThreadDistribution(struct UpnpNonblockParam *Param) UpnpString *Sid = UpnpString_new(); UpnpString *Url = UpnpString_new(); UpnpString_set_String(Url, Param->Url); - UpnpString_set_String(Sid, (char *)Evt.Sid); Evt.ErrCode = genaSubscribe( Param->Handle, Url, @@ -3330,6 +3329,7 @@ void UpnpThreadDistribution(struct UpnpNonblockParam *Param) Sid); strcpy(Evt.PublisherUrl, Param->Url); Evt.TimeOut = Param->TimeOut; + strcpy((char *)Evt.Sid, UpnpString_get_String(Sid)); Param->Fun(UPNP_EVENT_SUBSCRIBE_COMPLETE, &Evt, Param->Cookie); UpnpString_delete(Sid); UpnpString_delete(Url);