[vlc-commits] upnp: Specify <StartingIndex> after <Filter>

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed May 25 18:16:53 2016 +0200| [f6f309af88b4bf0f681ef5f966c8a0f964ee0ccb] | committer: Hugo Beauzée-Luyssen

upnp: Specify <StartingIndex> after <Filter>

As not doing so prevents MS Media Sharing servers from understanding the
request.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f6f309af88b4bf0f681ef5f966c8a0f964ee0ccb
---

 modules/services_discovery/upnp.cpp |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
index ab282db..1fa2aa4 100644
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -945,30 +945,30 @@ IXML_Document* MediaServer::_browseAction( const char* psz_object_id_,
     }
 
     i_res = UpnpAddToAction( &p_action, "Browse",
-            CONTENT_DIRECTORY_SERVICE_TYPE, "StartingIndex", "0" );
+            CONTENT_DIRECTORY_SERVICE_TYPE, "BrowseFlag", psz_browser_flag_ );
+
     if ( i_res != UPNP_E_SUCCESS )
     {
-        msg_Dbg( access_, "AddToAction 'StartingIndex' failed: %s",
+        msg_Dbg( access_, "AddToAction 'BrowseFlag' failed: %s",
                 UpnpGetErrorMessage( i_res ) );
         goto browseActionCleanup;
     }
 
     i_res = UpnpAddToAction( &p_action, "Browse",
-            CONTENT_DIRECTORY_SERVICE_TYPE, "BrowseFlag", psz_browser_flag_ );
+            CONTENT_DIRECTORY_SERVICE_TYPE, "Filter", psz_filter_ );
 
     if ( i_res != UPNP_E_SUCCESS )
     {
-        msg_Dbg( access_, "AddToAction 'BrowseFlag' failed: %s",
+        msg_Dbg( access_, "AddToAction 'Filter' failed: %s",
                 UpnpGetErrorMessage( i_res ) );
         goto browseActionCleanup;
     }
 
     i_res = UpnpAddToAction( &p_action, "Browse",
-            CONTENT_DIRECTORY_SERVICE_TYPE, "Filter", psz_filter_ );
-
+            CONTENT_DIRECTORY_SERVICE_TYPE, "StartingIndex", "0" );
     if ( i_res != UPNP_E_SUCCESS )
     {
-        msg_Dbg( access_, "AddToAction 'Filter' failed: %s",
+        msg_Dbg( access_, "AddToAction 'StartingIndex' failed: %s",
                 UpnpGetErrorMessage( i_res ) );
         goto browseActionCleanup;
     }