/*****************************************************************************
* Includes
*****************************************************************************/
-#define _GNU_SOURCE
-#include <stdlib.h> /* malloc(), free() */
-
#include <vlc/vlc.h>
+#include <assert.h>
+
#include <vlc_playlist.h>
#include <vlc_demux.h>
# include <zlib.h>
#endif
+#ifndef WIN32
+# include <net/if.h>
+#endif
+
/************************************************************************
* Macros and definitions
************************************************************************/
#define SAP_V4_LINK_ADDRESS "224.0.0.255"
#define ADD_SESSION 1
-#define SAP_V6_1 "FF0"
-/* Scope is inserted between them */
-#define SAP_V6_2 "::2:7FFE"
-/* See RFC3513 for list of valid scopes */
-/* FIXME: find a way to listen to link-local scope */
-static const char ipv6_scopes[] = "1456789ABCDE";
-
-
/*****************************************************************************
* Module descriptor
*****************************************************************************/
"can specify a specific address." )
#define SAP_IPV4_TEXT N_( "IPv4 SAP" )
#define SAP_IPV4_LONGTEXT N_( \
- "Listen to IPv4 announcements " \
- "on the standard address." )
+ "Listen to IPv4 announcements on the standard addresses." )
#define SAP_IPV6_TEXT N_( "IPv6 SAP" )
#define SAP_IPV6_LONGTEXT N_( \
- "Listen to IPv6 announcements " \
- "on the standard addresses." )
+ "Listen to IPv6 announcements on the standard addresses." )
#define SAP_SCOPE_TEXT N_( "IPv6 SAP scope" )
#define SAP_SCOPE_LONGTEXT N_( \
"Scope for IPv6 announcements (default is 8)." )
set_callbacks( Open, Close );
add_submodule();
- set_description( _("SDP file parser for UDP") );
+ set_description( _("SDP Descriptions parser") );
add_shortcut( "sdp" );
set_capability( "demux2", 51 );
set_callbacks( OpenDemux, CloseDemux );
/* medias (well, we only support one atm) */
unsigned mediac;
- struct sdp_media_t mediav[1];
+ struct sdp_media_t *mediav;
};
struct attribute_t
sdp_t *p_sdp;
int i_input_id;
- int i_item_id_cat;
- int i_item_id_one;
};
struct services_discovery_sys_t
int i_fd;
int *pi_fd;
- /* playlist node */
- playlist_item_t *p_node_cat;
- playlist_item_t *p_node_one;
-
/* Table of announces */
int i_announces;
struct sap_announce_t **pp_announces;
#endif
/* Cache sap_timeshift value */
- p_sys->b_timeshift = var_CreateGetInteger( p_sd, "sap-timeshift" )
- ? VLC_TRUE : VLC_FALSE;
+ p_sys->b_timeshift = var_CreateGetInteger( p_sd, "sap-timeshift" );
- /* Create our playlist node */
- pl_Yield( p_sd );
+ /* Set our name */
+ services_discovery_SetLocalizedName( p_sd, _("SAP") );
- playlist_NodesPairCreate( pl_Get( p_sd ), _("SAP sessions"),
- &p_sys->p_node_cat, &p_sys->p_node_one,
- VLC_TRUE );
- p_sys->p_node_cat->p_input->b_prefers_tree = VLC_TRUE;
p_sys->i_announces = 0;
p_sys->pp_announces = NULL;
static int OpenDemux( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
- uint8_t *p_peek;
- int i_max_sdp = 1024;
- int i_sdp = 0;
+ const uint8_t *p_peek;
char *psz_sdp = NULL;
sdp_t *p_sdp = NULL;
+ int errval = VLC_EGENERIC;
+ size_t i_len;
if( !var_CreateGetInteger( p_demux, "sap-parse" ) )
{
return VLC_EGENERIC;
}
- /* Probe for SDP */
- if( p_demux->s )
- {
- if( stream_Peek( p_demux->s, &p_peek, 7 ) < 7 ) return VLC_EGENERIC;
+ assert( p_demux->s ); /* this is NOT an access_demux */
- 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] != '=' ) )
- {
- return VLC_EGENERIC;
- }
- }
+ /* Probe for SDP */
+ if( stream_Peek( p_demux->s, &p_peek, 7 ) < 7 )
+ return VLC_EGENERIC;
- psz_sdp = (char *)malloc( i_max_sdp );
- if( !psz_sdp ) return VLC_EGENERIC;
+ if( memcmp( p_peek, "v=0\r\no=", 7 ) && memcmp( p_peek, "v=0\no=", 6 ) )
+ return VLC_EGENERIC;
/* Gather the complete sdp file */
- for( ;; )
+ for( i_len = 0, psz_sdp = NULL; i_len < 65536; )
{
- int i_read = stream_Read( p_demux->s,
- &psz_sdp[i_sdp], i_max_sdp - i_sdp - 1 );
-
- if( i_read < 0 )
+ const int i_read_max = 1024;
+ char *psz_sdp_new = realloc( psz_sdp, i_len + i_read_max );
+ size_t i_read;
+ if( psz_sdp_new == NULL )
{
- msg_Err( p_demux, "failed to read SDP" );
+ errval = VLC_ENOMEM;
goto error;
}
+ psz_sdp = psz_sdp_new;
- i_sdp += i_read;
-
- if( i_read < i_max_sdp - i_sdp - 1 )
+ i_read = stream_Read( p_demux->s, &psz_sdp[i_len], i_read_max );
+ if( i_read < 0 )
{
- psz_sdp[i_sdp] = '\0';
- break;
+ msg_Err( p_demux, "cannot read SDP" );
+ goto error;
}
+ i_len += i_read;
+
+ psz_sdp[i_len] = '\0';
- i_max_sdp += 1000;
- psz_sdp = (char *)realloc( psz_sdp, i_max_sdp );
+ if( i_read < i_read_max )
+ break; // EOF
}
p_sdp = ParseSDP( VLC_OBJECT(p_demux), psz_sdp );
FREENULL( psz_sdp );
if( p_sdp ) FreeSDP( p_sdp ); p_sdp = NULL;
stream_Seek( p_demux->s, 0 );
- return VLC_EGENERIC;
+ return errval;
}
/*****************************************************************************
}
FREENULL( p_sys->pp_announces );
- playlist_NodeDelete( pl_Get(p_sd), p_sys->p_node_cat, VLC_TRUE,
- VLC_TRUE );
- playlist_NodeDelete( pl_Get(p_sd), p_sys->p_node_one, VLC_TRUE,
- VLC_TRUE );
pl_Release( p_sd );
free( p_sys );
}
}
if( var_CreateGetInteger( p_sd, "sap-ipv6" ) )
{
- char psz_address[] = SAP_V6_1"0"SAP_V6_2;
- const char *c_scope;
+ char psz_address[NI_MAXNUMERICHOST] = "ff02::2:7ffe%";
+
+#ifndef WIN32
+ struct if_nameindex *l = if_nameindex ();
+ if (l != NULL)
+ {
+ char *ptr = strchr (psz_address, '%') + 1;
+ for (unsigned i = 0; l[i].if_index; i++)
+ {
+ strcpy (ptr, l[i].if_name);
+ InitSocket (p_sd, psz_address, SAP_PORT);
+ }
+ if_freenameindex (l);
+ }
+#else
+ /* this is the Winsock2 equivalant of SIOCGIFCONF on BSD stacks,
+ which if_nameindex uses internally anyway */
+
+ // first create a dummy socket to pin down the protocol family
+ SOCKET s = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP);
+ if( s != INVALID_SOCKET )
+ {
+ INTERFACE_INFO ifaces[10]; // Assume there will be no more than 10 IP interfaces
+ size_t len = sizeof(ifaces);
+
+ if( SOCKET_ERROR != WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, &ifaces, len, &len, NULL, NULL) )
+ {
+ unsigned ifcount = len/sizeof(INTERFACE_INFO);
+ char *ptr = strchr (psz_address, '%') + 1;
+ for(unsigned i = 1; i<=ifcount; ++i )
+ {
+ // append link-local zone identifier
+ sprintf(ptr, "%d", i);
+ }
+ }
+ closesocket(s);
+ }
+#endif
+ *strchr (psz_address, '%') = '\0';
- for( c_scope = ipv6_scopes; *c_scope; c_scope++ )
+ static const char ipv6_scopes[] = "1456789ABCDE";
+ for (const char *c_scope = ipv6_scopes; *c_scope; c_scope++)
{
- psz_address[sizeof(SAP_V6_1) - 1] = *c_scope;
+ psz_address[3] = *c_scope;
InitSocket( p_sd, psz_address, SAP_PORT );
}
}
return VLC_EGENERIC;
}
- p_parent_input = input_GetItem(p_input);
+ p_parent_input = input_GetItem( p_input );
+
+ input_item_SetURI( p_parent_input, p_sdp->psz_uri );
+ input_item_SetName( p_parent_input, p_sdp->psz_sessionname );
vlc_mutex_lock( &p_parent_input->lock );
- FREENULL( p_parent_input->psz_uri );
- p_parent_input->psz_uri = strdup( p_sdp->psz_uri );
- FREENULL( p_parent_input->psz_name );
- p_parent_input->psz_name = strdup( p_sdp->psz_sessionname );
+
p_parent_input->i_type = ITEM_TYPE_NET;
if( p_playlist->status.p_item &&
sdp_t *p_sdp )
{
input_item_t *p_input;
- playlist_item_t *p_item, *p_child;
const char *psz_value;
sap_announce_t *p_sap = (sap_announce_t *)malloc(
sizeof(sap_announce_t ) );
psz_value = GetAttribute( p_sap->p_sdp->pp_attributes, p_sap->p_sdp->i_attributes, "tool" );
if( psz_value != NULL )
{
- input_ItemAddInfo( p_input, _("Session"),_("Tool"), psz_value );
+ input_ItemAddInfo( p_input, _("Session"), _("Tool"), "%s",
+ psz_value );
}
if( strcmp( p_sdp->username, "-" ) )
{
- input_ItemAddInfo( p_input, _("Session"),
- _("User"), p_sdp->username );
+ input_ItemAddInfo( p_input, _("Session"), _("User"), "%s",
+ p_sdp->username );
}
/* Handle group */
else
psz_value = GetAttribute( p_sap->p_sdp->pp_attributes, p_sap->p_sdp->i_attributes, "x-plgroup" );
- if( psz_value != NULL )
- {
- p_child = playlist_ChildSearchName( p_sys->p_node_cat, psz_value );
-
- if( p_child == NULL )
- {
- p_child = playlist_NodeCreate( pl_Get( p_sd ), psz_value,
- p_sys->p_node_cat, 0 );
- p_child->i_flags &= ~PLAYLIST_SKIP_FLAG;
- }
- }
- else
- {
- p_child = p_sys->p_node_cat;
- }
-
- p_item = playlist_NodeAddInput( pl_Get( p_sd ), p_input, p_child,
- PLAYLIST_APPEND, PLAYLIST_END, VLC_FALSE );
- p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
- p_item->i_flags &= ~PLAYLIST_SAVE_FLAG;
- p_sap->i_item_id_cat = p_item->i_id;
-
- p_item = playlist_NodeAddInput( pl_Get( p_sd ), p_input,
- p_sys->p_node_one, PLAYLIST_APPEND, PLAYLIST_END,
- VLC_FALSE );
- p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
- p_item->i_flags &= ~PLAYLIST_SAVE_FLAG;
- p_sap->i_item_id_one = p_item->i_id;
+ services_discovery_AddItem( p_sd, p_input, psz_value /* category name */ );
TAB_APPEND( p_sys->i_announces, p_sys->pp_announces, p_sap );
/* Fill p_sdp->psz_uri */
static int ParseConnection( vlc_object_t *p_obj, sdp_t *p_sdp )
{
- if (p_sdp->mediac != 1)
+ if (p_sdp->mediac == 0)
+ {
+ msg_Dbg (p_obj, "Ignoring SDP with no media");
+ return VLC_EGENERIC;
+ }
+
+ for (unsigned i = 1; i < p_sdp->mediac; i++)
+ {
+ if ((p_sdp->mediav[i].n_addr != p_sdp->mediav->n_addr)
+ || (p_sdp->mediav[i].addrlen != p_sdp->mediav->addrlen)
+ || memcmp (&p_sdp->mediav[i].addr, &p_sdp->mediav->addr,
+ p_sdp->mediav->addrlen))
+ {
+ msg_Dbg (p_obj, "Multiple media ports not supported -> live555");
+ return VLC_EGENERIC;
+ }
+ }
+
+ if (p_sdp->mediav->n_addr != 1)
+ {
+ msg_Dbg (p_obj, "Layered encoding not supported -> live555");
return VLC_EGENERIC;
+ }
char psz_uri[1026];
const char *host;
int port;
psz_uri[0] = '[';
- if (vlc_getnameinfo ((struct sockaddr *)&(p_sdp->mediav[0].addr),
- p_sdp->mediav[0].addrlen, psz_uri + 1,
+ if (vlc_getnameinfo ((struct sockaddr *)&(p_sdp->mediav->addr),
+ p_sdp->mediav->addrlen, psz_uri + 1,
sizeof (psz_uri) - 2, &port, NI_NUMERICHOST))
return VLC_EGENERIC;
return VLC_ENOMEM;
char *subtype = strchr (sdp_proto, ' ');
- if (sdp_proto == NULL)
+ if (subtype == NULL)
{
msg_Dbg (p_obj, "missing SDP media subtype: %s", sdp_proto);
p_sdp->i_media_type = 0;
uint8_t flags = 0;
for (const char *proto = proto_match; *proto;)
{
- if (strcasecmp (proto, sdp_proto))
+ if (strcasecmp (proto, sdp_proto) == 0)
{
vlc_proto = proto + strlen (proto) + 1;
flags = vlc_proto[strlen (vlc_proto) + 1];
memset (&glob_addr, 0, sizeof (glob_addr));
socklen_t glob_len = 0;
unsigned glob_count = 1;
+ int port = 0;
/* TODO: use iconv and charset attribute instead of EnsureUTF8 */
while (*psz_sdp)
/* Media description */
case 'm':
+ media:
{
expect = 'i';
if (cat != 'm')
msg_Dbg (p_obj, "missing SDP media description");
goto error;
}
- struct sdp_media_t *m = p_sdp->mediav + p_sdp->mediac;
+ struct sdp_media_t *m;
+ m = realloc (p_sdp->mediav, (p_sdp->mediac + 1) * sizeof (*m));
+ if (m == NULL)
+ goto error;
+
+ p_sdp->mediav = m;
+ m += p_sdp->mediac;
+ p_sdp->mediac++;
+ memset (m, 0, sizeof (*m));
memcpy (&m->addr, &glob_addr, m->addrlen = glob_len);
m->n_addr = glob_count;
msg_Dbg (p_obj, "missing SDP media port");
goto error;
}
- int port = atoi (++data);
+ port = atoi (++data);
if (port <= 0 || port >= 65536)
{
msg_Dbg (p_obj, "invalid transport port %d", port);
if (m->fmt == NULL)
goto error;
- p_sdp->mediac++;
break;
}
case 'i':
"%s", data);
goto error;
}
+ net_SetPort ((struct sockaddr *)&m->addr, htons (port));
break;
}
case 'b':
}
if (cat == 'm')
- {
- /* TODO */
- msg_Dbg (p_obj, "multi-media SDP not implemented -> live555");
- goto error;
- }
+ goto media;
if (cat != 'm')
{
if (i_fd == -1)
return VLC_EGENERIC;
- net_StopSend( i_fd );
+ shutdown( i_fd, SHUT_WR );
INSERT_ELEM (p_sd->p_sys->pi_fd, p_sd->p_sys->i_fd,
p_sd->p_sys->i_fd, i_fd);
return VLC_SUCCESS;
free (p_sdp->mediav[j].fmt);
for (int i = 0; i < p_sdp->mediav[j].i_attributes; i++)
FreeAttribute (p_sdp->mediav[j].pp_attributes[i]);
+ free (p_sdp->mediav[j].pp_attributes);
}
+ free (p_sdp->mediav);
for (int i = 0; i < p_sdp->i_attributes; i++)
FreeAttribute (p_sdp->pp_attributes[i]);
projects / vlc / blobdiff