From: Damien Fouilleul <damienf@videolan.org>
Date: Sun, 29 Apr 2007 17:44:44 +0000 (+0000)
Subject: - live555: toggle TCP use when we receive a '461 Unsupported Transport' during SETUP... 
X-Git-Tag: 0.9.0-test0~7574
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6bc91febc84c01b39879d7d6420232ce21782355;p=vlc

- live555: toggle TCP use when we receive a '461 Unsupported Transport' during SETUP request
---

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index abdaac2a15..7ef5893e19 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -602,9 +602,15 @@ static int SessionsSetup( demux_t *p_demux )
                 if( !( p_sys->rtsp->setupMediaSubsession( *sub, False,
                                                    b_rtsp_tcp ? True : False ) ) )
                 {
-                    msg_Err( p_demux, "SETUP of'%s/%s' failed %s", sub->mediumName(),
-                             sub->codecName(), p_sys->env->getResultMsg() );
-                    continue;
+                    /* if we get an unsupported transport error, toggle TCP use and try again */
+                    if( !strstr(p_sys->env->getResultMsg(), "461 Unsupported Transport")
+                     || !( p_sys->rtsp->setupMediaSubsession( *sub, False,
+                                                   b_rtsp_tcp ? False : True ) ) )
+                    {
+                        msg_Err( p_demux, "SETUP of'%s/%s' failed %s", sub->mediumName(),
+                                 sub->codecName(), p_sys->env->getResultMsg() );
+                        continue;
+                    }
                 }
             }