Changeset e1b146414f8b85755fb917bbac941367fb3c4e15

Timestamp:

24/05/08 19:00:02 (5 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1211648402 +0300

git-parent:

[db47cf33d70da786fd365b0321700b2236546926]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1211648402 +0300

Message:

Remove non-sensical connect->listen transition

Thank you big time for committing stuff against people's review.

Files:

• modules/access_output/rtmp.c (modified) (1 diff)

modules/access_output/rtmp.c

@@ -182 +182 @@
-    p_sys->p_thread->fd = net_ConnectTCP( p_access, p_sys->p_thread->url.psz_host, p_sys->p_thread->url.i_port );
-    if( p_sys->p_thread->fd == -1 )
-    {
-        int *p_fd_listen;
-
-        msg_Warn( p_access, "cannot connect to %s:%d", p_sys->p_thread->url.psz_host, p_sys->p_thread->url.i_port );
-        msg_Dbg( p_access, "switching to passive mode" );
-
-        p_sys->active = 0;
-
-        p_fd_listen = net_ListenTCP( p_access, p_sys->p_thread->url.psz_host, p_sys->p_thread->url.i_port );
-        if( p_fd_listen == NULL )
-        {
-            msg_Warn( p_access, "cannot listen to %s port %i", p_sys->p_thread->url.psz_host, p_sys->p_thread->url.i_port );
-            goto error2;
-        }
-
-        p_sys->p_thread->fd = net_Accept( p_access, p_fd_listen, -1 );
-
-        net_ListenClose( p_fd_listen );
-
-        if( rtmp_handshake_passive( p_this, p_sys->p_thread->fd ) < 0 )
-        {
-            msg_Err( p_access, "handshake passive failed");
-            goto error2;
-        }
-    }
-    else
-    {
-        msg_Err( p_access, "to be implemented" );
-        goto error2;
-    }
-
-    if( vlc_thread_create( p_sys->p_thread, "rtmp control thread", ThreadControl,