X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fstream_output%2Fsap.c;h=b2782c7030e8a3c362aba396e1da04841415d078;hb=88148cbd02ad19ec15d540f3413f80b7c7a39e6d;hp=5daec1956c121ba05810b943c7956d7bf2afc34c;hpb=e7440c3ba1ccd9169914d32b8f1b6ca09c7d2d5e;p=vlc diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c index 5daec1956c..b2782c7030 100644 --- a/src/stream_output/sap.c +++ b/src/stream_output/sap.c @@ -1,7 +1,7 @@ /***************************************************************************** * sap.c : SAP announce handler ***************************************************************************** - * Copyright (C) 2002-2005 the VideoLAN team + * Copyright (C) 2002-2007 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -19,34 +19,25 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ + +#include + #include /* free() */ #include /* sprintf() */ #include /* strerror() */ #include /* tolower(), isxdigit() */ -#include -#include - -#include "network.h" -#if defined( WIN32 ) || defined( UNDER_CE ) -# if defined(UNDER_CE) && defined(sockaddr_storage) -# undef sockaddr_storage -# endif -# include -# include -#else -# include -# ifdef HAVE_ARPA_INET_H -# include -# endif -#endif -#include "charset.h" +#include +#include +#include + +#include "stream_output.h" /* SAP is always on that port */ #define SAP_PORT 9875 @@ -68,8 +59,8 @@ struct sap_address_t { char *psz_address; - char psz_machine[NI_MAXNUMERICHOST]; - int i_port; + struct sockaddr_storage orig; + socklen_t origlen; int i_rfd; /* Read socket */ int i_wfd; /* Write socket */ @@ -82,14 +73,26 @@ struct sap_address_t int i_limit; }; +/* A SAP session descriptor, enqueued in the SAP handler queue */ +struct sap_session_t { + uint8_t *psz_data; + unsigned i_length; + sap_address_t *p_address; + session_descriptor_t *p_sd; + + /* Last and next send */ + mtime_t i_last; + mtime_t i_next; +}; + /***************************************************************************** * Local prototypes *****************************************************************************/ static void RunThread( vlc_object_t *p_this); -static int CalculateRate( sap_handler_t *p_sap, sap_address_t *p_address ); +static int ComputeRate( sap_address_t *p_address ); static char *SDPGenerate( sap_handler_t *p_sap, const session_descriptor_t *p_session, - const sap_address_t *p_addr ); + vlc_bool_t b_ssm ); static int announce_SendSAPAnnounce( sap_handler_t *p_sap, sap_session_t *p_session ); @@ -101,8 +104,6 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, static int announce_SAPAnnounceDel( sap_handler_t *p_sap, session_descriptor_t *p_session ); -#define FREE( p ) if( p ) { free( p ); (p) = NULL; } - /** * Create the SAP handler @@ -136,7 +137,7 @@ sap_handler_t *announce_SAPHandlerCreate( announce_handler_t *p_announce ) if( vlc_thread_create( p_sap, "sap handler", RunThread, VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) { - msg_Dbg( p_announce, "Unable to spawn SAP handler thread"); + msg_Dbg( p_announce, "unable to spawn SAP handler thread"); free( p_sap ); return NULL; }; @@ -159,17 +160,16 @@ void announce_SAPHandlerDestroy( sap_handler_t *p_sap ) for( i = 0 ; i< p_sap->i_sessions ; i++) { sap_session_t *p_session = p_sap->pp_sessions[i]; - FREE( p_session->psz_sdp ); - FREE( p_session->psz_data ); + FREENULL( p_session->psz_data ); REMOVE_ELEM( p_sap->pp_sessions, p_sap->i_sessions , i ); - FREE( p_session ); + FREENULL( p_session ); } /* Free the remaining addresses */ for( i = 0 ; i< p_sap->i_addresses ; i++) { sap_address_t *p_address = p_sap->pp_addresses[i]; - FREE( p_address->psz_address ); + FREENULL( p_address->psz_address ); if( p_address->i_rfd > -1 ) { net_Close( p_address->i_rfd ); @@ -179,7 +179,7 @@ void announce_SAPHandlerDestroy( sap_handler_t *p_sap ) net_Close( p_address->i_wfd ); } REMOVE_ELEM( p_sap->pp_addresses, p_sap->i_addresses, i ); - FREE( p_address ); + FREENULL( p_address ); } /* Free the structure */ @@ -207,7 +207,7 @@ static void RunThread( vlc_object_t *p_this) { if( p_sap->pp_addresses[i]->b_enabled == VLC_TRUE ) { - CalculateRate( p_sap, p_sap->pp_addresses[i] ); + ComputeRate( p_sap->pp_addresses[i] ); } } } @@ -246,51 +246,27 @@ static void RunThread( vlc_object_t *p_this) static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, session_descriptor_t *p_session ) { - int i_header_size, i; - char *psz_head, psz_addr[NI_MAXNUMERICHOST]; - vlc_bool_t b_ipv6 = VLC_FALSE; + int i; + char psz_addr[NI_MAXNUMERICHOST]; + vlc_bool_t b_ipv6 = VLC_FALSE, b_ssm = VLC_FALSE; sap_session_t *p_sap_session; mtime_t i_hash; - struct addrinfo hints, *res; struct sockaddr_storage addr; + socklen_t addrlen; vlc_mutex_lock( &p_sap->object_lock ); - - if( p_session->psz_uri == NULL ) + addrlen = p_session->addrlen; + if ((addrlen == 0) || (addrlen > sizeof (addr))) { vlc_mutex_unlock( &p_sap->object_lock ); - msg_Err( p_sap, "*FIXME* Unexpected NULL URI for SAP announce" ); - msg_Err( p_sap, "This should not happen. VLC needs fixing." ); + msg_Err( p_sap, "No/invalid address specified for SAP announce" ); return VLC_EGENERIC; } /* Determine SAP multicast address automatically */ - memset( &hints, 0, sizeof( hints ) ); - hints.ai_socktype = SOCK_DGRAM; - hints.ai_flags = AI_NUMERICHOST; + memcpy (&addr, &p_session->addr, addrlen); - i = vlc_getaddrinfo( (vlc_object_t *)p_sap, p_session->psz_uri, 0, - &hints, &res ); - if( i ) - { - vlc_mutex_unlock( &p_sap->object_lock ); - msg_Err( p_sap, "Invalid URI for SAP announce: %s: %s", - p_session->psz_uri, vlc_gai_strerror( i ) ); - return VLC_EGENERIC; - } - - if( (unsigned)res->ai_addrlen > sizeof( addr ) ) - { - vlc_mutex_unlock( &p_sap->object_lock ); - vlc_freeaddrinfo( res ); - msg_Err( p_sap, "Unsupported address family of size %d > %u", - res->ai_addrlen, sizeof( addr ) ); - return VLC_EGENERIC; - } - - memcpy( &addr, res->ai_addr, res->ai_addrlen ); - - switch( addr.ss_family ) + switch( p_session->addr.ss_family ) { #if defined (HAVE_INET_PTON) || defined (WIN32) case AF_INET6: @@ -301,8 +277,13 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, memcpy( a6->s6_addr + 2, "\x00\x00\x00\x00\x00\x00" "\x00\x00\x00\x00\x00\x02\x7f\xfe", 14 ); if( IN6_IS_ADDR_MULTICAST( a6 ) ) - /* force flags to zero, preserve scope */ + { + /* SSM <=> ff3x::/32 */ + b_ssm = (U32_AT (a6->s6_addr) & 0xfff0ffff) == 0xff300000; + + /* force flags to zero, preserve scope */ a6->s6_addr[1] &= 0xf; + } else /* Unicast IPv6 - assume global scope */ memcpy( a6->s6_addr, "\xff\x0e", 2 ); @@ -330,22 +311,37 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, if ((ipv4 & 0xfffc0000) == 0xefc00000) ipv4 = 0xefc3ffff; else + if ((ipv4 & 0xff000000) == 0xef000000) + ipv4 = 0; + else /* other addresses => 224.2.127.254 */ + { + /* SSM: 232.0.0.0/8 */ + b_ssm = (ipv4 >> 24) == 232; ipv4 = 0xe0027ffe; + } + + if( ipv4 == 0 ) + { + msg_Err( p_sap, "Out-of-scope multicast address " + "not supported by SAP" ); + vlc_mutex_unlock( &p_sap->object_lock ); + return VLC_EGENERIC; + } + + ((struct sockaddr_in *)&addr)->sin_addr.s_addr = htonl( ipv4 ); break; } - + default: vlc_mutex_unlock( &p_sap->object_lock ); - vlc_freeaddrinfo( res ); msg_Err( p_sap, "Address family %d not supported by SAP", addr.ss_family ); return VLC_EGENERIC; } - i = vlc_getnameinfo( (struct sockaddr *)&addr, res->ai_addrlen, + i = vlc_getnameinfo( (struct sockaddr *)&addr, addrlen, psz_addr, sizeof( psz_addr ), NULL, NI_NUMERICHOST ); - vlc_freeaddrinfo( res ); if( i ) { @@ -358,6 +354,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, /* XXX: Check for dupes */ p_sap_session = (sap_session_t*)malloc(sizeof(sap_session_t)); + p_sap_session->p_sd = p_session; p_sap_session->p_address = NULL; /* Add the address to the buffer */ @@ -376,33 +373,24 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, malloc( sizeof(sap_address_t) ); if( !p_address ) { - msg_Err( p_sap, "out of memory" ); + vlc_mutex_unlock( &p_sap->object_lock ); return VLC_ENOMEM; } p_address->psz_address = strdup( psz_addr ); - p_address->i_port = 9875; - p_address->i_wfd = net_OpenUDP( p_sap, "", 0, psz_addr, - p_address->i_port ); + p_address->i_wfd = net_ConnectUDP( VLC_OBJECT(p_sap), psz_addr, SAP_PORT, 255 ); if( p_address->i_wfd != -1 ) { - char *ptr; - - net_StopRecv( p_address->i_wfd ); - net_GetSockAddress( p_address->i_wfd, p_address->psz_machine, - NULL ); - - /* removes scope if present */ - ptr = strchr( p_address->psz_machine, '%' ); - if( ptr != NULL ) - *ptr = '\0'; + shutdown( p_address->i_wfd, SHUT_RD ); + p_address->origlen = sizeof (p_address->orig); + getsockname (p_address->i_wfd, (struct sockaddr *)&p_address->orig, + &p_address->origlen); } if( p_sap->b_control == VLC_TRUE ) { - p_address->i_rfd = net_OpenUDP( p_sap, psz_addr, - p_address->i_port, "", 0 ); + p_address->i_rfd = net_ListenUDP1( (vlc_object_t*)p_sap, psz_addr, SAP_PORT ); if( p_address->i_rfd != -1 ) - net_StopSend( p_address->i_rfd ); + shutdown( p_address->i_rfd, SHUT_WR ); p_address->i_buff = 0; p_address->b_enabled = VLC_TRUE; p_address->b_ready = VLC_FALSE; @@ -431,47 +419,32 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, p_sap_session->p_address = p_address; } + if (p_session->origlen == 0) + memcpy (&p_session->orig, &p_sap_session->p_address->orig, + p_session->origlen = p_sap_session->p_address->origlen); - /* Build the SAP Headers */ - i_header_size = ( b_ipv6 ? 16 : 4 ) + 20; - psz_head = (char *) malloc( i_header_size * sizeof( char ) ); - if( psz_head == NULL ) - { - msg_Err( p_sap, "out of memory" ); - return VLC_ENOMEM; - } - - /* SAPv1, not encrypted, not compressed */ - psz_head[0] = b_ipv6 ? 0x30 : 0x20; - psz_head[1] = 0x00; /* No authentification length */ - - i_hash = mdate(); - psz_head[2] = (i_hash & 0xFF00) >> 8; /* Msg id hash */ - psz_head[3] = (i_hash & 0xFF); /* Msg id hash 2 */ - -#if defined (HAVE_INET_PTON) || defined (WIN32) - if( b_ipv6 ) + size_t headsize = 20; + switch (p_session->orig.ss_family) { - inet_pton( AF_INET6, /* can't fail */ - p_sap_session->p_address->psz_machine, - psz_head + 4 ); - } - else -#else - { - inet_pton( AF_INET, /* can't fail */ - p_sap_session->p_address->psz_machine, - psz_head + 4 ); - } +#ifdef AF_INET6 + case AF_INET6: + headsize += 16; + break; #endif - - memcpy( psz_head + (b_ipv6 ? 20 : 8), "application/sdp", 15 ); + case AF_INET: + headsize += 4; + break; + default: + msg_Err( p_sap, "Address family %d not supported by SAP", + addr.ss_family ); + vlc_mutex_unlock( &p_sap->object_lock ); + return VLC_EGENERIC; + } /* If needed, build the SDP */ if( p_session->psz_sdp == NULL ) { - p_session->psz_sdp = SDPGenerate( p_sap, p_session, - p_sap_session->p_address ); + p_session->psz_sdp = SDPGenerate( p_sap, p_session, b_ssm ); if( p_session->psz_sdp == NULL ) { vlc_mutex_unlock( &p_sap->object_lock ); @@ -479,33 +452,66 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, } } - p_sap_session->psz_sdp = strdup( p_session->psz_sdp ); p_sap_session->i_last = 0; + p_sap_session->i_length = headsize + strlen (p_session->psz_sdp); + p_sap_session->psz_data = malloc (p_sap_session->i_length + 1); + if (p_sap_session->psz_data == NULL) + { + free (p_session->psz_sdp); + vlc_mutex_unlock( &p_sap->object_lock ); + return VLC_ENOMEM; + } - psz_head[ i_header_size-1 ] = '\0'; - p_sap_session->i_length = i_header_size + strlen( p_sap_session->psz_sdp); + /* Build the SAP Headers */ + uint8_t *psz_head = p_sap_session->psz_data; - p_sap_session->psz_data = (uint8_t *)malloc( sizeof(char)* - p_sap_session->i_length ); + /* SAPv1, not encrypted, not compressed */ + psz_head[0] = 0x20; + psz_head[1] = 0x00; /* No authentification length */ - /* Build the final message */ - memcpy( p_sap_session->psz_data, psz_head, i_header_size ); - memcpy( p_sap_session->psz_data+i_header_size, p_sap_session->psz_sdp, - strlen( p_sap_session->psz_sdp) ); + i_hash = mdate(); + psz_head[2] = i_hash >> 8; /* Msg id hash */ + psz_head[3] = i_hash; /* Msg id hash 2 */ - free( psz_head ); + headsize = 4; + switch (p_session->orig.ss_family) + { +#ifdef AF_INET6 + case AF_INET6: + { + struct in6_addr *a6 = + &((struct sockaddr_in6 *)&p_session->orig)->sin6_addr; + memcpy (psz_head + headsize, a6, 16); + psz_head[0] |= 0x10; /* IPv6 flag */ + headsize += 16; + break; + } +#endif + case AF_INET: + { + uint32_t ipv4 = + (((struct sockaddr_in *)&p_session->orig)->sin_addr.s_addr); + memcpy (psz_head + headsize, &ipv4, 4); + headsize += 4; + break; + } + + } + + memcpy (psz_head + headsize, "application/sdp", 16); + headsize += 16; + + /* Build the final message */ + strcpy( (char *)psz_head + headsize, p_session->psz_sdp); /* Enqueue the announce */ INSERT_ELEM( p_sap->pp_sessions, p_sap->i_sessions, p_sap->i_sessions, p_sap_session ); - msg_Dbg( p_sap,"Addresses: %i Sessions: %i", + msg_Dbg( p_sap,"%i addresses, %i sessions", p_sap->i_addresses,p_sap->i_sessions); - /* Remember the SAP session for later deletion */ - p_session->p_sap = p_sap_session; - vlc_mutex_unlock( &p_sap->object_lock ); return VLC_SUCCESS; @@ -518,20 +524,20 @@ static int announce_SAPAnnounceDel( sap_handler_t *p_sap, int i; vlc_mutex_lock( &p_sap->object_lock ); - msg_Dbg( p_sap,"removing SAP announce %p",p_session->p_sap); + msg_Dbg( p_sap, "removing session %p from SAP", p_session); /* Dequeue the announce */ for( i = 0; i< p_sap->i_sessions; i++) { - if( p_session->p_sap == p_sap->pp_sessions[i] ) + if( p_session == p_sap->pp_sessions[i]->p_sd ) { + sap_session_t *p_mysession = p_sap->pp_sessions[i]; REMOVE_ELEM( p_sap->pp_sessions, p_sap->i_sessions, i ); - FREE( p_session->p_sap->psz_sdp ); - FREE( p_session->p_sap->psz_data ); - free( p_session->p_sap ); + free( p_mysession->psz_data ); + free( p_mysession ); break; } } @@ -540,7 +546,7 @@ static int announce_SAPAnnounceDel( sap_handler_t *p_sap, * TODO: - address refcount - send a SAP deletion packet */ - msg_Dbg( p_sap,"%i announces remaining", p_sap->i_sessions ); + msg_Dbg( p_sap,"%i announcements remaining", p_sap->i_sessions ); vlc_mutex_unlock( &p_sap->object_lock ); @@ -563,7 +569,7 @@ static int announce_SendSAPAnnounce( sap_handler_t *p_sap, if( p_session->i_next < mdate() ) { #ifdef EXTRA_DEBUG - msg_Dbg( p_sap, "Sending announce"); + msg_Dbg( p_sap, "sending announce"); #endif i_ret = net_Write( p_sap, p_session->p_address->i_wfd, NULL, p_session->psz_data, @@ -571,8 +577,8 @@ static int announce_SendSAPAnnounce( sap_handler_t *p_sap, if( i_ret != (int)p_session->i_length ) { msg_Warn( p_sap, "SAP send failed on address %s (%i %i)", - p_session->p_address->psz_address, - i_ret, p_session->i_length ); + p_session->p_address->psz_address, + i_ret, p_session->i_length ); } p_session->i_last = p_session->i_next; p_session->i_next = p_session->i_last @@ -587,67 +593,52 @@ static int announce_SendSAPAnnounce( sap_handler_t *p_sap, static char *SDPGenerate( sap_handler_t *p_sap, const session_descriptor_t *p_session, - const sap_address_t *p_addr ) + vlc_bool_t b_ssm ) { - int64_t i_sdp_id = mdate(); - int i_sdp_version = 1 + p_sap->i_sessions + (rand()&0xfff); - char *psz_group, *psz_name, psz_uribuf[NI_MAXNUMERICHOST], *psz_uri, - *psz_sdp; - char ipv; + char *psz_group, *psz_name, *psz_sdp; + + char *head = StartSDP (p_session->psz_name, p_session->description, + p_session->url, p_session->email, p_session->phone, b_ssm, + (const struct sockaddr *)&p_session->orig, p_session->origlen, + (const struct sockaddr *)&p_session->addr, p_session->addrlen); + if (head == NULL) + return NULL; psz_group = p_session->psz_group; psz_name = p_session->psz_name; - /* FIXME: really check that psz_uri is a real IP address - * FIXME: make a common function to obtain a canonical IP address */ - ipv = ( strchr( p_session->psz_uri, ':' ) != NULL) ? '6' : '4'; - if( *p_session->psz_uri == '[' ) - { - char *ptr; - - strncpy( psz_uribuf, p_session->psz_uri + 1, sizeof( psz_uribuf ) ); - psz_uribuf[sizeof( psz_uribuf ) - 1] = '\0'; - ptr = strchr( psz_uribuf, '%' ); - if( ptr != NULL) - *ptr = '\0'; - ptr = strchr( psz_uribuf, ']' ); - if( ptr != NULL) - *ptr = '\0'; - psz_uri = psz_uribuf; - } - else - psz_uri = p_session->psz_uri; - - /* see the lists in modules/stream_out/rtp.c for compliance stuff */ - if( asprintf( &psz_sdp, - "v=0\r\n" - "o=- "I64Fd" %d IN IP%c %s\r\n" - "s=%s\r\n" - "t=0 0\r\n" - "c=IN IP%c %s/%d\r\n" - "m=video %d udp %d\r\n" - "a=tool:"PACKAGE_STRING"\r\n" - "a=type:broadcast\r\n" - "%s%s%s", - i_sdp_id, i_sdp_version, - ipv, p_addr->psz_machine, - psz_name, ipv, - psz_uri, p_session->i_ttl, - p_session->i_port, p_session->i_payload, - psz_group ? "a=x-plgroup:" : "", - psz_group ? psz_group : "", psz_group ? "\r\n" : "" ) == -1 ) + char *plgroup; + if ((psz_group == NULL) + || (asprintf (&plgroup, "a=x-plgroup:%s\r\n", psz_group) == -1)) + plgroup = NULL; + + const char *comedia = NULL; + if (!strncasecmp (p_session->sdpformat, "DCCP", 4) + || !strncasecmp (p_session->sdpformat, "TCP", 3)) + comedia = "a=setup:passive\r\n" + "a=connection:new\r\n"; + + int res = asprintf (&psz_sdp, "%s" "%s" "%s" + "m=video %d %s\r\n", + head, + plgroup ?: "", + comedia ?: "", + ntohs (net_GetPort ((const struct sockaddr *)&p_session->addr)), + p_session->sdpformat); + free (plgroup); + + if (res == -1) return NULL; - + msg_Dbg( p_sap, "Generated SDP (%i bytes):\n%s", strlen(psz_sdp), psz_sdp ); return psz_sdp; } -static int CalculateRate( sap_handler_t *p_sap, sap_address_t *p_address ) +static int ComputeRate( sap_address_t *p_address ) { - int i_read; uint8_t buffer[SAP_MAX_BUFFER]; - int i_tot = 0; + ssize_t i_tot = 0; mtime_t i_temp; int i_rate; @@ -656,13 +647,14 @@ static int CalculateRate( sap_handler_t *p_sap, sap_address_t *p_address ) p_address->t1 = mdate(); return VLC_SUCCESS; } - do + for (;;) { /* Might be too slow if we have huge data */ - i_read = net_ReadNonBlock( p_sap, p_address->i_rfd, NULL, buffer, - SAP_MAX_BUFFER, 0 ); + ssize_t i_read = recv( p_address->i_rfd, buffer, SAP_MAX_BUFFER, 0 ); + if (i_read == -1) + break; i_tot += i_read; - } while( i_read > 0 && i_tot < SAP_MAX_BUFFER ); + } i_temp = mdate(); @@ -687,10 +679,8 @@ static int CalculateRate( sap_handler_t *p_sap, sap_address_t *p_address ) p_address->i_interval = MAX_INTERVAL; } #ifdef EXTRA_DEBUG - msg_Dbg( p_sap,"%s:%i : Rate=%i, Interval = %i s", - p_address->psz_address,p_address->i_port, - i_rate, - p_address->i_interval ); + msg_Dbg( p_sap,"%s:%i: rate=%i, interval = %i s", + p_address->psz_address,SAP_PORT, i_rate, p_address->i_interval ); #endif p_address->b_ready = VLC_TRUE;