Commit 672a85d7 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

SAP out: no need for net_Write here

parent 0bdeef7e
...@@ -82,7 +82,7 @@ struct sap_address_t ...@@ -82,7 +82,7 @@ struct sap_address_t
/* A SAP session descriptor, enqueued in the SAP handler queue */ /* A SAP session descriptor, enqueued in the SAP handler queue */
struct sap_session_t { struct sap_session_t {
uint8_t *psz_data; uint8_t *psz_data;
unsigned i_length; size_t i_length;
sap_address_t *p_address; sap_address_t *p_address;
session_descriptor_t *p_sd; session_descriptor_t *p_sd;
...@@ -193,10 +193,7 @@ static void * RunThread( vlc_object_t *p_this) ...@@ -193,10 +193,7 @@ static void * RunThread( vlc_object_t *p_this)
sap_handler_t *p_sap = (sap_handler_t*)p_this; sap_handler_t *p_sap = (sap_handler_t*)p_this;
sap_session_t *p_session; sap_session_t *p_session;
int canc = vlc_savecancel (); int canc = vlc_savecancel ();
/* TODO: Once net_Write() is cancel-safe, so will this whole thread. /* TODO: Use poll() instead of msleep()). */
* However, there is a more serious issues here: msleep(SAP_IDLE).
* This thread should really use poll().
*/
while( !p_sap->b_die ) while( !p_sap->b_die )
{ {
...@@ -551,8 +548,6 @@ static int announce_SAPAnnounceDel( sap_handler_t *p_sap, ...@@ -551,8 +548,6 @@ static int announce_SAPAnnounceDel( sap_handler_t *p_sap,
static int announce_SendSAPAnnounce( sap_handler_t *p_sap, static int announce_SendSAPAnnounce( sap_handler_t *p_sap,
sap_session_t *p_session ) sap_session_t *p_session )
{ {
int i_ret;
/* This announce has never been sent yet */ /* This announce has never been sent yet */
if( p_session->i_last == 0 ) if( p_session->i_last == 0 )
{ {
...@@ -563,15 +558,11 @@ static int announce_SendSAPAnnounce( sap_handler_t *p_sap, ...@@ -563,15 +558,11 @@ static int announce_SendSAPAnnounce( sap_handler_t *p_sap,
if( p_session->i_next < mdate() ) if( p_session->i_next < mdate() )
{ {
#ifdef EXTRA_DEBUG ssize_t i_ret = send( p_session->p_address->i_wfd, p_session->psz_data,
msg_Dbg( p_sap, "sending announce"); p_session->i_length, 0 );
#endif if( i_ret != (ssize_t)p_session->i_length )
i_ret = net_Write( p_sap, p_session->p_address->i_wfd, NULL,
p_session->psz_data,
p_session->i_length );
if( i_ret != (int)p_session->i_length )
{ {
msg_Warn( p_sap, "SAP send failed on address %s (%i %i)", msg_Warn( p_sap, "SAP send failed on address %s (%zd/%zu)",
p_session->p_address->psz_address, p_session->p_address->psz_address,
i_ret, p_session->i_length ); i_ret, p_session->i_length );
} }
......
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