Commit 49d2b0ef authored by Dennis van Amerongen's avatar Dennis van Amerongen

* modules/access_output/shout.c: Revert [23295], [23317] and [23318] -...

* modules/access_output/shout.c: Revert [23295], [23317] and [23318] - Autoreconnect mechanism (not all issues are covered yet for bugfix). Reopened #1167 for now
parent 4e63be9e
...@@ -215,10 +215,17 @@ static int Open( vlc_object_t *p_this ) ...@@ -215,10 +215,17 @@ static int Open( vlc_object_t *p_this )
return VLC_EGENERIC; return VLC_EGENERIC;
} }
/* Connect at startup. Cycle through the possible protocols. */ /* Shoutcast using ICY protocol */
i_ret = shout_get_connected( p_shout ); i_ret = shout_open( p_shout );
while ( i_ret != SHOUTERR_CONNECTED ) if( i_ret == SHOUTERR_SUCCESS )
{ {
i_ret = SHOUTERR_CONNECTED;
msg_Dbg( p_access, "connected using 'icy' (shoutcast) protocol" );
}
else
{
msg_Warn( p_access, "failed to connect using 'icy' (shoutcast) protocol" );
/* Shout parameters cannot be changed on an open connection */ /* Shout parameters cannot be changed on an open connection */
i_ret = shout_close( p_shout ); i_ret = shout_close( p_shout );
if( i_ret == SHOUTERR_SUCCESS ) if( i_ret == SHOUTERR_SUCCESS )
...@@ -226,67 +233,34 @@ static int Open( vlc_object_t *p_this ) ...@@ -226,67 +233,34 @@ static int Open( vlc_object_t *p_this )
i_ret = SHOUTERR_UNCONNECTED; i_ret = SHOUTERR_UNCONNECTED;
} }
/* Re-initialize for Shoutcast using ICY protocol. Not needed for initial connection /* IceCAST using HTTP protocol */
but it is when we are reconnecting after other protocol was tried. */ i_ret = shout_set_protocol( p_shout, SHOUT_PROTOCOL_HTTP );
i_ret = shout_set_protocol( p_shout, SHOUT_PROTOCOL_ICY );
if( i_ret != SHOUTERR_SUCCESS ) if( i_ret != SHOUTERR_SUCCESS )
{ {
msg_Err( p_access, "failed to set the protocol to 'icy'" ); msg_Err( p_access, "failed to set the protocol to 'http'" );
free( p_access->p_sys ); free( p_access->p_sys );
free( psz_accessname ); free( psz_accessname );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
i_ret = shout_open( p_shout ); i_ret = shout_open( p_shout );
if( i_ret == SHOUTERR_SUCCESS ) if( i_ret == SHOUTERR_SUCCESS )
{ {
i_ret = SHOUTERR_CONNECTED; i_ret = SHOUTERR_CONNECTED;
msg_Dbg( p_access, "connected using 'icy' (shoutcast) protocol" ); msg_Dbg( p_access, "connected using 'http' (icecast 2.x) protocol" );
} }
else else
{ msg_Warn( p_access, "failed to connect using 'http' (icecast 2.x) protocol " );
msg_Warn( p_access, "failed to connect using 'icy' (shoutcast) protocol" );
/* Shout parameters cannot be changed on an open connection */
i_ret = shout_close( p_shout );
if( i_ret == SHOUTERR_SUCCESS )
{
i_ret = SHOUTERR_UNCONNECTED;
}
/* IceCAST using HTTP protocol */
i_ret = shout_set_protocol( p_shout, SHOUT_PROTOCOL_HTTP );
if( i_ret != SHOUTERR_SUCCESS )
{
msg_Err( p_access, "failed to set the protocol to 'http'" );
free( p_access->p_sys );
free( psz_accessname );
return VLC_EGENERIC;
}
i_ret = shout_open( p_shout );
if( i_ret == SHOUTERR_SUCCESS )
{
i_ret = SHOUTERR_CONNECTED;
msg_Dbg( p_access, "connected using 'http' (icecast 2.x) protocol" );
}
else
msg_Warn( p_access, "failed to connect using 'http' (icecast 2.x) protocol " );
}
/*
for non-blocking, use:
while( i_ret == SHOUTERR_BUSY )
{
sleep( 1 );
i_ret = shout_get_connected( p_shout );
}
*/
/* Only wait when we have no connection */
if ( i_ret != SHOUTERR_CONNECTED )
{
msg_Warn( p_access, "unable to establish connection. waiting 30 seconds to retry..." );
msleep( 30000000 );
}
} }
/*
for non-blocking, use:
while( i_ret == SHOUTERR_BUSY )
{
sleep( 1 );
i_ret = shout_get_connected( p_shout );
}
*/
if( i_ret != SHOUTERR_CONNECTED ) if( i_ret != SHOUTERR_CONNECTED )
{ {
msg_Err( p_access, "failed to open shout stream to %s:%i/%s: %s", msg_Err( p_access, "failed to open shout stream to %s:%i/%s: %s",
...@@ -368,25 +342,6 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer ) ...@@ -368,25 +342,6 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer )
{ {
msg_Err( p_access, "cannot write to stream: %s", msg_Err( p_access, "cannot write to stream: %s",
shout_get_error(p_access->p_sys->p_shout) ); shout_get_error(p_access->p_sys->p_shout) );
/* The most common cause seems to be a server disconnect, resulting in a
Socket Error which can only be fixed by closing and reconnecting.
Since we already began with a working connection, the most feasable
approach to get out of this error status is a (timed) reconnect approach. */
shout_close( p_access->p_sys->p_shout );
msg_Warn( p_access, "server unavailable? waiting 30 seconds to reconnect..." );
msleep( 30000000 );
/* Re-open the connection (protocol params have already been set) and re-sync */
if( shout_open( p_access->p_sys->p_shout ) == SHOUTERR_SUCCESS )
{
shout_sync( p_access->p_sys->p_shout );
msg_Warn( p_access, "reconnected to server" );
}
else
{
msg_Err( p_access, "failed to reconnect to server" );
}
} }
block_Release( p_buffer ); block_Release( p_buffer );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment