From e1b146414f8b85755fb917bbac941367fb3c4e15 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 24 May 2008 20:00:02 +0300 Subject: [PATCH] Remove non-sensical connect->listen transition Thank you big time for committing stuff against people's review. --- modules/access_output/rtmp.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/modules/access_output/rtmp.c b/modules/access_output/rtmp.c index c6ede297bb..fd826dcb31 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 ) ) -- 2.39.5