/*****************************************************************************
* Includes
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <assert.h>
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
+#ifdef HAVE_POLL
+# include <poll.h>
+#endif
#ifdef HAVE_ZLIB_H
# include <zlib.h>
struct sap_announce_t
{
mtime_t i_last;
+ mtime_t i_period;
+ uint8_t i_period_trust;
uint16_t i_hash;
uint32_t i_source[4];
static int Decompress( const unsigned char *psz_src, unsigned char **_dst, int i_len );
static void FreeSDP( sdp_t *p_sdp );
+static inline int min_int( int a, int b )
+{
+ return a > b ? b : a;
+}
+
/*****************************************************************************
* Open: initialize and create stuff
*****************************************************************************/
static int OpenDemux( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
- uint8_t *p_peek;
+ const uint8_t *p_peek;
char *psz_sdp = NULL;
sdp_t *p_sdp = NULL;
int errval = VLC_EGENERIC;
psz_sdp = psz_sdp_new;
i_read = stream_Read( p_demux->s, &psz_sdp[i_len], i_read_max );
- if( i_read < 0 )
+ if( (int)i_read < 0 )
{
msg_Err( p_demux, "cannot read SDP" );
goto error;
psz_sdp[i_len] = '\0';
- if( i_read < i_read_max )
+ if( (int)i_read < i_read_max )
break; // EOF
}
}
FREENULL( p_sys->pp_announces );
- pl_Release( p_sd );
free( p_sys );
}
{
char *psz_addr;
int i;
+ int timeout = -1;
/* Braindead Winsock DNS resolver will get stuck over 2 seconds per failed
* DNS queries, even if the DNS server returns an error with milliseconds.
if( s != INVALID_SOCKET )
{
INTERFACE_INFO ifaces[10]; // Assume there will be no more than 10 IP interfaces
- size_t len = sizeof(ifaces);
+ size_t len = sizeof(ifaces);
if( SOCKET_ERROR != WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, &ifaces, len, &len, NULL, NULL) )
{
return;
}
+ vlc_object_lock( p_sd );
+
/* read SAP packets */
- while( !p_sd->b_die )
+ while( vlc_object_alive( p_sd ) )
{
- int i_read;
- uint8_t p_buffer[MAX_SAP_BUFFER+1];
+ unsigned n = p_sd->p_sys->i_fd;
+ struct pollfd ufd[n+1];
+
+ for (unsigned i = 0; i < n; i++)
+ {
+ ufd[i].fd = p_sd->p_sys->pi_fd[i];
+ ufd[i].events = POLLIN;
+ ufd[i].revents = 0;
+ }
- i_read = net_Select( p_sd, p_sd->p_sys->pi_fd,
- p_sd->p_sys->i_fd, p_buffer,
- MAX_SAP_BUFFER );
+ /* Make sure we track vlc_object_signal() */
+ ufd[n].fd = vlc_object_waitpipe( p_sd );
+ ufd[n].events = POLLIN | POLLHUP;
+ ufd[n].revents = 0;
- /* Check for items that need deletion */
- for( i = 0; i < p_sd->p_sys->i_announces; i++ )
+ if( ufd[n].fd == -1 )
{
- mtime_t i_timeout = ( mtime_t ) 1000000 * p_sd->p_sys->i_timeout;
+ /* On windows, fd will be -1, as we can't select on a pipe()-ed
+ * fildes. Because we have no other solution to track that
+ * object is killed, we make sure the timeout won't be to long. */
+ if( timeout > 1000 || timeout == -1 )
+ timeout = 1000;
+ }
- if( mdate() - p_sd->p_sys->pp_announces[i]->i_last > i_timeout )
+ vlc_object_unlock( p_sd );
+
+ if (poll (ufd, n+1, timeout) > 0)
+ {
+ for (unsigned i = 0; i < n; i++)
{
- RemoveAnnounce( p_sd, p_sd->p_sys->pp_announces[i] );
+ if (ufd[i].revents)
+ {
+ uint8_t p_buffer[MAX_SAP_BUFFER+1];
+ ssize_t i_read;
+
+ i_read = net_Read (p_sd, ufd[i].fd, NULL, p_buffer,
+ MAX_SAP_BUFFER, VLC_FALSE);
+ if (i_read < 0)
+ msg_Warn (p_sd, "receive error: %m");
+ if (i_read > 6)
+ {
+ /* Parse the packet */
+ p_buffer[i_read] = '\0';
+ ParseSAP (p_sd, p_buffer, i_read);
+ }
+ }
}
}
- /* Minimum length is > 6 */
- if( i_read <= 6 )
+ mtime_t now = mdate();
+
+ /* A 1 hour timeout correspong to the RFC Implicit timeout.
+ * This timeout is tuned in the following loop. */
+ timeout = 1000 * 60 * 60;
+
+ /* Check for items that need deletion */
+ for( i = 0; i < p_sd->p_sys->i_announces; i++ )
{
- if( i_read < 0 )
+ mtime_t i_timeout = ( mtime_t ) 1000000 * p_sd->p_sys->i_timeout;
+ sap_announce_t * p_announce = p_sd->p_sys->pp_announces[i];
+ mtime_t i_last_period = now - p_announce->i_last;
+
+ /* Remove the annoucement, if the last announcement was 1 hour ago
+ * or if the last packet emitted was 3 times the average time
+ * between two packets */
+ if( ( p_announce->i_period_trust > 5 && i_last_period > 3 * p_announce->i_period ) ||
+ i_last_period > i_timeout )
+ {
+ RemoveAnnounce( p_sd, p_announce );
+ }
+ else
{
- msg_Warn( p_sd, "socket read error" );
+ /* Compute next timeout */
+ if( p_announce->i_period_trust > 5 )
+ timeout = min_int((3 * p_announce->i_period - i_last_period) / 1000, timeout);
+ timeout = min_int((i_timeout - i_last_period)/1000, timeout);
}
- continue;
}
- p_buffer[i_read] = '\0';
+ if( !p_sd->p_sys->i_announces )
+ timeout = -1; /* We can safely poll indefinitly. */
+ else if( timeout < 200 )
+ timeout = 200; /* Don't wakeup too fast. */
- /* Parse the packet */
- ParseSAP( p_sd, p_buffer, i_read );
+ vlc_object_lock( p_sd );
}
+ vlc_object_unlock( p_sd );
}
/**********************************************************************
static int Control( demux_t *p_demux, int i_query, va_list args )
{
+ VLC_UNUSED(p_demux); VLC_UNUSED(i_query); VLC_UNUSED(args);
return VLC_EGENERIC;
}
for( i = 0 ; i< p_sd->p_sys->i_announces ; i++ )
{
+ sap_announce_t * p_announce = p_sd->p_sys->pp_announces[i];
/* FIXME: slow */
/* FIXME: we create a new announce each time the sdp changes */
- if( IsSameSession( p_sd->p_sys->pp_announces[i]->p_sdp, p_sdp ) )
+ if( IsSameSession( p_announce->p_sdp, p_sdp ) )
{
- if( b_need_delete )
+ /* We don't support delete announcement as they can easily
+ * Be used to highjack an announcement by a third party.
+ * Intead we cleverly implement Implicit Announcement removal.
+ *
+ * if( b_need_delete )
+ * RemoveAnnounce( p_sd, p_sd->p_sys->pp_announces[i]);
+ * else
+ */
+
+ if( !b_need_delete )
{
- RemoveAnnounce( p_sd, p_sd->p_sys->pp_announces[i]);
- }
- else
- {
- p_sd->p_sys->pp_announces[i]->i_last = mdate();
+ /* No need to go after six, as we start to trust the
+ * average period at six */
+ if( p_announce->i_period_trust <= 5 )
+ p_announce->i_period_trust++;
+
+ /* Compute the average period */
+ p_announce->i_period = (p_announce->i_period + (mdate() - p_announce->i_last)) / 2;
+ p_announce->i_last = mdate();
}
FreeSDP( p_sdp ); p_sdp = NULL;
return VLC_SUCCESS;
p_sys = p_sd->p_sys;
p_sap->i_last = mdate();
+ p_sap->i_period = 0;
+ p_sap->i_period_trust = 0;
p_sap->i_hash = i_hash;
p_sap->p_sdp = p_sdp;
services_discovery_AddItem( p_sd, p_input, psz_value /* category name */ );
TAB_APPEND( p_sys->i_announces, p_sys->pp_announces, p_sap );
-
+ vlc_gc_decref( p_input );
return p_sap;
}
if (strchr (psz_uri + 1, ':'))
{
host = psz_uri;
- psz_uri[strlen (psz_uri)] = ']';
+ strcat (psz_uri, "]");
}
else
host = psz_uri + 1;
psz_source_ip) == 2)
{
/* According to RFC4570, FQDNs can be used for source-filters,
- * but -seriously- this is impractical */
+ * but -seriously- this is impractical */
switch (ipv)
{
#ifdef AF_INET6