[vlc-devel] commit: Remove non-sensical connect->listen transition ( Rémi Denis-Courmont )

Miguel Angel Cabrera macabrera at solaiemes.com
Sun May 25 13:41:49 CEST 2008


With this commit functionality is completely broken.

On Sat, 2008-05-24 at 18:58 +0200, git version control wrote:
> vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Sat May 24 20:00:02 2008 +0300| [e1b146414f8b85755fb917bbac941367fb3c4e15]
> 
> Remove non-sensical connect->listen transition
> 
> Thank you big time for committing stuff against people's review.
> 
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e1b146414f8b85755fb917bbac941367fb3c4e15
> ---
> 
>  modules/access_output/rtmp.c |   29 -----------------------------
>  1 files changed, 0 insertions(+), 29 deletions(-)
> 
> diff --git a/modules/access_output/rtmp.c b/modules/access_output/rtmp.c
> index c6ede29..fd826dc 100644
> --- a/modules/access_output/rtmp.c
> +++ b/modules/access_output/rtmp.c
> @@ -181,36 +181,7 @@ static int Open( vlc_object_t *p_this )
>      /* Open connection */
>      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,
>                             VLC_THREAD_PRIORITY_INPUT, false ) )
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> http://mailman.videolan.org/listinfo/vlc-devel




More information about the vlc-devel mailing list