Changeset 0a342122be23ccbb7d856c18f19323eb94a71e75

Timestamp:

06/12/07 20:08:04 (1 year ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1196968084 +0000

git-parent:

[fde8b7fc53e178f59adc59e88df6eb623fa9797d]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1196968084 +0000

Message:

Cleanup.

Files:

• modules/demux/live555.cpp (modified) (10 diffs)

modules/demux/live555.cpp

@@ -220 +220 @@
-    MediaSubsession         *sub    = NULL;
-    int i, i_return;
+    int i_error = VLC_EGENERIC;
-
-    if( p_demux->s )
@@ -293 +294 @@
-        uint8_t *p_sdp      = (uint8_t*) malloc( i_sdp_max );
-
+        if( !p_sdp )
+        {
+            i_error = VLC_ENOMEM;
+            goto error;
+        }
+
-        for( ;; )
-        {
@@ -333 +340 @@
-    {
-        msg_Err( p_demux, "Failed to retrieve the RTSP Session Description" );
+        i_error = VLC_ENOMEM;
-        goto error;
-    }
@@ -389 +397 @@
-
-    free( p_sys );
-VLC_EGENERIC
+i_error
-}
-
@@ -448 +456 @@
-    int  i_ret        = VLC_SUCCESS;
-
+    psz_url = (char*)malloc( strlen( p_sys->psz_path ) + 8 );
+    if( !psz_url ) return VLC_ENOMEM;
+
+    if( p_sys->url.psz_username || p_sys->url.psz_password )
+    {
+        sprintf( psz_url, "rtsp://%s%s", p_sys->url.psz_host,
+                 p_sys->url.psz_path );
+
+        psz_user = strdup( p_sys->url.psz_username );
+        psz_pwd  = strdup( p_sys->url.psz_password );
+    }
+    else
+    {
+        sprintf( psz_url, "rtsp://%s", p_sys->psz_path );
+
+        psz_user = var_CreateGetString( p_demux, "rtsp-user" );
+        psz_pwd  = var_CreateGetString( p_demux, "rtsp-pwd" );
+    }
+
-createnew:
-    if( var_CreateGetBool( p_demux, "rtsp-http" ) )
@@ -475 +502 @@
-    }
-
-
-    psz_url = (char*)malloc( strlen( p_sys->psz_path ) + 8 );
-    if( !psz_url ) return VLC_ENOMEM;
-
-    if( p_sys->url.psz_username || p_sys->url.psz_password )
-    {
-        sprintf( psz_url, "rtsp://%s%s", p_sys->url.psz_host,
-                 p_sys->url.psz_path );
-
-        psz_user = strdup( p_sys->url.psz_username );
-        psz_pwd  = strdup( p_sys->url.psz_password );
-    }
-    else
-    {
-        sprintf( psz_url, "rtsp://%s", p_sys->psz_path );
-
-        psz_user = var_CreateGetString( p_demux, "rtsp-user" );
-        psz_pwd  = var_CreateGetString( p_demux, "rtsp-pwd" );
-    }
-
-describe:
-msg_Info( p_demux, "[%s] user=%s pwd=%s", psz_url, psz_user, psz_pwd );
-    authenticator.setUsernameAndPassword( (const char*)psz_user,
-                                          (const char*)psz_pwd );
@@ -504 +510 @@
-    if( psz_options ) delete [] psz_options;
-
-
-
-
-
-
-
+
+
-    if( p_sdp == NULL )
-    {
@@ -518 +520 @@
-        msg_Dbg( p_demux, "DESCRIBE failed with %d: %s", i_code, psz_error );
-        if( var_CreateGetBool( p_demux, "rtsp-http" ) )
-
+
+
-        else sscanf( psz_error, "%*sRTSP/%*s%3u", &i_code );
-
-        if( i_code == 401 )
-        {
-char *psz_login = NULL; char *psz_password = NULL
+int i_result
-            msg_Dbg( p_demux, "authentication failed" );
-
-
+
+
+
+
+
-                           _("Please enter a valid login name and a password."),
-login, &psz_passwor
-
+user, &psz_pw
+sul
-            {
-                msg_Dbg( p_demux, "retrying with user=%s, pwd=%s",
-
-
-
-
+
-                goto describe;
-            }
-            if( psz_login ) free( psz_login );
-            if( psz_password ) free( psz_password );
-        }
-        else if( !var_GetBool( p_demux, "rtsp-http" ) )
@@ -548 +550 @@
-            msg_Dbg( p_demux, "we will now try HTTP tunneling mode" );
-            var_Set( p_demux, "rtsp-http", val );
-            if( psz_url ) free( psz_url );
-            if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp );
-            goto createnew;
@@ -557 +558 @@
-
-    /* malloc-ated copy */
+    if( psz_user ) free( psz_user );
+    if( psz_pwd ) free( psz_pwd );
+
-    if( p_sys->p_sdp ) free( p_sys->p_sdp );
-    p_sys->p_sdp = NULL;