/*****************************************************************************
* sap.c : SAP interface module
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004-2005 VideoLAN
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
#include <vlc/input.h>
#include "network.h"
+#include "charset.h"
#include <errno.h> /* ENOMEM */
static void CloseDemux ( vlc_object_t * );
vlc_module_begin();
- set_description( _("SAP interface") );
+ set_shortname( _("SAP"));
+ set_description( _("SAP announces") );
set_category( CAT_PLAYLIST );
set_subcategory( SUBCAT_PLAYLIST_SD );
/* playlist node */
playlist_item_t *p_node;
+ /* charset conversion */
+ vlc_iconv_t iconvHandle;
+
/* Table of announces */
int i_announces;
struct sap_announce_t **pp_announces;
static void CacheLoad( services_discovery_t *p_sd );
static void CacheSave( services_discovery_t *p_sd );
/* Helper functions */
- static char *GetAttribute( sdp_t *p_sdp, const char *psz_search );
- static vlc_bool_t IsSameSession( sdp_t *p_sdp1, sdp_t *p_sdp2 );
- static int InitSocket( services_discovery_t *p_sd, char *psz_address, int i_port );
+ static char *GetAttribute( sdp_t *p_sdp, const char *psz_search );
+ static vlc_bool_t IsSameSession( sdp_t *p_sdp1, sdp_t *p_sdp2 );
+ static char *convert_from_utf8( struct services_discovery_t *p_sd,
+ char *psz_unicode );
+ static int InitSocket( services_discovery_t *p_sd, char *psz_address, int i_port );
#ifdef HAVE_ZLIB_H
- static int Decompress( unsigned char *psz_src, unsigned char **_dst, int i_len );
+ static int Decompress( unsigned char *psz_src, unsigned char **_dst, int i_len );
static void FreeSDP( sdp_t *p_sdp );
#endif
playlist_t *p_playlist;
playlist_view_t *p_view;
- char *psz_addr;
+ char *psz_addr, *psz_charset;
vlc_value_t val;
- p_sys->i_timeout = config_GetInt( p_sd,"sap-timeout" );
+ p_sys->i_timeout = var_CreateGetInteger( p_sd, "sap-timeout" );
+
+ vlc_current_charset( &psz_charset );
+ p_sys->iconvHandle = vlc_iconv_open( psz_charset, "UTF-8" );
+ free( psz_charset );
+ if( p_sys->iconvHandle == (vlc_iconv_t)(-1) )
+ {
+ msg_Warn( p_sd, "Unable to do requested conversion" );
+ }
p_sd->pf_run = Run;
p_sd->p_sys = p_sys;
p_sys->pi_fd = NULL;
p_sys->i_fd = 0;
- p_sys->b_strict = config_GetInt( p_sd, "sap-strict");
- p_sys->b_parse = config_GetInt( p_sd, "sap-parse" );
+ p_sys->b_strict = var_CreateGetInteger( p_sd, "sap-strict");
+ p_sys->b_parse = var_CreateGetInteger( p_sd, "sap-parse" );
- if( config_GetInt( p_sd, "sap-cache" ) )
+ if( var_CreateGetInteger( p_sd, "sap-cache" ) )
{
CacheLoad( p_sd );
}
- if( config_GetInt( p_sd, "sap-ipv4" ) )
+ if( var_CreateGetInteger( p_sd, "sap-ipv4" ) )
{
InitSocket( p_sd, SAP_V4_ADDRESS, SAP_PORT );
}
- if( config_GetInt( p_sd, "sap-ipv6" ) )
+ if( var_CreateGetInteger( p_sd, "sap-ipv6" ) )
{
/* [ + 8x4+7*':' + ] */
char psz_address[42];
char c_scope;
- char *psz_scope = config_GetPsz( p_sd, "sap-ipv6-scope" );
+ char *psz_scope = var_CreateGetString( p_sd, "sap-ipv6-scope" );
if( psz_scope == NULL || *psz_scope == '\0')
{
InitSocket( p_sd, psz_address, SAP_PORT );
}
- psz_addr = config_GetPsz( p_sd, "sap-addr" );
+ psz_addr = var_CreateGetString( p_sd, "sap-addr" );
if( psz_addr && *psz_addr )
{
InitSocket( p_sd, psz_addr, SAP_PORT );
if( p_sys->i_fd == 0 )
{
- msg_Err( p_sd, "unable to read on any address");
+ msg_Err( p_sd, "unable to read on any address" );
return VLC_EGENERIC;
}
p_view = playlist_ViewFind( p_playlist, VIEW_CATEGORY );
p_sys->p_node = playlist_NodeCreate( p_playlist, VIEW_CATEGORY,
_("SAP"), p_view->p_root );
+ p_sys->p_node->i_flags |= PLAYLIST_RO_FLAG;
val.b_bool = VLC_TRUE;
var_Set( p_playlist, "intf-change", val );
uint8_t *p_peek;
int i_max_sdp = 1024;
int i_sdp = 0;
- char *psz_sdp = (char *)malloc( i_max_sdp );
+ char *psz_sdp = NULL;
sdp_t *p_sdp = NULL;
- if( !psz_sdp )
- {
- return VLC_EGENERIC;
- }
-
-
/* Probe for SDP */
if( p_demux->s )
{
- if( stream_Peek( p_demux->s, &p_peek, 7 ) < 7 )
- {
- msg_Err( p_demux, "cannot peek" );
- return VLC_EGENERIC;
- }
+ if( stream_Peek( p_demux->s, &p_peek, 7 ) < 7 ) return VLC_EGENERIC;
+
if( strncmp( (char*)p_peek, "v=0\r\n", 5 ) &&
strncmp( (char*)p_peek, "v=0\n", 4 ) &&
( p_peek[0] < 'a' || p_peek[0] > 'z' || p_peek[1] != '=' ) )
{
- msg_Warn( p_demux, "SDP (UDP) module discarded" );
return VLC_EGENERIC;
}
}
+ psz_sdp = (char *)malloc( i_max_sdp );
+ if( !psz_sdp ) return VLC_EGENERIC;
+
/* Gather the complete sdp file */
for( ;; )
{
int i_read = stream_Read( p_demux->s,
&psz_sdp[i_sdp], i_max_sdp - i_sdp - 1 );
-
+
if( i_read < 0 )
-
{
msg_Err( p_demux, "failed to read SDP" );
goto error;
i_max_sdp += 1000;
psz_sdp = (uint8_t*)realloc( psz_sdp, i_max_sdp );
}
-
+
p_sdp = ParseSDP( VLC_OBJECT(p_demux), psz_sdp );
-
+
if( !p_sdp )
{
msg_Warn( p_demux, "invalid SDP");
goto error;
}
-
+
if( p_sdp->i_media > 1 )
{
goto error;
}
-
+
if( ParseConnection( VLC_OBJECT( p_demux ), p_sdp ) )
{
p_sdp->psz_uri = NULL;
}
- if( p_sdp->i_media_type != 33 && p_sdp->i_media_type != 32 && p_sdp->i_media_type != 14 )
+ if( p_sdp->i_media_type != 33 && p_sdp->i_media_type != 32 &&
+ p_sdp->i_media_type != 14 )
goto error;
-
+
if( p_sdp->psz_uri == NULL ) goto error;
p_demux->p_sys = (demux_sys_t *)malloc( sizeof(demux_sys_t) );
p_demux->pf_demux = Demux;
free( psz_sdp );
- if( p_sdp ) FreeSDP( p_sdp );
return VLC_SUCCESS;
-
+
error:
free( psz_sdp );
if( p_sdp ) FreeSDP( p_sdp );
if( p_playlist )
{
- playlist_NodeDelete( p_playlist, p_sys->p_node, VLC_TRUE );
+ playlist_NodeDelete( p_playlist, p_sys->p_node, VLC_TRUE , VLC_TRUE );
vlc_object_release( p_playlist );
}
+ if( p_sys->iconvHandle != (vlc_iconv_t)(-1) )
+ vlc_iconv_close( p_sys->iconvHandle );
+
free( p_sys );
}
static void Run( services_discovery_t *p_sd )
{
+ int i;
uint8_t *p_buffer;
- /* Dirty hack to slow down the startup of the sap interface */
- /* Unneeded now : our node is in no_select mode */
- // msleep( 500000 );
+ playlist_t *p_playlist;
/* read SAP packets */
while( !p_sd->b_die )
i_read = net_Select( p_sd, p_sd->p_sys->pi_fd, NULL,
p_sd->p_sys->i_fd, p_buffer,
MAX_SAP_BUFFER, 500000 );
-#if 0
+
/* Check for items that need deletion */
- for( i = 0 ; i< p_sd->p_sys->i_announces ; i++ )
+ for( i = 0; i < p_sd->p_sys->i_announces; i++ )
{
- struct sap_announce_t *p_announce;
- mtime_t i_timeout = ( mtime_t ) 1000000*p_sys->i_timeout;
- if( mdate() - p_sd->p_sys->pp_announces[i]->i_last > i_timeout )
- {
- msg_Dbg( p_sd,"Time out for %s, deleting (%i/%i)",
- p_sd->p_sys->pp_announces[i]->psz_name,
+ mtime_t i_timeout = ( mtime_t ) 1000000 * p_sd->p_sys->i_timeout;
+
+ if( mdate() - p_sd->p_sys->pp_announces[i]->i_last > i_timeout )
+ {
+ struct sap_announce_t *p_announce;
+ p_announce = p_sd->p_sys->pp_announces[i];
+
+ msg_Dbg( p_sd, "Time out for %s, deleting (%i/%i)",
+ p_announce->p_item->input.psz_name,
i , p_sd->p_sys->i_announces );
- /* Remove the playlist item */
- p_playlist = vlc_object_find( p_sd, VLC_OBJECT_PLAYLIST,
+ /* Remove the playlist item */
+ p_playlist = vlc_object_find( p_sd, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
- if( p_playlist )
- {
- int i_pos = playlist_GetPositionById( p_playlist,
- p_sd->p_sys->pp_announces[i]->i_id );
- playlist_Delete( p_playlist, i_pos );
- vlc_object_release( p_playlist );
- }
-
- /* Free the p_announce */
- p_announce = p_sd->p_sys->pp_announces[i];
- if( p_announce->psz_name )
- free( p_announce->psz_name );
- if( p_announce->psz_uri )
- free( p_announce->psz_uri );
-
- /* Remove the sap_announce from the array */
- REMOVE_ELEM( p_sd->p_sys->pp_announces,
- p_sd->p_sys->i_announces, i );
+ if( p_playlist )
+ {
+ playlist_Delete( p_playlist, p_announce->p_item->input.i_id );
+ vlc_object_release( p_playlist );
+ }
- free( p_announce );
+ /* Remove the sap_announce from the array */
+ REMOVE_ELEM( p_sd->p_sys->pp_announces,
+ p_sd->p_sys->i_announces, i );
- }
+ free( p_announce );
+ }
}
-#endif
/* Minimum length is > 6 */
if( i_read <= 6 )
sdp_t *p_sdp = p_demux->p_sys->p_sdp;
playlist_t *p_playlist;
- p_playlist = (playlist_t *)vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
+ p_playlist = (playlist_t *)vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
- p_playlist->status.p_item->i_flags |= PLAYLIST_DEL_FLAG;
+ p_playlist->status.p_item->i_flags |= PLAYLIST_DEL_FLAG;
- playlist_Add( p_playlist, p_sdp->psz_uri, p_sdp->psz_sessionname,
+ playlist_Add( p_playlist, p_sdp->psz_uri, p_sdp->psz_sessionname,
PLAYLIST_APPEND, PLAYLIST_END );
- vlc_object_release( p_playlist );
+ vlc_object_release( p_playlist );
+ if( p_sdp ) FreeSDP( p_sdp );
- return VLC_SUCCESS;
+ return VLC_SUCCESS;
}
static int Control( demux_t *p_demux, int i_query, va_list args )
/* First, check the sap announce is correct */
i_version = p_buffer[0] >> 5;
-
if( i_version != 1 )
{
msg_Dbg( p_sd, "strange sap version %d found", i_version );
psz_sdp += 4;
if( i_read <= 9 )
{
- msg_Warn( p_sd,"too short SAP packet\n" );
+ msg_Warn( p_sd, "too short SAP packet\n" );
return VLC_EGENERIC;
}
}
psz_sdp += 16;
if( i_read <= 21 )
{
- msg_Warn( p_sd,"too short SAP packet\n" );
+ msg_Warn( p_sd, "too short SAP packet\n" );
return VLC_EGENERIC;
}
}
char *psz_value;
sap_announce_t *p_sap = (sap_announce_t *)malloc(
sizeof(sap_announce_t ) );
- if( !p_sap )
+
+ psz_value = convert_from_utf8( p_sd, p_sdp->psz_sessionname );
+ if( p_sap == NULL || psz_value == NULL )
{
msg_Err( p_sd, "out of memory");
+ FREE( p_sap );
+ FREE( psz_value );
p_sd->b_die = VLC_TRUE;
return NULL;
}
p_sap->p_item = NULL;
/* Create the playlist item here */
- p_item = playlist_ItemNew( p_sd, p_sap->p_sdp->psz_uri,
- p_sap->p_sdp->psz_sessionname );
+ p_item = playlist_ItemNew( p_sd, p_sap->p_sdp->psz_uri, psz_value );
+ free( psz_value );
if( !p_item )
{
return NULL;
}
+ psz_value = GetAttribute( p_sap->p_sdp, "tool" );
+ if( psz_value != NULL )
+ {
+ vlc_input_item_AddInfo( &p_item->input, _("Session"),
+ _("Tool"), psz_value );
+ }
+ if( strcmp( p_sdp->psz_username, "-" ) )
+ {
+ vlc_input_item_AddInfo( &p_item->input, _("Session"),
+ _("User"), p_sdp->psz_username );
+ }
+
psz_value = GetAttribute( p_sap->p_sdp, "x-plgroup" );
if( psz_value == NULL )
if( psz_value != NULL )
{
- p_child = playlist_ChildSearchName( p_sd->p_sys->p_node, psz_value );
+ char *psz_grp = convert_from_utf8( p_sd, psz_value );
- if( p_child == NULL )
+ if( psz_grp != NULL )
+ {
+ p_child = playlist_ChildSearchName( p_sd->p_sys->p_node,
+ psz_grp );
+
+ if( p_child == NULL )
+ p_child = playlist_NodeCreate( p_playlist, VIEW_CATEGORY,
+ psz_grp, p_sd->p_sys->p_node );
+ free( psz_grp );
+ free( psz_value );
+ }
+ else
{
- p_child = playlist_NodeCreate( p_playlist, VIEW_CATEGORY,
- psz_value, p_sd->p_sys->p_node );
+ vlc_object_release( p_playlist );
+ msg_Err( p_sd, "out of memory");
+ free( psz_value );
+ free( p_sap );
+ return NULL;
}
}
else
}
p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
+ p_item->i_flags &= ~PLAYLIST_SAVE_FLAG;
playlist_NodeAddItem( p_playlist, p_item, VIEW_CATEGORY, p_child,
PLAYLIST_APPEND, PLAYLIST_END );
}
else
{
- msg_Dbg( p_obj, "incorrect c field");
+ msg_Dbg( p_obj, "incorrect c field, %s", p_sdp->psz_connection );
}
psz_uri = strdup( psz_parse );
}
else
{
- msg_Dbg( p_obj, "incorrect m field");
+ msg_Dbg( p_obj, "incorrect m field, %s", p_sdp->psz_media );
p_sdp->i_media_type = 33;
psz_proto = strdup( psz_parse );
}
free( psz_proto );
psz_proto = strdup( "rtp" );
}
- if( psz_proto && !strncmp( psz_proto, "UDP", 3 ) )
+ if( psz_proto && !strncasecmp( psz_proto, "UDP", 3 ) )
{
free( psz_proto );
psz_proto = strdup( "udp" );
}
-
/* FIXME: HTTP support */
sdp_t *p_sdp;
vlc_bool_t b_invalid = VLC_FALSE;
vlc_bool_t b_end = VLC_FALSE;
-
if( psz_sdp == NULL )
{
return NULL;
}
+static char *convert_from_utf8( struct services_discovery_t *p_sd,
+ char *psz_unicode )
+{
+ char *psz_local, *psz_in, *psz_out;
+ size_t ret, i_in, i_out;
+
+ if( psz_unicode == NULL )
+ return NULL;
+ if ( p_sd->p_sys->iconvHandle == (vlc_iconv_t)(-1) )
+ return strdup( psz_unicode );
+
+ psz_in = psz_unicode;
+ i_in = strlen( psz_unicode );
+
+ i_out = 2 * i_in;
+ psz_local = malloc( i_out + 1 );
+ if( psz_local == NULL )
+ return strdup( psz_unicode );
+ psz_out = psz_local;
+
+ ret = vlc_iconv( p_sd->p_sys->iconvHandle,
+ &psz_in, &i_in, &psz_out, &i_out);
+ if( ret == (size_t)(-1) || i_in )
+ {
+ msg_Warn( p_sd, "Failed to convert \"%s\" from UTF-8", psz_unicode );
+ return strdup( psz_unicode );
+ }
+ *psz_out = '\0';
+ return psz_local;
+}
+
+
/***********************************************************************
* ismult: returns true if we have a multicast address
***********************************************************************/
projects / vlc / blobdiff